From e405291c1b36d1f36297fcd7db80460a4f5c289e Mon Sep 17 00:00:00 2001 From: DongHun Kim <31065684+d-h-k@users.noreply.github.com> Date: Mon, 3 May 2021 16:23:08 +0900 Subject: [PATCH 01/88] Create .gitignore --- .gitignore | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..cca136960 --- /dev/null +++ b/.gitignore @@ -0,0 +1,260 @@ + +# Created by https://www.toptal.com/developers/gitignore/api/swift,xcode,java,intellij,gradle,vscode +# Edit at https://www.toptal.com/developers/gitignore?templates=swift,xcode,java,intellij,gradle,vscode + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Swift ### +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Obj-C/Swift specific +*.hmap + +## App packaging +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm + +.build/ + +# CocoaPods +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# Pods/ +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build/ + +# Add this lines if you are using Accio dependency management (Deprecated since Xcode 12) +# Dependencies/ +# .accio/ + +# fastlane +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +### vscode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +### Xcode ### +# Xcode +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + + + + +## Gcc Patch +/*.gcno + +### Xcode Patch ### +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcworkspace/contents.xcworkspacedata +**/xcshareddata/WorkspaceSettings.xcsettings + +### Gradle ### +.gradle + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +# End of https://www.toptal.com/developers/gitignore/api/swift,xcode,java,intellij,gradle,vscode From 47eae7f6edd804c051c7e07b61c5b5e37f2b6cd0 Mon Sep 17 00:00:00 2001 From: DongHun Kim <31065684+d-h-k@users.noreply.github.com> Date: Mon, 3 May 2021 16:24:18 +0900 Subject: [PATCH 02/88] Update .gitignore --- .gitignore | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.gitignore b/.gitignore index cca136960..6722b1e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -257,4 +257,39 @@ gradle-app.setting ### Gradle Patch ### **/build/ + +# Created by https://www.toptal.com/developers/gitignore/api/osx +# Edit at https://www.toptal.com/developers/gitignore?templates=osx + +### OSX ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# End of https://www.toptal.com/developers/gitignore/api/osx + # End of https://www.toptal.com/developers/gitignore/api/swift,xcode,java,intellij,gradle,vscode From 4213a9b09dc45b52bffccde240e5bd74cb7bdf6b Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Mon, 3 May 2021 17:11:06 +0900 Subject: [PATCH 03/88] first BE-Commit --- BE_baseball/.gitignore | 37 ++++ BE_baseball/build.gradle | 30 +++ BE_baseball/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + BE_baseball/gradlew | 185 ++++++++++++++++++ BE_baseball/gradlew.bat | 89 +++++++++ BE_baseball/settings.gradle | 1 + .../dong/baseball/BaseballApplication.java | 13 ++ .../src/main/resources/application.properties | 1 + .../baseball/BaseballApplicationTests.java | 13 ++ 10 files changed, 374 insertions(+) create mode 100644 BE_baseball/.gitignore create mode 100644 BE_baseball/build.gradle create mode 100644 BE_baseball/gradle/wrapper/gradle-wrapper.jar create mode 100644 BE_baseball/gradle/wrapper/gradle-wrapper.properties create mode 100755 BE_baseball/gradlew create mode 100644 BE_baseball/gradlew.bat create mode 100644 BE_baseball/settings.gradle create mode 100644 BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java create mode 100644 BE_baseball/src/main/resources/application.properties create mode 100644 BE_baseball/src/test/java/com/dong/baseball/BaseballApplicationTests.java diff --git a/BE_baseball/.gitignore b/BE_baseball/.gitignore new file mode 100644 index 000000000..c2065bc26 --- /dev/null +++ b/BE_baseball/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/BE_baseball/build.gradle b/BE_baseball/build.gradle new file mode 100644 index 000000000..72391957b --- /dev/null +++ b/BE_baseball/build.gradle @@ -0,0 +1,30 @@ +plugins { + id 'org.springframework.boot' version '2.3.10.RELEASE' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.dong' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'mysql:mysql-connector-java' + testImplementation('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } +} + +test { + useJUnitPlatform() +} diff --git a/BE_baseball/gradle/wrapper/gradle-wrapper.jar b/BE_baseball/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/BE_baseball/gradle/wrapper/gradle-wrapper.properties b/BE_baseball/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..442d9132e --- /dev/null +++ b/BE_baseball/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/BE_baseball/gradlew b/BE_baseball/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /dev/null +++ b/BE_baseball/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/BE_baseball/gradlew.bat b/BE_baseball/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/BE_baseball/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/BE_baseball/settings.gradle b/BE_baseball/settings.gradle new file mode 100644 index 000000000..c1cccd8ee --- /dev/null +++ b/BE_baseball/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'baseball' diff --git a/BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java b/BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java new file mode 100644 index 000000000..86906aa53 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java @@ -0,0 +1,13 @@ +package com.dong.baseball; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class BaseballApplication { + + public static void main(String[] args) { + SpringApplication.run(BaseballApplication.class, args); + } + +} diff --git a/BE_baseball/src/main/resources/application.properties b/BE_baseball/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/BE_baseball/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/BE_baseball/src/test/java/com/dong/baseball/BaseballApplicationTests.java b/BE_baseball/src/test/java/com/dong/baseball/BaseballApplicationTests.java new file mode 100644 index 000000000..91fa6bcb5 --- /dev/null +++ b/BE_baseball/src/test/java/com/dong/baseball/BaseballApplicationTests.java @@ -0,0 +1,13 @@ +package com.dong.baseball; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BaseballApplicationTests { + + @Test + void contextLoads() { + } + +} From 86436b35730016cd425aaf2744749f44359ae8e3 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Mon, 3 May 2021 18:13:28 +0900 Subject: [PATCH 04/88] Readme file only for BE update --- BE_baseball/BE_ReadME.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 BE_baseball/BE_ReadME.md diff --git a/BE_baseball/BE_ReadME.md b/BE_baseball/BE_ReadME.md new file mode 100644 index 000000000..8bf605917 --- /dev/null +++ b/BE_baseball/BE_ReadME.md @@ -0,0 +1,29 @@ +# 테크니컬 첼린지 포인트 +## Oauth 구현하기 + - github 페이지와 ouath인증 진행하기 + - Spring security는 사용하지 않는다. + - 어려운 경우 >> Oauth를 별도 라이브러리로 구현하고 baseball 프로젝트에 통합 적용해 본다. + +## admin tool 제작 + - 게임 운영에 필요한 도구들을 모아놓은 admin tool을 별도 웹으로 구현한다. + - admin 도구는 프론트 및 백엔드 모두 백엔드에서 직접 구현한다. + - admin 사용자 인증은 hard coding으로 최대한 간단히 구현한다. admin email 주소를 설정에 포함할 것 + - 내생각 + - admin@dong.com / javaking >> 요런느낌으로 가자 + - 게임 운영에 필요한 도구들 + - 모든 데이터베이스 조회 + - 프론엔드 백엔드 다 구현해버리기 + +## VPC 학습 + - 웹서버와 데이터베이스는 다른컴퓨터로 쓰기!! + - EC2 두대로 각각 웹서버와, DB서버 두대 돌려 생성 + - 혹은 데이터베이스는 RDS로 쓰고, 웹서버 EC2 쓰는 구조 + - 22,80 포트 제외하고 다 닫기 + - 3306이나 8080은 포트 열려있는거 자체가 보안 취약점이니까 꼭 닫아놓기 + - 엔진엑스랑 연결되는거니까 다음항목을 봐라 + +## Nginx + - 프론트 배포는 NginX를 설정해서 사용한다. 프론트는 80포트에서 동작 + - NginX와 tomcat을 연동하고 80포트만 외부에 개방 + - 8080 포트는 외부에 개방하지마라 + - 그러니까 쉽게말해서 프론트사이드 From b65a14683e27e3dae8a271944dcac350637bbf4c Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 17:47:10 +0900 Subject: [PATCH 05/88] =?UTF-8?q?feat=20:=20=EC=8A=A4=ED=94=84=EB=A7=81=20?= =?UTF-8?q?=EB=B6=80=ED=8A=B8=20=EC=96=B4=ED=94=8C=EB=A6=AC=EC=BC=80?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=85=8B=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/application.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BE_baseball/src/main/resources/application.properties b/BE_baseball/src/main/resources/application.properties index 8b1378917..fadc21f58 100644 --- a/BE_baseball/src/main/resources/application.properties +++ b/BE_baseball/src/main/resources/application.properties @@ -1 +1,12 @@ +# DB +spring.datasource.url=jdbc:mysql://localhost:3306/baseball?serverTimezone=UTC&characterEncoding=UTF-8 +spring.datasource.username=root +spring.datasource.password=password +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.initialization-mode=always +# schema.sql, data.sql 파일이 있다면 서버 시작 시 스크립트를 실행합니다. +# logs +#logging.level.com.codesquad.team14.*=DEBUG +logging.level.root=info +logging.file.path=logs From a8d49e07c05f44757d284764768a9a23ff0936e0 Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 17:47:34 +0900 Subject: [PATCH 06/88] =?UTF-8?q?docs=20:=20=EB=AC=B8=EC=84=9C=ED=99=94?= =?UTF-8?q?=EC=9E=90=EB=A3=8C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/BE_ReadME.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/BE_baseball/BE_ReadME.md b/BE_baseball/BE_ReadME.md index 8bf605917..3603adf48 100644 --- a/BE_baseball/BE_ReadME.md +++ b/BE_baseball/BE_ReadME.md @@ -27,3 +27,15 @@ - NginX와 tomcat을 연동하고 80포트만 외부에 개방 - 8080 포트는 외부에 개방하지마라 - 그러니까 쉽게말해서 프론트사이드 + + +## 커밋 메시지 규칙 +> 원문 : http://karma-runner.github.io/5.0/dev/git-commit-msg.html + +- feat (new feature for the user, not a new feature for build script) +- fix (bug fix for the user, not a fix to a build script) +- docs (changes to the documentation) +- style (formatting, missing semi colons, etc; no production code change) +- refactor (refactoring production code, eg. renaming a variable) +- test (adding missing tests, refactoring tests; no production code change) +- chore (updating grunt tasks etc; no production code change) From 22aa74146c3b6dc5d284d32c38bd908fb1efd18c Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 17:48:08 +0900 Subject: [PATCH 07/88] =?UTF-8?q?feat=20:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=A4=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BE_baseball/build.gradle b/BE_baseball/build.gradle index 72391957b..3a2c2600c 100644 --- a/BE_baseball/build.gradle +++ b/BE_baseball/build.gradle @@ -14,9 +14,9 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + //implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + //implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + //implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'mysql:mysql-connector-java' From 90ba49c3f6dcfde93a5061b507aec08fc42f303f Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 17:53:07 +0900 Subject: [PATCH 08/88] =?UTF-8?q?feat=20:=20=EC=95=BC=EA=B5=AC=20=EB=B0=B1?= =?UTF-8?q?=EC=97=94=EB=93=9C=EC=84=9C=EB=B2=84=EB=A5=BC=20=EB=A7=8C?= =?UTF-8?q?=EB=93=9C=EB=8A=94=EB=8D=B0=20=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Domain/Board.java | 17 +++++++ .../java/com/dong/baseball/Domain/Match.java | 44 +++++++++++++++++++ .../java/com/dong/baseball/Domain/Player.java | 11 +++++ .../com/dong/baseball/Domain/utils/Team.java | 5 +++ 4 files changed, 77 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java new file mode 100644 index 000000000..bf499855a --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java @@ -0,0 +1,17 @@ +package com.dong.baseball.Domain; + +import org.springframework.data.annotation.Id; + +public class Board { + + @Id + private Long gameId; + + private String turn; + private int strike; + private int ball; + private int out; + private int point; + private String pitcher; + private String batter; +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java new file mode 100644 index 000000000..5c1111741 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java @@ -0,0 +1,44 @@ +package com.dong.baseball.Domain; + +import org.springframework.data.annotation.Id; + +public class Match { + @Id + Long matchId; + + String home; + String away; + + public Long getMatchId() { + return matchId; + } + + public void setMatchId(Long matchId) { + this.matchId = matchId; + } + + public String getHome() { + return home; + } + + public void setHome(String home) { + this.home = home; + } + + public String getAway() { + return away; + } + + public void setAway(String away) { + this.away = away; + } + + @Override + public String toString() { + return "Match{" + + "matchId=" + matchId + + ", home='" + home + '\'' + + ", away='" + away + '\'' + + '}'; + } +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java new file mode 100644 index 000000000..84b372718 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java @@ -0,0 +1,11 @@ +package com.dong.baseball.Domain; + +public class Player { + String team; + int gamesPlayed; + int atBat; + int hit; + int ball; + int Strike; + double battingAverage; +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java new file mode 100644 index 000000000..2e77062f5 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java @@ -0,0 +1,5 @@ +package com.dong.baseball.Domain.utils; + +public enum Team { + Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants; +} From d7a0d4e4dda7dc53bf36e48810293a5fc4f291e1 Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 17:57:26 +0900 Subject: [PATCH 09/88] =?UTF-8?q?feat=20:=20=EB=B0=B0=ED=8F=AC=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=ED=99=94=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/deploy.sh | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 BE_baseball/src/main/resources/deploy.sh diff --git a/BE_baseball/src/main/resources/deploy.sh b/BE_baseball/src/main/resources/deploy.sh new file mode 100644 index 000000000..c8921dc30 --- /dev/null +++ b/BE_baseball/src/main/resources/deploy.sh @@ -0,0 +1,45 @@ +# 설정 +LINE='#########################################################' +SERVADDR='ec2-13-125-229-168.ap-northeast-2.compute.amazonaws.com' #배포할 AWS EC2 서버 +KEYFILE='~/Downloads/DongDong.pem' # 내 개발콤퓨터에서 AWS key 위치 +AUTOINJECT_JAR=1 #1:자동으로 scp명령어로 밀어넣기, #0=안밀어넣고 명령어만 보여주고 끝내기 +# +echo $LINE +echo "## DongDong's 바이너리파일 밀어넣기 스크립트 " +echo "## >> 프로젝트 : baseball << " +echo $LINE + +cd ../../../ +./gradlew build -x test +cd build/libs +BINFILE=`ls | grep *.jar` +echo $BINFILE +echo $LINE + +if [ ${AUTOINJECT_JAR} -eq 1 ];then + scp -i $KEYFILE $BINFILE ubuntu@$SERVADDR:/home/ubuntu + echo "JAR FILE SEND OK...!" + + echo "" + echo "## tip!" + echo "" + echo "#how to run?" + echo "nohup java -jar ${BINFILE} &" + echo "" + echo "#how to show log file?" + echo "tail -F nohup.out" + echo "" + echo "#java start fail?" + echo "ps -ef | grep java" + echo "" + echo "go EC2 SERVER" + echo $LINE + + ssh -i $KEYFILE ubuntu@$SERVADDR +fi + + + + + + From 3d5a8bd491c184a1258eb2ee06a217628f5293e3 Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 17:57:41 +0900 Subject: [PATCH 10/88] =?UTF-8?q?DML=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 BE_baseball/src/main/resources/data.sql diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql new file mode 100644 index 000000000..af4447b28 --- /dev/null +++ b/BE_baseball/src/main/resources/data.sql @@ -0,0 +1,13 @@ +-- schema.sql 파일은 DDL 스크립트 +-- data.sql 파일은 DML 스크립트 +use baseball; +INSERT INTO `match`(home,away) values + ('Tigers','Bears'), + ('Bears','Twins'), + ('Twins','Dinos'), + ('Dinos','Lions'), + ('Lions','Eagles'), + ('Eagles','Giants'), + ('Giants','Tigers'); + + From 80c60271a9fb8725a83d94408d9b55e72d253b31 Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 17:57:53 +0900 Subject: [PATCH 11/88] =?UTF-8?q?DDL=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/schema.sql | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 BE_baseball/src/main/resources/schema.sql diff --git a/BE_baseball/src/main/resources/schema.sql b/BE_baseball/src/main/resources/schema.sql new file mode 100644 index 000000000..eb637e9f1 --- /dev/null +++ b/BE_baseball/src/main/resources/schema.sql @@ -0,0 +1,39 @@ +-- schema.sql 파일은 DDL 스크립트 +-- data.sql 파일은 DML 스크립트 + +use baseball; + +drop table IF EXISTS `match`; + +CREATE TABLE IF NOT EXISTS `baseball`.`match`( +`match_id` BIGINT PRIMARY KEY AUTO_INCREMENT, +`home` VARCHAR(45) NOT NULL, +`away` VARCHAR(45) NOT NULL +); +ALTER TABLE `match` CONVERT TO character SET utf8; + +DESC `match`; +-- +-- + +drop table IF EXISTS `board`; + +CREATE TABLE IF NOT EXISTS `baseball`.`board` +( +`game_id` BIGINT PRIMARY KEY AUTO_INCREMENT, +`turn` VARCHAR(45) NOT NULL, +`strike` INT NOT NULL, -- 점 +`ball` INT NOT NULL, +`out` INT NOT NULL, +`point` INT NOT NULL, -- 득 +`pitcher` VARCHAR(45) NOT NULL, +`batter` VARCHAR(45) NOT NULL +); +ALTER TABLE `board` CONVERT TO character SET utf8; +DESC `board`; + + +-- +-- + +show tables; From 35752e91aaef159fb3d3ae105042056b1ae9a8e9 Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 19:04:29 +0900 Subject: [PATCH 12/88] =?UTF-8?q?feat=20:=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=EC=9D=84=20=EC=9C=84=ED=95=9C=20repository?= =?UTF-8?q?=20=EC=9D=B8=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=EB=A5=BC=20cru?= =?UTF-8?q?d=EB=A1=9C=20=EC=83=81=EC=86=8D=EB=B0=9B=EC=95=84=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Repository/GameRepository.java | 8 ++++++++ .../com/dong/baseball/Repository/LeagueRepository.java | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Repository/GameRepository.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Repository/LeagueRepository.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/GameRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/GameRepository.java new file mode 100644 index 000000000..ba3accd5b --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/GameRepository.java @@ -0,0 +1,8 @@ +package com.dong.baseball.Repository; + +import com.dong.baseball.Domain.Board; +import org.springframework.data.repository.CrudRepository; + +public interface GameRepository extends CrudRepository { + +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/LeagueRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/LeagueRepository.java new file mode 100644 index 000000000..34286e193 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/LeagueRepository.java @@ -0,0 +1,10 @@ +package com.dong.baseball.Repository; + +import com.dong.baseball.Domain.Match; +import org.springframework.data.repository.CrudRepository; + +import java.util.List; + +public interface LeagueRepository extends CrudRepository { + List findAll(); +} From a44cdb9e62b25e59f7e3d8abff2c62544c437a3f Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 4 May 2021 19:05:05 +0900 Subject: [PATCH 13/88] =?UTF-8?q?feat=20:=20Game=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EB=AA=A9=EC=97=85=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=EB=B0=8F=20?= =?UTF-8?q?=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/Controller/GameController.java | 30 +++++++++++++++++++ .../dong/baseball/Service/GameService.java | 26 ++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java new file mode 100644 index 000000000..9ae52518b --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -0,0 +1,30 @@ +package com.dong.baseball.Controller; + +import com.dong.baseball.Domain.Match; +import com.dong.baseball.Service.GameService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/games") +public class GameController { + + + private final GameService gameService; + + public GameController(GameService gameService) { + this.gameService = gameService; + } + + @GetMapping("") + public List allMatches() { + return gameService.findAllMatches(); + } + + @GetMapping("/{matchId}") + public + +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java new file mode 100644 index 000000000..82e347396 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -0,0 +1,26 @@ +package com.dong.baseball.Service; + +import com.dong.baseball.Domain.Match; +import com.dong.baseball.Repository.GameRepository; +import com.dong.baseball.Repository.LeagueRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class GameService { + + private final GameRepository gameRepository; + private final LeagueRepository leagueRepository; + + public GameService(GameRepository gameRepository, LeagueRepository leagueRepository) { + this.gameRepository = gameRepository; + this.leagueRepository = leagueRepository; + } + + + public List findAllMatches() { + return leagueRepository.findAll(); + } +} + From 7bb11bf3a01155f48d3ab0833858e02bb3dacf37 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 5 May 2021 22:08:45 +0900 Subject: [PATCH 14/88] =?UTF-8?q?refactor=20:=20board=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=BB=AC=EB=9F=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dong/baseball/Domain/Board.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java index bf499855a..e6da5a728 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java @@ -5,13 +5,16 @@ public class Board { @Id - private Long gameId; + private Long board_Id; + + private Long matchId; private String turn; private int strike; private int ball; private int out; - private int point; + private int HomePoint; + private int AwayPoint; private String pitcher; private String batter; } From 70c783c334969a19f057ca4b1e0c371482afa833 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 5 May 2021 22:09:04 +0900 Subject: [PATCH 15/88] =?UTF-8?q?refactor=20:=20DTO=EB=A1=9C=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Service/GameService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index 82e347396..a67858a18 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -1,10 +1,12 @@ package com.dong.baseball.Service; +import com.dong.baseball.DTO.MatchUpListDTO; import com.dong.baseball.Domain.Match; import com.dong.baseball.Repository.GameRepository; import com.dong.baseball.Repository.LeagueRepository; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; @Service @@ -19,8 +21,13 @@ public GameService(GameRepository gameRepository, LeagueRepository leagueReposit } - public List findAllMatches() { - return leagueRepository.findAll(); + public List matchList() { + List matchList = leagueRepository.findAll(); + List dtoList = new ArrayList<>(); + for(Match match : matchList) { + dtoList.add(new MatchUpListDTO(match)); + } + return dtoList; } } From 049d167090f176441351271d1b9a0b7e1783241e Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 5 May 2021 22:09:17 +0900 Subject: [PATCH 16/88] =?UTF-8?q?refactor=20:=20DTO=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/MatchUpListDTO.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java new file mode 100644 index 000000000..13cd9cf28 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java @@ -0,0 +1,49 @@ +package com.dong.baseball.DTO; + +import com.dong.baseball.Domain.Match; + +public class MatchUpListDTO { + private Long matchId; + private String home; + private String away; + + + public MatchUpListDTO(Match match) { + this.matchId = match.getMatchId(); + this.home = match.getHome(); + this.away = match.getAway(); + } + + public Long getMatchId() { + return matchId; + } + + public void setMatchId(Long matchId) { + this.matchId = matchId; + } + + public String getHome() { + return home; + } + + public void setHome(String home) { + this.home = home; + } + + public String getAway() { + return away; + } + + public void setAway(String away) { + this.away = away; + } + + @Override + public String toString() { + return "MatchUpListDTO{" + + "matchId=" + matchId + + ", home='" + home + '\'' + + ", away='" + away + '\'' + + '}'; + } +} From 81630b3599d6189a2a21ddb05b298a05de28ebb3 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 5 May 2021 22:24:08 +0900 Subject: [PATCH 17/88] =?UTF-8?q?refactor=20:=20=EB=A0=88=ED=8F=AC?= =?UTF-8?q?=EC=A7=80=ED=86=A0=EB=A6=AC=20=EC=9D=B4=EB=A6=84=EC=9D=80=20Gam?= =?UTF-8?q?e=20>>=20Board=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{GameRepository.java => BoardRepository.java} | 2 +- .../com/dong/baseball/Service/GameService.java | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) rename BE_baseball/src/main/java/com/dong/baseball/Repository/{GameRepository.java => BoardRepository.java} (66%) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/GameRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/BoardRepository.java similarity index 66% rename from BE_baseball/src/main/java/com/dong/baseball/Repository/GameRepository.java rename to BE_baseball/src/main/java/com/dong/baseball/Repository/BoardRepository.java index ba3accd5b..36a5051a7 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Repository/GameRepository.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/BoardRepository.java @@ -3,6 +3,6 @@ import com.dong.baseball.Domain.Board; import org.springframework.data.repository.CrudRepository; -public interface GameRepository extends CrudRepository { +public interface BoardRepository extends CrudRepository { } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index a67858a18..48002ae69 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -1,8 +1,10 @@ package com.dong.baseball.Service; import com.dong.baseball.DTO.MatchUpListDTO; +import com.dong.baseball.DTO.SituationBoardDTO; +import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; -import com.dong.baseball.Repository.GameRepository; +import com.dong.baseball.Repository.BoardRepository; import com.dong.baseball.Repository.LeagueRepository; import org.springframework.stereotype.Service; @@ -12,11 +14,11 @@ @Service public class GameService { - private final GameRepository gameRepository; + private final BoardRepository boardRepository; private final LeagueRepository leagueRepository; - public GameService(GameRepository gameRepository, LeagueRepository leagueRepository) { - this.gameRepository = gameRepository; + public GameService(BoardRepository boardRepository, LeagueRepository leagueRepository) { + this.boardRepository = boardRepository; this.leagueRepository = leagueRepository; } @@ -29,5 +31,9 @@ public List matchList() { } return dtoList; } + + public List matchInformations() { + List matchBoards = leagueRepository. + } } From a66f34a009333f654481c9c4077a66ceac301ce2 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 6 May 2021 00:21:38 +0900 Subject: [PATCH 18/88] =?UTF-8?q?refactor=20:=20inning=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Domain/Board.java | 90 ++++++++++++++++++- 1 file changed, 89 insertions(+), 1 deletion(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java index e6da5a728..4d587f294 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java @@ -8,7 +8,7 @@ public class Board { private Long board_Id; private Long matchId; - + private int inning; private String turn; private int strike; private int ball; @@ -17,4 +17,92 @@ public class Board { private int AwayPoint; private String pitcher; private String batter; + + public Long getBoard_Id() { + return board_Id; + } + + public void setBoard_Id(Long board_Id) { + this.board_Id = board_Id; + } + + public Long getMatchId() { + return matchId; + } + + public void setMatchId(Long matchId) { + this.matchId = matchId; + } + + public int getInning() { + return inning; + } + + public void setInning(int inning) { + this.inning = inning; + } + + public String getTurn() { + return turn; + } + + public void setTurn(String turn) { + this.turn = turn; + } + + public int getStrike() { + return strike; + } + + public void setStrike(int strike) { + this.strike = strike; + } + + public int getBall() { + return ball; + } + + public void setBall(int ball) { + this.ball = ball; + } + + public int getOut() { + return out; + } + + public void setOut(int out) { + this.out = out; + } + + public int getHomePoint() { + return HomePoint; + } + + public void setHomePoint(int homePoint) { + HomePoint = homePoint; + } + + public int getAwayPoint() { + return AwayPoint; + } + + public void setAwayPoint(int awayPoint) { + AwayPoint = awayPoint; + } + + public String getPitcher() { + return pitcher; + } + + public void setPitcher(String pitcher) { + this.pitcher = pitcher; + } + + public String getBatter() { + return batter; + } + + public void setBatter(String batter) { + this.batter = batter; + } } From ef9fcf45c26f5b48f4e73511b18772eb95e65be7 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 6 May 2021 00:22:42 +0900 Subject: [PATCH 19/88] =?UTF-8?q?refactor=20:=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Repository/BoardRepository.java | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 BE_baseball/src/main/java/com/dong/baseball/Repository/BoardRepository.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/BoardRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/BoardRepository.java deleted file mode 100644 index 36a5051a7..000000000 --- a/BE_baseball/src/main/java/com/dong/baseball/Repository/BoardRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.dong.baseball.Repository; - -import com.dong.baseball.Domain.Board; -import org.springframework.data.repository.CrudRepository; - -public interface BoardRepository extends CrudRepository { - -} From c264c00ab11a4244666f8d96ab334f0df41128ec Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 6 May 2021 00:23:18 +0900 Subject: [PATCH 20/88] =?UTF-8?q?refactor=20:=20=EA=B2=8C=EC=9E=84?= =?UTF-8?q?=EB=B3=84=20=EC=84=B8=EB=B6=80=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=A0=9C=EA=B3=B5=ED=95=98=EB=8A=94=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dong/baseball/Controller/GameController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index 9ae52518b..d6665838a 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -1,8 +1,12 @@ package com.dong.baseball.Controller; +import com.dong.baseball.DTO.MatchUpListDTO; +import com.dong.baseball.DTO.SituationBoardDTO; +import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; import com.dong.baseball.Service.GameService; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -20,11 +24,15 @@ public GameController(GameService gameService) { } @GetMapping("") - public List allMatches() { - return gameService.findAllMatches(); + public List allMatches() { + return gameService.matchList(); } @GetMapping("/{matchId}") - public + public List matchInfos(@PathVariable Long matchId) { + return gameService.matchInformations(matchId); + } + + } From 3d5ff022241ef6501519ea296c4a6cd32c98bea5 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 6 May 2021 00:23:26 +0900 Subject: [PATCH 21/88] =?UTF-8?q?refactor=20:=20=EA=B2=8C=EC=9E=84?= =?UTF-8?q?=EB=B3=84=20=EC=84=B8=EB=B6=80=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=A0=9C=EA=B3=B5=ED=95=98=EB=8A=94=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dong/baseball/Service/GameService.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index 48002ae69..2a2d84f78 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -4,7 +4,6 @@ import com.dong.baseball.DTO.SituationBoardDTO; import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; -import com.dong.baseball.Repository.BoardRepository; import com.dong.baseball.Repository.LeagueRepository; import org.springframework.stereotype.Service; @@ -14,15 +13,13 @@ @Service public class GameService { - private final BoardRepository boardRepository; + //private final BoardRepository boardRepository; private final LeagueRepository leagueRepository; - public GameService(BoardRepository boardRepository, LeagueRepository leagueRepository) { - this.boardRepository = boardRepository; + public GameService(LeagueRepository leagueRepository) { this.leagueRepository = leagueRepository; } - public List matchList() { List matchList = leagueRepository.findAll(); List dtoList = new ArrayList<>(); @@ -32,8 +29,16 @@ public List matchList() { return dtoList; } - public List matchInformations() { - List matchBoards = leagueRepository. + public List matchInformations(Long matchId) { + Match match = leagueRepository.findById(matchId).get(); + List matchBoards = match.getGameBoards(); + List matchBoardInfo = new ArrayList<>(); + + for(Board board : matchBoards) { + matchBoardInfo.add(new SituationBoardDTO(board)); + } + + return matchBoardInfo; } } From 8c73d43ea65cae3a7d9e08f30e78d678c3a1fda8 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 6 May 2021 00:24:09 +0900 Subject: [PATCH 22/88] =?UTF-8?q?refactor=20:=20=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=A0=9C=ED=95=9C=EC=9E=90=20private=20=EC=B6=94=EA=B0=80,=201?= =?UTF-8?q?:N=20=EA=B4=80=EA=B3=84=EC=9D=98=20=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=EB=A5=BC=20=EA=B0=96=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Domain/Match.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java index 5c1111741..2ff53181d 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java @@ -2,12 +2,27 @@ import org.springframework.data.annotation.Id; +import java.util.ArrayList; +import java.util.List; + public class Match { @Id - Long matchId; + private Long matchId; + + private String home; + private String away; + + List gameBoards = new ArrayList<>(); - String home; - String away; + public void addGameBoards(Board... boards) { + for (Board board : boards) { + this.gameBoards.add(board); + } + } + + public List getGameBoards() { + return gameBoards; + } public Long getMatchId() { return matchId; @@ -39,6 +54,7 @@ public String toString() { "matchId=" + matchId + ", home='" + home + '\'' + ", away='" + away + '\'' + + ", gameBoards=" + gameBoards + '}'; } } From 83506948535928e52a01779ecbfe9587647aa842 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 6 May 2021 00:24:31 +0900 Subject: [PATCH 23/88] =?UTF-8?q?refactor=20:=20DTO=EB=A5=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=98=EC=97=AC=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EB=B3=B4=EB=82=B4?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dong/baseball/DTO/SituationBoardDTO.java | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java new file mode 100644 index 000000000..76bdc83e5 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java @@ -0,0 +1,121 @@ +package com.dong.baseball.DTO; + +import com.dong.baseball.Domain.Board; + +public class SituationBoardDTO { + + private Long matchId; + private int inning; + private String turn; + private int strike; + private int ball; + private int out; + private int HomePoint; + private int AwayPoint; + private String pitcher; + private String batter; + + public SituationBoardDTO(Board board) { + this.inning = board.getInning(); + this.turn = board.getTurn(); + this.strike = board.getStrike(); + this.ball =board.getBall(); + //@ Todo 할일더많음 + } + + public Long getMatchId() { + return matchId; + } + + public void setMatchId(Long matchId) { + this.matchId = matchId; + } + + public int getInning() { + return inning; + } + + public void setInning(int inning) { + this.inning = inning; + } + + public String getTurn() { + return turn; + } + + public void setTurn(String turn) { + this.turn = turn; + } + + public int getStrike() { + return strike; + } + + public void setStrike(int strike) { + this.strike = strike; + } + + public int getBall() { + return ball; + } + + public void setBall(int ball) { + this.ball = ball; + } + + public int getOut() { + return out; + } + + public void setOut(int out) { + this.out = out; + } + + public int getHomePoint() { + return HomePoint; + } + + public void setHomePoint(int homePoint) { + HomePoint = homePoint; + } + + public int getAwayPoint() { + return AwayPoint; + } + + public void setAwayPoint(int awayPoint) { + AwayPoint = awayPoint; + } + + public String getPitcher() { + return pitcher; + } + + public void setPitcher(String pitcher) { + this.pitcher = pitcher; + } + + public String getBatter() { + return batter; + } + + public void setBatter(String batter) { + this.batter = batter; + } + + @Override + public String toString() { + return "SituationBoardDTO{" + + "matchId=" + matchId + + ", inning=" + inning + + ", turn='" + turn + '\'' + + ", strike=" + strike + + ", ball=" + ball + + ", out=" + out + + ", HomePoint=" + HomePoint + + ", AwayPoint=" + AwayPoint + + ", pitcher='" + pitcher + '\'' + + ", batter='" + batter + '\'' + + '}'; + } +} From 707dec91ad720e665ce0576513027d4cbdafd19d Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 6 May 2021 00:30:51 +0900 Subject: [PATCH 24/88] =?UTF-8?q?refactor=20:=20=EA=B9=83=EC=97=90=20?= =?UTF-8?q?=EB=A1=9C=EC=BB=AC=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EC=98=AC=EB=9D=BC?= =?UTF-8?q?=EA=B0=80=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20gitignore=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/.gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BE_baseball/.gitignore b/BE_baseball/.gitignore index c2065bc26..a3386a750 100644 --- a/BE_baseball/.gitignore +++ b/BE_baseball/.gitignore @@ -35,3 +35,9 @@ out/ ### VS Code ### .vscode/ + + +## logfiles +/logs/ +*.gz +*.log From 3bb7f5b2fcba647c569689e34dec725bf6a4af83 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Fri, 7 May 2021 00:18:26 +0900 Subject: [PATCH 25/88] =?UTF-8?q?refactor=20:=201:N=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=8F=99=EC=9E=91=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/MatchUpListDTO.java | 2 +- .../java/com/dong/baseball/Domain/Board.java | 33 +++++++++++-------- .../java/com/dong/baseball/Domain/Match.java | 14 ++++---- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java index 13cd9cf28..3375b6148 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java @@ -9,7 +9,7 @@ public class MatchUpListDTO { public MatchUpListDTO(Match match) { - this.matchId = match.getMatchId(); + this.matchId = match.getId(); this.home = match.getHome(); this.away = match.getAway(); } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java index 4d587f294..179c18423 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java @@ -1,13 +1,16 @@ package com.dong.baseball.Domain; + +import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.Id; +import java.time.LocalDateTime; + public class Board { @Id - private Long board_Id; + private Long id; - private Long matchId; private int inning; private String turn; private int strike; @@ -18,21 +21,25 @@ public class Board { private String pitcher; private String batter; - public Long getBoard_Id() { - return board_Id; - } + //@CreatedDate + //private LocalDateTime createdAt; - public void setBoard_Id(Long board_Id) { - this.board_Id = board_Id; - } - public Long getMatchId() { - return matchId; + @Override + public String toString() { + return "Board{" + + ", inning=" + inning + + ", turn='" + turn + '\'' + + ", strike=" + strike + + ", ball=" + ball + + ", out=" + out + + ", HomePoint=" + HomePoint + + ", AwayPoint=" + AwayPoint + + ", pitcher='" + pitcher + '\'' + + ", batter='" + batter + '\'' + + '}'; } - public void setMatchId(Long matchId) { - this.matchId = matchId; - } public int getInning() { return inning; diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java index 2ff53181d..ccf5dee21 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java @@ -1,17 +1,19 @@ package com.dong.baseball.Domain; import org.springframework.data.annotation.Id; +import org.springframework.data.relational.core.mapping.MappedCollection; import java.util.ArrayList; import java.util.List; public class Match { @Id - private Long matchId; + private Long id; private String home; private String away; + @MappedCollection(keyColumn = "match_id") List gameBoards = new ArrayList<>(); public void addGameBoards(Board... boards) { @@ -24,12 +26,12 @@ public List getGameBoards() { return gameBoards; } - public Long getMatchId() { - return matchId; + public Long getId() { + return id; } - public void setMatchId(Long matchId) { - this.matchId = matchId; + public void setId(Long id) { + this.id = id; } public String getHome() { @@ -51,7 +53,7 @@ public void setAway(String away) { @Override public String toString() { return "Match{" + - "matchId=" + matchId + + "id=" + id + ", home='" + home + '\'' + ", away='" + away + '\'' + ", gameBoards=" + gameBoards + From 98cfba7cb8ba30577659615775caba7efdfae0b0 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Fri, 7 May 2021 00:18:46 +0900 Subject: [PATCH 26/88] =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=B2=A0?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 18 ++++++++++++++++++ BE_baseball/src/main/resources/schema.sql | 21 ++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index af4447b28..f59e887c6 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -10,4 +10,22 @@ INSERT INTO `match`(home,away) values ('Eagles','Giants'), ('Giants','Tigers'); +-- -- 둘중하나 TOP/AWAY or BOT/HOME +INSERT INTO 'board'(`inning`,`turn`,`strike`,`ball`,`out`,`home_point`,`away_point`,`pitcher`,`batter`) values +(1,'TOP/AWAY',0,0,0,0,0,'kim','dong'), +(1,'TOP/AWAY',1,0,0,0,0,'kim','dong'), -- 1 스트라이크 +(1,'TOP/AWAY',2,0,0,0,0,'kim','dong'), -- 2 스트라이크 +(1,'TOP/AWAY',3,0,1,0,0,'kim','dong'), -- 3 스트라이크 , 삼진아웃 +(1,'TOP/AWAY',0,0,1,0,0,'kim','hun'), -- 타자변경 +(1,'TOP/AWAY',0,1,1,0,0,'kim','hun'), -- 1 볼 +(1,'TOP/AWAY',0,2,1,0,0,'kim','hun'), -- 2 볼 +(1,'TOP/AWAY',1,2,1,0,0,'kim','hun'), -- 2 볼 1스트라이크 +(1,'TOP/AWAY',0,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 +(1,'TOP/AWAY',1,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 +(1,'TOP/AWAY',2,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 +(1,'TOP/AWAY',3,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 + + + +(1,'BOT/HOME',0,0,0,0,0,'kim','dong'); \ No newline at end of file diff --git a/BE_baseball/src/main/resources/schema.sql b/BE_baseball/src/main/resources/schema.sql index eb637e9f1..d6e3dd2b5 100644 --- a/BE_baseball/src/main/resources/schema.sql +++ b/BE_baseball/src/main/resources/schema.sql @@ -1,12 +1,13 @@ -- schema.sql 파일은 DDL 스크립트 -- data.sql 파일은 DML 스크립트 +CREATE DATABASE IF NOT EXISTS `baseball`; use baseball; drop table IF EXISTS `match`; CREATE TABLE IF NOT EXISTS `baseball`.`match`( -`match_id` BIGINT PRIMARY KEY AUTO_INCREMENT, +`id` BIGINT PRIMARY KEY AUTO_INCREMENT, `home` VARCHAR(45) NOT NULL, `away` VARCHAR(45) NOT NULL ); @@ -18,14 +19,20 @@ DESC `match`; drop table IF EXISTS `board`; + + CREATE TABLE IF NOT EXISTS `baseball`.`board` ( -`game_id` BIGINT PRIMARY KEY AUTO_INCREMENT, -`turn` VARCHAR(45) NOT NULL, -`strike` INT NOT NULL, -- 점 -`ball` INT NOT NULL, -`out` INT NOT NULL, -`point` INT NOT NULL, -- 득 + `id` BIGINT PRIMARY KEY AUTO_INCREMENT, +`match` BIGINT REFERENCES `match`(id), +`match_id` INT, +`inning` INT NOT NULL, -- 이닝, 몇회차인지 +`turn` VARCHAR(45) NOT NULL, -- 둘중하나 TOP/AWAY or BOT/HOME +`strike` INT NOT NULL, -- 스트라이크 갯수 +`ball` INT NOT NULL, -- 볼 갯수 +`out` INT NOT NULL, -- 현 회차에서 아웃한 타자의 수 +`home_point` INT NOT NULL, -- 홈팀의 득점 +`away_point` INT NOT NULL, -- 원정팀의 득점 `pitcher` VARCHAR(45) NOT NULL, `batter` VARCHAR(45) NOT NULL ); From aa0a2408205dad2853562df31a335246b78ec630 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:09:32 +0900 Subject: [PATCH 27/88] =?UTF-8?q?docs=20:=20=ED=83=80=20=EC=82=AC=EC=9D=B4?= =?UTF-8?q?=EB=93=9C=20=EB=B6=84=EB=93=A4=EA=B3=BC=20=ED=9A=8C=EC=9D=98?= =?UTF-8?q?=ED=95=9C=20=EB=82=B4=EC=9A=A9(=ED=9A=8C=EC=9D=98=EB=A1=9D)?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/BE_ReadME.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/BE_baseball/BE_ReadME.md b/BE_baseball/BE_ReadME.md index 3603adf48..6962f34ef 100644 --- a/BE_baseball/BE_ReadME.md +++ b/BE_baseball/BE_ReadME.md @@ -39,3 +39,32 @@ - refactor (refactoring production code, eg. renaming a variable) - test (adding missing tests, refactoring tests; no production code change) - chore (updating grunt tasks etc; no production code change) + + + +## 앞으로 더 구현할 기능 +### 데이터 입력받기 기능 + - ios / 데이터 입력받기 : 볼 , 스트라이크, 아웃, @@@@ +### api 문서화 어떻게 쓰는지에 대하여 + - 보기 편하시도록, 실서버에서 돌아가는거 +### 관리자 페이지 제공해서 시뮬레이션 해보실수 있도록??(옵션) + - 이거는 버리는옵션, 일단 백엔드 우선으로 돌리자 +### 팀 데이터(랭킹데이터) 제이슨으로 리턴되고, 승점순으로 정렬되 + - 승점순으로 정렬해서 제이슨으로 리턴해드리기 + - 지금은 축구룰 승점 적용(승리*3 + 비김*1)이지만, 나중에 야구룰 적용할지는 미지수 +### 상세보기 페이지 + - 뭐에대한 상세보기였지..? +### 오어쓰 기능구현 + - Oauth 2.0 생활코딩 강의 필기(낮은 우선순위) + - 하게된다면 이런 이슈는 있다 >> 옥토캣 라이브러리 사용한다(iOS분들) +### 1루 2루 3루 홈 누가있는지 리스트로 관리하기 + - 이부분 추가해야되요!! +


+# ios 사이드 요청사항 반영할꺼 +### 1 최신순으로 맨 위에 올라오게 >> 지금 경기상황 +- 경기상황 +### 2 스코어 화면 +- 편하게 띄워줄수 있도록 DTO 작성 +


+# 나의마인드셋 +- 언제든 불편한거 말씀하시면 99.8% 정도는 맞춰드리겠습니다!! From a8914377d7dfeba9a10da3cd5d85c8fa1332f2d0 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:11:16 +0900 Subject: [PATCH 28/88] =?UTF-8?q?feat=20:=20board=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=9D=98=EB=AF=B8?= =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 45 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index f59e887c6..abbc83f50 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -1,6 +1,11 @@ -- schema.sql 파일은 DDL 스크립트 -- data.sql 파일은 DML 스크립트 use baseball; + + +-- ---------------------------------------------------------- +-- match 관련 데이터 +DESC `match`; INSERT INTO `match`(home,away) values ('Tigers','Bears'), ('Bears','Twins'), @@ -9,22 +14,32 @@ INSERT INTO `match`(home,away) values ('Lions','Eagles'), ('Eagles','Giants'), ('Giants','Tigers'); +-- ---------------------------------------------------------- + + + +-- ---------------------------------------------------------- +-- board 관련 데이터 +-- -- turn 은 둘중하나 TOP/AWAY or BOT/HOME +desc `board`; +INSERT INTO `board`(`match`,`inning`,`turn`,`strike`,`ball`,`out`,`home_point`,`away_point`,`pitcher`,`batter`) values +(1,1,'TOP/AWAY',0,0,0,0,0,'kim','dong'), +(1,1,'TOP/AWAY',1,0,0,0,0,'kim','dong'), -- 1 스트라이크 +(1,1,'TOP/AWAY',2,0,0,0,0,'kim','dong'), -- 2 스트라이크 +(1,1,'TOP/AWAY',3,0,1,0,0,'kim','dong'), -- 3 스트라이크 , 삼진아웃 +(1,1,'TOP/AWAY',0,0,1,0,0,'kim','hun'), -- 타자변경 +(1,1,'TOP/AWAY',0,1,1,0,0,'kim','hun'), -- 1 볼 +(1,1,'TOP/AWAY',0,2,1,0,0,'kim','hun'), -- 2 볼 +(1,1,'TOP/AWAY',1,2,1,0,0,'kim','hun'), -- 2 볼 1스트라이크 +(1,1,'TOP/AWAY',0,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 +(1,1,'TOP/AWAY',1,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 +(1,1,'TOP/AWAY',2,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 +(1,1,'TOP/AWAY',3,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 + --- -- 둘중하나 TOP/AWAY or BOT/HOME - -INSERT INTO 'board'(`inning`,`turn`,`strike`,`ball`,`out`,`home_point`,`away_point`,`pitcher`,`batter`) values -(1,'TOP/AWAY',0,0,0,0,0,'kim','dong'), -(1,'TOP/AWAY',1,0,0,0,0,'kim','dong'), -- 1 스트라이크 -(1,'TOP/AWAY',2,0,0,0,0,'kim','dong'), -- 2 스트라이크 -(1,'TOP/AWAY',3,0,1,0,0,'kim','dong'), -- 3 스트라이크 , 삼진아웃 -(1,'TOP/AWAY',0,0,1,0,0,'kim','hun'), -- 타자변경 -(1,'TOP/AWAY',0,1,1,0,0,'kim','hun'), -- 1 볼 -(1,'TOP/AWAY',0,2,1,0,0,'kim','hun'), -- 2 볼 -(1,'TOP/AWAY',1,2,1,0,0,'kim','hun'), -- 2 볼 1스트라이크 -(1,'TOP/AWAY',0,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 -(1,'TOP/AWAY',1,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 -(1,'TOP/AWAY',2,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 -(1,'TOP/AWAY',3,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 +(1,1,'BOT/HOME',0,0,0,0,0,'kim','dong'); -- */ +select * from board; +-- ---------------------------------------------------------- From f89c563601e4af21257d777ea22a96716a7e4883 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:12:47 +0900 Subject: [PATCH 29/88] =?UTF-8?q?feat=20:=20team=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EA=B4=80=EB=A0=A8=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index abbc83f50..bc12b82ad 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -43,4 +43,21 @@ select * from board; -(1,'BOT/HOME',0,0,0,0,0,'kim','dong'); \ No newline at end of file + +-- ---------------------------------------------------------- +-- team 관련 데이터 +-- Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants; +DESC `team`; +-- DELETE FROM `team` WHERE team_id = *; +INSERT INTO `team`(`team_id`,`team_name`,`win`,`lose`,`draw`,`victory_point`) values +(1,'Tigers',10,10,2,10*3+2), +(2,'Bears',1,19,2,1*3+2), +(3,'Twins',3,17,2,3*3+2), +(4,'Dinos',5,15,2,5*3+2), +(5,'Lions',7,13,2,7*3+2), +(6,'Eagles',9,11,2,9*3+2), +(7,'Giants',12,8,2,12*3+2); +SELECT * FROM team; + + +-- ---------------------------------------------------------- From 2ac83f943e7e2add892544c84d272cee42a90322 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:13:20 +0900 Subject: [PATCH 30/88] =?UTF-8?q?feat=20:=20=EC=84=A4=EA=B3=84=ED=95=98?= =?UTF-8?q?=EB=8B=A4=20=EB=AF=B8=EB=9E=98=EC=97=90=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=82=AC=ED=95=AD=EC=9D=B4=EB=82=98=20=EA=B6=81=EA=B8=88?= =?UTF-8?q?=EC=A6=9D=EC=97=90=20=EB=8C=80=EC=9D=91=ED=95=98=EA=B8=B0=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=20=EC=A3=BC=EC=84=9D=EC=9D=84=20=EC=A0=81?= =?UTF-8?q?=EC=96=B4=EB=86=93=EC=9D=8C(=EC=B6=94=ED=9B=84=20=ED=99=95?= =?UTF-8?q?=EC=9E=A5=EC=9D=84=20=EC=9C=84=ED=95=B4=EC=84=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java index 84b372718..29b682f3f 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java @@ -1,6 +1,8 @@ package com.dong.baseball.Domain; public class Player { + // 타자 투수 구별은 없음, 왜냐하면 불펜으로 타자가 투수할수도 있기 때문 + // 나중에 Player를 최대한 풍부하게 만들어놓고 batter, pitcher 클래스를 상속받아 만들면 됨 String team; int gamesPlayed; int atBat; From bfc9f306c5b0b493863c3a69b84aaa899d07393d Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:14:20 +0900 Subject: [PATCH 31/88] =?UTF-8?q?feat=20:=20TEAM=20=EC=9D=B4=EB=84=98?= =?UTF-8?q?=EC=9D=84=20=EB=B6=84=EB=A6=AC=ED=95=98=EC=A7=80=20=EB=A7=90?= =?UTF-8?q?=EA=B3=A0,=20team=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EB=82=B4?= =?UTF-8?q?=EB=B6=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99=EC=8B=9C=ED=82=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/ProgressDTO.java | 19 ++++++ .../java/com/dong/baseball/Domain/Team.java | 65 +++++++++++++++++++ .../com/dong/baseball/Domain/utils/Team.java | 5 -- 3 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java delete mode 100644 BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java new file mode 100644 index 000000000..54241ddd8 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java @@ -0,0 +1,19 @@ +package com.dong.baseball.DTO; + +import com.dong.baseball.Domain.Player; + +import java.util.List; + +public class ProgressDTO { + + private String away; + private String home; + private int inning; + private String offenseTurn; + private List firstBase; + private List secondBase; + private List thirdBase; + private Player pitcher; + private Player batter; + +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java new file mode 100644 index 000000000..6f59d89b5 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java @@ -0,0 +1,65 @@ +package com.dong.baseball.Domain; + +import org.springframework.data.annotation.Id; + +public class Team { + @Id + private Long teamId; + + private String TeamName; + private int win; + private int lose; + private int draw; + private int victoryPoint; + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getTeamName() { + return TeamName; + } + + public void setTeamName(String teamName) { + TeamName = teamName; + } + + public int getWin() { + return win; + } + + public void setWin(int win) { + this.win = win; + } + + public int getLose() { + return lose; + } + + public void setLose(int lose) { + this.lose = lose; + } + + public int getDraw() { + return draw; + } + + public void setDraw(int draw) { + this.draw = draw; + } + + public int getVictoryPoint() { + return victoryPoint; + } + + public void setVictoryPoint(int victoryPoint) { + this.victoryPoint = victoryPoint; + } +} +enum Team_enum { + Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants; +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java deleted file mode 100644 index 2e77062f5..000000000 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/utils/Team.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.dong.baseball.Domain.utils; - -public enum Team { - Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants; -} From 89de6061cdc3465400ac33f271646f1b76bdb3d2 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:14:52 +0900 Subject: [PATCH 32/88] =?UTF-8?q?feat=20:=20TEAM=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=EC=9D=84=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=EC=84=9C=20?= =?UTF-8?q?=ED=8C=80=EB=9E=AD=ED=82=B9=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20?= =?UTF-8?q?=EB=A6=AC=ED=84=B4=ED=95=B4=EC=A3=BC=EB=8A=94=20=EC=BB=A8?= =?UTF-8?q?=ED=8A=B8=EB=A1=A4=EB=9F=AC,=20=EC=84=9C=EB=B9=84=EC=8A=A4?= =?UTF-8?q?=EB=A5=BC=20=EA=B5=AC=ED=98=84=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/Controller/TeamController.java | 25 ++++++++++++ .../baseball/Repository/TeamRepository.java | 10 +++++ .../dong/baseball/Service/TeamService.java | 38 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java new file mode 100644 index 000000000..4a2f12704 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java @@ -0,0 +1,25 @@ +package com.dong.baseball.Controller; + +import com.dong.baseball.Domain.Team; +import com.dong.baseball.Service.TeamService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/teams") +public class TeamController { + + private final TeamService teamService; + + public TeamController(TeamService teamService) { + this.teamService = teamService; + } + + @GetMapping + public List teamRanking() { + return teamService.teamRanking(); + } +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java new file mode 100644 index 000000000..97637bf5b --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java @@ -0,0 +1,10 @@ +package com.dong.baseball.Repository; + +import com.dong.baseball.Domain.Team; +import org.springframework.data.repository.CrudRepository; + +import java.util.List; + +public interface TeamRepository extends CrudRepository { + List findAll(); +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java new file mode 100644 index 000000000..d9e4ae530 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java @@ -0,0 +1,38 @@ +package com.dong.baseball.Service; + +import com.dong.baseball.Domain.Team; +import com.dong.baseball.Repository.TeamRepository; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +@Service +public class TeamService { + + private final TeamRepository teamRepository; + + public TeamService(TeamRepository teamRepository) { + this.teamRepository = teamRepository; + } + + + public List teamRanking() { + List teamList = teamRepository.findAll(); + + Collections.sort(teamList, new Comparator() { + @Override + public int compare(Team t1, Team t2) { + if (t1.getVictoryPoint() > t2.getVictoryPoint()) { + return -1; + } + if (t1.getVictoryPoint() < t2.getVictoryPoint()) { + return 1; + } + return 0; + } + }); + return teamList; + } +} From 7540b09a6fce95f1813c52cc26cd4b88131d996f Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:15:26 +0900 Subject: [PATCH 33/88] =?UTF-8?q?feat=20:=20TEAM=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=EC=9D=84=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=20team=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EA=B4=80=EB=A0=A8=20DDL=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/schema.sql | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/BE_baseball/src/main/resources/schema.sql b/BE_baseball/src/main/resources/schema.sql index d6e3dd2b5..2dfb72530 100644 --- a/BE_baseball/src/main/resources/schema.sql +++ b/BE_baseball/src/main/resources/schema.sql @@ -19,8 +19,6 @@ DESC `match`; drop table IF EXISTS `board`; - - CREATE TABLE IF NOT EXISTS `baseball`.`board` ( `id` BIGINT PRIMARY KEY AUTO_INCREMENT, @@ -43,4 +41,22 @@ DESC `board`; -- -- + + +drop table IF EXISTS `team`; + +CREATE TABLE IF NOT EXISTS `baseball`.`team` +( + `team_id` BIGINT PRIMARY KEY AUTO_INCREMENT, + `team_name` VARCHAR(45) NOT NULL, + `win` INT NOT NULL, + `lose` INT NOT NULL, + `draw` INT NOT NULL, + `victory_point` INT NOT NULL +); + +ALTER TABLE `team` CONVERT TO character SET utf8; +DESC `team`; + + show tables; From 61c14936842550523959815f9de92cfdc3a5eb77 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:24:28 +0900 Subject: [PATCH 34/88] =?UTF-8?q?refactor=20:=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=ED=8F=AC=EB=A7=B7=ED=8C=85=20=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dong/baseball/DTO/SituationBoardDTO.java | 2 +- .../src/main/java/com/dong/baseball/Domain/Team.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java index 76bdc83e5..fd4e16b36 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java @@ -19,7 +19,7 @@ public SituationBoardDTO(Board board) { this.inning = board.getInning(); this.turn = board.getTurn(); this.strike = board.getStrike(); - this.ball =board.getBall(); + this.ball = board.getBall(); //@ Todo 할일더많음 } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java index 6f59d89b5..4179c602d 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java @@ -2,6 +2,10 @@ import org.springframework.data.annotation.Id; +enum Team_enum { + Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants +} + public class Team { @Id private Long teamId; @@ -60,6 +64,3 @@ public void setVictoryPoint(int victoryPoint) { this.victoryPoint = victoryPoint; } } -enum Team_enum { - Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants; -} From e79bc1576877fb8c6962f1f3e87aeb2e0a6aa905 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:28:09 +0900 Subject: [PATCH 35/88] =?UTF-8?q?feat=20:=20=EA=B2=8C=EC=9E=84=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=83=81=ED=99=A9=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EA=B3=B5?= =?UTF-8?q?=EA=B2=A9=EC=B8=A1/=EC=88=98=EB=B9=84=EC=B8=A1=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=A0=84=EB=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Controller/GameController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index d6665838a..cf08562fb 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -33,6 +33,10 @@ public List matchInfos(@PathVariable Long matchId) { return gameService.matchInformations(matchId); } + @GetMapping("/progress/offense") + public + + @GetMapping("/progress/defense") } From 2cdb19419383f30a69bf328fede595fe1189f58d Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 7 May 2021 13:42:22 +0900 Subject: [PATCH 36/88] =?UTF-8?q?feat=20:=20=EA=B2=8C=EC=9E=84=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=83=81=ED=99=A9=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EA=B3=B5?= =?UTF-8?q?=EA=B2=A9=EC=B8=A1/=EC=88=98=EB=B9=84=EC=B8=A1=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/Controller/GameController.java | 8 +- .../com/dong/baseball/DTO/ProgressDTO.java | 85 +++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletion(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index cf08562fb..a62f856e2 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -1,6 +1,7 @@ package com.dong.baseball.Controller; import com.dong.baseball.DTO.MatchUpListDTO; +import com.dong.baseball.DTO.ProgressDTO; import com.dong.baseball.DTO.SituationBoardDTO; import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; @@ -34,9 +35,14 @@ public List matchInfos(@PathVariable Long matchId) { } @GetMapping("/progress/offense") - public + public ProgressDTO offeseInfo() { + return new ProgressDTO(""); + } @GetMapping("/progress/defense") + public ProgressDTO defenseInfo() { + return new ProgressDTO(""); + } } diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java index 54241ddd8..5c39d3ce1 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java @@ -2,6 +2,7 @@ import com.dong.baseball.Domain.Player; +import java.util.ArrayList; import java.util.List; public class ProgressDTO { @@ -16,4 +17,88 @@ public class ProgressDTO { private Player pitcher; private Player batter; + + public ProgressDTO(String s) { + this.away = "away"; + this.home = "home"; + this.inning = 99; + this.offenseTurn = "offenseTurn"; + this.firstBase = new ArrayList<>(); + this.secondBase = new ArrayList<>(); + this.thirdBase = new ArrayList<>(); + this.pitcher = new Player(); + this.batter = new Player(); + } + + public String getAway() { + return away; + } + + public void setAway(String away) { + this.away = away; + } + + public String getHome() { + return home; + } + + public void setHome(String home) { + this.home = home; + } + + public int getInning() { + return inning; + } + + public void setInning(int inning) { + this.inning = inning; + } + + public String getOffenseTurn() { + return offenseTurn; + } + + public void setOffenseTurn(String offenseTurn) { + this.offenseTurn = offenseTurn; + } + + public List getFirstBase() { + return firstBase; + } + + public void setFirstBase(List firstBase) { + this.firstBase = firstBase; + } + + public List getSecondBase() { + return secondBase; + } + + public void setSecondBase(List secondBase) { + this.secondBase = secondBase; + } + + public List getThirdBase() { + return thirdBase; + } + + public void setThirdBase(List thirdBase) { + this.thirdBase = thirdBase; + } + + public Player getPitcher() { + return pitcher; + } + + public void setPitcher(Player pitcher) { + this.pitcher = pitcher; + } + + public Player getBatter() { + return batter; + } + + public void setBatter(Player batter) { + this.batter = batter; + } } From 1f66f721c568eeb7a5bb67847f369efcbfcf232d Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:36:43 +0900 Subject: [PATCH 37/88] =?UTF-8?q?=EB=94=94=EB=B2=84=EA=B9=85=EC=9D=84=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EC=98=B5=EC=85=98=20:=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=EB=B2=A0=EC=9D=B4=EC=8A=A4=EB=A1=9C=20?= =?UTF-8?q?=EB=82=A0=EB=9D=BC=EA=B0=80=EB=8A=94=20=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=EB=AC=B8=EC=9D=84=20=EC=BD=98=EC=86=94=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BE_baseball/src/main/resources/application.properties b/BE_baseball/src/main/resources/application.properties index fadc21f58..823c0877a 100644 --- a/BE_baseball/src/main/resources/application.properties +++ b/BE_baseball/src/main/resources/application.properties @@ -7,6 +7,7 @@ spring.datasource.initialization-mode=always # schema.sql, data.sql 파일이 있다면 서버 시작 시 스크립트를 실행합니다. # logs -#logging.level.com.codesquad.team14.*=DEBUG +logging.level.sql=debug +# logging.level.com.codesquad.team14.*=DEBUG logging.level.root=info logging.file.path=logs From 9a2f1aa3d5febe5b6b3c472b981faae2b4f994a2 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:37:26 +0900 Subject: [PATCH 38/88] =?UTF-8?q?Player=20=EA=B4=80=EB=A0=A8=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index bc12b82ad..7596d615b 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -61,3 +61,14 @@ SELECT * FROM team; -- ---------------------------------------------------------- + + +-- ---------------------------------------------------------- +-- player 관련 데이터 +-- ---------------------------------------------------------- +DESC `player`; +INSERT INTO `player`(`team_id`, `name`,`uniform_number`,`played_games`,`at_bat`,`hit`,`ball`,`strike`) values +(1,'Seon Dong yeal',11,20,5,8,11,20); + +SELECT * FROM `player`; +-- ---------------------------------------------------------- \ No newline at end of file From 7897856c3c7ba1f0a0ae61878c8dc874d7d75462 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:38:00 +0900 Subject: [PATCH 39/88] =?UTF-8?q?=20PK=EA=B0=80=20=EC=9E=90=EB=8F=99?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=9D=B8=EB=8D=B0,=20=EC=9E=84=EC=9D=98?= =?UTF-8?q?=EC=9D=98=20=EC=88=AB=EC=9E=90=EB=A5=BC=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=ED=95=98=EB=8D=98=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=9E=85=EB=A0=A5=EC=9D=84=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index 7596d615b..3e002e996 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -59,6 +59,17 @@ INSERT INTO `team`(`team_id`,`team_name`,`win`,`lose`,`draw`,`victory_point`) va (7,'Giants',12,8,2,12*3+2); SELECT * FROM team; + */ + +INSERT INTO `team`(`team_name`,`win`,`lose`,`draw`,`victory_point`) values +('Tigers',10,10,2,10*3+2), +('Bears',1,19,2,1*3+2), +('Twins',3,17,2,3*3+2), +('Dinos',5,15,2,5*3+2), +('Lions',7,13,2,7*3+2), +('Eagles',9,11,2,9*3+2), +('Giants',12,8,2,12*3+2); +SELECT * FROM team; -- ---------------------------------------------------------- From 9fa89856d30ebdba44776f383860aa22d79a0791 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:38:59 +0900 Subject: [PATCH 40/88] =?UTF-8?q?=EC=8B=9C=EA=B0=81=EC=A0=81=EC=9D=B8=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=EA=B0=90=EC=9D=84=20=EC=9C=84=ED=95=B4?= =?UTF-8?q?=EC=84=9C=20sql=ED=8C=8C=EC=9D=BC=EC=97=90=20=EC=84=A0=EC=9D=84?= =?UTF-8?q?=20=EA=B7=B8=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index 3e002e996..1bc0c35fa 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -5,6 +5,7 @@ use baseball; -- ---------------------------------------------------------- -- match 관련 데이터 +-- ---------------------------------------------------------- DESC `match`; INSERT INTO `match`(home,away) values ('Tigers','Bears'), @@ -20,6 +21,7 @@ INSERT INTO `match`(home,away) values -- ---------------------------------------------------------- -- board 관련 데이터 +-- ---------------------------------------------------------- -- -- turn 은 둘중하나 TOP/AWAY or BOT/HOME desc `board`; INSERT INTO `board`(`match`,`inning`,`turn`,`strike`,`ball`,`out`,`home_point`,`away_point`,`pitcher`,`batter`) values @@ -36,19 +38,19 @@ INSERT INTO `board`(`match`,`inning`,`turn`,`strike`,`ball`,`out`,`home_point`,` (1,1,'TOP/AWAY',2,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 (1,1,'TOP/AWAY',3,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 - (1,1,'BOT/HOME',0,0,0,0,0,'kim','dong'); -- */ select * from board; -- ---------------------------------------------------------- - -- ---------------------------------------------------------- -- team 관련 데이터 +-- ---------------------------------------------------------- -- Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants; DESC `team`; -- DELETE FROM `team` WHERE team_id = *; +/* INSERT INTO `team`(`team_id`,`team_name`,`win`,`lose`,`draw`,`victory_point`) values (1,'Tigers',10,10,2,10*3+2), (2,'Bears',1,19,2,1*3+2), From 39105285f65d491e218d67e6ae73b15f51490742 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:39:37 +0900 Subject: [PATCH 41/88] =?UTF-8?q?=EC=84=A0=EC=88=98=EB=A5=BC=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EB=8A=94=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Domain/Player.java | 104 ++++++++++++++++-- 1 file changed, 97 insertions(+), 7 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java index 29b682f3f..10009a9df 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java @@ -3,11 +3,101 @@ public class Player { // 타자 투수 구별은 없음, 왜냐하면 불펜으로 타자가 투수할수도 있기 때문 // 나중에 Player를 최대한 풍부하게 만들어놓고 batter, pitcher 클래스를 상속받아 만들면 됨 - String team; - int gamesPlayed; - int atBat; - int hit; - int ball; - int Strike; - double battingAverage; + private String name; + private Integer uniformNumber; + private Integer playedGames; + private Integer atBat; + private Integer hit; + private Integer ball; + private Integer strike; + private Double battingAverage; + + /** + * `ball`, + * `name`, + * `at_bat`, + * strike`, + * `played_games`, + * ``uniform_number`, + * `batting_average`, + * `player_index` + */ + + public Integer getUniformNumber() { + return uniformNumber; + } + + public void setUniformNumber(Integer uniformNumber) { + this.uniformNumber = uniformNumber; + } + + public Integer getPlayedGames() { + return playedGames; + } + + public void setPlayedGames(Integer playedGames) { + this.playedGames = playedGames; + } + + public Integer getAtBat() { + return atBat; + } + + public void setAtBat(Integer atBat) { + this.atBat = atBat; + } + + public Integer getHit() { + return hit; + } + + public void setHit(Integer hit) { + this.hit = hit; + } + + public Integer getBall() { + return ball; + } + + public void setBall(Integer ball) { + this.ball = ball; + } + + public Integer getStrike() { + return strike; + } + + public void setStrike(Integer strike) { + this.strike = strike; + } + + public Double getBattingAverage() { + return battingAverage; + } + + public void setBattingAverage(Double battingAverage) { + this.battingAverage = battingAverage; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public String toString() { + return "Player{" + + "name='" + name + '\'' + + ", uniformNumber=" + uniformNumber + + ", playedGames=" + playedGames + + ", atBat=" + atBat + + ", hit=" + hit + + ", ball=" + ball + + ", strike=" + strike + + ", battingAverage=" + battingAverage + + '}'; + } } From 28714a3ec98de31af1f8528be651459a896d23e2 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:40:23 +0900 Subject: [PATCH 42/88] =?UTF-8?q?Optional=20=EC=82=AC=EC=9A=A9=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=EC=9D=91=ED=95=98=EC=97=AC=20=EC=BB=A4=EC=8A=A4?= =?UTF-8?q?=ED=85=80=20=EC=9D=B5=EC=85=89=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Exception/PlayerNotFound.java | 9 +++++++++ .../java/com/dong/baseball/Exception/TeamNotFound.java | 8 ++++++++ 2 files changed, 17 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java new file mode 100644 index 000000000..6598069ec --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java @@ -0,0 +1,9 @@ +package com.dong.baseball.Exception; + +public class PlayerNotFound extends RuntimeException{ + static final String MESSAGE = "Palyer Cannot founded"; + + public PlayerNotFound() { + + } +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java new file mode 100644 index 000000000..6c20289ca --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java @@ -0,0 +1,8 @@ +package com.dong.baseball.Exception; + +public class TeamNotFound extends RuntimeException{ + static final String MESSAGE = "Palyer Cannot founded"; + + public TeamNotFound() { + } +} From fed22a960520fa689542a676f746a5687249ae7e Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:40:38 +0900 Subject: [PATCH 43/88] =?UTF-8?q?=EB=A6=B0=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/schema.sql | 95 +++++++++++++++++------ 1 file changed, 70 insertions(+), 25 deletions(-) diff --git a/BE_baseball/src/main/resources/schema.sql b/BE_baseball/src/main/resources/schema.sql index 2dfb72530..0eac0d778 100644 --- a/BE_baseball/src/main/resources/schema.sql +++ b/BE_baseball/src/main/resources/schema.sql @@ -1,50 +1,61 @@ -- schema.sql 파일은 DDL 스크립트 -- data.sql 파일은 DML 스크립트 CREATE DATABASE IF NOT EXISTS `baseball`; - use baseball; -drop table IF EXISTS `match`; + +-- ------------------------------------------------- +-- match +-- ------------------------------------------------- +drop table IF EXISTS `match`; +-- CREATE TABLE IF NOT EXISTS `baseball`.`match`( -`id` BIGINT PRIMARY KEY AUTO_INCREMENT, -`home` VARCHAR(45) NOT NULL, -`away` VARCHAR(45) NOT NULL + `id` BIGINT PRIMARY KEY AUTO_INCREMENT, + `home` VARCHAR(45) NOT NULL, + `away` VARCHAR(45) NOT NULL ); +-- ALTER TABLE `match` CONVERT TO character SET utf8; - -DESC `match`; -- +DESC `match`; -- -drop table IF EXISTS `board`; + +-- ------------------------------------------------- +-- match +-- ------------------------------------------------- +drop table IF EXISTS `board`; +-- CREATE TABLE IF NOT EXISTS `baseball`.`board` ( `id` BIGINT PRIMARY KEY AUTO_INCREMENT, -`match` BIGINT REFERENCES `match`(id), -`match_id` INT, -`inning` INT NOT NULL, -- 이닝, 몇회차인지 -`turn` VARCHAR(45) NOT NULL, -- 둘중하나 TOP/AWAY or BOT/HOME -`strike` INT NOT NULL, -- 스트라이크 갯수 -`ball` INT NOT NULL, -- 볼 갯수 -`out` INT NOT NULL, -- 현 회차에서 아웃한 타자의 수 -`home_point` INT NOT NULL, -- 홈팀의 득점 -`away_point` INT NOT NULL, -- 원정팀의 득점 -`pitcher` VARCHAR(45) NOT NULL, -`batter` VARCHAR(45) NOT NULL + `match` BIGINT REFERENCES `match`(id), + `match_id` INT, + `inning` INT NOT NULL, -- 이닝, 몇회차인지 + `turn` VARCHAR(45) NOT NULL, -- 둘중하나 TOP/AWAY or BOT/HOME + `strike` INT NOT NULL, -- 스트라이크 갯수 + `ball` INT NOT NULL, -- 볼 갯수 + `out` INT NOT NULL, -- 현 회차에서 아웃한 타자의 수 + `home_point` INT NOT NULL, -- 홈팀의 득점 + `away_point` INT NOT NULL, -- 원정팀의 득점 + `pitcher` VARCHAR(45) NOT NULL, + `batter` VARCHAR(45) NOT NULL ); +-- ALTER TABLE `board` CONVERT TO character SET utf8; -DESC `board`; - - -- +DESC `board`; -- +-- ------------------------------------------------- +-- team +-- ------------------------------------------------- drop table IF EXISTS `team`; - +-- CREATE TABLE IF NOT EXISTS `baseball`.`team` ( `team_id` BIGINT PRIMARY KEY AUTO_INCREMENT, @@ -54,9 +65,43 @@ CREATE TABLE IF NOT EXISTS `baseball`.`team` `draw` INT NOT NULL, `victory_point` INT NOT NULL ); - +-- ALTER TABLE `team` CONVERT TO character SET utf8; +-- DESC `team`; +-- + + + +-- ------------------------------------------------- +-- player +-- ------------------------------------------------- +drop table IF EXISTS `player`; +-- +CREATE TABLE IF NOT EXISTS `baseball`.`player` +( + `player_id` BIGINT PRIMARY KEY AUTO_INCREMENT, + `team_id` BIGINT REFERENCES `team` (team_id), + `player_index` INT, + -- `dddong` INT, + `name` VARCHAR(64) NOT NULL, + `uniform_number` INT NOT NULL, + `played_games` INT NOT NULL, + `at_bat` INT NOT NULL, + `hit` INT NOT NULL, + `ball` INT NOT NULL, + `strike` INT NOT NULL, + `batting_average` DOUBLE DEFAULT NULL +); +-- +SELECT * FROM player; +ALTER TABLE `player` CONVERT TO character SET utf8; +-- +DESC `player`; +-- -show tables; +-- ------------------------------------------------- +-- END OF SQL +-- ------------------------------------------------- +-- show tables; \ No newline at end of file From 1934e4315da8cc42e1f47b8d92bb1ec48e491161 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:41:25 +0900 Subject: [PATCH 44/88] =?UTF-8?q?team=EA=B3=BC=20Player=20=EB=8A=94=201:N?= =?UTF-8?q?=20=EA=B4=80=EA=B3=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Domain/Team.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java index 4179c602d..bca4f4350 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java @@ -1,21 +1,25 @@ package com.dong.baseball.Domain; import org.springframework.data.annotation.Id; +import org.springframework.data.relational.core.mapping.MappedCollection; -enum Team_enum { - Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants -} +import java.util.ArrayList; +import java.util.List; +// Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants public class Team { @Id private Long teamId; - private String TeamName; + private String teamName; private int win; private int lose; private int draw; private int victoryPoint; + @MappedCollection(idColumn = "team_id", keyColumn = "player_index") + List members = new ArrayList<>(); + public Long getTeamId() { return teamId; } @@ -25,11 +29,11 @@ public void setTeamId(Long teamId) { } public String getTeamName() { - return TeamName; + return teamName; } public void setTeamName(String teamName) { - TeamName = teamName; + this.teamName = teamName; } public int getWin() { @@ -63,4 +67,8 @@ public int getVictoryPoint() { public void setVictoryPoint(int victoryPoint) { this.victoryPoint = victoryPoint; } + + public List getMembers() { + return members; + } } From a09d654fefd91c84e7ec420705ead7cc8d2bc492 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:42:17 +0900 Subject: [PATCH 45/88] =?UTF-8?q?team=EC=9D=98=20=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EB=82=98=ED=83=80=EB=82=B4?= =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=B4=20=EC=A0=9C=EA=B3=B5=ED=95=98?= =?UTF-8?q?=EB=8A=94=20url=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit int형 id와 String 모두로 검색이 가능하도록 제공함 --- .../dong/baseball/Controller/TeamController.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java index 4a2f12704..2a9a40e66 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/TeamController.java @@ -1,8 +1,10 @@ package com.dong.baseball.Controller; +import com.dong.baseball.DTO.TeamRankDTO; import com.dong.baseball.Domain.Team; import com.dong.baseball.Service.TeamService; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,7 +21,17 @@ public TeamController(TeamService teamService) { } @GetMapping - public List teamRanking() { + public List teamRanking() { return teamService.teamRanking(); } + + @GetMapping("/num/{teamId}") + public Team teamInfoById(@PathVariable Long teamId) { + return teamService.teamInfoById(teamId); + } + + @GetMapping("/{teamName}") + public Team teamInfoByName(@PathVariable String teamName) { + return teamService.teamInfoByName(teamName); + } } From 698333185d0906bf5ee34502525e392f3ee93512 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:42:40 +0900 Subject: [PATCH 46/88] =?UTF-8?q?team=20=EC=A0=84=EC=B2=B4=EC=9D=98=20?= =?UTF-8?q?=EB=9E=AD=ED=82=B9=EC=9D=84=20=EB=B3=B4=EA=B8=B0=20=EC=9C=84?= =?UTF-8?q?=ED=95=B4=EC=84=9C=20DTO=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/TeamRankDTO.java | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/TeamRankDTO.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/TeamRankDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/TeamRankDTO.java new file mode 100644 index 000000000..f19d8bd3c --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/TeamRankDTO.java @@ -0,0 +1,81 @@ +package com.dong.baseball.DTO; + +import com.dong.baseball.Domain.Team; + +public class TeamRankDTO { + private Long teamId; + private String teamName; + private int win; + private int lose; + private int draw; + private int victoryPoint; + + public TeamRankDTO(Team team) { + this.teamId = team.getTeamId(); + this.teamName = team.getTeamName(); + this.win = team.getWin(); + this.lose = team.getLose(); + this.draw = team.getDraw(); + this.victoryPoint = team.getVictoryPoint(); + } + + public Long getTeamId() { + return teamId; + } + + public void setTeamId(Long teamId) { + this.teamId = teamId; + } + + public String getTeamName() { + return teamName; + } + + public void setTeamName(String teamName) { + this.teamName = teamName; + } + + public int getWin() { + return win; + } + + public void setWin(int win) { + this.win = win; + } + + public int getLose() { + return lose; + } + + public void setLose(int lose) { + this.lose = lose; + } + + public int getDraw() { + return draw; + } + + public void setDraw(int draw) { + this.draw = draw; + } + + public int getVictoryPoint() { + return victoryPoint; + } + + public void setVictoryPoint(int victoryPoint) { + this.victoryPoint = victoryPoint; + } + + @Override + public String toString() { + return "TeamRankDTO{" + + "teamId=" + teamId + + ", teamName='" + teamName + '\'' + + ", win=" + win + + ", lose=" + lose + + ", draw=" + draw + + ", victoryPoint=" + victoryPoint + + '}'; + } +} From d60da3112fa2acf1127f28940effef6264652372 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:43:08 +0900 Subject: [PATCH 47/88] =?UTF-8?q?ID=EC=99=80=20Name=20,=20=EC=88=AB?= =?UTF-8?q?=EC=9E=90=EC=99=80=20=EB=AC=B8=EC=9E=90=20=EB=AA=A8=EB=91=90?= =?UTF-8?q?=EB=A1=9C=20Team=EC=9D=84=20=EA=B2=80=EC=83=89=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Repository/TeamRepository.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java index 97637bf5b..b6828a1a9 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java @@ -2,9 +2,16 @@ import com.dong.baseball.Domain.Team; import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Optional; +//@Repository public interface TeamRepository extends CrudRepository { List findAll(); + + Optional findByTeamId(Long teamId); + + Optional findByTeamName(String teamName); } From b3be8983954b9c1548552786df3ff2e6e7028d47 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 15:43:19 +0900 Subject: [PATCH 48/88] =?UTF-8?q?ID=EC=99=80=20Name=20,=20=EC=88=AB?= =?UTF-8?q?=EC=9E=90=EC=99=80=20=EB=AC=B8=EC=9E=90=20=EB=AA=A8=EB=91=90?= =?UTF-8?q?=EB=A1=9C=20Team=EC=9D=84=20=EA=B2=80=EC=83=89=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dong/baseball/Service/TeamService.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java index d9e4ae530..99a030c75 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java @@ -1,9 +1,12 @@ package com.dong.baseball.Service; +import com.dong.baseball.DTO.TeamRankDTO; import com.dong.baseball.Domain.Team; +import com.dong.baseball.Exception.TeamNotFound; import com.dong.baseball.Repository.TeamRepository; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -18,21 +21,29 @@ public TeamService(TeamRepository teamRepository) { } - public List teamRanking() { + public List teamRanking() { List teamList = teamRepository.findAll(); + System.out.println("@@@@@@@@" + teamList + " : " + teamList.size()); + List teamRankDTOList = new ArrayList<>(); - Collections.sort(teamList, new Comparator() { + for(Team team : teamList) { + teamRankDTOList.add(new TeamRankDTO(team)); + } + + teamRankDTOList.sort(new Comparator() { @Override - public int compare(Team t1, Team t2) { - if (t1.getVictoryPoint() > t2.getVictoryPoint()) { - return -1; - } - if (t1.getVictoryPoint() < t2.getVictoryPoint()) { - return 1; - } - return 0; + public int compare(TeamRankDTO t1, TeamRankDTO t2) { + return Integer.compare(t2.getVictoryPoint(), t1.getVictoryPoint()); } }); - return teamList; + return teamRankDTOList; + } + + public Team teamInfoById(Long teamId) { + return teamRepository.findByTeamId(teamId).orElseThrow (() -> new TeamNotFound()); + } + + public Team teamInfoByName(String teamName) { + return teamRepository.findByTeamName(teamName).orElseThrow(() -> new TeamNotFound()); } } From 7eefa89ee9146d037935640ed97e02b24f5bf0e1 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 16:30:39 +0900 Subject: [PATCH 49/88] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/deploy.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BE_baseball/src/main/resources/deploy.sh b/BE_baseball/src/main/resources/deploy.sh index c8921dc30..989bd623e 100644 --- a/BE_baseball/src/main/resources/deploy.sh +++ b/BE_baseball/src/main/resources/deploy.sh @@ -1,8 +1,9 @@ # 설정 LINE='#########################################################' -SERVADDR='ec2-13-125-229-168.ap-northeast-2.compute.amazonaws.com' #배포할 AWS EC2 서버 -KEYFILE='~/Downloads/DongDong.pem' # 내 개발콤퓨터에서 AWS key 위치 +파SERVADDR='ec2-3-35-226-74.ap-northeast-2.compute.amazonaws.com' #배포할 AWS EC2 서버 +KEYFILE='~/Downloads/Dong210511.pem' # 내 개발콤퓨터에서 AWS key 위치 AUTOINJECT_JAR=1 #1:자동으로 scp명령어로 밀어넣기, #0=안밀어넣고 명령어만 보여주고 끝내기 +NGINX_SETUP = '/Users/gimdonghun/Workspace/baseball/BE_baseball/src/main/resources/nginx.sh' # echo $LINE echo "## DongDong's 바이너리파일 밀어넣기 스크립트 " @@ -18,6 +19,8 @@ echo $LINE if [ ${AUTOINJECT_JAR} -eq 1 ];then scp -i $KEYFILE $BINFILE ubuntu@$SERVADDR:/home/ubuntu + scp -i $KEYFILE $NGINX_SETUP ubuntu@$SERVADDR:/home/ubuntu + echo "JAR FILE SEND OK...!" echo "" From 597a29d5f960f10d7e7d14ab1b798cc35a4e8d53 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 16:30:57 +0900 Subject: [PATCH 50/88] =?UTF-8?q?DB=20=EC=84=9C=EB=B2=84=EC=99=80=20?= =?UTF-8?q?=EC=9B=B9=EC=84=9C=EB=B2=84=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE_baseball/src/main/resources/application.properties b/BE_baseball/src/main/resources/application.properties index 823c0877a..81073ec57 100644 --- a/BE_baseball/src/main/resources/application.properties +++ b/BE_baseball/src/main/resources/application.properties @@ -1,5 +1,5 @@ # DB -spring.datasource.url=jdbc:mysql://localhost:3306/baseball?serverTimezone=UTC&characterEncoding=UTF-8 +spring.datasource.url=jdbc:mysql://3.35.231.79:57314/baseball?serverTimezone=UTC&characterEncoding=UTF-8 spring.datasource.username=root spring.datasource.password=password spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver From 65106292c89c6caeed4c076b09528f3e48afc0b1 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 18:29:52 +0900 Subject: [PATCH 51/88] =?UTF-8?q?DB=20=EC=84=9C=EB=B2=84=EC=99=80=20?= =?UTF-8?q?=EC=9B=B9=EC=84=9C=EB=B2=84=20=EB=B0=B0=ED=8F=AC=EB=A5=BC=20?= =?UTF-8?q?=EC=9C=84=ED=95=B4=EC=84=9C=20=EC=9D=BC=EB=8B=A8=20=ED=86=B5?= =?UTF-8?q?=ED=95=A9=ED=95=98=EA=B3=A0,=20=EC=B6=94=ED=9B=84=20=EC=9E=AC?= =?UTF-8?q?=20=EB=B6=84=ED=95=A0=20=EC=98=88=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE_baseball/src/main/resources/application.properties b/BE_baseball/src/main/resources/application.properties index 81073ec57..823c0877a 100644 --- a/BE_baseball/src/main/resources/application.properties +++ b/BE_baseball/src/main/resources/application.properties @@ -1,5 +1,5 @@ # DB -spring.datasource.url=jdbc:mysql://3.35.231.79:57314/baseball?serverTimezone=UTC&characterEncoding=UTF-8 +spring.datasource.url=jdbc:mysql://localhost:3306/baseball?serverTimezone=UTC&characterEncoding=UTF-8 spring.datasource.username=root spring.datasource.password=password spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver From bf74cf72ba3c4574e90b2441902203fbd983d941 Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 18:30:09 +0900 Subject: [PATCH 52/88] =?UTF-8?q?=EC=84=A0=EC=88=98=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EC=85=8B=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index 1bc0c35fa..e31f644b3 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -81,7 +81,28 @@ SELECT * FROM team; -- ---------------------------------------------------------- DESC `player`; INSERT INTO `player`(`team_id`, `name`,`uniform_number`,`played_games`,`at_bat`,`hit`,`ball`,`strike`) values -(1,'Seon Dong yeal',11,20,5,8,11,20); +-- 1번 팀 선수 +(1,'최동원',411,120,355,1518,111,120), +(1,'이대호',140,720,6454,158,411,201), +(1,'윤학길',229,2200,545,444,112,132), +(1,'손섭',2224,839,144,445,456,485), +(1,'강민호',345,345,123,235,152,98), +(1,'염김종석',247,567,546,346,83,662), +-- 2번팀 선수 +(2,'손민한',411,120,355,158,111,1), +(2,'김응국',140,720,645,158,41,201), +(2,'로드리게스',229,200,5445,444,112,132), +(2,'산쵸스',224,839,144,445,456,485), +(2,'효도르',345,3245,123,235,152,998), +(2,'김추찬',2247,567,546,346,823,662), +-- 3번팀 선수 +(3,'홍문종',411,120,355,158,111,120), +(3,'박현승',140,720,645,158,411,201), +(3,'페르디난드',229,200,545,444,112,132), +(3,'한영준',224,839,144,445,456,485), +(3,'강병철',345,345,123,235,152,998), +(3,'레일리',247,567,546,346,823,662); + SELECT * FROM `player`; -- ---------------------------------------------------------- \ No newline at end of file From 5ae01ad8f5471f5aa75e76d7ba87ae9b2af51efb Mon Sep 17 00:00:00 2001 From: DongHunKim Date: Tue, 11 May 2021 22:47:19 +0900 Subject: [PATCH 53/88] =?UTF-8?q?=EB=85=B8=ED=8A=B8=EB=B6=81=20=EC=9D=B4?= =?UTF-8?q?=EC=83=81=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=B4=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9CPC=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dong/baseball/Controller/GameController.java | 4 ++-- .../main/java/com/dong/baseball/Domain/Player.java | 14 +++++++------- BE_baseball/src/main/resources/deploy.sh | 5 ++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index a62f856e2..9bf11b9b2 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -34,12 +34,12 @@ public List matchInfos(@PathVariable Long matchId) { return gameService.matchInformations(matchId); } - @GetMapping("/progress/offense") + @GetMapping("/progress/offense/{matchId}") public ProgressDTO offeseInfo() { return new ProgressDTO(""); } - @GetMapping("/progress/defense") + @GetMapping("/progress/defense/{matchId}") public ProgressDTO defenseInfo() { return new ProgressDTO(""); } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java index 10009a9df..616777a39 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java @@ -10,16 +10,16 @@ public class Player { private Integer hit; private Integer ball; private Integer strike; - private Double battingAverage; + private Double battingAverage; /** - * `ball`, + * `ball`, * `name`, - * `at_bat`, + * `at_bat`, * strike`, * `played_games`, * ``uniform_number`, - * `batting_average`, + * `batting_average`, * `player_index` */ @@ -71,12 +71,12 @@ public void setStrike(Integer strike) { this.strike = strike; } - public Double getBattingAverage() { + public Double getBattingAverage() { return battingAverage; } - public void setBattingAverage(Double battingAverage) { - this.battingAverage = battingAverage; + public void setBattingAverage(Double battingAverage) { + this.battingAverage = (double) (this.hit + this.strike) / (double) (this.atBat); } public String getName() { diff --git a/BE_baseball/src/main/resources/deploy.sh b/BE_baseball/src/main/resources/deploy.sh index 989bd623e..cd56ee1e8 100644 --- a/BE_baseball/src/main/resources/deploy.sh +++ b/BE_baseball/src/main/resources/deploy.sh @@ -3,7 +3,6 @@ LINE='#########################################################' 파SERVADDR='ec2-3-35-226-74.ap-northeast-2.compute.amazonaws.com' #배포할 AWS EC2 서버 KEYFILE='~/Downloads/Dong210511.pem' # 내 개발콤퓨터에서 AWS key 위치 AUTOINJECT_JAR=1 #1:자동으로 scp명령어로 밀어넣기, #0=안밀어넣고 명령어만 보여주고 끝내기 -NGINX_SETUP = '/Users/gimdonghun/Workspace/baseball/BE_baseball/src/main/resources/nginx.sh' # echo $LINE echo "## DongDong's 바이너리파일 밀어넣기 스크립트 " @@ -16,11 +15,11 @@ cd build/libs BINFILE=`ls | grep *.jar` echo $BINFILE echo $LINE +echo "sdfwef" if [ ${AUTOINJECT_JAR} -eq 1 ];then scp -i $KEYFILE $BINFILE ubuntu@$SERVADDR:/home/ubuntu - scp -i $KEYFILE $NGINX_SETUP ubuntu@$SERVADDR:/home/ubuntu - + echo "fffff" echo "JAR FILE SEND OK...!" echo "" From aaacd33890044cfb30ca315f224f2491888aebcd Mon Sep 17 00:00:00 2001 From: dong Date: Tue, 11 May 2021 23:08:13 +0900 Subject: [PATCH 54/88] =?UTF-8?q?=ED=95=9C=EA=B8=80=EC=9D=B4=20=EC=82=BD?= =?UTF-8?q?=EC=9E=85=ED=95=B4=EC=84=9C=20=EB=B9=8C=EB=93=9C=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=EA=B0=80=20=EC=A0=95=EC=83=81?= =?UTF-8?q?=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EB=8F=99=EC=9E=91=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EB=AC=B8=EC=A0=9C=EB=A5=BC=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE_baseball/src/main/resources/deploy.sh b/BE_baseball/src/main/resources/deploy.sh index cd56ee1e8..e1abb9a0a 100644 --- a/BE_baseball/src/main/resources/deploy.sh +++ b/BE_baseball/src/main/resources/deploy.sh @@ -1,6 +1,6 @@ # 설정 LINE='#########################################################' -파SERVADDR='ec2-3-35-226-74.ap-northeast-2.compute.amazonaws.com' #배포할 AWS EC2 서버 +SERVADDR='ec2-3-35-226-74.ap-northeast-2.compute.amazonaws.com' #배포할 AWS EC2 서버 KEYFILE='~/Downloads/Dong210511.pem' # 내 개발콤퓨터에서 AWS key 위치 AUTOINJECT_JAR=1 #1:자동으로 scp명령어로 밀어넣기, #0=안밀어넣고 명령어만 보여주고 끝내기 # From 526da1cfa5228286351a55da6a56bbcb893f75ce Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 01:38:49 +0900 Subject: [PATCH 55/88] =?UTF-8?q?ProgressDTO=EC=99=80=20=EB=82=B4=EC=9A=A9?= =?UTF-8?q?/=EA=B8=B0=EB=8A=A5=EC=9D=B4=20=EC=A4=91=EB=B3=B5=EB=90=98?= =?UTF-8?q?=EB=AF=80=EB=A1=9C=20=ED=95=98=EB=82=98=EB=A1=9C=20=ED=86=B5?= =?UTF-8?q?=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dong/baseball/DTO/SituationBoardDTO.java | 121 ------------------ 1 file changed, 121 deletions(-) delete mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java deleted file mode 100644 index fd4e16b36..000000000 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/SituationBoardDTO.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.dong.baseball.DTO; - -import com.dong.baseball.Domain.Board; - -public class SituationBoardDTO { - - private Long matchId; - private int inning; - private String turn; - private int strike; - private int ball; - private int out; - private int HomePoint; - private int AwayPoint; - private String pitcher; - private String batter; - - public SituationBoardDTO(Board board) { - this.inning = board.getInning(); - this.turn = board.getTurn(); - this.strike = board.getStrike(); - this.ball = board.getBall(); - //@ Todo 할일더많음 - } - - public Long getMatchId() { - return matchId; - } - - public void setMatchId(Long matchId) { - this.matchId = matchId; - } - - public int getInning() { - return inning; - } - - public void setInning(int inning) { - this.inning = inning; - } - - public String getTurn() { - return turn; - } - - public void setTurn(String turn) { - this.turn = turn; - } - - public int getStrike() { - return strike; - } - - public void setStrike(int strike) { - this.strike = strike; - } - - public int getBall() { - return ball; - } - - public void setBall(int ball) { - this.ball = ball; - } - - public int getOut() { - return out; - } - - public void setOut(int out) { - this.out = out; - } - - public int getHomePoint() { - return HomePoint; - } - - public void setHomePoint(int homePoint) { - HomePoint = homePoint; - } - - public int getAwayPoint() { - return AwayPoint; - } - - public void setAwayPoint(int awayPoint) { - AwayPoint = awayPoint; - } - - public String getPitcher() { - return pitcher; - } - - public void setPitcher(String pitcher) { - this.pitcher = pitcher; - } - - public String getBatter() { - return batter; - } - - public void setBatter(String batter) { - this.batter = batter; - } - - @Override - public String toString() { - return "SituationBoardDTO{" + - "matchId=" + matchId + - ", inning=" + inning + - ", turn='" + turn + '\'' + - ", strike=" + strike + - ", ball=" + ball + - ", out=" + out + - ", HomePoint=" + HomePoint + - ", AwayPoint=" + AwayPoint + - ", pitcher='" + pitcher + '\'' + - ", batter='" + batter + '\'' + - '}'; - } -} From a1b83ac5ec6ea3fc046d893c5129b3946854e48a Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 01:40:40 +0900 Subject: [PATCH 56/88] =?UTF-8?q?Board=20=EA=B0=9D=EC=B2=B4=EC=97=90?= =?UTF-8?q?=EC=84=9C=20ProgressDTO=EA=B0=9D=EC=B2=B4=EB=A5=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=98=A4=EB=B2=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=94=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/ProgressDTO.java | 126 +++++++----------- 1 file changed, 46 insertions(+), 80 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java index 5c39d3ce1..c75f41bcb 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java @@ -1,104 +1,70 @@ package com.dong.baseball.DTO; +import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Player; import java.util.ArrayList; import java.util.List; public class ProgressDTO { - + private Long matchId; private String away; private String home; private int inning; - private String offenseTurn; + private String offenseTeam; private List firstBase; private List secondBase; private List thirdBase; - private Player pitcher; - private Player batter; - - - public ProgressDTO(String s) { - this.away = "away"; - this.home = "home"; - this.inning = 99; - this.offenseTurn = "offenseTurn"; - this.firstBase = new ArrayList<>(); - this.secondBase = new ArrayList<>(); - this.thirdBase = new ArrayList<>(); - this.pitcher = new Player(); - this.batter = new Player(); - } - - public String getAway() { - return away; - } - - public void setAway(String away) { + //private Player pitcher; + //private Player batter; + private String pitcher; + private String batter; + private int strike; + private int ball; + private int out; + private int homePoint; + private int awayPoint; + + public ProgressDTO(Long matchId, String away, String home, int inning, + String offenseTeam, List firstBase, List secondBase, + List thirdBase, String pitcher, String batter, int strike, + int ball, int out, int homePoint, int awayPoint) { + this.matchId = matchId; this.away = away; - } - - public String getHome() { - return home; - } - - public void setHome(String home) { this.home = home; - } - - public int getInning() { - return inning; - } - - public void setInning(int inning) { this.inning = inning; - } - - public String getOffenseTurn() { - return offenseTurn; - } - - public void setOffenseTurn(String offenseTurn) { - this.offenseTurn = offenseTurn; - } - - public List getFirstBase() { - return firstBase; - } - - public void setFirstBase(List firstBase) { + this.offenseTeam = offenseTeam; this.firstBase = firstBase; - } - - public List getSecondBase() { - return secondBase; - } - - public void setSecondBase(List secondBase) { this.secondBase = secondBase; - } - - public List getThirdBase() { - return thirdBase; - } - - public void setThirdBase(List thirdBase) { this.thirdBase = thirdBase; - } - - public Player getPitcher() { - return pitcher; - } - - public void setPitcher(Player pitcher) { this.pitcher = pitcher; - } - - public Player getBatter() { - return batter; - } - - public void setBatter(Player batter) { this.batter = batter; + this.strike = strike; + this.ball = ball; + this.out = out; + this.homePoint = homePoint; + this.awayPoint = awayPoint; + } + + public ProgressDTO(Board board) { + this.matchId = board.getId(); + this.away = "awayteam to string"; + this.home = "hometeam to string"; + this.inning = board.getInning(); + this.offenseTeam = "offenseTeam to String"; + //this.firstBase = firstBase; + //this.secondBase = secondBase; + //this.thirdBase = thirdBase; + this.firstBase = new ArrayList<>(); + this.secondBase = new ArrayList<>();; + this.thirdBase = new ArrayList<>();; + + this.pitcher = board.getPitcher(); + this.batter = board.getBatter(); + this.strike = board.getStrike(); + this.ball = board.getBall(); + this.out = board.getOut(); + this.homePoint = board.getHomePoint(); + this.awayPoint = board.getAwayPoint(); } } From 59ebf57ba682e9ed872fda7c9a1c9ba66059605e Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 01:41:41 +0900 Subject: [PATCH 57/88] =?UTF-8?q?matchId=20=EB=A5=BC=20=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EB=B0=9B=EC=95=84=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EA=B2=BD=EA=B8=B0=EC=9D=98=20=EC=B5=9C=EC=8B=A0=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EB=A5=BC=20=EB=A6=AC=ED=84=B4=ED=95=B4=20=EC=A3=BC?= =?UTF-8?q?=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Service/GameService.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index 2a2d84f78..4e0bb9452 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -1,7 +1,7 @@ package com.dong.baseball.Service; import com.dong.baseball.DTO.MatchUpListDTO; -import com.dong.baseball.DTO.SituationBoardDTO; +import com.dong.baseball.DTO.ProgressDTO; import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; import com.dong.baseball.Repository.LeagueRepository; @@ -29,16 +29,22 @@ public List matchList() { return dtoList; } - public List matchInformations(Long matchId) { - Match match = leagueRepository.findById(matchId).get(); + public List matchInformations(Long matchId) { + Match match = leagueRepository.findById(matchId).get();//@Todo get List matchBoards = match.getGameBoards(); - List matchBoardInfo = new ArrayList<>(); + List matchBoardInfo = new ArrayList<>(); for(Board board : matchBoards) { - matchBoardInfo.add(new SituationBoardDTO(board)); + matchBoardInfo.add(new ProgressDTO(board)); } return matchBoardInfo; } + + public Board matchStream(Long matchId) { + Match match = leagueRepository.findById(matchId).get();//@Todo get + List matchBoards = match.getGameBoards(); + return matchBoards.get(matchBoards.size()-1); + } } From 7df9474da3d145af5bdf77d1415394e9e411f984 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 01:45:57 +0900 Subject: [PATCH 58/88] =?UTF-8?q?=EA=B3=B5=EA=B2=A9=20=EB=B0=8F=20?= =?UTF-8?q?=EC=88=98=EB=B9=84=EC=9E=85=EC=9E=A5=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EB=8A=94=20DTO=20=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/Controller/GameController.java | 21 ++++++++++--------- .../java/com/dong/baseball/Domain/Board.java | 4 ++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index 9bf11b9b2..5cc3e53a8 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -2,9 +2,6 @@ import com.dong.baseball.DTO.MatchUpListDTO; import com.dong.baseball.DTO.ProgressDTO; -import com.dong.baseball.DTO.SituationBoardDTO; -import com.dong.baseball.Domain.Board; -import com.dong.baseball.Domain.Match; import com.dong.baseball.Service.GameService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -30,18 +27,22 @@ public List allMatches() { } @GetMapping("/{matchId}") - public List matchInfos(@PathVariable Long matchId) { + public List matchInfos(@PathVariable Long matchId) { return gameService.matchInformations(matchId); } - @GetMapping("/progress/offense/{matchId}") - public ProgressDTO offeseInfo() { - return new ProgressDTO(""); + @GetMapping("/offense/{matchId}") + public ProgressDTO offeseInfo(@PathVariable Long matchId) { + + gameService.matchInformations(matchId); + return new ProgressDTO(gameService.matchStream(matchId)); } - @GetMapping("/progress/defense/{matchId}") - public ProgressDTO defenseInfo() { - return new ProgressDTO(""); + @GetMapping("/defense/{matchId}") + public ProgressDTO defenseInfo(@PathVariable Long matchId) { + + gameService.matchInformations(matchId); + return new ProgressDTO(gameService.matchStream(matchId)); } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java index 179c18423..dc6d4f955 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java @@ -21,6 +21,7 @@ public class Board { private String pitcher; private String batter; + //@Todo 시간 기입해주기 //@CreatedDate //private LocalDateTime createdAt; @@ -40,6 +41,9 @@ public String toString() { '}'; } + public Long getId() { + return id; + } public int getInning() { return inning; From ebe519a457ae02fece16ee4931fe3ab74c5b7486 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:14:06 +0900 Subject: [PATCH 59/88] =?UTF-8?q?=EA=B2=BD=EA=B8=B0=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91=EC=9D=B8=EC=A7=80=20=EC=95=84=EB=8B=8C=EC=A7=80=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=EB=A5=BC=20=EA=B8=B0=EC=96=B5=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=9C=20=EB=B3=80=EC=88=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dong/baseball/Domain/Match.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java index ccf5dee21..87c351b9b 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java @@ -16,6 +16,8 @@ public class Match { @MappedCollection(keyColumn = "match_id") List gameBoards = new ArrayList<>(); + private int inProgress; + public void addGameBoards(Board... boards) { for (Board board : boards) { this.gameBoards.add(board); @@ -50,6 +52,14 @@ public void setAway(String away) { this.away = away; } + public int getInProgress() { + return inProgress; + } + + public void setInProgress(int inProgress) { + this.inProgress = inProgress; + } + @Override public String toString() { return "Match{" + From c78475428b73af77a59401fee352459565308c12 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:17:47 +0900 Subject: [PATCH 60/88] =?UTF-8?q?=EA=B2=BD=EA=B8=B0=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91=EC=9D=B8=EC=A7=80=20=EC=95=84=EB=8B=8C=EC=A7=80=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=EB=A5=BC=20=EA=B8=B0=EC=96=B5=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=9C=20=EB=B3=80=EC=88=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dong/baseball/Domain/Match.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java index 87c351b9b..94bd2e1a0 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java @@ -16,8 +16,6 @@ public class Match { @MappedCollection(keyColumn = "match_id") List gameBoards = new ArrayList<>(); - private int inProgress; - public void addGameBoards(Board... boards) { for (Board board : boards) { this.gameBoards.add(board); @@ -52,13 +50,6 @@ public void setAway(String away) { this.away = away; } - public int getInProgress() { - return inProgress; - } - - public void setInProgress(int inProgress) { - this.inProgress = inProgress; - } @Override public String toString() { From a486b974048b9c9605a0a71fb568daaefefd5a94 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:23:56 +0900 Subject: [PATCH 61/88] =?UTF-8?q?POST=EC=9A=94=EC=B2=AD=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=ED=95=9C=20=EC=9D=91=EB=8B=B5=20JSON=20DTO=20?= =?UTF-8?q?=EA=B0=9D=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/ResponseDTO.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/ResponseDTO.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ResponseDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ResponseDTO.java new file mode 100644 index 000000000..907818a6f --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ResponseDTO.java @@ -0,0 +1,46 @@ +package com.dong.baseball.DTO; + +public class ResponseDTO { + private int code; + private String status; + private String explanation; + + public ResponseDTO() { + this.code = 200; + this.status = "OK"; + this.explanation = ""; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getExplanation() { + return explanation; + } + + public void setExplanation(String explanation) { + this.explanation = explanation; + } + + @Override + public String toString() { + return "ResponseDTO{" + + "code=" + code + + ", status='" + status + '\'' + + ", explanation='" + explanation + '\'' + + '}'; + } +} From cb02d829c6abcbc1daa52115380938d65b00076b Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:24:15 +0900 Subject: [PATCH 62/88] =?UTF-8?q?getter=20setter=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/ProgressDTO.java | 142 ++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java index c75f41bcb..c8cfe89e7 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java @@ -52,6 +52,7 @@ public ProgressDTO(Board board) { this.home = "hometeam to string"; this.inning = board.getInning(); this.offenseTeam = "offenseTeam to String"; + //this.firstBase = firstBase; //this.secondBase = secondBase; //this.thirdBase = thirdBase; @@ -67,4 +68,145 @@ public ProgressDTO(Board board) { this.homePoint = board.getHomePoint(); this.awayPoint = board.getAwayPoint(); } + + public Long getMatchId() { + return matchId; + } + + public void setMatchId(Long matchId) { + this.matchId = matchId; + } + + public String getAway() { + return away; + } + + public void setAway(String away) { + this.away = away; + } + + public String getHome() { + return home; + } + + public void setHome(String home) { + this.home = home; + } + + public int getInning() { + return inning; + } + + public void setInning(int inning) { + this.inning = inning; + } + + public String getOffenseTeam() { + return offenseTeam; + } + + public void setOffenseTeam(String offenseTeam) { + this.offenseTeam = offenseTeam; + } + + public List getFirstBase() { + return firstBase; + } + + public void setFirstBase(List firstBase) { + this.firstBase = firstBase; + } + + public List getSecondBase() { + return secondBase; + } + + public void setSecondBase(List secondBase) { + this.secondBase = secondBase; + } + + public List getThirdBase() { + return thirdBase; + } + + public void setThirdBase(List thirdBase) { + this.thirdBase = thirdBase; + } + + public String getPitcher() { + return pitcher; + } + + public void setPitcher(String pitcher) { + this.pitcher = pitcher; + } + + public String getBatter() { + return batter; + } + + public void setBatter(String batter) { + this.batter = batter; + } + + public int getStrike() { + return strike; + } + + public void setStrike(int strike) { + this.strike = strike; + } + + public int getBall() { + return ball; + } + + public void setBall(int ball) { + this.ball = ball; + } + + public int getOut() { + return out; + } + + public void setOut(int out) { + this.out = out; + } + + public int getHomePoint() { + return homePoint; + } + + public void setHomePoint(int homePoint) { + this.homePoint = homePoint; + } + + public int getAwayPoint() { + return awayPoint; + } + + public void setAwayPoint(int awayPoint) { + this.awayPoint = awayPoint; + } + + @Override + public String toString() { + return "ProgressDTO{" + + "matchId=" + matchId + + ", away='" + away + '\'' + + ", home='" + home + '\'' + + ", inning=" + inning + + ", offenseTeam='" + offenseTeam + '\'' + + ", firstBase=" + firstBase + + ", secondBase=" + secondBase + + ", thirdBase=" + thirdBase + + ", pitcher='" + pitcher + '\'' + + ", batter='" + batter + '\'' + + ", strike=" + strike + + ", ball=" + ball + + ", out=" + out + + ", homePoint=" + homePoint + + ", awayPoint=" + awayPoint + + '}'; + } } From 8b7ca14f63d99d33ee863b61ab4e29b2779636b8 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:24:36 +0900 Subject: [PATCH 63/88] =?UTF-8?q?POST=EC=9A=94=EC=B2=AD=EC=9D=84=20?= =?UTF-8?q?=EB=B0=9B=EC=95=84=EB=93=A4=EC=97=AC=20=EC=99=B8=EB=B6=80=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EB=B0=9B=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Service/GameService.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index 4e0bb9452..76fc04873 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -2,6 +2,7 @@ import com.dong.baseball.DTO.MatchUpListDTO; import com.dong.baseball.DTO.ProgressDTO; +import com.dong.baseball.DTO.ResponseDTO; import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; import com.dong.baseball.Repository.LeagueRepository; @@ -46,5 +47,21 @@ public Board matchStream(Long matchId) { List matchBoards = match.getGameBoards(); return matchBoards.get(matchBoards.size()-1); } + + + public ResponseDTO gameStart(Long matchId) { + System.out.println("start!"); + return new ResponseDTO(); + } + + public ResponseDTO gameEnd(Long matchId) { + System.out.println("end"); + return new ResponseDTO(); + } + + public ResponseDTO gameProgress(Long matchId) { + System.out.println("progress"); + return new ResponseDTO(); + } } From 9fef885e0b2fc199b4251432c127fc7d4e7a156c Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:24:47 +0900 Subject: [PATCH 64/88] =?UTF-8?q?POST=EC=9A=94=EC=B2=AD=EC=9D=84=20?= =?UTF-8?q?=EB=B0=9B=EC=95=84=EB=93=A4=EC=97=AC=20=EC=99=B8=EB=B6=80=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=20=EB=B0=9B=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/Controller/GameController.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index 5cc3e53a8..82f744412 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -2,11 +2,9 @@ import com.dong.baseball.DTO.MatchUpListDTO; import com.dong.baseball.DTO.ProgressDTO; +import com.dong.baseball.DTO.ResponseDTO; import com.dong.baseball.Service.GameService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -45,5 +43,18 @@ public ProgressDTO defenseInfo(@PathVariable Long matchId) { return new ProgressDTO(gameService.matchStream(matchId)); } + @PostMapping("/start/{matchId}") + public ResponseDTO gameStart(@PathVariable Long matchId) { + return gameService.gameStart(matchId); + } + + @PostMapping("/end/{matchId}") + public ResponseDTO gameEnd(@PathVariable Long matchId) { + return gameService.gameEnd(matchId); + } + @PostMapping("/throws/{matchId}") + public ResponseDTO gameProgress(@PathVariable Long matchId) { + return gameService.gameProgress(matchId); + } } From 121032ed3e53daba588d0fd9cda458b1e0ba986e Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:26:29 +0900 Subject: [PATCH 65/88] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8F=AC?= =?UTF-8?q?=EB=A7=B7=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dong/baseball/BaseballApplication.java | 6 +++--- .../src/main/java/com/dong/baseball/DTO/ProgressDTO.java | 4 ++-- .../src/main/java/com/dong/baseball/Domain/Board.java | 3 --- .../src/main/java/com/dong/baseball/Domain/Match.java | 6 ++---- .../src/main/java/com/dong/baseball/Domain/Team.java | 6 ++---- .../java/com/dong/baseball/Exception/PlayerNotFound.java | 2 +- .../java/com/dong/baseball/Exception/TeamNotFound.java | 2 +- .../java/com/dong/baseball/Repository/TeamRepository.java | 3 +-- .../main/java/com/dong/baseball/Service/GameService.java | 8 ++++---- .../main/java/com/dong/baseball/Service/TeamService.java | 5 ++--- 10 files changed, 18 insertions(+), 27 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java b/BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java index 86906aa53..d75d056d3 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java +++ b/BE_baseball/src/main/java/com/dong/baseball/BaseballApplication.java @@ -6,8 +6,8 @@ @SpringBootApplication public class BaseballApplication { - public static void main(String[] args) { - SpringApplication.run(BaseballApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(BaseballApplication.class, args); + } } diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java index c8cfe89e7..9b1b8a91c 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java @@ -57,8 +57,8 @@ public ProgressDTO(Board board) { //this.secondBase = secondBase; //this.thirdBase = thirdBase; this.firstBase = new ArrayList<>(); - this.secondBase = new ArrayList<>();; - this.thirdBase = new ArrayList<>();; + this.secondBase = new ArrayList<>(); + this.thirdBase = new ArrayList<>(); this.pitcher = board.getPitcher(); this.batter = board.getBatter(); diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java index dc6d4f955..41f9e4e09 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java @@ -1,11 +1,8 @@ package com.dong.baseball.Domain; -import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.Id; -import java.time.LocalDateTime; - public class Board { @Id diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java index 94bd2e1a0..1daffc156 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java @@ -7,15 +7,13 @@ import java.util.List; public class Match { + @MappedCollection(keyColumn = "match_id") + List gameBoards = new ArrayList<>(); @Id private Long id; - private String home; private String away; - @MappedCollection(keyColumn = "match_id") - List gameBoards = new ArrayList<>(); - public void addGameBoards(Board... boards) { for (Board board : boards) { this.gameBoards.add(board); diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java index bca4f4350..8e783e2c4 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java @@ -8,18 +8,16 @@ // Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants public class Team { + @MappedCollection(idColumn = "team_id", keyColumn = "player_index") + List members = new ArrayList<>(); @Id private Long teamId; - private String teamName; private int win; private int lose; private int draw; private int victoryPoint; - @MappedCollection(idColumn = "team_id", keyColumn = "player_index") - List members = new ArrayList<>(); - public Long getTeamId() { return teamId; } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java index 6598069ec..91b0fd2f4 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java @@ -1,6 +1,6 @@ package com.dong.baseball.Exception; -public class PlayerNotFound extends RuntimeException{ +public class PlayerNotFound extends RuntimeException { static final String MESSAGE = "Palyer Cannot founded"; public PlayerNotFound() { diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java index 6c20289ca..08700266a 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java @@ -1,6 +1,6 @@ package com.dong.baseball.Exception; -public class TeamNotFound extends RuntimeException{ +public class TeamNotFound extends RuntimeException { static final String MESSAGE = "Palyer Cannot founded"; public TeamNotFound() { diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java index b6828a1a9..7932c05fa 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java @@ -2,13 +2,12 @@ import com.dong.baseball.Domain.Team; import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; import java.util.List; import java.util.Optional; //@Repository -public interface TeamRepository extends CrudRepository { +public interface TeamRepository extends CrudRepository { List findAll(); Optional findByTeamId(Long teamId); diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index 76fc04873..dd0296a34 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -22,9 +22,9 @@ public GameService(LeagueRepository leagueRepository) { } public List matchList() { - List matchList = leagueRepository.findAll(); + List matchList = leagueRepository.findAll(); List dtoList = new ArrayList<>(); - for(Match match : matchList) { + for (Match match : matchList) { dtoList.add(new MatchUpListDTO(match)); } return dtoList; @@ -35,7 +35,7 @@ public List matchInformations(Long matchId) { List matchBoards = match.getGameBoards(); List matchBoardInfo = new ArrayList<>(); - for(Board board : matchBoards) { + for (Board board : matchBoards) { matchBoardInfo.add(new ProgressDTO(board)); } @@ -45,7 +45,7 @@ public List matchInformations(Long matchId) { public Board matchStream(Long matchId) { Match match = leagueRepository.findById(matchId).get();//@Todo get List matchBoards = match.getGameBoards(); - return matchBoards.get(matchBoards.size()-1); + return matchBoards.get(matchBoards.size() - 1); } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java index 99a030c75..f992f8850 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java @@ -7,7 +7,6 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -26,7 +25,7 @@ public List teamRanking() { System.out.println("@@@@@@@@" + teamList + " : " + teamList.size()); List teamRankDTOList = new ArrayList<>(); - for(Team team : teamList) { + for (Team team : teamList) { teamRankDTOList.add(new TeamRankDTO(team)); } @@ -40,7 +39,7 @@ public int compare(TeamRankDTO t1, TeamRankDTO t2) { } public Team teamInfoById(Long teamId) { - return teamRepository.findByTeamId(teamId).orElseThrow (() -> new TeamNotFound()); + return teamRepository.findByTeamId(teamId).orElseThrow(() -> new TeamNotFound()); } public Team teamInfoByName(String teamName) { From 3ceab1103f44f8e161c94933eca30f78bbe5df24 Mon Sep 17 00:00:00 2001 From: dong Date: Wed, 12 May 2021 15:39:26 +0900 Subject: [PATCH 66/88] =?UTF-8?q?refactor=20:=20iOS=EC=B8=A1=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - "matchUpList" 라는 객체가 한번 더 감싸서 JSON을 출력하도록 수정 - 프론트엔드 측 문자열 파싱을 위한 구분 문자열 추가함 --- .../baseball/Controller/GameController.java | 4 ++-- .../{MatchUpListDTO.java => MatchDTO.java} | 4 ++-- .../dong/baseball/DTO/MatchUpListsDTO.java | 19 +++++++++++++++++++ .../dong/baseball/Service/GameService.java | 11 ++++++----- 4 files changed, 29 insertions(+), 9 deletions(-) rename BE_baseball/src/main/java/com/dong/baseball/DTO/{MatchUpListDTO.java => MatchDTO.java} (92%) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListsDTO.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index 82f744412..a9b3172c1 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -1,6 +1,6 @@ package com.dong.baseball.Controller; -import com.dong.baseball.DTO.MatchUpListDTO; +import com.dong.baseball.DTO.MatchUpListsDTO; import com.dong.baseball.DTO.ProgressDTO; import com.dong.baseball.DTO.ResponseDTO; import com.dong.baseball.Service.GameService; @@ -20,7 +20,7 @@ public GameController(GameService gameService) { } @GetMapping("") - public List allMatches() { + public MatchUpListsDTO allMatches() { return gameService.matchList(); } diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchDTO.java similarity index 92% rename from BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java rename to BE_baseball/src/main/java/com/dong/baseball/DTO/MatchDTO.java index 3375b6148..f41086834 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchDTO.java @@ -2,13 +2,13 @@ import com.dong.baseball.Domain.Match; -public class MatchUpListDTO { +public class MatchDTO { private Long matchId; private String home; private String away; - public MatchUpListDTO(Match match) { + public MatchDTO(Match match) { this.matchId = match.getId(); this.home = match.getHome(); this.away = match.getAway(); diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListsDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListsDTO.java new file mode 100644 index 000000000..755558a56 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchUpListsDTO.java @@ -0,0 +1,19 @@ +package com.dong.baseball.DTO; + +import java.util.List; + +public class MatchUpListsDTO { + List matchUpList; + + public MatchUpListsDTO(List matchUpList) { + this.matchUpList = matchUpList; + } + + public List getMatchUpList() { + return matchUpList; + } + + public void setMatchUpList(List matchUpList) { + this.matchUpList = matchUpList; + } +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index dd0296a34..ac7a64474 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -1,6 +1,7 @@ package com.dong.baseball.Service; -import com.dong.baseball.DTO.MatchUpListDTO; +import com.dong.baseball.DTO.MatchDTO; +import com.dong.baseball.DTO.MatchUpListsDTO; import com.dong.baseball.DTO.ProgressDTO; import com.dong.baseball.DTO.ResponseDTO; import com.dong.baseball.Domain.Board; @@ -21,13 +22,13 @@ public GameService(LeagueRepository leagueRepository) { this.leagueRepository = leagueRepository; } - public List matchList() { + public MatchUpListsDTO matchList() { List matchList = leagueRepository.findAll(); - List dtoList = new ArrayList<>(); + List dtoList = new ArrayList<>(); for (Match match : matchList) { - dtoList.add(new MatchUpListDTO(match)); + dtoList.add(new MatchDTO(match)); } - return dtoList; + return new MatchUpListsDTO(dtoList); } public List matchInformations(Long matchId) { From e316d1bf38269d3242f69c4b30e3ec0ce4ec5912 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 00:51:22 +0900 Subject: [PATCH 67/88] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D,=20=EB=B9=88=EC=A4=84=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Controller/GameController.java | 11 +++++------ BE_baseball/src/main/resources/schema.sql | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index a9b3172c1..49daf0e76 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -29,31 +29,30 @@ public List matchInfos(@PathVariable Long matchId) { return gameService.matchInformations(matchId); } - @GetMapping("/offense/{matchId}") + @GetMapping("/{matchId}/offense") public ProgressDTO offeseInfo(@PathVariable Long matchId) { - gameService.matchInformations(matchId); return new ProgressDTO(gameService.matchStream(matchId)); } - @GetMapping("/defense/{matchId}") + @GetMapping("/{matchId}/defense") public ProgressDTO defenseInfo(@PathVariable Long matchId) { gameService.matchInformations(matchId); return new ProgressDTO(gameService.matchStream(matchId)); } - @PostMapping("/start/{matchId}") + @PostMapping("/{matchId}/start") public ResponseDTO gameStart(@PathVariable Long matchId) { return gameService.gameStart(matchId); } - @PostMapping("/end/{matchId}") + @PostMapping("/{matchId}/end") public ResponseDTO gameEnd(@PathVariable Long matchId) { return gameService.gameEnd(matchId); } - @PostMapping("/throws/{matchId}") + @PostMapping("/{matchId}/throws") public ResponseDTO gameProgress(@PathVariable Long matchId) { return gameService.gameProgress(matchId); } diff --git a/BE_baseball/src/main/resources/schema.sql b/BE_baseball/src/main/resources/schema.sql index 0eac0d778..d60496cc4 100644 --- a/BE_baseball/src/main/resources/schema.sql +++ b/BE_baseball/src/main/resources/schema.sql @@ -83,7 +83,6 @@ CREATE TABLE IF NOT EXISTS `baseball`.`player` `player_id` BIGINT PRIMARY KEY AUTO_INCREMENT, `team_id` BIGINT REFERENCES `team` (team_id), `player_index` INT, - -- `dddong` INT, `name` VARCHAR(64) NOT NULL, `uniform_number` INT NOT NULL, `played_games` INT NOT NULL, @@ -104,4 +103,4 @@ DESC `player`; -- ------------------------------------------------- -- END OF SQL -- ------------------------------------------------- --- show tables; \ No newline at end of file +-- show tables; From 6b806a3a05b6f0226ddbe6281ed5c20404acc7d9 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 00:51:36 +0900 Subject: [PATCH 68/88] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D,=20=EB=B9=88=EC=A4=84=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/build.gradle | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/BE_baseball/build.gradle b/BE_baseball/build.gradle index 3a2c2600c..e80dbff9f 100644 --- a/BE_baseball/build.gradle +++ b/BE_baseball/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.springframework.boot' version '2.3.10.RELEASE' + id 'org.springframework.boot' version '2.4.5' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'java' } @@ -14,15 +14,10 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' - //implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - //implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - //implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'mysql:mysql-connector-java' - testImplementation('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } + testImplementation('org.springframework.boot:spring-boot-starter-test') } test { From 6731550723888be4bfc7437c06be56d0822db690 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 01:17:11 +0900 Subject: [PATCH 69/88] =?UTF-8?q?=EB=84=88=EB=AC=B4=20=EC=9D=BC=EB=B0=98?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20=EC=9D=B4=EB=A6=84=EC=9D=80=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EB=AA=85=EC=9C=BC=EB=A1=9C=20=EC=A0=81?= =?UTF-8?q?=EC=A0=88=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/{ResponseDTO.java => BaseballServerResponseDTO.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename BE_baseball/src/main/java/com/dong/baseball/DTO/{ResponseDTO.java => BaseballServerResponseDTO.java} (91%) diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ResponseDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/BaseballServerResponseDTO.java similarity index 91% rename from BE_baseball/src/main/java/com/dong/baseball/DTO/ResponseDTO.java rename to BE_baseball/src/main/java/com/dong/baseball/DTO/BaseballServerResponseDTO.java index 907818a6f..54a3de1da 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/ResponseDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/BaseballServerResponseDTO.java @@ -1,11 +1,11 @@ package com.dong.baseball.DTO; -public class ResponseDTO { +public class BaseballServerResponseDTO { private int code; private String status; private String explanation; - public ResponseDTO() { + public BaseballServerResponseDTO() { this.code = 200; this.status = "OK"; this.explanation = ""; From 44ded6e727956fbdf555e1ec375e9bd4e75fd332 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 01:17:23 +0900 Subject: [PATCH 70/88] =?UTF-8?q?=EB=84=88=EB=AC=B4=20=EC=9D=BC=EB=B0=98?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20=EC=9D=B4=EB=A6=84=EC=9D=80=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EB=AA=85=EC=9C=BC=EB=A1=9C=20=EC=A0=81?= =?UTF-8?q?=EC=A0=88=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Controller/GameController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index 49daf0e76..e209b96eb 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -2,7 +2,7 @@ import com.dong.baseball.DTO.MatchUpListsDTO; import com.dong.baseball.DTO.ProgressDTO; -import com.dong.baseball.DTO.ResponseDTO; +import com.dong.baseball.DTO.BaseballServerResponseDTO; import com.dong.baseball.Service.GameService; import org.springframework.web.bind.annotation.*; @@ -43,17 +43,17 @@ public ProgressDTO defenseInfo(@PathVariable Long matchId) { } @PostMapping("/{matchId}/start") - public ResponseDTO gameStart(@PathVariable Long matchId) { + public BaseballServerResponseDTO gameStart(@PathVariable Long matchId) { return gameService.gameStart(matchId); } @PostMapping("/{matchId}/end") - public ResponseDTO gameEnd(@PathVariable Long matchId) { + public BaseballServerResponseDTO gameEnd(@PathVariable Long matchId) { return gameService.gameEnd(matchId); } @PostMapping("/{matchId}/throws") - public ResponseDTO gameProgress(@PathVariable Long matchId) { + public BaseballServerResponseDTO gameProgress(@PathVariable Long matchId) { return gameService.gameProgress(matchId); } } From e715ff33cfd3d79f3a0c6f02b66c2994420d4796 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 01:17:33 +0900 Subject: [PATCH 71/88] =?UTF-8?q?=EB=84=88=EB=AC=B4=20=EC=9D=BC=EB=B0=98?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20=EC=9D=B4=EB=A6=84=EC=9D=80=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EB=AA=85=EC=9C=BC=EB=A1=9C=20=EC=A0=81?= =?UTF-8?q?=EC=A0=88=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Service/GameService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index ac7a64474..d102a1350 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -3,7 +3,7 @@ import com.dong.baseball.DTO.MatchDTO; import com.dong.baseball.DTO.MatchUpListsDTO; import com.dong.baseball.DTO.ProgressDTO; -import com.dong.baseball.DTO.ResponseDTO; +import com.dong.baseball.DTO.BaseballServerResponseDTO; import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; import com.dong.baseball.Repository.LeagueRepository; @@ -50,19 +50,19 @@ public Board matchStream(Long matchId) { } - public ResponseDTO gameStart(Long matchId) { + public BaseballServerResponseDTO gameStart(Long matchId) { System.out.println("start!"); - return new ResponseDTO(); + return new BaseballServerResponseDTO(); } - public ResponseDTO gameEnd(Long matchId) { + public BaseballServerResponseDTO gameEnd(Long matchId) { System.out.println("end"); - return new ResponseDTO(); + return new BaseballServerResponseDTO(); } - public ResponseDTO gameProgress(Long matchId) { + public BaseballServerResponseDTO gameProgress(Long matchId) { System.out.println("progress"); - return new ResponseDTO(); + return new BaseballServerResponseDTO(); } } From e0c646ad556f9f3eddda6fac8d5b727748370e0b Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 20:41:37 +0900 Subject: [PATCH 72/88] =?UTF-8?q?List=EB=A5=BC=20=EB=B0=94=EB=A1=9C=20JSON?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=A6=AC=ED=84=B4=ED=95=B4=EC=A3=BC?= =?UTF-8?q?=EB=8A=94=20=EB=B0=A9=EC=8B=9D=EC=9D=84=20=ED=94=BC=ED=95=98?= =?UTF-8?q?=EC=9E=90!=20Wrapper=20Class=EB=A5=BC=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Controller/GameController.java | 9 ++++----- .../main/java/com/dong/baseball/Service/GameService.java | 8 ++++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index e209b96eb..a96b95129 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -1,13 +1,12 @@ package com.dong.baseball.Controller; +import com.dong.baseball.DTO.BaseballServerResponseDTO; +import com.dong.baseball.DTO.MatchAllProgressDataDTO; import com.dong.baseball.DTO.MatchUpListsDTO; import com.dong.baseball.DTO.ProgressDTO; -import com.dong.baseball.DTO.BaseballServerResponseDTO; import com.dong.baseball.Service.GameService; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("/games") public class GameController { @@ -25,8 +24,8 @@ public MatchUpListsDTO allMatches() { } @GetMapping("/{matchId}") - public List matchInfos(@PathVariable Long matchId) { - return gameService.matchInformations(matchId); + public MatchAllProgressDataDTO matchInfos(@PathVariable Long matchId) { + return new MatchAllProgressDataDTO(gameService.findMatch(matchId), gameService.matchInformations(matchId)); } @GetMapping("/{matchId}/offense") diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index d102a1350..69bb60ca3 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -1,11 +1,12 @@ package com.dong.baseball.Service; +import com.dong.baseball.DTO.BaseballServerResponseDTO; import com.dong.baseball.DTO.MatchDTO; import com.dong.baseball.DTO.MatchUpListsDTO; import com.dong.baseball.DTO.ProgressDTO; -import com.dong.baseball.DTO.BaseballServerResponseDTO; import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; +import com.dong.baseball.Exception.MatchNotFoundException; import com.dong.baseball.Repository.LeagueRepository; import org.springframework.stereotype.Service; @@ -15,7 +16,6 @@ @Service public class GameService { - //private final BoardRepository boardRepository; private final LeagueRepository leagueRepository; public GameService(LeagueRepository leagueRepository) { @@ -64,5 +64,9 @@ public BaseballServerResponseDTO gameProgress(Long matchId) { System.out.println("progress"); return new BaseballServerResponseDTO(); } + + public MatchDTO findMatch(Long matchId) { + return new MatchDTO(leagueRepository.findById(matchId).orElseThrow(() -> new MatchNotFoundException())); + } } From a35e08b08e10b0645b495df8c2a4cd2911630185 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 20:42:10 +0900 Subject: [PATCH 73/88] =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20=EC=9D=B5?= =?UTF-8?q?=EC=85=89=EC=85=98=EB=93=A4=EC=9D=84=20=EC=9E=90=EB=B0=94?= =?UTF-8?q?=EC=96=B8=EC=96=B4=20=EA=B4=80=EB=A1=80=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EB=8A=94=20=ED=98=95=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/DTO/MatchAllProgressDataDTO.java | 31 +++++++++++++++++++ .../Exception/MatchNotFoundException.java | 9 ++++++ .../baseball/Exception/NotFoundException.java | 7 +++++ .../baseball/Exception/PlayerNotFound.java | 9 ------ .../Exception/PlayerNotFoundException.java | 10 ++++++ .../dong/baseball/Exception/TeamNotFound.java | 8 ----- .../Exception/TeamNotFoundException.java | 10 ++++++ 7 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 BE_baseball/src/main/java/com/dong/baseball/DTO/MatchAllProgressDataDTO.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/NotFoundException.java delete mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java delete mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java create mode 100644 BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchAllProgressDataDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchAllProgressDataDTO.java new file mode 100644 index 000000000..d96838b9a --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/MatchAllProgressDataDTO.java @@ -0,0 +1,31 @@ +package com.dong.baseball.DTO; + +import java.util.List; + +public class MatchAllProgressDataDTO { + private MatchDTO matchInfomation; + private List progressInfoList; + + public MatchAllProgressDataDTO(MatchDTO matchInfomation, List progressInfoList) { + this.matchInfomation = matchInfomation; + this.progressInfoList = progressInfoList; + } + + public MatchDTO getMatchInfomation() { + return matchInfomation; + } + + public void setMatchInfomation(MatchDTO matchInfomation) { + this.matchInfomation = matchInfomation; + } + + public List getProgressInfoList() { + return progressInfoList; + } + + public void setProgressInfoList(List progressInfoList) { + this.progressInfoList = progressInfoList; + } + + +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java new file mode 100644 index 000000000..2ebe2ab51 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java @@ -0,0 +1,9 @@ +package com.dong.baseball.Exception; + +public class MatchNotFoundException extends NotFoundException { + private static final String ERROR_MESSAGE = "Match"; + + public MatchNotFoundException() { + super(ERROR_MESSAGE); + } +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/NotFoundException.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/NotFoundException.java new file mode 100644 index 000000000..c862ec4b7 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/NotFoundException.java @@ -0,0 +1,7 @@ +package com.dong.baseball.Exception; + +public abstract class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java deleted file mode 100644 index 91b0fd2f4..000000000 --- a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFound.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.dong.baseball.Exception; - -public class PlayerNotFound extends RuntimeException { - static final String MESSAGE = "Palyer Cannot founded"; - - public PlayerNotFound() { - - } -} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java new file mode 100644 index 000000000..2cac58b4e --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java @@ -0,0 +1,10 @@ +package com.dong.baseball.Exception; + +public class PlayerNotFoundException extends NotFoundException { + private static final String ERROR_MESSAGE = "Cannot Found Player"; + + public PlayerNotFoundException() { + super(ERROR_MESSAGE); + } + +} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java deleted file mode 100644 index 08700266a..000000000 --- a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFound.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.dong.baseball.Exception; - -public class TeamNotFound extends RuntimeException { - static final String MESSAGE = "Palyer Cannot founded"; - - public TeamNotFound() { - } -} diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java new file mode 100644 index 000000000..b06d406f0 --- /dev/null +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java @@ -0,0 +1,10 @@ +package com.dong.baseball.Exception; + +public class TeamNotFoundException extends NotFoundException { + private static final String ERROR_MESSAGE = "Cannot Found Player"; + + public TeamNotFoundException() { + super(ERROR_MESSAGE); + } + +} From 57562f37d3369a5fba148708b4476a72cbf9a247 Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 22:47:41 +0900 Subject: [PATCH 74/88] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java | 1 - 1 file changed, 1 deletion(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java index 8e783e2c4..cb55c8bc2 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Team.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; -// Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants public class Team { @MappedCollection(idColumn = "team_id", keyColumn = "player_index") List members = new ArrayList<>(); From 741b4c46de625a27d98f79450d73daa4dcf8b3ba Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 22:48:35 +0900 Subject: [PATCH 75/88] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20pr?= =?UTF-8?q?int=20=EB=AC=B8=20=EC=A0=9C=EA=B1=B0=20=EC=BB=A4=EC=8A=A4?= =?UTF-8?q?=ED=85=80=20exception=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dong/baseball/Service/TeamService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java index f992f8850..43f760af8 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java @@ -2,7 +2,7 @@ import com.dong.baseball.DTO.TeamRankDTO; import com.dong.baseball.Domain.Team; -import com.dong.baseball.Exception.TeamNotFound; +import com.dong.baseball.Exception.TeamNotFoundException; import com.dong.baseball.Repository.TeamRepository; import org.springframework.stereotype.Service; @@ -22,7 +22,6 @@ public TeamService(TeamRepository teamRepository) { public List teamRanking() { List teamList = teamRepository.findAll(); - System.out.println("@@@@@@@@" + teamList + " : " + teamList.size()); List teamRankDTOList = new ArrayList<>(); for (Team team : teamList) { @@ -39,10 +38,10 @@ public int compare(TeamRankDTO t1, TeamRankDTO t2) { } public Team teamInfoById(Long teamId) { - return teamRepository.findByTeamId(teamId).orElseThrow(() -> new TeamNotFound()); + return teamRepository.findByTeamId(teamId).orElseThrow(() -> new TeamNotFoundException()); } public Team teamInfoByName(String teamName) { - return teamRepository.findByTeamName(teamName).orElseThrow(() -> new TeamNotFound()); + return teamRepository.findByTeamName(teamName).orElseThrow(() -> new TeamNotFoundException()); } } From 7327677e873b79a69a6bdeea6e7ad0a84829603e Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 23:00:32 +0900 Subject: [PATCH 76/88] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/DTO/ProgressDTO.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java index 9b1b8a91c..644b17af1 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java @@ -25,27 +25,6 @@ public class ProgressDTO { private int homePoint; private int awayPoint; - public ProgressDTO(Long matchId, String away, String home, int inning, - String offenseTeam, List firstBase, List secondBase, - List thirdBase, String pitcher, String batter, int strike, - int ball, int out, int homePoint, int awayPoint) { - this.matchId = matchId; - this.away = away; - this.home = home; - this.inning = inning; - this.offenseTeam = offenseTeam; - this.firstBase = firstBase; - this.secondBase = secondBase; - this.thirdBase = thirdBase; - this.pitcher = pitcher; - this.batter = batter; - this.strike = strike; - this.ball = ball; - this.out = out; - this.homePoint = homePoint; - this.awayPoint = awayPoint; - } - public ProgressDTO(Board board) { this.matchId = board.getId(); this.away = "awayteam to string"; @@ -53,9 +32,6 @@ public ProgressDTO(Board board) { this.inning = board.getInning(); this.offenseTeam = "offenseTeam to String"; - //this.firstBase = firstBase; - //this.secondBase = secondBase; - //this.thirdBase = thirdBase; this.firstBase = new ArrayList<>(); this.secondBase = new ArrayList<>(); this.thirdBase = new ArrayList<>(); From 6f6cf8ebcd775fd24437bce8c3b06bdcb3a0eb3f Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 23:14:04 +0900 Subject: [PATCH 77/88] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dong/baseball/Domain/Player.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java index 616777a39..0d548b29d 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Player.java @@ -1,8 +1,6 @@ package com.dong.baseball.Domain; public class Player { - // 타자 투수 구별은 없음, 왜냐하면 불펜으로 타자가 투수할수도 있기 때문 - // 나중에 Player를 최대한 풍부하게 만들어놓고 batter, pitcher 클래스를 상속받아 만들면 됨 private String name; private Integer uniformNumber; private Integer playedGames; @@ -12,17 +10,6 @@ public class Player { private Integer strike; private Double battingAverage; - /** - * `ball`, - * `name`, - * `at_bat`, - * strike`, - * `played_games`, - * ``uniform_number`, - * `batting_average`, - * `player_index` - */ - public Integer getUniformNumber() { return uniformNumber; } From 46eb6b4d0b51bd9195d1f9c33c94cc1f4fe48bbb Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 23:15:10 +0900 Subject: [PATCH 78/88] =?UTF-8?q?=EC=9E=90=EB=B0=94=EC=A7=84=EC=98=81?= =?UTF-8?q?=EC=9D=98=20=EA=B4=80=EC=8A=B5=EC=9D=84=20=EB=94=B0=EB=9D=BC=20?= =?UTF-8?q?id=EA=B0=80=20=EC=9C=84=EB=A1=9C=20=EC=98=A4=EB=8F=84=EB=A1=9D?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dong/baseball/Domain/Match.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java index 1daffc156..b40933f02 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Match.java @@ -7,13 +7,15 @@ import java.util.List; public class Match { - @MappedCollection(keyColumn = "match_id") - List gameBoards = new ArrayList<>(); + @Id private Long id; private String home; private String away; + @MappedCollection(keyColumn = "match_id") + List gameBoards = new ArrayList<>(); + public void addGameBoards(Board... boards) { for (Board board : boards) { this.gameBoards.add(board); @@ -28,18 +30,10 @@ public Long getId() { return id; } - public void setId(Long id) { - this.id = id; - } - public String getHome() { return home; } - public void setHome(String home) { - this.home = home; - } - public String getAway() { return away; } @@ -48,7 +42,6 @@ public void setAway(String away) { this.away = away; } - @Override public String toString() { return "Match{" + From 406a509306d8bf7be0d608e7456489d8a132d1cc Mon Sep 17 00:00:00 2001 From: dong Date: Thu, 13 May 2021 23:22:47 +0900 Subject: [PATCH 79/88] =?UTF-8?q?=EC=A2=80=EB=8D=94=20=EA=B5=AC=EC=B2=B4?= =?UTF-8?q?=EC=A0=81=EC=9D=B8=20=EC=97=90=EB=9F=AC=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80=20=EB=AA=85=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dong/baseball/Exception/MatchNotFoundException.java | 4 ++-- .../com/dong/baseball/Exception/PlayerNotFoundException.java | 4 ++-- .../com/dong/baseball/Exception/TeamNotFoundException.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java index 2ebe2ab51..7f422f28c 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/MatchNotFoundException.java @@ -1,9 +1,9 @@ package com.dong.baseball.Exception; public class MatchNotFoundException extends NotFoundException { - private static final String ERROR_MESSAGE = "Match"; + private static final String MATCH_NOT_FOUND_MESSAGE = "Cannot Found Match";; public MatchNotFoundException() { - super(ERROR_MESSAGE); + super(MATCH_NOT_FOUND_MESSAGE); } } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java index 2cac58b4e..7f9e9200c 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/PlayerNotFoundException.java @@ -1,10 +1,10 @@ package com.dong.baseball.Exception; public class PlayerNotFoundException extends NotFoundException { - private static final String ERROR_MESSAGE = "Cannot Found Player"; + private static final String PLAYER_NOT_FOUND_MESSAGE = "Cannot Found Player"; public PlayerNotFoundException() { - super(ERROR_MESSAGE); + super(PLAYER_NOT_FOUND_MESSAGE); } } diff --git a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java index b06d406f0..c1059133c 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Exception/TeamNotFoundException.java @@ -1,10 +1,10 @@ package com.dong.baseball.Exception; public class TeamNotFoundException extends NotFoundException { - private static final String ERROR_MESSAGE = "Cannot Found Player"; + private static final String TEAM_NOT_FOUND_MESSAGE = "Cannot Found Team"; public TeamNotFoundException() { - super(ERROR_MESSAGE); + super(TEAM_NOT_FOUND_MESSAGE); } } From 9223956306dc13c61371fc9031c9621cb53709df Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 00:32:12 +0900 Subject: [PATCH 80/88] =?UTF-8?q?=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{LeagueRepository.java => MatchRepository.java} | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) rename BE_baseball/src/main/java/com/dong/baseball/Repository/{LeagueRepository.java => MatchRepository.java} (68%) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/LeagueRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/MatchRepository.java similarity index 68% rename from BE_baseball/src/main/java/com/dong/baseball/Repository/LeagueRepository.java rename to BE_baseball/src/main/java/com/dong/baseball/Repository/MatchRepository.java index 34286e193..1019d0286 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Repository/LeagueRepository.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/MatchRepository.java @@ -5,6 +5,9 @@ import java.util.List; -public interface LeagueRepository extends CrudRepository { +public interface MatchRepository extends CrudRepository { + + @Override List findAll(); + } From 5cebc907d4e52afe6407395bfdc6bc404c179479 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 00:32:36 +0900 Subject: [PATCH 81/88] =?UTF-8?q?=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=B6=94=20=EB=B0=8F=20=ED=94=84=EB=A0=88=EC=9E=84?= =?UTF-8?q?=EC=9B=8C=ED=81=AC=EA=B0=80=20=EC=A7=80=EC=9B=90=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Repository/TeamRepository.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java index 7932c05fa..93b08e38a 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Repository/TeamRepository.java @@ -6,11 +6,13 @@ import java.util.List; import java.util.Optional; -//@Repository public interface TeamRepository extends CrudRepository { + + @Override List findAll(); - Optional findByTeamId(Long teamId); + @Override + Optional findById(Long aLong); Optional findByTeamName(String teamName); } From 965e88f41feb9ebac911e91422a323c74ffe6b32 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 00:33:04 +0900 Subject: [PATCH 82/88] =?UTF-8?q?=ED=94=84=EB=A0=88=EC=9E=84=EC=9B=8C?= =?UTF-8?q?=ED=81=AC=EA=B0=80=20=EC=A7=80=EC=9B=90=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dong/baseball/Service/TeamService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java index 43f760af8..84541871b 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/TeamService.java @@ -38,7 +38,7 @@ public int compare(TeamRankDTO t1, TeamRankDTO t2) { } public Team teamInfoById(Long teamId) { - return teamRepository.findByTeamId(teamId).orElseThrow(() -> new TeamNotFoundException()); + return teamRepository.findById(teamId).orElseThrow(() -> new TeamNotFoundException()); } public Team teamInfoByName(String teamName) { From 6796712ce7a1a58867c2ee69d2c15d5aaeefc1a3 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 00:33:39 +0900 Subject: [PATCH 83/88] =?UTF-8?q?=EC=9D=98=EC=A1=B4=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=EB=AA=85=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dong/baseball/Service/GameService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index 69bb60ca3..d4effc33a 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -7,7 +7,7 @@ import com.dong.baseball.Domain.Board; import com.dong.baseball.Domain.Match; import com.dong.baseball.Exception.MatchNotFoundException; -import com.dong.baseball.Repository.LeagueRepository; +import com.dong.baseball.Repository.MatchRepository; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,9 +16,9 @@ @Service public class GameService { - private final LeagueRepository leagueRepository; + private final MatchRepository leagueRepository; - public GameService(LeagueRepository leagueRepository) { + public GameService(MatchRepository leagueRepository) { this.leagueRepository = leagueRepository; } @@ -32,7 +32,7 @@ public MatchUpListsDTO matchList() { } public List matchInformations(Long matchId) { - Match match = leagueRepository.findById(matchId).get();//@Todo get + Match match = leagueRepository.findById(matchId).orElseThrow(() -> new MatchNotFoundException()); List matchBoards = match.getGameBoards(); List matchBoardInfo = new ArrayList<>(); From 06c3c2747cad2aef3cb01b0159edd7f2b983b769 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 00:38:01 +0900 Subject: [PATCH 84/88] =?UTF-8?q?=ED=98=BC=EB=8F=99=EC=9D=98=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=EC=84=B1=EC=9D=B4=20=EC=A1=B4=EC=9E=AC=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Controller/GameController.java | 4 ++-- .../src/main/java/com/dong/baseball/Service/GameService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java index a96b95129..35fdaf4bf 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Controller/GameController.java @@ -31,14 +31,14 @@ public MatchAllProgressDataDTO matchInfos(@PathVariable Long matchId) { @GetMapping("/{matchId}/offense") public ProgressDTO offeseInfo(@PathVariable Long matchId) { gameService.matchInformations(matchId); - return new ProgressDTO(gameService.matchStream(matchId)); + return new ProgressDTO(gameService.matchSingleInfo(matchId)); } @GetMapping("/{matchId}/defense") public ProgressDTO defenseInfo(@PathVariable Long matchId) { gameService.matchInformations(matchId); - return new ProgressDTO(gameService.matchStream(matchId)); + return new ProgressDTO(gameService.matchSingleInfo(matchId)); } @PostMapping("/{matchId}/start") diff --git a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java index d4effc33a..0b348c459 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Service/GameService.java @@ -43,7 +43,7 @@ public List matchInformations(Long matchId) { return matchBoardInfo; } - public Board matchStream(Long matchId) { + public Board matchSingleInfo(Long matchId) { Match match = leagueRepository.findById(matchId).get();//@Todo get List matchBoards = match.getGameBoards(); return matchBoards.get(matchBoards.size() - 1); From a1915e72a61416ba511d61b6611719e10a3a0dca Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 00:41:24 +0900 Subject: [PATCH 85/88] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dong/baseball/DTO/ProgressDTO.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java index 644b17af1..d471d6a37 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java +++ b/BE_baseball/src/main/java/com/dong/baseball/DTO/ProgressDTO.java @@ -15,8 +15,6 @@ public class ProgressDTO { private List firstBase; private List secondBase; private List thirdBase; - //private Player pitcher; - //private Player batter; private String pitcher; private String batter; private int strike; From 8903e0ea557321c373fc413899a2042f7c48855e Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 00:41:52 +0900 Subject: [PATCH 86/88] =?UTF-8?q?=EA=B4=80=EB=A1=80=EC=83=81=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=ED=95=B4=EC=95=BC=ED=95=A0=EA=B3=B3=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dong/baseball/Domain/Board.java | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java index 41f9e4e09..92ac0dfb3 100644 --- a/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java +++ b/BE_baseball/src/main/java/com/dong/baseball/Domain/Board.java @@ -22,22 +22,6 @@ public class Board { //@CreatedDate //private LocalDateTime createdAt; - - @Override - public String toString() { - return "Board{" + - ", inning=" + inning + - ", turn='" + turn + '\'' + - ", strike=" + strike + - ", ball=" + ball + - ", out=" + out + - ", HomePoint=" + HomePoint + - ", AwayPoint=" + AwayPoint + - ", pitcher='" + pitcher + '\'' + - ", batter='" + batter + '\'' + - '}'; - } - public Long getId() { return id; } @@ -113,4 +97,19 @@ public String getBatter() { public void setBatter(String batter) { this.batter = batter; } + + @Override + public String toString() { + return "Board{" + + ", inning=" + inning + + ", turn='" + turn + '\'' + + ", strike=" + strike + + ", ball=" + ball + + ", out=" + out + + ", HomePoint=" + HomePoint + + ", AwayPoint=" + AwayPoint + + ", pitcher='" + pitcher + '\'' + + ", batter='" + batter + '\'' + + '}'; + } } From 8ab4ec24d5507ab5b5d4dcddefcf77ccb3eed769 Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 01:31:03 +0900 Subject: [PATCH 87/88] =?UTF-8?q?sha=20bang=20=EC=B6=94=EA=B0=80=20-=20?= =?UTF-8?q?=ED=95=B4=EB=8B=B9=20=EC=89=98=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=EA=B0=80=20=EB=8F=8C=EC=95=84=EA=B0=80=EC=95=BC?= =?UTF-8?q?=ED=95=A0=20=EC=89=98=20=EC=A2=85=EB=A5=98=EB=A5=BC=20=EB=AA=85?= =?UTF-8?q?=EC=8B=9C=ED=95=98=EB=8A=94=20=EC=89=90=EB=B1=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/deploy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/BE_baseball/src/main/resources/deploy.sh b/BE_baseball/src/main/resources/deploy.sh index e1abb9a0a..d7c4446a8 100644 --- a/BE_baseball/src/main/resources/deploy.sh +++ b/BE_baseball/src/main/resources/deploy.sh @@ -1,3 +1,4 @@ +#!/bin/zsh # 설정 LINE='#########################################################' SERVADDR='ec2-3-35-226-74.ap-northeast-2.compute.amazonaws.com' #배포할 AWS EC2 서버 From ef1107a6322ae2d851baa732e026784e4501ebbb Mon Sep 17 00:00:00 2001 From: dong Date: Fri, 14 May 2021 01:31:19 +0900 Subject: [PATCH 88/88] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EB=A5=BC=20=EC=A1=B0=ED=9A=8C=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=EB=AC=B8=20=EC=83=9D=EB=9E=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE_baseball/src/main/resources/data.sql | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/BE_baseball/src/main/resources/data.sql b/BE_baseball/src/main/resources/data.sql index e31f644b3..c61ab7c05 100644 --- a/BE_baseball/src/main/resources/data.sql +++ b/BE_baseball/src/main/resources/data.sql @@ -37,9 +37,7 @@ INSERT INTO `board`(`match`,`inning`,`turn`,`strike`,`ball`,`out`,`home_point`,` (1,1,'TOP/AWAY',1,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 (1,1,'TOP/AWAY',2,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 (1,1,'TOP/AWAY',3,0,1,0,0,'kim','honux'), -- 앞에서 안타 쳐서 호눅스로 타자변경 - (1,1,'BOT/HOME',0,0,0,0,0,'kim','dong'); -- */ -select * from board; -- ---------------------------------------------------------- @@ -50,19 +48,6 @@ select * from board; -- Tigers, Bears, Twins, Dinos, Lions, Eagles, Giants; DESC `team`; -- DELETE FROM `team` WHERE team_id = *; -/* -INSERT INTO `team`(`team_id`,`team_name`,`win`,`lose`,`draw`,`victory_point`) values -(1,'Tigers',10,10,2,10*3+2), -(2,'Bears',1,19,2,1*3+2), -(3,'Twins',3,17,2,3*3+2), -(4,'Dinos',5,15,2,5*3+2), -(5,'Lions',7,13,2,7*3+2), -(6,'Eagles',9,11,2,9*3+2), -(7,'Giants',12,8,2,12*3+2); -SELECT * FROM team; - - */ - INSERT INTO `team`(`team_name`,`win`,`lose`,`draw`,`victory_point`) values ('Tigers',10,10,2,10*3+2), ('Bears',1,19,2,1*3+2), @@ -71,8 +56,6 @@ INSERT INTO `team`(`team_name`,`win`,`lose`,`draw`,`victory_point`) values ('Lions',7,13,2,7*3+2), ('Eagles',9,11,2,9*3+2), ('Giants',12,8,2,12*3+2); -SELECT * FROM team; - -- ---------------------------------------------------------- @@ -102,7 +85,4 @@ INSERT INTO `player`(`team_id`, `name`,`uniform_number`,`played_games`,`at_bat`, (3,'한영준',224,839,144,445,456,485), (3,'강병철',345,345,123,235,152,998), (3,'레일리',247,567,546,346,823,662); - - -SELECT * FROM `player`; --- ---------------------------------------------------------- \ No newline at end of file +-- ----------------------------------------------------------