From 7d3ca8a3565665c4835ebce65b33427b4582921d Mon Sep 17 00:00:00 2001 From: Hoyoung Son Date: Mon, 3 May 2021 15:39:33 +0900 Subject: [PATCH 01/96] Update README.md --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 029ce7391..8e833c8e8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,12 @@ -# baseball -그룹프로젝트 #3 +# **CPR** 페이지에 오신걸 환영합니다!!!!! + +## 맴버 + +| CPR Position | Name | Comment | +| :-: | :--: | :-----: | +|

**BE** |

[coco](https://github.com/ChoiGiSung) | | +| **FE** | [pengdori](https://github.com/dudn1933) | 🐟를 흔들어주세요 🦦 | +| **FE** | [Rano](https://github.com/17-sss) | 점심 나가서 먹을거 같애 | + +## CPR WIKI 😀 +- [협업룰](https://github.com/ChoiGiSung/baseball/wiki/코란도-협업룰) From a052649939362405838c31348e8b6a7c5bdc5bfc Mon Sep 17 00:00:00 2001 From: Hoyoung Son Date: Mon, 3 May 2021 15:50:53 +0900 Subject: [PATCH 02/96] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8e833c8e8..baacc056e 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ | CPR Position | Name | Comment | | :-: | :--: | :-----: | -|

**BE** |

[coco](https://github.com/ChoiGiSung) | | -| **FE** | [pengdori](https://github.com/dudn1933) | 🐟를 흔들어주세요 🦦 | -| **FE** | [Rano](https://github.com/17-sss) | 점심 나가서 먹을거 같애 | +|


**BE** |


[coco](https://github.com/ChoiGiSung) | | +|

**FE** |

[pengdori](https://github.com/dudn1933) | | +|


**FE** |


[Rano](https://github.com/17-sss) | | ## CPR WIKI 😀 - [협업룰](https://github.com/ChoiGiSung/baseball/wiki/코란도-협업룰) From d303c9a2f2ad843efad59415a952c286cf0cbe9e Mon Sep 17 00:00:00 2001 From: Hoyoung Son Date: Mon, 3 May 2021 15:52:04 +0900 Subject: [PATCH 03/96] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index baacc056e..28b1e22b6 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ | CPR Position | Name | Comment | | :-: | :--: | :-----: | -|


**BE** |


[coco](https://github.com/ChoiGiSung) | | -|

**FE** |

[pengdori](https://github.com/dudn1933) | | -|


**FE** |


[Rano](https://github.com/17-sss) | | +| **BE** | [coco](https://github.com/ChoiGiSung) | | +| **FE** | [pengdori](https://github.com/dudn1933) | | +| **FE** | [Rano](https://github.com/17-sss) | | ## CPR WIKI 😀 - [협업룰](https://github.com/ChoiGiSung/baseball/wiki/코란도-협업룰) From d562a1ea1c01996394c3c2f806bb9cf59a5a7ef1 Mon Sep 17 00:00:00 2001 From: Hoyoung Son Date: Mon, 3 May 2021 16:48:45 +0900 Subject: [PATCH 04/96] =?UTF-8?q?docs:=20BE=20=EC=B4=88=EA=B8=B0=20?= =?UTF-8?q?=ED=8F=B4=EB=8D=94=EA=B5=AC=EC=A1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/_noDel | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 BE/_noDel diff --git a/BE/_noDel b/BE/_noDel new file mode 100644 index 000000000..e69de29bb From ddc45848a24b12ba4edcd2427536a55a267f4232 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 14:17:23 +0900 Subject: [PATCH 05/96] =?UTF-8?q?feat=20:=20=EC=B4=88=EA=B8=B0=20=EC=84=B8?= =?UTF-8?q?=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/.gitignore | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 BE/.gitignore diff --git a/BE/.gitignore b/BE/.gitignore new file mode 100644 index 000000000..c2065bc26 --- /dev/null +++ b/BE/.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/ From 79f9857e15b38f671ef063a68e8fd7684d3de432 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 14:18:35 +0900 Subject: [PATCH 06/96] =?UTF-8?q?feat=20:=20=EC=B4=88=EA=B8=B0=20=EC=84=B8?= =?UTF-8?q?=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/_noDel | 0 BE/build.gradle | 24 +++ BE/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes BE/gradle/wrapper/gradle-wrapper.properties | 5 + BE/gradlew | 185 ++++++++++++++++++ BE/gradlew.bat | 89 +++++++++ BE/settings.gradle | 1 + .../com/codesquad/coco/CocoApplication.java | 13 ++ BE/src/main/resources/application.properties | 1 + .../codesquad/coco/CocoApplicationTests.java | 13 ++ 10 files changed, 331 insertions(+) delete mode 100644 BE/_noDel create mode 100644 BE/build.gradle create mode 100644 BE/gradle/wrapper/gradle-wrapper.jar create mode 100644 BE/gradle/wrapper/gradle-wrapper.properties create mode 100644 BE/gradlew create mode 100644 BE/gradlew.bat create mode 100644 BE/settings.gradle create mode 100644 BE/src/main/java/com/codesquad/coco/CocoApplication.java create mode 100644 BE/src/main/resources/application.properties create mode 100644 BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java diff --git a/BE/_noDel b/BE/_noDel deleted file mode 100644 index e69de29bb..000000000 diff --git a/BE/build.gradle b/BE/build.gradle new file mode 100644 index 000000000..6e2fe07ac --- /dev/null +++ b/BE/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'org.springframework.boot' version '2.4.5' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.codesquad' +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-web' + runtimeOnly 'mysql:mysql-connector-java' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +test { + useJUnitPlatform() +} diff --git a/BE/gradle/wrapper/gradle-wrapper.jar b/BE/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/gradle/wrapper/gradle-wrapper.properties b/BE/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..442d9132e --- /dev/null +++ b/BE/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/gradlew b/BE/gradlew new file mode 100644 index 000000000..4f906e0c8 --- /dev/null +++ b/BE/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/gradlew.bat b/BE/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/BE/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/settings.gradle b/BE/settings.gradle new file mode 100644 index 000000000..d7ed485c5 --- /dev/null +++ b/BE/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'coco' diff --git a/BE/src/main/java/com/codesquad/coco/CocoApplication.java b/BE/src/main/java/com/codesquad/coco/CocoApplication.java new file mode 100644 index 000000000..b92aa7349 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/CocoApplication.java @@ -0,0 +1,13 @@ +package com.codesquad.coco; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CocoApplication { + + public static void main(String[] args) { + SpringApplication.run(CocoApplication.class, args); + } + +} diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/BE/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java b/BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java new file mode 100644 index 000000000..b7bf8faea --- /dev/null +++ b/BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java @@ -0,0 +1,13 @@ +package com.codesquad.coco; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CocoApplicationTests { + + @Test + void contextLoads() { + } + +} From dbaf9853332558169ea82c9631ed86c8a5ce0771 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 15:44:42 +0900 Subject: [PATCH 07/96] =?UTF-8?q?feat=20:=20database=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - property와 schema 작성 --- BE/src/main/resources/application.properties | 8 +++ BE/src/main/resources/schema.sql | 51 ++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 BE/src/main/resources/schema.sql diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index 8b1378917..d222f0bd6 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1 +1,9 @@ +#mysql database datasource +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/BASEBALL?serverTimezone=UTC&characterEncoding=UTF-8 +spring.datasource.username=dev +spring.datasource.password=1234 +#mysql database etc +spring.datasource.initialization-mode=always +spring.datasource.schema=classpath:schema.sql \ No newline at end of file diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql new file mode 100644 index 000000000..41251e333 --- /dev/null +++ b/BE/src/main/resources/schema.sql @@ -0,0 +1,51 @@ +use BASEBALL; + +drop table if exists team; +drop table if exists player; +drop table if exists record; +drop table if exists game; +drop table if exists score_board; +drop table if exists innings; + +create table team( + id BIGINT auto_increment primary key, + name varchar(20) not null unique +); + +create table record( + id BIGINT auto_increment primary key, + at_bat int not null, + hits int not null, + outs int not null, + average DECIMAL(3,3) not null +); + +create table player( + id BIGINT auto_increment primary key, + name varchar(20) not null, + type varchar(20) not null, + team BIGINT references team(id), + record BIGINT references record(id) +); + + + +create table game( + id BIGINT auto_increment primary key, + user_type varchar(20) not null, + away_id BIGINT references team(id), + home_id BIGINT references team(id) +); + +create table score_board( + id BIGINT auto_increment primary key, + game BIGINT references game(id), + team BIGINT references team(id) +); + +create table innings( + id BIGINT auto_increment primary key, + score int not null, + score_board BIGINT references score_board(id), + score_board_key int +); \ No newline at end of file From 075b2ea27cb83cf086b53a13095d25bf81f43a6b Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 17:19:11 +0900 Subject: [PATCH 08/96] =?UTF-8?q?test=20:=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20test=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/codesquad/coco/CocoApplicationTests.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java diff --git a/BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java b/BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java deleted file mode 100644 index b7bf8faea..000000000 --- a/BE/src/test/java/com/codesquad/coco/CocoApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.codesquad.coco; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class CocoApplicationTests { - - @Test - void contextLoads() { - } - -} From 56315c9710faf53aec5fd96a0fe46f2a7a1d6168 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 17:19:55 +0900 Subject: [PATCH 09/96] =?UTF-8?q?feat=20:=20team=EC=9D=98=20primary=20key?= =?UTF-8?q?=EB=A5=BC=20name=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 - 팀의 이름이 기본 키가 된다. --- BE/src/main/resources/schema.sql | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 41251e333..f9965638b 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -8,39 +8,36 @@ drop table if exists score_board; drop table if exists innings; create table team( - id BIGINT auto_increment primary key, - name varchar(20) not null unique -); - -create table record( - id BIGINT auto_increment primary key, - at_bat int not null, - hits int not null, - outs int not null, - average DECIMAL(3,3) not null + name varchar(20) primary key not null ); create table player( id BIGINT auto_increment primary key, name varchar(20) not null, type varchar(20) not null, - team BIGINT references team(id), - record BIGINT references record(id) + team varchar(20) references team(name) ); - +create table record( + id BIGINT auto_increment primary key, + at_bat int not null, + hits int not null, + outs int not null, + average double(4,3) not null, + player BIGINT references player(id) +); create table game( id BIGINT auto_increment primary key, user_type varchar(20) not null, - away_id BIGINT references team(id), - home_id BIGINT references team(id) + away varchar(20) references team(name), + home varchar(20) references team(name) ); create table score_board( id BIGINT auto_increment primary key, game BIGINT references game(id), - team BIGINT references team(id) + team varchar(20) references team(name) ); create table innings( From d0c0f9685b36870eb8ca7e73fccde1def9a50737 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 17:21:20 +0900 Subject: [PATCH 10/96] =?UTF-8?q?feat=20:=20team,=20player,=20record=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 - class 생성 --- .../codesquad/coco/player/domain/Player.java | 39 ++++++++++++++++ .../codesquad/coco/player/domain/Record.java | 46 +++++++++++++++++++ .../com/codesquad/coco/team/domain/Team.java | 24 ++++++++++ 3 files changed, 109 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/Player.java create mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/Record.java create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/Team.java diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Player.java b/BE/src/main/java/com/codesquad/coco/player/domain/Player.java new file mode 100644 index 000000000..cf1d612ad --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/domain/Player.java @@ -0,0 +1,39 @@ +package com.codesquad.coco.player.domain; + +import org.springframework.data.annotation.Id; + +public class Player { + + @Id + private Long id; + + private String name; + private String type; + private Record record; + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public String getType() { + return type; + } + + public Record getRecord() { + return record; + } + + @Override + public String toString() { + return "Player{" + + "id=" + id + + ", name='" + name + '\'' + + ", type='" + type + '\'' + + ", record=" + record + + '}'; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java new file mode 100644 index 000000000..cf418251c --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java @@ -0,0 +1,46 @@ +package com.codesquad.coco.player.domain; + +import org.springframework.data.annotation.Id; + +public class Record { + + @Id + private Long id; + + private int atBat; + private int hits; + private int outs; + private double average; + + + public Long getId() { + return id; + } + + public int getAtBat() { + return atBat; + } + + public int getHits() { + return hits; + } + + public int getOuts() { + return outs; + } + + public double getAverage() { + return average; + } + + @Override + public String toString() { + return "Record{" + + "id=" + id + + ", atBat=" + atBat + + ", hits=" + hits + + ", outs=" + outs + + ", average=" + average + + '}'; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/Team.java b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java new file mode 100644 index 000000000..0f7678cec --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java @@ -0,0 +1,24 @@ +package com.codesquad.coco.team.domain; + +import com.codesquad.coco.player.domain.Player; +import org.springframework.data.annotation.Id; + +import java.util.Set; + +public class Team { + + + @Id + private String name; + + private Set players; + + public String getName() { + return name; + } + + public Set getPlayers() { + return players; + } + +} From 89b0bdded47590f7c5e9b9b33f0aced8664f8ce5 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 17:21:52 +0900 Subject: [PATCH 11/96] =?UTF-8?q?feat=20:=20data=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 기본 data 추가 --- BE/src/main/resources/data.sql | 142 +++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 BE/src/main/resources/data.sql diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql new file mode 100644 index 000000000..d84af0a75 --- /dev/null +++ b/BE/src/main/resources/data.sql @@ -0,0 +1,142 @@ +use BASEBALL; + +INSERT INTO team +(name) +VALUES ('두산 베어스'), + ('SSG 랜더스'), + ('기아 타이거즈'), + ('키움 히어로즈'), + ('한화 이글스'), + ('롯데 자이언츠'); + + + +INSERT INTO player +(name, team,type) +VALUES +-- 두산 베어스 +('허경민', '두산 베어스','투수'), +('오재원', '두산 베어스','타자'), +('페르난데스', '두산 베어스','타자'), +('박건우', '두산 베어스','타자'), +('조수행', '두산 베어스','타자'), +('김재환', '두산 베어스','타자'), +('안권수', '두산 베어스','타자'), +('권민석', '두산 베어스','타자'), +('유희관', '두산 베어스','타자'), +-- SSG 랜더스 +('최정', 'SSG 랜더스','투수'), +('추신수', 'SSG 랜더스','타자'), +('김성현', 'SSG 랜더스','타자'), +('로맥', 'SSG 랜더스','타자'), +('오태곤', 'SSG 랜더스','타자'), +('정의윤', 'SSG 랜더스','타자'), +('김강민', 'SSG 랜더스','타자'), +('이재원', 'SSG 랜더스','타자'), +('김광현', 'SSG 랜더스','타자'), +-- 기아 타이거즈 +('나지완', '기아 타이거즈','투수'), +('최형우', '기아 타이거즈','타자'), +('김선빈', '기아 타이거즈','타자'), +('터커', '기아 타이거즈','타자'), +('이우성', '기아 타이거즈','타자'), +('김민식', '기아 타이거즈','타자'), +('나주환', '기아 타이거즈','타자'), +('한승택', '기아 타이거즈','타자'), +('멩덴', '기아 타이거즈','타자'), +-- 키움 히어로즈 +('이정후', '키움 히어로즈','투수'), +('박병호', '키움 히어로즈','타자'), +('이용규', '키움 히어로즈','타자'), +('허정협', '키움 히어로즈','타자'), +('김혜성', '키움 히어로즈','타자'), +('서건창', '키움 히어로즈','타자'), +('신준우', '키움 히어로즈','타자'), +('프레이타', '키움 히어로즈','타자'), +('최원태', '키움 히어로즈','타자'), +-- 한화 이글스 +('정은원', '한화 이글스','투수'), +('노수광', '한화 이글스','타자'), +('하주석', '한화 이글스','타자'), +('힐리', '한화 이글스','타자'), +('이성열', '한화 이글스','타자'), +('정진호', '한화 이글스','타자'), +('장운호', '한화 이글스','타자'), +('임종찬', '한화 이글스','타자'), +('김민우', '한화 이글스','타자'), +-- 롯데 자이언츠 +('정훈', '롯데 자이언츠','투수'), +('손아섭', '롯데 자이언츠','타자'), +('전준우', '롯데 자이언츠','타자'), +('이대호', '롯데 자이언츠','타자'), +('마차도', '롯데 자이언츠','타자'), +('오윤석', '롯데 자이언츠','타자'), +('이병규', '롯데 자이언츠','타자'), +('김준태', '롯데 자이언츠','타자'), +('노경은', '롯데 자이언츠','타자'); + + + +INSERT INTO record +(id,player, at_bat, hits, outs, average) +VALUES +-- 두산 베어스 +(1,1, 2, 1, 1, 0.500), +(2,2, 2, 2, 0, 1.000), +(3,3, 2, 0, 2, 0.000), +(4,4, 2, 3, 2, 0.304), +(5,5, 2, 0, 2, 0.000), +(6,6, 2, 1, 1, 0.500), +(7,7, 2, 2, 2, 1.000), +(8,8, 2, 1, 1, 0.500), +(9,9, 2, 0, 0, 0.000), +-- ssg 랜더스 +(10,10,2, 2, 2, 1.000), +(11,11, 2, 1, 1, 0.500), +(12,12, 2, 0, 2, 0.000), +(13,13,2, 2, 2, 1.000), +(14,14, 2, 0, 2, 0.000), +(15,15, 2, 1, 1, 0.500), +(16,16, 2, 0, 2, 0.000), +(17,17, 2, 1, 1, 0.500), +(18,18, 2, 1, 1, 0.500), +-- 기아 타이거즈 +(19,19, 2, 1, 1, 0.500), +(20,20, 2, 0, 2, 0.000), +(21,21, 2, 1, 1, 0.500), +(22,22,2, 2, 2, 1.000), +(23,23, 2, 0, 2, 0.000), +(24,24, 2, 1, 1, 0.500), +(25,25, 2, 2, 2, 1.000), +(26,26, 2, 0, 2, 0.000), +(27,27,2, 1, 1, 0.500), +-- 키움 히어로즈 +(28,28,2, 0, 2, 0.000), +(29,29,2, 1, 1, 0.500), +(30,30,2, 2, 2, 1.000), +(31,31,2, 2, 2, 1.000), +(32,32,2, 1, 1, 0.500), +(33,33,2, 2, 2, 1.000), +(34,34,2, 2, 2, 1.000), +(35,35, 2, 1, 1, 0.500), +(36,36,2, 2, 2, 1.000), +-- 한화 이글스 +(37,37, 2, 0, 2, 0.000), +(38,38, 2, 2, 2, 1.000), +(39,39, 2, 2, 2, 1.000), +(40,40,2, 0, 2, 0.000), +(41,41, 2, 2, 2, 1.000), +(42,42, 2, 2, 2, 1.000), +(43,43, 2, 1, 1, 0.500), +(44,44, 2, 2, 2, 1.000), +(45,45, 2, 2, 2, 1.000), +-- 롯데 자이언츠 +(46,46,2, 2, 2, 1.000), +(47,47, 2, 0, 2, 0.000), +(48,48, 2, 2, 2, 1.000), +(49,49, 2, 2, 2, 1.000), +(50,50, 2, 2, 2, 1.000), +(51,51, 2, 2, 2, 1.000), +(52,52, 2, 1, 1, 0.500), +(53,53, 2, 0, 2, 0.000), +(54,54, 2, 2, 2, 1.000); From 63beab2964106d69825f9526432309161102232a Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 17:23:33 +0900 Subject: [PATCH 12/96] =?UTF-8?q?feat=20:=20=EB=A1=9C=EA=B7=B8=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/resources/application.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index d222f0bd6..9c57f4f1c 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,3 +1,6 @@ +# log +logging.level.root=info + #mysql database datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/BASEBALL?serverTimezone=UTC&characterEncoding=UTF-8 From 3ae91153d665895f528b13ad543db58acd5d0044 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 17:24:01 +0900 Subject: [PATCH 13/96] =?UTF-8?q?feat=20:=20team=20repository=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 - 이름으로 찾기 추가 --- .../codesquad/coco/team/domain/TeamRepository.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java new file mode 100644 index 000000000..86061a591 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java @@ -0,0 +1,11 @@ +package com.codesquad.coco.team.domain; + +import org.springframework.data.jdbc.repository.query.Query; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface TeamRepository extends CrudRepository{ + + Optional findTeamByName(String name); +} From a6d260e48922896fca977a2a0dfb600b87226b09 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 17:25:39 +0900 Subject: [PATCH 14/96] =?UTF-8?q?test=20:=20=EC=9D=B4=EB=A6=84=EB=93=A4?= =?UTF-8?q?=EC=9D=B4=20=EC=9E=98=20=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EC=A7=80?= =?UTF-8?q?=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 선수들이 잘 보인다. --- .../java/com/codesquad/coco/TeamTest.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 BE/src/test/java/com/codesquad/coco/TeamTest.java diff --git a/BE/src/test/java/com/codesquad/coco/TeamTest.java b/BE/src/test/java/com/codesquad/coco/TeamTest.java new file mode 100644 index 000000000..e4605a501 --- /dev/null +++ b/BE/src/test/java/com/codesquad/coco/TeamTest.java @@ -0,0 +1,36 @@ +package com.codesquad.coco; + +import com.codesquad.coco.player.domain.Player; +import com.codesquad.coco.team.domain.Team; +import com.codesquad.coco.team.domain.TeamRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Set; + +@Transactional +@SpringBootTest +public class TeamTest { + + @Autowired + TeamRepository teamRepository; + + Logger logger = LoggerFactory.getLogger(TeamTest.class); + + @Test + @DisplayName("선수 조회") + void showPlayer(){ + Team ssg = teamRepository.findTeamByName("SSG 랜더스").get(); + Set players = ssg.getPlayers(); + Assertions.assertThat(players).isNotNull(); + for (Player player : players) { + logger.info("선수 {}",player.toString()); + } + } +} From 3fd200fe80d26e04336822f601c65594178cffde Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 23:58:53 +0900 Subject: [PATCH 15/96] =?UTF-8?q?feat=20:=20=EC=83=9D=EC=84=B1=EC=9E=90=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 - 모든 필드를 가지는 생성자 추가 - template에서 DB를 읽어오면서 만들기 위해 생성 --- .../com/codesquad/coco/player/domain/Player.java | 7 +++++++ .../com/codesquad/coco/player/domain/Record.java | 7 +++++++ .../java/com/codesquad/coco/team/domain/Team.java | 13 ++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Player.java b/BE/src/main/java/com/codesquad/coco/player/domain/Player.java index cf1d612ad..389e3b817 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/Player.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/Player.java @@ -11,6 +11,13 @@ public class Player { private String type; private Record record; + public Player(Long id, String name, String type, Record record) { + this.id = id; + this.name = name; + this.type = type; + this.record = record; + } + public Long getId() { return id; } diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java index cf418251c..ea99706b8 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java @@ -12,6 +12,13 @@ public class Record { private int outs; private double average; + public Record(Long id, int atBat, int hits, int outs, double average) { + this.id = id; + this.atBat = atBat; + this.hits = hits; + this.outs = outs; + this.average = average; + } public Long getId() { return id; diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/Team.java b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java index 0f7678cec..43ad6c96d 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/Team.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java @@ -7,12 +7,16 @@ public class Team { - @Id private String name; private Set players; + public Team(String name, Set players) { + this.name = name; + this.players = players; + } + public String getName() { return name; } @@ -21,4 +25,11 @@ public Set getPlayers() { return players; } + @Override + public String toString() { + return "Team{" + + "name='" + name + '\'' + + ", players=" + players + + '}'; + } } From 44114e0390ff59852ca36d4557e7f07b689f4ab5 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 23:59:27 +0900 Subject: [PATCH 16/96] =?UTF-8?q?refactor=20:=20data=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DB설계 변경으로 인해 수정 --- BE/src/main/resources/data.sql | 229 ++++++++++++++++--------------- BE/src/main/resources/schema.sql | 62 +++++---- 2 files changed, 152 insertions(+), 139 deletions(-) diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index d84af0a75..387f655d3 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -1,7 +1,8 @@ -use BASEBALL; +use +BASEBALL; INSERT INTO team -(name) + (name) VALUES ('두산 베어스'), ('SSG 랜더스'), ('기아 타이거즈'), @@ -12,131 +13,135 @@ VALUES ('두산 베어스'), INSERT INTO player -(name, team,type) + (name, team, type) VALUES -- 두산 베어스 -('허경민', '두산 베어스','투수'), -('오재원', '두산 베어스','타자'), -('페르난데스', '두산 베어스','타자'), -('박건우', '두산 베어스','타자'), -('조수행', '두산 베어스','타자'), -('김재환', '두산 베어스','타자'), -('안권수', '두산 베어스','타자'), -('권민석', '두산 베어스','타자'), -('유희관', '두산 베어스','타자'), +('허경민', '두산 베어스', '투수'), +('오재원', '두산 베어스', '타자'), +('페르난데스', '두산 베어스', '타자'), +('박건우', '두산 베어스', '타자'), +('조수행', '두산 베어스', '타자'), +('김재환', '두산 베어스', '타자'), +('안권수', '두산 베어스', '타자'), +('권민석', '두산 베어스', '타자'), +('유희관', '두산 베어스', '타자'), -- SSG 랜더스 -('최정', 'SSG 랜더스','투수'), -('추신수', 'SSG 랜더스','타자'), -('김성현', 'SSG 랜더스','타자'), -('로맥', 'SSG 랜더스','타자'), -('오태곤', 'SSG 랜더스','타자'), -('정의윤', 'SSG 랜더스','타자'), -('김강민', 'SSG 랜더스','타자'), -('이재원', 'SSG 랜더스','타자'), -('김광현', 'SSG 랜더스','타자'), +('최정', 'SSG 랜더스', '투수'), +('추신수', 'SSG 랜더스', '타자'), +('김성현', 'SSG 랜더스', '타자'), +('로맥', 'SSG 랜더스', '타자'), +('오태곤', 'SSG 랜더스', '타자'), +('정의윤', 'SSG 랜더스', '타자'), +('김강민', 'SSG 랜더스', '타자'), +('이재원', 'SSG 랜더스', '타자'), +('김광현', 'SSG 랜더스', '타자'), -- 기아 타이거즈 -('나지완', '기아 타이거즈','투수'), -('최형우', '기아 타이거즈','타자'), -('김선빈', '기아 타이거즈','타자'), -('터커', '기아 타이거즈','타자'), -('이우성', '기아 타이거즈','타자'), -('김민식', '기아 타이거즈','타자'), -('나주환', '기아 타이거즈','타자'), -('한승택', '기아 타이거즈','타자'), -('멩덴', '기아 타이거즈','타자'), +('나지완', '기아 타이거즈', '투수'), +('최형우', '기아 타이거즈', '타자'), +('김선빈', '기아 타이거즈', '타자'), +('터커', '기아 타이거즈', '타자'), +('이우성', '기아 타이거즈', '타자'), +('김민식', '기아 타이거즈', '타자'), +('나주환', '기아 타이거즈', '타자'), +('한승택', '기아 타이거즈', '타자'), +('멩덴', '기아 타이거즈', '타자'), -- 키움 히어로즈 -('이정후', '키움 히어로즈','투수'), -('박병호', '키움 히어로즈','타자'), -('이용규', '키움 히어로즈','타자'), -('허정협', '키움 히어로즈','타자'), -('김혜성', '키움 히어로즈','타자'), -('서건창', '키움 히어로즈','타자'), -('신준우', '키움 히어로즈','타자'), -('프레이타', '키움 히어로즈','타자'), -('최원태', '키움 히어로즈','타자'), +('이정후', '키움 히어로즈', '투수'), +('박병호', '키움 히어로즈', '타자'), +('이용규', '키움 히어로즈', '타자'), +('허정협', '키움 히어로즈', '타자'), +('김혜성', '키움 히어로즈', '타자'), +('서건창', '키움 히어로즈', '타자'), +('신준우', '키움 히어로즈', '타자'), +('프레이타', '키움 히어로즈', '타자'), +('최원태', '키움 히어로즈', '타자'), -- 한화 이글스 -('정은원', '한화 이글스','투수'), -('노수광', '한화 이글스','타자'), -('하주석', '한화 이글스','타자'), -('힐리', '한화 이글스','타자'), -('이성열', '한화 이글스','타자'), -('정진호', '한화 이글스','타자'), -('장운호', '한화 이글스','타자'), -('임종찬', '한화 이글스','타자'), -('김민우', '한화 이글스','타자'), +('정은원', '한화 이글스', '투수'), +('노수광', '한화 이글스', '타자'), +('하주석', '한화 이글스', '타자'), +('힐리', '한화 이글스', '타자'), +('이성열', '한화 이글스', '타자'), +('정진호', '한화 이글스', '타자'), +('장운호', '한화 이글스', '타자'), +('임종찬', '한화 이글스', '타자'), +('김민우', '한화 이글스', '타자'), -- 롯데 자이언츠 -('정훈', '롯데 자이언츠','투수'), -('손아섭', '롯데 자이언츠','타자'), -('전준우', '롯데 자이언츠','타자'), -('이대호', '롯데 자이언츠','타자'), -('마차도', '롯데 자이언츠','타자'), -('오윤석', '롯데 자이언츠','타자'), -('이병규', '롯데 자이언츠','타자'), -('김준태', '롯데 자이언츠','타자'), -('노경은', '롯데 자이언츠','타자'); +('정훈', '롯데 자이언츠', '투수'), +('손아섭', '롯데 자이언츠', '타자'), +('전준우', '롯데 자이언츠', '타자'), +('이대호', '롯데 자이언츠', '타자'), +('마차도', '롯데 자이언츠', '타자'), +('오윤석', '롯데 자이언츠', '타자'), +('이병규', '롯데 자이언츠', '타자'), +('김준태', '롯데 자이언츠', '타자'), +('노경은', '롯데 자이언츠', '타자'); INSERT INTO record -(id,player, at_bat, hits, outs, average) + (id, player, at_bat, hits, outs, average) VALUES -- 두산 베어스 -(1,1, 2, 1, 1, 0.500), -(2,2, 2, 2, 0, 1.000), -(3,3, 2, 0, 2, 0.000), -(4,4, 2, 3, 2, 0.304), -(5,5, 2, 0, 2, 0.000), -(6,6, 2, 1, 1, 0.500), -(7,7, 2, 2, 2, 1.000), -(8,8, 2, 1, 1, 0.500), -(9,9, 2, 0, 0, 0.000), +(1, 1, 2, 1, 1, 0.500), +(2, 2, 2, 2, 0, 1.000), +(3, 3, 2, 0, 2, 0.000), +(4, 4, 2, 3, 2, 0.304), +(5, 5, 2, 0, 2, 0.000), +(6, 6, 2, 1, 1, 0.500), +(7, 7, 2, 2, 2, 1.000), +(8, 8, 2, 1, 1, 0.500), +(9, 9, 2, 0, 0, 0.000), -- ssg 랜더스 -(10,10,2, 2, 2, 1.000), -(11,11, 2, 1, 1, 0.500), -(12,12, 2, 0, 2, 0.000), -(13,13,2, 2, 2, 1.000), -(14,14, 2, 0, 2, 0.000), -(15,15, 2, 1, 1, 0.500), -(16,16, 2, 0, 2, 0.000), -(17,17, 2, 1, 1, 0.500), -(18,18, 2, 1, 1, 0.500), +(10, 10, 2, 2, 2, 1.000), +(11, 11, 2, 1, 1, 0.500), +(12, 12, 2, 0, 2, 0.000), +(13, 13, 2, 2, 2, 1.000), +(14, 14, 2, 0, 2, 0.000), +(15, 15, 2, 1, 1, 0.500), +(16, 16, 2, 0, 2, 0.000), +(17, 17, 2, 1, 1, 0.500), +(18, 18, 2, 1, 1, 0.500), -- 기아 타이거즈 -(19,19, 2, 1, 1, 0.500), -(20,20, 2, 0, 2, 0.000), -(21,21, 2, 1, 1, 0.500), -(22,22,2, 2, 2, 1.000), -(23,23, 2, 0, 2, 0.000), -(24,24, 2, 1, 1, 0.500), -(25,25, 2, 2, 2, 1.000), -(26,26, 2, 0, 2, 0.000), -(27,27,2, 1, 1, 0.500), +(19, 19, 2, 1, 1, 0.500), +(20, 20, 2, 0, 2, 0.000), +(21, 21, 2, 1, 1, 0.500), +(22, 22, 2, 2, 2, 1.000), +(23, 23, 2, 0, 2, 0.000), +(24, 24, 2, 1, 1, 0.500), +(25, 25, 2, 2, 2, 1.000), +(26, 26, 2, 0, 2, 0.000), +(27, 27, 2, 1, 1, 0.500), -- 키움 히어로즈 -(28,28,2, 0, 2, 0.000), -(29,29,2, 1, 1, 0.500), -(30,30,2, 2, 2, 1.000), -(31,31,2, 2, 2, 1.000), -(32,32,2, 1, 1, 0.500), -(33,33,2, 2, 2, 1.000), -(34,34,2, 2, 2, 1.000), -(35,35, 2, 1, 1, 0.500), -(36,36,2, 2, 2, 1.000), +(28, 28, 2, 0, 2, 0.000), +(29, 29, 2, 1, 1, 0.500), +(30, 30, 2, 2, 2, 1.000), +(31, 31, 2, 2, 2, 1.000), +(32, 32, 2, 1, 1, 0.500), +(33, 33, 2, 2, 2, 1.000), +(34, 34, 2, 2, 2, 1.000), +(35, 35, 2, 1, 1, 0.500), +(36, 36, 2, 2, 2, 1.000), -- 한화 이글스 -(37,37, 2, 0, 2, 0.000), -(38,38, 2, 2, 2, 1.000), -(39,39, 2, 2, 2, 1.000), -(40,40,2, 0, 2, 0.000), -(41,41, 2, 2, 2, 1.000), -(42,42, 2, 2, 2, 1.000), -(43,43, 2, 1, 1, 0.500), -(44,44, 2, 2, 2, 1.000), -(45,45, 2, 2, 2, 1.000), +(37, 37, 2, 0, 2, 0.000), +(38, 38, 2, 2, 2, 1.000), +(39, 39, 2, 2, 2, 1.000), +(40, 40, 2, 0, 2, 0.000), +(41, 41, 2, 2, 2, 1.000), +(42, 42, 2, 2, 2, 1.000), +(43, 43, 2, 1, 1, 0.500), +(44, 44, 2, 2, 2, 1.000), +(45, 45, 2, 2, 2, 1.000), -- 롯데 자이언츠 -(46,46,2, 2, 2, 1.000), -(47,47, 2, 0, 2, 0.000), -(48,48, 2, 2, 2, 1.000), -(49,49, 2, 2, 2, 1.000), -(50,50, 2, 2, 2, 1.000), -(51,51, 2, 2, 2, 1.000), -(52,52, 2, 1, 1, 0.500), -(53,53, 2, 0, 2, 0.000), -(54,54, 2, 2, 2, 1.000); +(46, 46, 2, 2, 2, 1.000), +(47, 47, 2, 0, 2, 0.000), +(48, 48, 2, 2, 2, 1.000), +(49, 49, 2, 2, 2, 1.000), +(50, 50, 2, 2, 2, 1.000), +(51, 51, 2, 2, 2, 1.000), +(52, 52, 2, 1, 1, 0.500), +(53, 53, 2, 0, 2, 0.000), +(54, 54, 2, 2, 2, 1.000); + + +insert into game(home, away, user_type) +values ('두산 베어스', 'SSG 랜더스', 'home'); \ No newline at end of file diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index f9965638b..2242b87ce 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -1,4 +1,5 @@ -use BASEBALL; +use +BASEBALL; drop table if exists team; drop table if exists player; @@ -7,42 +8,49 @@ drop table if exists game; drop table if exists score_board; drop table if exists innings; -create table team( - name varchar(20) primary key not null +create table team +( + name varchar(20) primary key not null ); -create table player( - id BIGINT auto_increment primary key, - name varchar(20) not null, - type varchar(20) not null, - team varchar(20) references team(name) +create table player +( + id BIGINT auto_increment primary key, + name varchar(20) not null, + type varchar(20) not null, + team varchar(20) references team (name) ); -create table record( - id BIGINT auto_increment primary key, - at_bat int not null, - hits int not null, - outs int not null, - average double(4,3) not null, +create table record +( + id BIGINT auto_increment primary key, + at_bat int not null, + hits int not null, + outs int not null, + average double(4, 3 +) not null, player BIGINT references player(id) ); -create table game( - id BIGINT auto_increment primary key, - user_type varchar(20) not null, - away varchar(20) references team(name), - home varchar(20) references team(name) +create table game +( + id BIGINT auto_increment primary key, + user_type varchar(20) not null, + home varchar(20) references team (name), + away varchar(20) references team (name) ); -create table score_board( - id BIGINT auto_increment primary key, - game BIGINT references game(id), - team varchar(20) references team(name) +create table score_board +( + id BIGINT auto_increment primary key, + game BIGINT references game (id), + team varchar(20) references team (name) ); -create table innings( - id BIGINT auto_increment primary key, - score int not null, - score_board BIGINT references score_board(id), +create table innings +( + id BIGINT auto_increment primary key, + score int not null, + score_board BIGINT references score_board (id), score_board_key int ); \ No newline at end of file From ef8e8f02f0d9274164ffdb8daa6fec005f1e77ec Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 5 May 2021 23:59:51 +0900 Subject: [PATCH 17/96] =?UTF-8?q?feat=20:=20log=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - sql도 볼 수 있도록 변경 --- BE/src/main/resources/application.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index 9c57f4f1c..ebd7b7b9e 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,5 +1,7 @@ # log logging.level.root=info +logging.level.sql=debug + #mysql database datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver From ae34eaf0f24f495a37258dfe7356786a793a5023 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:00:26 +0900 Subject: [PATCH 18/96] =?UTF-8?q?feat=20:=20PK=EA=B0=80=20String=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=EC=9D=B4=EB=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/codesquad/coco/team/domain/TeamRepository.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java index 86061a591..e51f66f92 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamRepository.java @@ -1,11 +1,10 @@ package com.codesquad.coco.team.domain; -import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; import java.util.Optional; -public interface TeamRepository extends CrudRepository{ +public interface TeamRepository extends CrudRepository { Optional findTeamByName(String name); } From ebb8bba1f85af93195781dc7bb8756085454580b Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:01:06 +0900 Subject: [PATCH 19/96] =?UTF-8?q?feat=20:=20game=20class=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 누구대 누구 를 저장하는 Game class --- .../com/codesquad/coco/game/domain/Game.java | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/Game.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/Game.java b/BE/src/main/java/com/codesquad/coco/game/domain/Game.java new file mode 100644 index 000000000..627bad73c --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/Game.java @@ -0,0 +1,58 @@ +package com.codesquad.coco.game.domain; + +import com.codesquad.coco.team.domain.Team; +import org.springframework.data.annotation.Id; + +public class Game { + + @Id + private Long id; + + private Team away; + + private Team home; + + private String userType; + + public Game(Long id, Team away, Team home, String userType) { + this.id = id; + this.away = away; + this.home = home; + this.userType = userType; + } + + + public Long getId() { + return id; + } + + public Team getAway() { + return away; + } + + public Team getHome() { + return home; + } + + public String getUserType() { + return userType; + } + + public String awayTeamName() { + return away.getName(); + } + + public String homeTeamName() { + return home.getName(); + } + + @Override + public String toString() { + return "Game{" + + "id=" + id + + ", away=" + away + + ", home=" + home + + ", userType='" + userType + '\'' + + '}'; + } +} From b696aad0492a4bcfbefe3856c18b7f386a897417 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:01:43 +0900 Subject: [PATCH 20/96] =?UTF-8?q?feat=20:=20ScoreBoard=20class=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 해당 게임의 점수를 관리한다. --- .../coco/game/domain/ScoreBoard.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java b/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java new file mode 100644 index 000000000..853d2a23f --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java @@ -0,0 +1,42 @@ +package com.codesquad.coco.game.domain; + +import com.codesquad.coco.team.domain.Team; +import org.springframework.data.annotation.Id; + +import java.util.List; + +public class ScoreBoard { + + @Id + private Long id; + + private Game game; + private Team team; + private List innings; + + public Long getId() { + return id; + } + + public Game getGame() { + return game; + } + + public Team getTeam() { + return team; + } + + public List getInnings() { + return innings; + } + + @Override + public String toString() { + return "ScoreBoard{" + + "id=" + id + + ", game=" + game + + ", team=" + team + + ", innings=" + innings + + '}'; + } +} From 678d41208e09ea5ff36fab4732877ede96503974 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:02:35 +0900 Subject: [PATCH 21/96] =?UTF-8?q?feat=20:=20Innings=20class=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 - 점수를 관리한다. scoreBoard가 1이고 이닝이 다 이다. --- .../java/com/codesquad/coco/game/domain/Innings.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/Innings.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/Innings.java b/BE/src/main/java/com/codesquad/coco/game/domain/Innings.java new file mode 100644 index 000000000..f1914193c --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/Innings.java @@ -0,0 +1,11 @@ +package com.codesquad.coco.game.domain; + +import org.springframework.data.annotation.Id; + +public class Innings { + + @Id + private Long id; + + private int score; +} From 62374013dc6699d0df02be6df9b720ab39594c9f Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:03:35 +0900 Subject: [PATCH 22/96] =?UTF-8?q?feat=20:=20GameDAO=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Game이 Team을 각각 2 개 같고 있다. - spring data jdbc로 풀기가 쉽지 않아 template로 노선을 변경했다. --- .../codesquad/coco/game/domain/GameDAO.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java new file mode 100644 index 000000000..9024c2c2b --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java @@ -0,0 +1,54 @@ +package com.codesquad.coco.game.domain; + +import com.codesquad.coco.player.domain.PlayerDAO; +import com.codesquad.coco.team.domain.Team; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; +import java.util.List; + +@Component +public class GameDAO { + + private JdbcTemplate template; + private PlayerDAO playerDAO; + + public GameDAO(DataSource dataSource, PlayerDAO playerDAO) { + this.template = new JdbcTemplate(dataSource); + this.playerDAO = playerDAO; + } + + public void save(Game game) { + String sql = "insert into game (home,away,user_type) values (?, ?,?)"; + template.update(sql, game.awayTeamName(), game.homeTeamName(), game.getUserType()); + } + + public Game findById(Long id) { + String sql = "select g.id, g.home,g.away,g.user_type from game g where g.id = " + id; + + List query = template.query(sql, (rs, rowNum) -> { + String homeTeamName = rs.getString("home"); + String awayTeamName = rs.getString("away"); + Team homeTeam = new Team( + homeTeamName, playerDAO.findByTeamName(homeTeamName) + ); + Team awayTeam = new Team( + awayTeamName, playerDAO.findByTeamName(awayTeamName) + ); + Game game = new Game( + rs.getLong("id"), + homeTeam, + awayTeam, + rs.getString("user_type") + ); + + return game; + }); + + return query.get(0); + + } + + +} From 0307d0452cbcac6f96b05fa4078fda1e70aa52a8 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:03:54 +0900 Subject: [PATCH 23/96] =?UTF-8?q?feat=20:=20GameRepository=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/codesquad/coco/game/domain/GameRepository.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java b/BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java new file mode 100644 index 000000000..bec494676 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java @@ -0,0 +1,7 @@ +package com.codesquad.coco.game.domain; + +import org.springframework.data.repository.CrudRepository; + +public interface GameRepository extends CrudRepository { + +} From f9ce9ced951b4880e3d0f935f4a19f0aabe24121 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:04:42 +0900 Subject: [PATCH 24/96] =?UTF-8?q?feat=20:=20PlayerDAO=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 선수들을 팀명으로 가지고 오기위해 정의 --- .../coco/player/domain/PlayerDAO.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java new file mode 100644 index 000000000..f7921cb5b --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -0,0 +1,47 @@ +package com.codesquad.coco.player.domain; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; +import java.util.HashSet; +import java.util.Set; + +@Component +public class PlayerDAO { + private JdbcTemplate template; + + public PlayerDAO(DataSource dataSource) { + this.template = new JdbcTemplate(dataSource); + } + + public Set findByTeamName(String teamName) { + // todo : 선수 순서 보장 + String sql = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat, r.average " + + "FROM player p " + + "inner JOIN record r ON r.player = p.id " + + "WHERE p.team = '" + teamName + "' order by p.id;"; + + Set players = new HashSet<>(); + + template.query(sql, (rs, rowNum) -> { + Record record = new Record( + rs.getLong("rid"), + rs.getInt("at_bat"), + rs.getInt("hits"), + rs.getInt("outs"), + rs.getDouble("average") + ); + players.add(new Player( + rs.getLong("pid"), + rs.getString("name"), + rs.getString("type"), + record + )); + return null; + }); + + return players; + } + +} From b8d1d72d55f46bc784f10023fe57a6408c0facff Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 00:05:08 +0900 Subject: [PATCH 25/96] =?UTF-8?q?test=20:=20Game=EC=9D=84=20Test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 그저 잘 가져오는지 log찍기만 합니다 --- .../java/com/codesquad/coco/GameTest.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 BE/src/test/java/com/codesquad/coco/GameTest.java diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java new file mode 100644 index 000000000..51b33993b --- /dev/null +++ b/BE/src/test/java/com/codesquad/coco/GameTest.java @@ -0,0 +1,45 @@ +package com.codesquad.coco; + + +import com.codesquad.coco.game.domain.Game; +import com.codesquad.coco.game.domain.GameDAO; +import com.codesquad.coco.team.domain.Team; +import com.codesquad.coco.team.domain.TeamRepository; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.transaction.annotation.Transactional; + + +@Transactional +@SpringBootTest +public class GameTest { + + @Autowired + TeamRepository teamRepository; + @Autowired + GameDAO gameDAO; + + Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Test + @DisplayName("게임 만들기") + void playGame() { + Team ssg = teamRepository.findTeamByName("SSG 랜더스").get(); + Team doSan = teamRepository.findTeamByName("두산 베어스").get(); + + Game bigMatch = new Game(null, ssg, doSan, "home"); + gameDAO.save(bigMatch); + } + + @Test + @DisplayName("게임 찾기") + void showGame() { + Game bigMatch = gameDAO.findById(1L); + + logger.info(bigMatch.toString()); + } +} \ No newline at end of file From 589f7fe48dea4bbc67131755bad26f0a82b18744 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 17:59:05 +0900 Subject: [PATCH 26/96] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?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 - domain 밑에 modle을 두었다 --- .../codesquad/coco/game/domain/Innings.java | 11 ---- .../coco/game/domain/ScoreBoard.java | 42 -------------- .../coco/game/domain/{ => model}/Game.java | 23 +++++++- .../coco/game/domain/model/Innings.java | 27 +++++++++ .../coco/game/domain/model/ScoreBoard.java | 58 +++++++++++++++++++ 5 files changed, 107 insertions(+), 54 deletions(-) delete mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/Innings.java delete mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java rename BE/src/main/java/com/codesquad/coco/game/domain/{ => model}/Game.java (62%) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/Innings.java b/BE/src/main/java/com/codesquad/coco/game/domain/Innings.java deleted file mode 100644 index f1914193c..000000000 --- a/BE/src/main/java/com/codesquad/coco/game/domain/Innings.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.codesquad.coco.game.domain; - -import org.springframework.data.annotation.Id; - -public class Innings { - - @Id - private Long id; - - private int score; -} diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java b/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java deleted file mode 100644 index 853d2a23f..000000000 --- a/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoard.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.codesquad.coco.game.domain; - -import com.codesquad.coco.team.domain.Team; -import org.springframework.data.annotation.Id; - -import java.util.List; - -public class ScoreBoard { - - @Id - private Long id; - - private Game game; - private Team team; - private List innings; - - public Long getId() { - return id; - } - - public Game getGame() { - return game; - } - - public Team getTeam() { - return team; - } - - public List getInnings() { - return innings; - } - - @Override - public String toString() { - return "ScoreBoard{" + - "id=" + id + - ", game=" + game + - ", team=" + team + - ", innings=" + innings + - '}'; - } -} diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/Game.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java similarity index 62% rename from BE/src/main/java/com/codesquad/coco/game/domain/Game.java rename to BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java index 627bad73c..a02273feb 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/Game.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java @@ -1,8 +1,11 @@ -package com.codesquad.coco.game.domain; +package com.codesquad.coco.game.domain.model; import com.codesquad.coco.team.domain.Team; import org.springframework.data.annotation.Id; +import java.util.HashSet; +import java.util.Set; + public class Game { @Id @@ -12,6 +15,8 @@ public class Game { private Team home; + private Set scoreBoard = new HashSet<>(); + private String userType; public Game(Long id, Team away, Team home, String userType) { @@ -21,6 +26,13 @@ public Game(Long id, Team away, Team home, String userType) { this.userType = userType; } + public Game(Long id, Team away, Team home, Set scoreBoard, String userType) { + this.id = id; + this.away = away; + this.home = home; + this.scoreBoard = scoreBoard; + this.userType = userType; + } public Long getId() { return id; @@ -46,12 +58,21 @@ public String homeTeamName() { return home.getName(); } + public void addScoreBoard(ScoreBoard board) { + scoreBoard.add(board); + } + + public Set getScoreBoard() { + return scoreBoard; + } + @Override public String toString() { return "Game{" + "id=" + id + ", away=" + away + ", home=" + home + + ", scoreBoard=" + scoreBoard + ", userType='" + userType + '\'' + '}'; } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java new file mode 100644 index 000000000..634976024 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java @@ -0,0 +1,27 @@ +package com.codesquad.coco.game.domain.model; + +import org.springframework.data.annotation.Id; + +public class Innings { + + @Id + private Long id; + + private Long scoreBoard; + private int score; + + public Innings(Long id, Long scoreBoard, int score) { + this.id = id; + this.scoreBoard = scoreBoard; + this.score = score; + } + + @Override + public String toString() { + return "Innings{" + + "id=" + id + + ", scoreBoard=" + scoreBoard + + ", score=" + score + + '}'; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java new file mode 100644 index 000000000..28c655c83 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java @@ -0,0 +1,58 @@ +package com.codesquad.coco.game.domain.model; + +import org.springframework.data.annotation.Id; + +import java.util.List; + +public class ScoreBoard { + + @Id + private Long id; + + private Long game; + private String team; + private List innings; + + + public ScoreBoard(Long id, Long game, String teamName, List innings) { + this.id = id; + this.game = game; + this.team = teamName; + this.innings = innings; + } + + public ScoreBoard(Long gameId, String team) { + this.game = gameId; + this.team = team; + } + + public Long getId() { + return id; + } + + public Long getGameId() { + return game; + } + + public String teamName() { + return team; + } + + public String getTeam() { + return team; + } + + public List getInnings() { + return innings; + } + + @Override + public String toString() { + return "ScoreBoard{" + + "id=" + id + + ", gameId=" + game + + ", team=" + team + + ", innings=" + innings + + '}'; + } +} From 07a4b35ad4f949f39bf31b371acdbd272f982421 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 17:59:37 +0900 Subject: [PATCH 27/96] =?UTF-8?q?feat=20:=20data=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 스코어 판을 확인하기 위해서 추가 --- BE/src/main/resources/data.sql | 22 ++++++++++++++++++++-- BE/src/main/resources/schema.sql | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 387f655d3..414d2da17 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -143,5 +143,23 @@ VALUES (54, 54, 2, 2, 2, 1.000); -insert into game(home, away, user_type) -values ('두산 베어스', 'SSG 랜더스', 'home'); \ No newline at end of file +insert into game(id, home, away, user_type) +values (1, '두산 베어스', 'SSG 랜더스', 'home'); + +insert into score_board(id, game, team) +values (1, 1, '두산 베어스'); + +insert into score_board(id, game, team) +values (2, 1, 'SSG 랜더스'); + +insert into innings (id, score, score_board, score_board_key) +values (1, 0, 1, 1), + (2, 2, 1, 2), + (3, 1, 1, 3); + +insert into innings (id, score, score_board, score_board_key) +values (4, 2, 2, 1), + (5, 0, 2, 2), + (6, 0, 2, 3); + + diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 2242b87ce..2ab35fd12 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -53,4 +53,4 @@ create table innings score int not null, score_board BIGINT references score_board (id), score_board_key int -); \ No newline at end of file +); From b240b9458058870ee879dffdaeb5d772eab99c4d Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 18:00:46 +0900 Subject: [PATCH 28/96] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?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 - 패키지 이동 import 변경 --- .../main/java/com/codesquad/coco/game/domain/GameRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java b/BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java index bec494676..a34f7a433 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/GameRepository.java @@ -1,5 +1,6 @@ package com.codesquad.coco.game.domain; +import com.codesquad.coco.game.domain.model.Game; import org.springframework.data.repository.CrudRepository; public interface GameRepository extends CrudRepository { From 5ec184cb4223394a1a3047c0f029abb9380221c1 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 18:01:27 +0900 Subject: [PATCH 29/96] =?UTF-8?q?feat=20:=20inningsDAO=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 이닝을 가져오는 DAO --- .../coco/game/domain/InningsDAO.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/InningsDAO.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/InningsDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/InningsDAO.java new file mode 100644 index 000000000..da8dd3d02 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/InningsDAO.java @@ -0,0 +1,36 @@ +package com.codesquad.coco.game.domain; + +import com.codesquad.coco.game.domain.model.Innings; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; +import java.util.ArrayList; +import java.util.List; + +@Component +public class InningsDAO { + + private JdbcTemplate template; + + public InningsDAO(DataSource dataSource) { + this.template = new JdbcTemplate(dataSource); + } + + public List findAllById(long id) { + String sql = "select i.id, i.score, i.score_board from innings i where i.score_board =" + id + " order by score_board_key"; + + List innings = new ArrayList<>(); + + template.query(sql, (rs, rowNum) -> { + innings.add(new Innings( + rs.getLong("id"), + rs.getLong("score_board"), + rs.getInt("score") + )); + return null; + }); + + return innings; + } +} From 4d6e0c2f88941587a09d2949dbe9a5390a7949a9 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 18:03:24 +0900 Subject: [PATCH 30/96] =?UTF-8?q?feat=20:=20Game=20svae,=20findById=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - game을 세이브할때 점수판도 같이 저장한다 - game저장 후 id를 받아서 점수판을 저장 - find시 점수판도 함께 가져온다 - 점수판은 이닝을 같이 가져온다 --- .../codesquad/coco/game/domain/GameDAO.java | 53 +++++++++++++++++-- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java index 9024c2c2b..62dd1a2b4 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java @@ -1,11 +1,20 @@ package com.codesquad.coco.game.domain; +import com.codesquad.coco.game.domain.model.Game; +import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.player.domain.PlayerDAO; import com.codesquad.coco.team.domain.Team; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.support.GeneratedKeyHolder; +import org.springframework.jdbc.support.KeyHolder; import org.springframework.stereotype.Component; import javax.sql.DataSource; +import java.sql.PreparedStatement; +import java.sql.Statement; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; import java.util.List; @Component @@ -13,33 +22,69 @@ public class GameDAO { private JdbcTemplate template; private PlayerDAO playerDAO; + private ScoreBoardDAO boardDAO; - public GameDAO(DataSource dataSource, PlayerDAO playerDAO) { + public GameDAO(DataSource dataSource, PlayerDAO playerDAO, ScoreBoardDAO boardDAO) { this.template = new JdbcTemplate(dataSource); this.playerDAO = playerDAO; + this.boardDAO = boardDAO; } - public void save(Game game) { - String sql = "insert into game (home,away,user_type) values (?, ?,?)"; - template.update(sql, game.awayTeamName(), game.homeTeamName(), game.getUserType()); + public Long save(Game game) { + Long gameId = saveGame(game); + ScoreBoard away = new ScoreBoard(gameId, game.awayTeamName()); + ScoreBoard home = new ScoreBoard(gameId, game.homeTeamName()); + saveScoreBoard(game, away); + saveScoreBoard(game, home); + return gameId; } + private Long saveScoreBoard(Game game, ScoreBoard away) { + Long scoreId = boardDAO.save(away); + game.addScoreBoard(away); + return scoreId; + } + + private Long saveGame(Game game) { + KeyHolder keyHolder = new GeneratedKeyHolder(); + String sql = "insert into game (home,away,user_type) values (?, ?, ?)"; + + template.update(con -> { + PreparedStatement ps = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); + ps.setString(1, game.homeTeamName()); + ps.setString(2, game.awayTeamName()); + ps.setString(3, game.getUserType()); + return ps; + }, keyHolder); + + return keyHolder.getKey().longValue(); + } + + public Game findById(Long id) { String sql = "select g.id, g.home,g.away,g.user_type from game g where g.id = " + id; List query = template.query(sql, (rs, rowNum) -> { String homeTeamName = rs.getString("home"); String awayTeamName = rs.getString("away"); + + ScoreBoard homeScoreBoard = boardDAO.findByGameIdAndTeamName(id, homeTeamName); + ScoreBoard awayScoreBoard = boardDAO.findByGameIdAndTeamName(id, awayTeamName); + Team homeTeam = new Team( homeTeamName, playerDAO.findByTeamName(homeTeamName) ); Team awayTeam = new Team( awayTeamName, playerDAO.findByTeamName(awayTeamName) ); + + Game game = new Game( rs.getLong("id"), homeTeam, awayTeam, + Collections.unmodifiableSet(new HashSet( + Arrays.asList(homeScoreBoard, awayScoreBoard))), rs.getString("user_type") ); From 7b20350f3892468b1301c85bd006b6459ba9626f Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 18:05:06 +0900 Subject: [PATCH 31/96] =?UTF-8?q?feat=20:=20ScoreBoardDAO=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - scoreBoard는 find시 이닝들도 가지고 온다 --- .../coco/game/domain/ScoreBoardDAO.java | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoardDAO.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoardDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoardDAO.java new file mode 100644 index 000000000..81d35154f --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoardDAO.java @@ -0,0 +1,60 @@ +package com.codesquad.coco.game.domain; + +import com.codesquad.coco.game.domain.model.Innings; +import com.codesquad.coco.game.domain.model.ScoreBoard; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.support.GeneratedKeyHolder; +import org.springframework.jdbc.support.KeyHolder; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; +import java.sql.PreparedStatement; +import java.sql.Statement; +import java.util.List; + +@Component +public class ScoreBoardDAO { + + private JdbcTemplate template; + + private InningsDAO inningsDAO; + + public ScoreBoardDAO(DataSource dataSource, InningsDAO inningsDAO) { + this.template = new JdbcTemplate(dataSource); + this.inningsDAO = inningsDAO; + } + + public Long save(ScoreBoard board) { + KeyHolder keyHolder = new GeneratedKeyHolder(); + String sql = "insert into score_board (game,team) values (?, ?)"; + + template.update(con -> { + PreparedStatement ps = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); + ps.setLong(1, board.getGameId()); + ps.setString(2, board.teamName()); + return ps; + }, keyHolder); + + return keyHolder.getKey().longValue(); + } + + public ScoreBoard findByGameIdAndTeamName(Long id, String teamName) { + String sql = "select s.id, s.game,s.team from score_board s where s.game = " + id + " and s.team = '" + teamName + "'"; + + + List query = template.query(sql, (rs, rowNum) -> { + + List innings = inningsDAO.findAllById(rs.getLong("id")); + + ScoreBoard board = new ScoreBoard( + rs.getLong("id"), + rs.getLong("game"), + rs.getString("team"), + innings + ); + + return board; + }); + return query.get(0); + } +} From 8426f8ca80dafa97501b4819cffde4ff62610baf Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 18:05:47 +0900 Subject: [PATCH 32/96] test : game test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - game을 저장시 id를 리턴하는지 검사 --- BE/src/test/java/com/codesquad/coco/GameTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java index 51b33993b..8c5a02e2c 100644 --- a/BE/src/test/java/com/codesquad/coco/GameTest.java +++ b/BE/src/test/java/com/codesquad/coco/GameTest.java @@ -1,10 +1,11 @@ package com.codesquad.coco; -import com.codesquad.coco.game.domain.Game; import com.codesquad.coco.game.domain.GameDAO; +import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.team.domain.Team; import com.codesquad.coco.team.domain.TeamRepository; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -32,7 +33,9 @@ void playGame() { Team doSan = teamRepository.findTeamByName("두산 베어스").get(); Game bigMatch = new Game(null, ssg, doSan, "home"); - gameDAO.save(bigMatch); + Long gameId = gameDAO.save(bigMatch); + Assertions.assertThat(gameId).isEqualTo(2L); + //todo : 게임은 만들어 지면서 스코어 보드도 만들어야 한다. } @Test From b93a81850178a65b0a9c626c4e353a5235978795 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 18:06:59 +0900 Subject: [PATCH 33/96] test : ScoreBoard Test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 점수판을 저장 --- .../java/com/codesquad/coco/ScoreTest.java | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 BE/src/test/java/com/codesquad/coco/ScoreTest.java diff --git a/BE/src/test/java/com/codesquad/coco/ScoreTest.java b/BE/src/test/java/com/codesquad/coco/ScoreTest.java new file mode 100644 index 000000000..334c51785 --- /dev/null +++ b/BE/src/test/java/com/codesquad/coco/ScoreTest.java @@ -0,0 +1,44 @@ +package com.codesquad.coco; + +import com.codesquad.coco.game.domain.GameDAO; +import com.codesquad.coco.game.domain.ScoreBoardDAO; +import com.codesquad.coco.game.domain.model.Game; +import com.codesquad.coco.game.domain.model.ScoreBoard; +import com.codesquad.coco.team.domain.Team; +import com.codesquad.coco.team.domain.TeamRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@SpringBootTest +public class ScoreTest { + + @Autowired + TeamRepository teamRepository; + @Autowired + GameDAO gameDAO; + @Autowired + ScoreBoardDAO scoreBoardDAO; + + @Test + @DisplayName("점수판 보기") + void showScoreBoard() { + Game bigMatch = gameDAO.findById(1L); + Team home = bigMatch.getHome(); + Team away = bigMatch.getAway(); + + ScoreBoard homeBoard = new ScoreBoard(bigMatch.getId(), home.getName()); + ScoreBoard awayBoard = new ScoreBoard(bigMatch.getId(), away.getName()); + + Long homeBoardId = scoreBoardDAO.save(homeBoard); + Long awayBoardId = scoreBoardDAO.save(awayBoard); + + Assertions.assertThat(homeBoardId).isEqualTo(3L); + Assertions.assertThat(awayBoardId).isEqualTo(4L); + + } +} From 2ba6f6abb0b09b4bf6b6d6b876c45eacf9adc9a5 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 21:05:19 +0900 Subject: [PATCH 34/96] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?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 - DAO 패키지 생성 --- .../com/codesquad/coco/game/domain/{ => DAO}/GameDAO.java | 2 +- .../com/codesquad/coco/game/domain/{ => DAO}/InningsDAO.java | 2 +- .../codesquad/coco/game/domain/{ => DAO}/ScoreBoardDAO.java | 2 +- BE/src/test/java/com/codesquad/coco/GameTest.java | 2 +- BE/src/test/java/com/codesquad/coco/ScoreTest.java | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename BE/src/main/java/com/codesquad/coco/game/domain/{ => DAO}/GameDAO.java (98%) rename BE/src/main/java/com/codesquad/coco/game/domain/{ => DAO}/InningsDAO.java (95%) rename BE/src/main/java/com/codesquad/coco/game/domain/{ => DAO}/ScoreBoardDAO.java (97%) diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java similarity index 98% rename from BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java rename to BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 62dd1a2b4..1562771a3 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.game.domain; +package com.codesquad.coco.game.domain.DAO; import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.ScoreBoard; diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/InningsDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java similarity index 95% rename from BE/src/main/java/com/codesquad/coco/game/domain/InningsDAO.java rename to BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java index da8dd3d02..d56a1186e 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/InningsDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.game.domain; +package com.codesquad.coco.game.domain.DAO; import com.codesquad.coco.game.domain.model.Innings; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoardDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java similarity index 97% rename from BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoardDAO.java rename to BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java index 81d35154f..b1e1f80b6 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/ScoreBoardDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.game.domain; +package com.codesquad.coco.game.domain.DAO; import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.game.domain.model.ScoreBoard; diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java index 8c5a02e2c..8606567d9 100644 --- a/BE/src/test/java/com/codesquad/coco/GameTest.java +++ b/BE/src/test/java/com/codesquad/coco/GameTest.java @@ -1,7 +1,7 @@ package com.codesquad.coco; -import com.codesquad.coco.game.domain.GameDAO; +import com.codesquad.coco.game.domain.DAO.GameDAO; import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.team.domain.Team; import com.codesquad.coco.team.domain.TeamRepository; diff --git a/BE/src/test/java/com/codesquad/coco/ScoreTest.java b/BE/src/test/java/com/codesquad/coco/ScoreTest.java index 334c51785..e6774810c 100644 --- a/BE/src/test/java/com/codesquad/coco/ScoreTest.java +++ b/BE/src/test/java/com/codesquad/coco/ScoreTest.java @@ -1,7 +1,7 @@ package com.codesquad.coco; -import com.codesquad.coco.game.domain.GameDAO; -import com.codesquad.coco.game.domain.ScoreBoardDAO; +import com.codesquad.coco.game.domain.DAO.GameDAO; +import com.codesquad.coco.game.domain.DAO.ScoreBoardDAO; import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.domain.Team; From c8d89f4b5a48a8d183636abb9c90ed4476eeef7c Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 21:37:25 +0900 Subject: [PATCH 35/96] =?UTF-8?q?feat=20:=20mainPageAPI=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 - main입력시 오는 api 작성 --- .../codesquad/coco/team/TeamController.java | 22 ++++++++++++++ .../com/codesquad/coco/team/TeamService.java | 19 ++++++++++++ .../coco/team/domain/MainTeamDTO.java | 18 +++++++++++ .../codesquad/coco/team/domain/TeamDAO.java | 30 +++++++++++++++++++ .../codesquad/coco/team/domain/TeamDTO.java | 14 +++++++++ 5 files changed, 103 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/team/TeamController.java create mode 100644 BE/src/main/java/com/codesquad/coco/team/TeamService.java create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamController.java b/BE/src/main/java/com/codesquad/coco/team/TeamController.java new file mode 100644 index 000000000..1d6245f23 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/TeamController.java @@ -0,0 +1,22 @@ +package com.codesquad.coco.team; + +import com.codesquad.coco.team.domain.MainTeamDTO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api") +public class TeamController { + + private TeamService teamService; + + public TeamController(TeamService teamService) { + this.teamService = teamService; + } + + @GetMapping("/main") + public MainTeamDTO mainPage() { + return teamService.findMainTeams(); + } +} diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamService.java b/BE/src/main/java/com/codesquad/coco/team/TeamService.java new file mode 100644 index 000000000..bb7c8f92a --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/TeamService.java @@ -0,0 +1,19 @@ +package com.codesquad.coco.team; + +import com.codesquad.coco.team.domain.MainTeamDTO; +import com.codesquad.coco.team.domain.TeamDAO; +import org.springframework.stereotype.Service; + +@Service +public class TeamService { + + private final TeamDAO teamDAO; + + public TeamService(TeamDAO teamDAO) { + this.teamDAO = teamDAO; + } + + public MainTeamDTO findMainTeams() { + return teamDAO.findAllName(); + } +} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java new file mode 100644 index 000000000..01320f26e --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java @@ -0,0 +1,18 @@ +package com.codesquad.coco.team.domain; + +import java.util.ArrayList; +import java.util.List; + +public class MainTeamDTO { + + private List teams = new ArrayList<>(); + + public void addTeamDTO(TeamDTO teamDTO) { + teams.add(teamDTO); + } + + public List getTeams() { + return teams; + } + +} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java new file mode 100644 index 000000000..8c39b4955 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java @@ -0,0 +1,30 @@ +package com.codesquad.coco.team.domain; + +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; + +@Component +public class TeamDAO { + + private JdbcTemplate template; + + public TeamDAO(DataSource dataSource) { + this.template = new JdbcTemplate(dataSource); + } + + public MainTeamDTO findAllName() { + String sql = "select t.name from team t;"; + + MainTeamDTO mainTeamDTO = new MainTeamDTO(); + + template.query(sql, (rs, rowNum) -> { + mainTeamDTO.addTeamDTO(new TeamDTO( + rs.getString("name") + )); + return null; + }); + return mainTeamDTO; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java new file mode 100644 index 000000000..5a9144271 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java @@ -0,0 +1,14 @@ +package com.codesquad.coco.team.domain; + +public class TeamDTO { + + private String name; + + public TeamDTO(String name) { + this.name = name; + } + + public String getName() { + return name; + } +} From a1816c71231efc6203edb7d08b0fb41277f1e4ed Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:10:12 +0900 Subject: [PATCH 36/96] =?UTF-8?q?feat=20:=20propery=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - JSON 반환시 Snake_case로 내보내기 위해 추가 --- BE/src/main/resources/application.properties | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index ebd7b7b9e..0275962f3 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,14 +1,13 @@ # log logging.level.root=info logging.level.sql=debug - - #mysql database datasource spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.url=jdbc:mysql://localhost:3306/BASEBALL?serverTimezone=UTC&characterEncoding=UTF-8 spring.datasource.username=dev spring.datasource.password=1234 - #mysql database etc spring.datasource.initialization-mode=always -spring.datasource.schema=classpath:schema.sql \ No newline at end of file +spring.datasource.schema=classpath:schema.sql +#json +spring.jackson.property-naming-strategy=SNAKE_CASE \ No newline at end of file From 24303f39e4f6bf283762fa8b0b4f75276462fdcc Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:11:20 +0900 Subject: [PATCH 37/96] =?UTF-8?q?feat=20:=20teamNameDTO=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 - 팀의 이름을 보여주기 위한 DTO 추가 - 선수까지 select하기 싫어서 따로 작성함 --- .../coco/team/domain/DTO/TeamNameDTO.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamNameDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamNameDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamNameDTO.java new file mode 100644 index 000000000..2e03aae96 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamNameDTO.java @@ -0,0 +1,14 @@ +package com.codesquad.coco.team.domain.DTO; + +public class TeamNameDTO { + + private String name; + + public TeamNameDTO(String name) { + this.name = name; + } + + public String getName() { + return name; + } +} From 3618c4250a7b7c8f5335ff63cf3519c18aa4cf59 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:15:40 +0900 Subject: [PATCH 38/96] =?UTF-8?q?feat=20:=20MainPageDTO=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 메인 페이지에서는 팀명만 반출을 한다 --- .../coco/team/domain/DTO/MainPageTeamDTO.java | 18 ++++++++++++++++++ .../coco/team/domain/MainTeamDTO.java | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/DTO/MainPageTeamDTO.java delete mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/MainPageTeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/MainPageTeamDTO.java new file mode 100644 index 000000000..62e05a734 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/MainPageTeamDTO.java @@ -0,0 +1,18 @@ +package com.codesquad.coco.team.domain.DTO; + +import java.util.ArrayList; +import java.util.List; + +public class MainPageTeamDTO { + + private List teams = new ArrayList<>(); + + public void addTeamDTO(TeamNameDTO teamNameDTO) { + teams.add(teamNameDTO); + } + + public List getTeams() { + return teams; + } + +} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java deleted file mode 100644 index 01320f26e..000000000 --- a/BE/src/main/java/com/codesquad/coco/team/domain/MainTeamDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.codesquad.coco.team.domain; - -import java.util.ArrayList; -import java.util.List; - -public class MainTeamDTO { - - private List teams = new ArrayList<>(); - - public void addTeamDTO(TeamDTO teamDTO) { - teams.add(teamDTO); - } - - public List getTeams() { - return teams; - } - -} From 060f632c4c1d8404ccba05a6a99850870471d6e5 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:16:32 +0900 Subject: [PATCH 39/96] =?UTF-8?q?feat=20:=20TeamDTO=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Team이 가지고 있는 정보들을 DTO로 만들었다 --- .../coco/team/domain/DTO/TeamDTO.java | 24 +++++++++++++++++++ .../codesquad/coco/team/domain/TeamDTO.java | 14 ----------- 2 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java delete mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java new file mode 100644 index 000000000..b9535c45a --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java @@ -0,0 +1,24 @@ +package com.codesquad.coco.team.domain.DTO; + +import com.codesquad.coco.game.domain.model.PlayerDTO; + +import java.util.List; + +public class TeamDTO { + + private String teamName; + private List players; + + public TeamDTO(String teamName, List players) { + this.teamName = teamName; + this.players = players; + } + + public String getTeamName() { + return teamName; + } + + public List getPlayers() { + return players; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java deleted file mode 100644 index 5a9144271..000000000 --- a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.codesquad.coco.team.domain; - -public class TeamDTO { - - private String name; - - public TeamDTO(String name) { - this.name = name; - } - - public String getName() { - return name; - } -} From dd68e369e1a86e46ef419e8ae0119c8f8eec795a Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:17:12 +0900 Subject: [PATCH 40/96] =?UTF-8?q?feat=20:=20PlayerDTO=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Play의 정보를 DTO로 변환 --- .../coco/game/domain/model/PlayerDTO.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/model/PlayerDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/PlayerDTO.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/PlayerDTO.java new file mode 100644 index 000000000..26fac2249 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/PlayerDTO.java @@ -0,0 +1,26 @@ +package com.codesquad.coco.game.domain.model; + +public class PlayerDTO { + + private Long id; + private String name; + private String type; + + public PlayerDTO(Long id, String name, String type) { + this.id = id; + this.name = name; + this.type = type; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public String getType() { + return type; + } +} From 81affef11a251e59e679b849602cd78d8596f41d Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:17:42 +0900 Subject: [PATCH 41/96] =?UTF-8?q?feat=20:=20TeamChoiceDTO=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 팀을 선택할 때 사용할 DTO --- .../coco/team/domain/DTO/TeamChoiceDTO.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java new file mode 100644 index 000000000..ea4538325 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java @@ -0,0 +1,20 @@ +package com.codesquad.coco.team.domain.DTO; + +public class TeamChoiceDTO { + + private String player; + private String opponent; + + public TeamChoiceDTO(String player, String opponent) { + this.player = player; + this.opponent = opponent; + } + + public String getPlayer() { + return player; + } + + public String getOpponent() { + return opponent; + } +} From a0539b53998e5e883d4c802265a3592eb42bbc54 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:18:36 +0900 Subject: [PATCH 42/96] =?UTF-8?q?feat=20:=20GamePlayDTO=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 게임을 선택하면 해당 게임의 정보를 준다 - 게임의 정보를 담을 DTO --- .../coco/team/domain/DTO/GamePlayDTO.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/DTO/GamePlayDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/GamePlayDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/GamePlayDTO.java new file mode 100644 index 000000000..d1782f51d --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/GamePlayDTO.java @@ -0,0 +1,27 @@ +package com.codesquad.coco.team.domain.DTO; + +public class GamePlayDTO { + + private Long gameId; + + private TeamDTO user; + private TeamDTO opponent; + + public GamePlayDTO(Long gameId, TeamDTO user, TeamDTO opponent) { + this.gameId = gameId; + this.user = user; + this.opponent = opponent; + } + + public Long getGameId() { + return gameId; + } + + public TeamDTO getUser() { + return user; + } + + public TeamDTO getOpponent() { + return opponent; + } +} From 65e47c8d180ba7123d812c924286880693bfd393 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:20:04 +0900 Subject: [PATCH 43/96] =?UTF-8?q?feat=20:=20DTOConverter=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - team의 정보를 변환하는 converter 정의 --- .../com/codesquad/coco/utils/DTOConverter.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java diff --git a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java new file mode 100644 index 000000000..6185a9670 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java @@ -0,0 +1,18 @@ +package com.codesquad.coco.utils; + +import com.codesquad.coco.game.domain.model.PlayerDTO; +import com.codesquad.coco.team.domain.DTO.TeamDTO; +import com.codesquad.coco.team.domain.Team; + +import java.util.List; +import java.util.stream.Collectors; + +public class DTOConverter { + + public static TeamDTO teamToDTO(Team team) { + List opponentPlayerDTO = team.getPlayers().stream() + .map(player -> new PlayerDTO(player.getId(), player.getName(), player.getType())) + .collect(Collectors.toList()); + return new TeamDTO(team.getName(), opponentPlayerDTO); + } +} From 556b9f3c31fce58fe6e75475d50f5fe65d7f8f98 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:20:48 +0900 Subject: [PATCH 44/96] =?UTF-8?q?style=20:=20=EC=A0=9C=EB=84=A4=EB=A6=AD?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 삭제가능한 제네릭 삭제 --- .../main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 1562771a3..a672353b7 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -81,9 +81,9 @@ public Game findById(Long id) { Game game = new Game( rs.getLong("id"), - homeTeam, awayTeam, - Collections.unmodifiableSet(new HashSet( + homeTeam, + Collections.unmodifiableSet(new HashSet<>( Arrays.asList(homeScoreBoard, awayScoreBoard))), rs.getString("user_type") ); From 59a2619c6e0bf4f943567171d76048633ef360ca Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:21:49 +0900 Subject: [PATCH 45/96] =?UTF-8?q?refactor=20=20:=20game=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EC=9E=90=EC=97=90=EC=84=9C=20id=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 해당 생성자는 id가 필요 없는 생성자 --- .../main/java/com/codesquad/coco/game/domain/model/Game.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java index a02273feb..54e48ca8a 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java @@ -19,8 +19,7 @@ public class Game { private String userType; - public Game(Long id, Team away, Team home, String userType) { - this.id = id; + public Game(Team away, Team home, String userType) { this.away = away; this.home = home; this.userType = userType; From 70448f394d04951a07a3adf21351d14dda97552e Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:22:46 +0900 Subject: [PATCH 46/96] =?UTF-8?q?fix=20:=20game=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EC=9E=90=EC=9D=98=20=EC=88=9C=EC=84=9C=EB=A5=BC=20=EB=AF=B8?= =?UTF-8?q?=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - home에 home이 들어가지 않았다 --- .../java/com/codesquad/coco/team/domain/TeamDAO.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java index 8c39b4955..c713df412 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java @@ -1,5 +1,7 @@ package com.codesquad.coco.team.domain; +import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamNameDTO; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Component; @@ -14,17 +16,17 @@ public TeamDAO(DataSource dataSource) { this.template = new JdbcTemplate(dataSource); } - public MainTeamDTO findAllName() { + public MainPageTeamDTO findAllName() { String sql = "select t.name from team t;"; - MainTeamDTO mainTeamDTO = new MainTeamDTO(); + MainPageTeamDTO mainPageTeamDTO = new MainPageTeamDTO(); template.query(sql, (rs, rowNum) -> { - mainTeamDTO.addTeamDTO(new TeamDTO( + mainPageTeamDTO.addTeamDTO(new TeamNameDTO( rs.getString("name") )); return null; }); - return mainTeamDTO; + return mainPageTeamDTO; } } From 222da041df847ba931007b949e75b0d9ae9afe01 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:23:13 +0900 Subject: [PATCH 47/96] =?UTF-8?q?refactor=20:=20game=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EC=9E=90=EC=97=90=20id=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - id를 삭제 --- BE/src/test/java/com/codesquad/coco/GameTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java index 8606567d9..b832fa450 100644 --- a/BE/src/test/java/com/codesquad/coco/GameTest.java +++ b/BE/src/test/java/com/codesquad/coco/GameTest.java @@ -32,7 +32,7 @@ void playGame() { Team ssg = teamRepository.findTeamByName("SSG 랜더스").get(); Team doSan = teamRepository.findTeamByName("두산 베어스").get(); - Game bigMatch = new Game(null, ssg, doSan, "home"); + Game bigMatch = new Game(ssg, doSan, "home"); Long gameId = gameDAO.save(bigMatch); Assertions.assertThat(gameId).isEqualTo(2L); //todo : 게임은 만들어 지면서 스코어 보드도 만들어야 한다. From eacef73d3db27d1d62e39913734ac3864fe0c0f4 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:23:42 +0900 Subject: [PATCH 48/96] =?UTF-8?q?feat=20:=20gameService=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DAO에서 game을 가지고 온다 --- .../com/codesquad/coco/game/GameService.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/game/GameService.java diff --git a/BE/src/main/java/com/codesquad/coco/game/GameService.java b/BE/src/main/java/com/codesquad/coco/game/GameService.java new file mode 100644 index 000000000..56df746c8 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/GameService.java @@ -0,0 +1,19 @@ +package com.codesquad.coco.game; + +import com.codesquad.coco.game.domain.DAO.GameDAO; +import com.codesquad.coco.game.domain.model.Game; +import org.springframework.stereotype.Service; + +@Service +public class GameService { + + private GameDAO gameDAO; + + public GameService(GameDAO gameDAO) { + this.gameDAO = gameDAO; + } + + public Game choiceGame(Long id) { + return gameDAO.findById(id); + } +} From c719107938c46e44306a92030746cdb912adc034 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:24:58 +0900 Subject: [PATCH 49/96] =?UTF-8?q?feat=20:=20TeamService=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 사용자가 home,away를 고름에 따라 다른 동작을 한다 - 다른 동작이라 함은 Game에서 home과 away를 조정하는 동작이다 --- .../com/codesquad/coco/team/TeamService.java | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamService.java b/BE/src/main/java/com/codesquad/coco/team/TeamService.java index bb7c8f92a..09a23fc1d 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamService.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamService.java @@ -1,6 +1,11 @@ package com.codesquad.coco.team; -import com.codesquad.coco.team.domain.MainTeamDTO; +import com.codesquad.coco.game.domain.DAO.GameDAO; +import com.codesquad.coco.game.domain.model.Game; +import com.codesquad.coco.player.domain.PlayerDAO; +import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; +import com.codesquad.coco.team.domain.Team; import com.codesquad.coco.team.domain.TeamDAO; import org.springframework.stereotype.Service; @@ -8,12 +13,42 @@ public class TeamService { private final TeamDAO teamDAO; + private final GameDAO gameDAO; + private final PlayerDAO playerDAO; - public TeamService(TeamDAO teamDAO) { + public TeamService(TeamDAO teamDAO, GameDAO gameDAO, PlayerDAO playerDAO) { this.teamDAO = teamDAO; + this.gameDAO = gameDAO; + this.playerDAO = playerDAO; } - public MainTeamDTO findMainTeams() { + public MainPageTeamDTO findMainTeams() { return teamDAO.findAllName(); } + + public Long makeHomeGame(TeamChoiceDTO choiceDTO) { + Team playerTeam = getPlayerTeam(choiceDTO); + Team opponentTeam = getOpponentTeam(choiceDTO); + + Game game = new Game(opponentTeam, playerTeam, "home"); + return gameDAO.save(game); + } + + public Long makeAwayGame(TeamChoiceDTO choiceDTO) { + Team playerTeam = getPlayerTeam(choiceDTO); + Team opponentTeam = getOpponentTeam(choiceDTO); + + Game game = new Game(playerTeam, opponentTeam, "away"); + return gameDAO.save(game); + } + + private Team getPlayerTeam(TeamChoiceDTO choiceDTO) { + String teamName = choiceDTO.getPlayer(); + return new Team(teamName, playerDAO.findByTeamName(teamName)); + } + + private Team getOpponentTeam(TeamChoiceDTO choiceDTO) { + String teamName = choiceDTO.getOpponent(); + return new Team(teamName, playerDAO.findByTeamName(teamName)); + } } From ef8c9aa1cd3a992b2692db4ba744d0ebae0fdd19 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:27:33 +0900 Subject: [PATCH 50/96] =?UTF-8?q?feat=20:=20TeamController=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - player는 home일 때와 away일 때 다른 url을 요청한다 - 백엔드는 그에 맞게 동작을 한다 --- .../codesquad/coco/team/TeamController.java | 45 ++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamController.java b/BE/src/main/java/com/codesquad/coco/team/TeamController.java index 1d6245f23..3840ada30 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamController.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamController.java @@ -1,22 +1,55 @@ package com.codesquad.coco.team; -import com.codesquad.coco.team.domain.MainTeamDTO; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.codesquad.coco.game.GameService; +import com.codesquad.coco.game.domain.model.Game; +import com.codesquad.coco.team.domain.DTO.GamePlayDTO; +import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; +import com.codesquad.coco.team.domain.DTO.TeamDTO; +import com.codesquad.coco.utils.DTOConverter; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api") public class TeamController { private TeamService teamService; + private GameService gameService; - public TeamController(TeamService teamService) { + public TeamController(TeamService teamService, GameService gameService) { this.teamService = teamService; + this.gameService = gameService; } @GetMapping("/main") - public MainTeamDTO mainPage() { + @ResponseStatus(HttpStatus.OK) + public MainPageTeamDTO mainPage() { return teamService.findMainTeams(); } + + @PostMapping("/player/home") + @ResponseStatus(HttpStatus.CREATED) + public GamePlayDTO homeTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { + Long gameId = teamService.makeHomeGame(choiceDTO); + Game game = gameService.choiceGame(gameId); + + TeamDTO homeTeam = DTOConverter.teamToDTO(game.getHome()); + TeamDTO awayTeam = DTOConverter.teamToDTO(game.getAway()); + + return new GamePlayDTO(gameId, homeTeam, awayTeam); + + } + + @PostMapping("/player/away") + @ResponseStatus(HttpStatus.CREATED) + public GamePlayDTO awayTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { + Long gameId = teamService.makeAwayGame(choiceDTO); + Game game = gameService.choiceGame(gameId); + + TeamDTO homeTeam = DTOConverter.teamToDTO(game.getHome()); + TeamDTO awayTeam = DTOConverter.teamToDTO(game.getAway()); + + return new GamePlayDTO(gameId, awayTeam, homeTeam); + } } From e3cc85bb93016d9ca0ca41883fff0a2f2941d5a0 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:30:02 +0900 Subject: [PATCH 51/96] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?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 - 이름에 맞게 패키지 이동 --- .../{team/domain/DTO => game/domain/model}/GamePlayDTO.java | 4 +++- .../coco/{game/domain/model => player/domain}/PlayerDTO.java | 2 +- BE/src/main/java/com/codesquad/coco/team/TeamController.java | 2 +- .../main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java | 2 +- BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) rename BE/src/main/java/com/codesquad/coco/{team/domain/DTO => game/domain/model}/GamePlayDTO.java (82%) rename BE/src/main/java/com/codesquad/coco/{game/domain/model => player/domain}/PlayerDTO.java (89%) diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/GamePlayDTO.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/GamePlayDTO.java similarity index 82% rename from BE/src/main/java/com/codesquad/coco/team/domain/DTO/GamePlayDTO.java rename to BE/src/main/java/com/codesquad/coco/game/domain/model/GamePlayDTO.java index d1782f51d..541735ffc 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/GamePlayDTO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/GamePlayDTO.java @@ -1,4 +1,6 @@ -package com.codesquad.coco.team.domain.DTO; +package com.codesquad.coco.game.domain.model; + +import com.codesquad.coco.team.domain.DTO.TeamDTO; public class GamePlayDTO { diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/PlayerDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDTO.java similarity index 89% rename from BE/src/main/java/com/codesquad/coco/game/domain/model/PlayerDTO.java rename to BE/src/main/java/com/codesquad/coco/player/domain/PlayerDTO.java index 26fac2249..7892fb27f 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/PlayerDTO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDTO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.game.domain.model; +package com.codesquad.coco.player.domain; public class PlayerDTO { diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamController.java b/BE/src/main/java/com/codesquad/coco/team/TeamController.java index 3840ada30..4f2d9289f 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamController.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamController.java @@ -2,7 +2,7 @@ import com.codesquad.coco.game.GameService; import com.codesquad.coco.game.domain.model.Game; -import com.codesquad.coco.team.domain.DTO.GamePlayDTO; +import com.codesquad.coco.game.domain.model.GamePlayDTO; import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java index b9535c45a..c7258fbf7 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java @@ -1,6 +1,6 @@ package com.codesquad.coco.team.domain.DTO; -import com.codesquad.coco.game.domain.model.PlayerDTO; +import com.codesquad.coco.player.domain.PlayerDTO; import java.util.List; diff --git a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java index 6185a9670..859f520a5 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java +++ b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java @@ -1,6 +1,6 @@ package com.codesquad.coco.utils; -import com.codesquad.coco.game.domain.model.PlayerDTO; +import com.codesquad.coco.player.domain.PlayerDTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; import com.codesquad.coco.team.domain.Team; From 4a0ae16469d9b965a6f50ee037fbfd38494a8ea1 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:37:57 +0900 Subject: [PATCH 52/96] =?UTF-8?q?refactor=20:=20userType=EC=9D=84=20Enum?= =?UTF-8?q?=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 - Enum으로 변경 --- .../java/com/codesquad/coco/game/domain/DAO/GameDAO.java | 5 +++-- .../java/com/codesquad/coco/game/domain/model/Game.java | 9 +++++---- .../java/com/codesquad/coco/player/domain/UserType.java | 5 +++++ .../main/java/com/codesquad/coco/team/TeamService.java | 5 +++-- BE/src/test/java/com/codesquad/coco/GameTest.java | 3 ++- 5 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/UserType.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index a672353b7..8211adb1c 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -3,6 +3,7 @@ import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.player.domain.PlayerDAO; +import com.codesquad.coco.player.domain.UserType; import com.codesquad.coco.team.domain.Team; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.support.GeneratedKeyHolder; @@ -53,7 +54,7 @@ private Long saveGame(Game game) { PreparedStatement ps = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); ps.setString(1, game.homeTeamName()); ps.setString(2, game.awayTeamName()); - ps.setString(3, game.getUserType()); + ps.setString(3, game.getUserType().toString()); return ps; }, keyHolder); @@ -85,7 +86,7 @@ public Game findById(Long id) { homeTeam, Collections.unmodifiableSet(new HashSet<>( Arrays.asList(homeScoreBoard, awayScoreBoard))), - rs.getString("user_type") + UserType.valueOf(rs.getString("user_type")) ); return game; diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java index 54e48ca8a..9a925b5ef 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/Game.java @@ -1,5 +1,6 @@ package com.codesquad.coco.game.domain.model; +import com.codesquad.coco.player.domain.UserType; import com.codesquad.coco.team.domain.Team; import org.springframework.data.annotation.Id; @@ -17,15 +18,15 @@ public class Game { private Set scoreBoard = new HashSet<>(); - private String userType; + private UserType userType; - public Game(Team away, Team home, String userType) { + public Game(Team away, Team home, UserType userType) { this.away = away; this.home = home; this.userType = userType; } - public Game(Long id, Team away, Team home, Set scoreBoard, String userType) { + public Game(Long id, Team away, Team home, Set scoreBoard, UserType userType) { this.id = id; this.away = away; this.home = home; @@ -45,7 +46,7 @@ public Team getHome() { return home; } - public String getUserType() { + public UserType getUserType() { return userType; } diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/UserType.java b/BE/src/main/java/com/codesquad/coco/player/domain/UserType.java new file mode 100644 index 000000000..e2676f03a --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/domain/UserType.java @@ -0,0 +1,5 @@ +package com.codesquad.coco.player.domain; + +public enum UserType { + HOME, AWAY +} diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamService.java b/BE/src/main/java/com/codesquad/coco/team/TeamService.java index 09a23fc1d..258dd06d4 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamService.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamService.java @@ -3,6 +3,7 @@ import com.codesquad.coco.game.domain.DAO.GameDAO; import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.player.domain.PlayerDAO; +import com.codesquad.coco.player.domain.UserType; import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; import com.codesquad.coco.team.domain.Team; @@ -30,7 +31,7 @@ public Long makeHomeGame(TeamChoiceDTO choiceDTO) { Team playerTeam = getPlayerTeam(choiceDTO); Team opponentTeam = getOpponentTeam(choiceDTO); - Game game = new Game(opponentTeam, playerTeam, "home"); + Game game = new Game(opponentTeam, playerTeam, UserType.HOME); return gameDAO.save(game); } @@ -38,7 +39,7 @@ public Long makeAwayGame(TeamChoiceDTO choiceDTO) { Team playerTeam = getPlayerTeam(choiceDTO); Team opponentTeam = getOpponentTeam(choiceDTO); - Game game = new Game(playerTeam, opponentTeam, "away"); + Game game = new Game(playerTeam, opponentTeam, UserType.AWAY); return gameDAO.save(game); } diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java index b832fa450..00a88f430 100644 --- a/BE/src/test/java/com/codesquad/coco/GameTest.java +++ b/BE/src/test/java/com/codesquad/coco/GameTest.java @@ -3,6 +3,7 @@ import com.codesquad.coco.game.domain.DAO.GameDAO; import com.codesquad.coco.game.domain.model.Game; +import com.codesquad.coco.player.domain.UserType; import com.codesquad.coco.team.domain.Team; import com.codesquad.coco.team.domain.TeamRepository; import org.assertj.core.api.Assertions; @@ -32,7 +33,7 @@ void playGame() { Team ssg = teamRepository.findTeamByName("SSG 랜더스").get(); Team doSan = teamRepository.findTeamByName("두산 베어스").get(); - Game bigMatch = new Game(ssg, doSan, "home"); + Game bigMatch = new Game(ssg, doSan, UserType.HOME); Long gameId = gameDAO.save(bigMatch); Assertions.assertThat(gameId).isEqualTo(2L); //todo : 게임은 만들어 지면서 스코어 보드도 만들어야 한다. From 8f4e5a77c2b408c7632f81255d23609daf3ad193 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 6 May 2021 23:40:08 +0900 Subject: [PATCH 53/96] =?UTF-8?q?refactor=20:=20=EC=84=A0=EC=88=98?= =?UTF-8?q?=EB=93=A4=EC=9D=84=20id=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - List로 관리하며 id로 정렬한다 --- .../java/com/codesquad/coco/player/domain/PlayerDAO.java | 8 ++++---- BE/src/main/java/com/codesquad/coco/team/domain/Team.java | 8 ++++---- BE/src/test/java/com/codesquad/coco/TeamTest.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java index f7921cb5b..cd1714d4d 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -4,8 +4,8 @@ import org.springframework.stereotype.Component; import javax.sql.DataSource; -import java.util.HashSet; -import java.util.Set; +import java.util.ArrayList; +import java.util.List; @Component public class PlayerDAO { @@ -15,14 +15,14 @@ public PlayerDAO(DataSource dataSource) { this.template = new JdbcTemplate(dataSource); } - public Set findByTeamName(String teamName) { + public List findByTeamName(String teamName) { // todo : 선수 순서 보장 String sql = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat, r.average " + "FROM player p " + "inner JOIN record r ON r.player = p.id " + "WHERE p.team = '" + teamName + "' order by p.id;"; - Set players = new HashSet<>(); + List players = new ArrayList<>(); template.query(sql, (rs, rowNum) -> { Record record = new Record( diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/Team.java b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java index 43ad6c96d..7a37f27a9 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/Team.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java @@ -3,16 +3,16 @@ import com.codesquad.coco.player.domain.Player; import org.springframework.data.annotation.Id; -import java.util.Set; +import java.util.List; public class Team { @Id private String name; - private Set players; + private List players; - public Team(String name, Set players) { + public Team(String name, List players) { this.name = name; this.players = players; } @@ -21,7 +21,7 @@ public String getName() { return name; } - public Set getPlayers() { + public List getPlayers() { return players; } diff --git a/BE/src/test/java/com/codesquad/coco/TeamTest.java b/BE/src/test/java/com/codesquad/coco/TeamTest.java index e4605a501..4a6cfc5ac 100644 --- a/BE/src/test/java/com/codesquad/coco/TeamTest.java +++ b/BE/src/test/java/com/codesquad/coco/TeamTest.java @@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.transaction.annotation.Transactional; -import java.util.Set; +import java.util.List; @Transactional @SpringBootTest @@ -25,12 +25,12 @@ public class TeamTest { @Test @DisplayName("선수 조회") - void showPlayer(){ + void showPlayer() { Team ssg = teamRepository.findTeamByName("SSG 랜더스").get(); - Set players = ssg.getPlayers(); + List players = ssg.getPlayers(); Assertions.assertThat(players).isNotNull(); for (Player player : players) { - logger.info("선수 {}",player.toString()); + logger.info("선수 {}", player.toString()); } } } From bcefb9378d60d3488ded9ffa8e08e1954f8c6c54 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 00:30:31 +0900 Subject: [PATCH 54/96] =?UTF-8?q?feat=20:=20playerDAO=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 레코드 업데이트와 선수 찾기 추가 --- .../coco/player/domain/PlayerDAO.java | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java index cd1714d4d..6bad23e4e 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -4,6 +4,7 @@ import org.springframework.stereotype.Component; import javax.sql.DataSource; +import java.sql.PreparedStatement; import java.util.ArrayList; import java.util.List; @@ -16,7 +17,6 @@ public PlayerDAO(DataSource dataSource) { } public List findByTeamName(String teamName) { - // todo : 선수 순서 보장 String sql = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat, r.average " + "FROM player p " + "inner JOIN record r ON r.player = p.id " + @@ -44,4 +44,43 @@ public List findByTeamName(String teamName) { return players; } + public Player findById(Long id) { + String sql = "select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat, r.average " + + "from player p " + + "inner JOIN record r ON r.player = p.id " + + "where p.id= " + id; + + List query = template.query(sql, (rs, rowNum) -> { + Record record = new Record( + rs.getLong("rid"), + rs.getInt("at_bat"), + rs.getInt("hits"), + rs.getInt("outs"), + rs.getDouble("average") + ); + Player player = new Player( + rs.getLong("pid"), + rs.getString("name"), + rs.getString("type"), + record + ); + return player; + }); + + return query.get(0); + } + + public void updateRecord(Record record) { + String sql = "update record set at_bat = ?, hits = ?, outs = ?, average = ? where id = ?"; + + template.update(con -> { + PreparedStatement ps = con.prepareStatement(sql); + ps.setInt(1, record.getAtBat()); + ps.setInt(2, record.getHits()); + ps.setInt(3, record.getOuts()); + ps.setDouble(4, record.getAverage()); + ps.setLong(5, record.getId()); + return ps; + }); + } } From 3e509b1f7927906154b05d3c4afca4f001c09f6c Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 00:31:23 +0900 Subject: [PATCH 55/96] =?UTF-8?q?feat=20:=20record=EB=A5=BC=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 클라이언트에서 보내주는 값을 확인해서 업데이트 --- .../java/com/codesquad/coco/player/domain/Record.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java index ea99706b8..d05938213 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java @@ -50,4 +50,15 @@ public String toString() { ", average=" + average + '}'; } + + public void update(String log) { + this.atBat++; + if (log.equals("안타")) { + this.hits++; + } + if (log.equals("아웃")) { + this.outs++; + } + this.average = (double) hits / atBat; + } } From 3507f6a879d63f194a17770a8b4088223019f9b4 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 00:32:41 +0900 Subject: [PATCH 56/96] =?UTF-8?q?feat=20:=20playerController=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 - 선수가 아웃이나 안타를 치면 record를 업데이트 합니다 --- .../coco/player/PlayerController.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/player/PlayerController.java diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerController.java b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java new file mode 100644 index 000000000..b41ef07fe --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java @@ -0,0 +1,26 @@ +package com.codesquad.coco.player; + +import com.codesquad.coco.player.domain.Player; +import com.codesquad.coco.player.domain.PlayerEventDTO; +import com.codesquad.coco.player.domain.Record; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api") +public class PlayerController { + + private final PlayerService playerService; + + public PlayerController(PlayerService playerService) { + this.playerService = playerService; + } + + @PutMapping("/players/{playerId}/log") + @ResponseStatus(HttpStatus.OK) + public void playerEvent(@PathVariable Long playerId, @RequestBody PlayerEventDTO eventDTO) { + Player player = playerService.findById(playerId); + Record record = player.getRecord(); + playerService.updateRecord(record, eventDTO); + } +} From e71bc86ee3e923da3fbb911485f5153cb9871084 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 00:33:31 +0900 Subject: [PATCH 57/96] =?UTF-8?q?feat=20:=20PlayerEventDTO=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 선수의 이벤트가 담겨 옮니다 --- .../codesquad/coco/player/domain/PlayerEventDTO.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java new file mode 100644 index 000000000..61ff4932a --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java @@ -0,0 +1,10 @@ +package com.codesquad.coco.player.domain; + +public class PlayerEventDTO { + + private String log; + + public String getLog() { + return log; + } +} From ebc0b6f4381df789b8a65b70d23985539f73153f Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 00:34:28 +0900 Subject: [PATCH 58/96] =?UTF-8?q?feat=20:=20playerService=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesquad/coco/player/PlayerService.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/player/PlayerService.java diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerService.java b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java new file mode 100644 index 000000000..c4ce7302d --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java @@ -0,0 +1,27 @@ +package com.codesquad.coco.player; + +import com.codesquad.coco.player.domain.Player; +import com.codesquad.coco.player.domain.PlayerDAO; +import com.codesquad.coco.player.domain.PlayerEventDTO; +import com.codesquad.coco.player.domain.Record; +import org.springframework.stereotype.Service; + +@Service +public class PlayerService { + + private final PlayerDAO playerDAO; + + public PlayerService(PlayerDAO playerDAO) { + this.playerDAO = playerDAO; + } + + + public Player findById(Long playerId) { + return playerDAO.findById(playerId); + } + + public void updateRecord(Record record, PlayerEventDTO eventDTO) { + record.update(eventDTO.getLog()); + playerDAO.updateRecord(record); + } +} From 2f253f8283c930ce387ecf7e2950d878dd310f2c Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 00:35:06 +0900 Subject: [PATCH 59/96] =?UTF-8?q?feat=20:=20LogType=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 아직 사용하지는 않습니다 - 사용하게 된다면 record의 update 부분에서 사용 예정 --- .../com/codesquad/coco/player/domain/LogType.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/LogType.java diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/LogType.java b/BE/src/main/java/com/codesquad/coco/player/domain/LogType.java new file mode 100644 index 000000000..f7f389e80 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/domain/LogType.java @@ -0,0 +1,12 @@ +package com.codesquad.coco.player.domain; + +public enum LogType { + HITS("안타"), + OUT("아웃"); + + private String log; + + LogType(String log) { + this.log = log; + } +} From 797190398aaa049dd8e32efcdf1354cf751124fa Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 10:57:50 +0900 Subject: [PATCH 60/96] =?UTF-8?q?feat=20:=20url=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fe와 협의하에 url을 변경 --- .../com/codesquad/coco/team/TeamController.java | 13 ++++++++++--- .../java/com/codesquad/coco/team/TeamService.java | 2 +- .../coco/team/domain/DTO/TeamChoiceDTO.java | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamController.java b/BE/src/main/java/com/codesquad/coco/team/TeamController.java index 4f2d9289f..568274ae2 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamController.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamController.java @@ -6,6 +6,7 @@ import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamPointDTO; import com.codesquad.coco.utils.DTOConverter; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; @@ -22,13 +23,13 @@ public TeamController(TeamService teamService, GameService gameService) { this.gameService = gameService; } - @GetMapping("/main") + @GetMapping("/intro") @ResponseStatus(HttpStatus.OK) public MainPageTeamDTO mainPage() { return teamService.findMainTeams(); } - @PostMapping("/player/home") + @PostMapping("/games/type-home") @ResponseStatus(HttpStatus.CREATED) public GamePlayDTO homeTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { Long gameId = teamService.makeHomeGame(choiceDTO); @@ -41,7 +42,7 @@ public GamePlayDTO homeTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { } - @PostMapping("/player/away") + @PostMapping("/games/type-away") @ResponseStatus(HttpStatus.CREATED) public GamePlayDTO awayTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { Long gameId = teamService.makeAwayGame(choiceDTO); @@ -52,4 +53,10 @@ public GamePlayDTO awayTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { return new GamePlayDTO(gameId, awayTeam, homeTeam); } + + @PutMapping("/games/{gameId}/points") + @ResponseStatus(HttpStatus.OK) + public void plusPoint(@PathVariable Long gameId, TeamPointDTO teamPointDTO) { + gameService.plusPoint() + } } diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamService.java b/BE/src/main/java/com/codesquad/coco/team/TeamService.java index 258dd06d4..cf5a91c99 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamService.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamService.java @@ -44,7 +44,7 @@ public Long makeAwayGame(TeamChoiceDTO choiceDTO) { } private Team getPlayerTeam(TeamChoiceDTO choiceDTO) { - String teamName = choiceDTO.getPlayer(); + String teamName = choiceDTO.getUser(); return new Team(teamName, playerDAO.findByTeamName(teamName)); } diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java index ea4538325..f6ab9012a 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamChoiceDTO.java @@ -2,16 +2,16 @@ public class TeamChoiceDTO { - private String player; + private String user; private String opponent; - public TeamChoiceDTO(String player, String opponent) { - this.player = player; + public TeamChoiceDTO(String user, String opponent) { + this.user = user; this.opponent = opponent; } - public String getPlayer() { - return player; + public String getUser() { + return user; } public String getOpponent() { From cd38cfe494a64274a06b540b666323432570771f Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 11:05:48 +0900 Subject: [PATCH 61/96] =?UTF-8?q?feat=20:=20gameController=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 이름 변경 - team보다 game에 관여를 많이해서 변경 --- .../TeamController.java => game/GameController.java} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename BE/src/main/java/com/codesquad/coco/{team/TeamController.java => game/GameController.java} (92%) diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java similarity index 92% rename from BE/src/main/java/com/codesquad/coco/team/TeamController.java rename to BE/src/main/java/com/codesquad/coco/game/GameController.java index 568274ae2..52f51da7d 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -1,8 +1,8 @@ -package com.codesquad.coco.team; +package com.codesquad.coco.game; -import com.codesquad.coco.game.GameService; import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.GamePlayDTO; +import com.codesquad.coco.team.TeamService; import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; @@ -13,12 +13,12 @@ @RestController @RequestMapping("/api") -public class TeamController { +public class GameController { private TeamService teamService; private GameService gameService; - public TeamController(TeamService teamService, GameService gameService) { + public GameController(TeamService teamService, GameService gameService) { this.teamService = teamService; this.gameService = gameService; } From 7b5425888a4f60849fe6ae5ee9d635aa7b089c49 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 12:09:40 +0900 Subject: [PATCH 62/96] =?UTF-8?q?feat=20:=20=ED=8C=80=20=EB=93=9D=EC=A0=90?= =?UTF-8?q?=20=EC=8B=9C=20=EC=A0=90=EC=88=98=20=ED=94=8C=EB=9F=AC=EC=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 이닝과 얻은 점수를 주면 이닝 테이블을 update합니다 --- .../codesquad/coco/game/GameController.java | 9 ++++-- .../com/codesquad/coco/game/GameService.java | 17 ++++++++++- .../coco/game/domain/DAO/ScoreBoardDAO.java | 11 +++++++ .../coco/game/domain/model/Innings.java | 27 +++++++++++++++++ .../coco/game/domain/model/ScoreBoard.java | 8 +++++ .../coco/team/domain/DTO/TeamPointDTO.java | 29 +++++++++++++++++++ 6 files changed, 97 insertions(+), 4 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamPointDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index 52f51da7d..b98ad342c 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -2,6 +2,7 @@ import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.GamePlayDTO; +import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.TeamService; import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; @@ -54,9 +55,11 @@ public GamePlayDTO awayTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { return new GamePlayDTO(gameId, awayTeam, homeTeam); } - @PutMapping("/games/{gameId}/points") + @PostMapping("/games/{gameId}/points") @ResponseStatus(HttpStatus.OK) - public void plusPoint(@PathVariable Long gameId, TeamPointDTO teamPointDTO) { - gameService.plusPoint() + public void plusPoint(@PathVariable Long gameId, @RequestBody TeamPointDTO teamPointDTO) { + System.out.println(teamPointDTO.toString()); + ScoreBoard scoreBoard = gameService.findScoreBoard(gameId, teamPointDTO); + gameService.plusPoint(scoreBoard, teamPointDTO); } } diff --git a/BE/src/main/java/com/codesquad/coco/game/GameService.java b/BE/src/main/java/com/codesquad/coco/game/GameService.java index 56df746c8..1e218cee1 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameService.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameService.java @@ -1,19 +1,34 @@ package com.codesquad.coco.game; import com.codesquad.coco.game.domain.DAO.GameDAO; +import com.codesquad.coco.game.domain.DAO.ScoreBoardDAO; import com.codesquad.coco.game.domain.model.Game; +import com.codesquad.coco.game.domain.model.Innings; +import com.codesquad.coco.game.domain.model.ScoreBoard; +import com.codesquad.coco.team.domain.DTO.TeamPointDTO; import org.springframework.stereotype.Service; @Service public class GameService { private GameDAO gameDAO; + private ScoreBoardDAO boardDAO; - public GameService(GameDAO gameDAO) { + public GameService(GameDAO gameDAO, ScoreBoardDAO boardDAO) { this.gameDAO = gameDAO; + this.boardDAO = boardDAO; } public Game choiceGame(Long id) { return gameDAO.findById(id); } + + public ScoreBoard findScoreBoard(Long gameId, TeamPointDTO teamPointDTO) { + return boardDAO.findByGameIdAndTeamName(gameId, teamPointDTO.getTeamName()); + } + + public void plusPoint(ScoreBoard scoreBoard, TeamPointDTO teamPointDTO) { + Innings innings = scoreBoard.updateScore(teamPointDTO.getRound(), teamPointDTO.getPoint()); + boardDAO.saveInnings(innings); + } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java index b1e1f80b6..91d2f30e4 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java @@ -57,4 +57,15 @@ public ScoreBoard findByGameIdAndTeamName(Long id, String teamName) { }); return query.get(0); } + + public void saveInnings(Innings innings) { + String sql = "insert into innings (score_board, score, score_board_key) values (?,?,?)"; + template.update(con -> { + PreparedStatement ps = con.prepareStatement(sql); + ps.setLong(1, innings.getScoreBoard()); + ps.setInt(2, innings.getScore()); + ps.setInt(3, innings.getInning()); + return ps; + }); + } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java index 634976024..820c18267 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/Innings.java @@ -9,6 +9,13 @@ public class Innings { private Long scoreBoard; private int score; + private int inning; + + public Innings(Long scoreBoard, int score, int inning) { + this.scoreBoard = scoreBoard; + this.score = score; + this.inning = inning; + } public Innings(Long id, Long scoreBoard, int score) { this.id = id; @@ -16,6 +23,22 @@ public Innings(Long id, Long scoreBoard, int score) { this.score = score; } + public Long getId() { + return id; + } + + public Long getScoreBoard() { + return scoreBoard; + } + + public int getScore() { + return score; + } + + public int getInning() { + return inning; + } + @Override public String toString() { return "Innings{" + @@ -24,4 +47,8 @@ public String toString() { ", score=" + score + '}'; } + + public void update(int point) { + this.score += point; + } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java index 28c655c83..0d928af6a 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java @@ -26,6 +26,12 @@ public ScoreBoard(Long gameId, String team) { this.team = team; } + public Innings updateScore(int round, int point) { + //fixme : 만약 해당 이닝에 점수가 나지 않았다면? -> 리스트는 0이 되어야함함 + // fixme : 이닝이 끝날 때 마다 보내 줌 -> 해당 팀만?, 상대 팀도? + return new Innings(this.id, point, round); + } + public Long getId() { return id; } @@ -55,4 +61,6 @@ public String toString() { ", innings=" + innings + '}'; } + + } diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamPointDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamPointDTO.java new file mode 100644 index 000000000..dbf7248cd --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamPointDTO.java @@ -0,0 +1,29 @@ +package com.codesquad.coco.team.domain.DTO; + +public class TeamPointDTO { + + private String teamName; + private int round; + private int point; + + public String getTeamName() { + return teamName; + } + + public int getRound() { + return round; + } + + public int getPoint() { + return point; + } + + @Override + public String toString() { + return "TeamPointDTO{" + + "teamName='" + teamName + '\'' + + ", round=" + round + + ", point=" + point + + '}'; + } +} From beba0e83a1d55b6063dc74ffd0c20e8196c88ede Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 12:19:53 +0900 Subject: [PATCH 63/96] =?UTF-8?q?feat=20:=20logType=EC=9D=84=20enum?= =?UTF-8?q?=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 - 이넘을 활용하기 위해 변경 - 이름도 record로 변경 --- .../com/codesquad/coco/player/PlayerController.java | 2 +- .../com/codesquad/coco/player/PlayerService.java | 2 +- .../coco/player/domain/PlayerEventDTO.java | 13 ++++++++++--- .../com/codesquad/coco/player/domain/Record.java | 6 +++--- .../player/domain/{LogType.java => RecordType.java} | 8 ++++---- 5 files changed, 19 insertions(+), 12 deletions(-) rename BE/src/main/java/com/codesquad/coco/player/domain/{LogType.java => RecordType.java} (53%) diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerController.java b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java index b41ef07fe..6da6a2d53 100644 --- a/BE/src/main/java/com/codesquad/coco/player/PlayerController.java +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java @@ -16,7 +16,7 @@ public PlayerController(PlayerService playerService) { this.playerService = playerService; } - @PutMapping("/players/{playerId}/log") + @PutMapping("/players/{playerId}/record") @ResponseStatus(HttpStatus.OK) public void playerEvent(@PathVariable Long playerId, @RequestBody PlayerEventDTO eventDTO) { Player player = playerService.findById(playerId); diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerService.java b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java index c4ce7302d..365b0665f 100644 --- a/BE/src/main/java/com/codesquad/coco/player/PlayerService.java +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java @@ -21,7 +21,7 @@ public Player findById(Long playerId) { } public void updateRecord(Record record, PlayerEventDTO eventDTO) { - record.update(eventDTO.getLog()); + record.update(eventDTO.getRecord()); playerDAO.updateRecord(record); } } diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java index 61ff4932a..9b138aaa3 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java @@ -2,9 +2,16 @@ public class PlayerEventDTO { - private String log; + private RecordType record; - public String getLog() { - return log; + public RecordType getRecord() { + return record; + } + + @Override + public String toString() { + return "PlayerEventDTO{" + + "record=" + record + + '}'; } } diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java index d05938213..2695e5ecf 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/Record.java @@ -51,12 +51,12 @@ public String toString() { '}'; } - public void update(String log) { + public void update(RecordType log) { this.atBat++; - if (log.equals("안타")) { + if (log == RecordType.HITS) { this.hits++; } - if (log.equals("아웃")) { + if (log == RecordType.OUT) { this.outs++; } this.average = (double) hits / atBat; diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/LogType.java b/BE/src/main/java/com/codesquad/coco/player/domain/RecordType.java similarity index 53% rename from BE/src/main/java/com/codesquad/coco/player/domain/LogType.java rename to BE/src/main/java/com/codesquad/coco/player/domain/RecordType.java index f7f389e80..e957e93fc 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/LogType.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/RecordType.java @@ -1,12 +1,12 @@ package com.codesquad.coco.player.domain; -public enum LogType { - HITS("안타"), - OUT("아웃"); +public enum RecordType { + HITS("hits"), + OUT("out"); private String log; - LogType(String log) { + RecordType(String log) { this.log = log; } } From 8e31f78c53515a297668cf14db010b27364a42d4 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 13:40:49 +0900 Subject: [PATCH 64/96] =?UTF-8?q?feat=20:=20=EC=83=81=EC=84=B8=20=EC=A0=90?= =?UTF-8?q?=EC=88=98=20=ED=8C=9D=EC=97=85=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 게임 id를 받아서 점수판을 보여준다 - user가 무슨 팀인지 알기 위해 분기 점이 존재한다 --- .../codesquad/coco/game/GameController.java | 26 +++++++++++++---- .../com/codesquad/coco/game/GameService.java | 12 +++++++- .../coco/game/domain/DAO/GameDAO.java | 5 ++++ .../coco/game/domain/DAO/ScoreBoardDAO.java | 29 ++++++++++++++++++- .../coco/game/domain/model/GameScoreDTO.java | 22 ++++++++++++++ .../coco/team/domain/DTO/TeamScoreDTO.java | 21 ++++++++++++++ .../codesquad/coco/utils/DTOConverter.java | 10 +++++++ 7 files changed, 117 insertions(+), 8 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/game/domain/model/GameScoreDTO.java create mode 100644 BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamScoreDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index b98ad342c..922849282 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -2,16 +2,16 @@ import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.GamePlayDTO; +import com.codesquad.coco.game.domain.model.GameScoreDTO; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.TeamService; -import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; -import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; -import com.codesquad.coco.team.domain.DTO.TeamDTO; -import com.codesquad.coco.team.domain.DTO.TeamPointDTO; +import com.codesquad.coco.team.domain.DTO.*; import com.codesquad.coco.utils.DTOConverter; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/api") public class GameController { @@ -58,8 +58,22 @@ public GamePlayDTO awayTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { @PostMapping("/games/{gameId}/points") @ResponseStatus(HttpStatus.OK) public void plusPoint(@PathVariable Long gameId, @RequestBody TeamPointDTO teamPointDTO) { - System.out.println(teamPointDTO.toString()); - ScoreBoard scoreBoard = gameService.findScoreBoard(gameId, teamPointDTO); + ScoreBoard scoreBoard = gameService.findScoreBoardByTeamName(gameId, teamPointDTO); gameService.plusPoint(scoreBoard, teamPointDTO); } + + @GetMapping("/games/{gameId}/points") + @ResponseStatus(HttpStatus.OK) + public GameScoreDTO gamePoint(@PathVariable Long gameId) { + List scoreBoard = gameService.findScoreBoardByGameId(gameId); + String userTeamName = gameService.findUserTeamNameByGameId(gameId); + + TeamScoreDTO teamScoreDTO = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(0)); + TeamScoreDTO teamScoreDTO1 = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(1)); + + if (teamScoreDTO.getTeamName().equals(userTeamName)) { + return new GameScoreDTO(teamScoreDTO, teamScoreDTO1); + } + return new GameScoreDTO(teamScoreDTO1, teamScoreDTO); + } } diff --git a/BE/src/main/java/com/codesquad/coco/game/GameService.java b/BE/src/main/java/com/codesquad/coco/game/GameService.java index 1e218cee1..341a93425 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameService.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameService.java @@ -8,6 +8,8 @@ import com.codesquad.coco.team.domain.DTO.TeamPointDTO; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class GameService { @@ -23,7 +25,7 @@ public Game choiceGame(Long id) { return gameDAO.findById(id); } - public ScoreBoard findScoreBoard(Long gameId, TeamPointDTO teamPointDTO) { + public ScoreBoard findScoreBoardByTeamName(Long gameId, TeamPointDTO teamPointDTO) { return boardDAO.findByGameIdAndTeamName(gameId, teamPointDTO.getTeamName()); } @@ -31,4 +33,12 @@ public void plusPoint(ScoreBoard scoreBoard, TeamPointDTO teamPointDTO) { Innings innings = scoreBoard.updateScore(teamPointDTO.getRound(), teamPointDTO.getPoint()); boardDAO.saveInnings(innings); } + + public List findScoreBoardByGameId(Long gameId) { + return boardDAO.findByGameId(gameId); + } + + public String findUserTeamNameByGameId(Long gameId) { + return gameDAO.findUserTeamNameByGameId(gameId); + } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 8211adb1c..7ea692617 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -97,4 +97,9 @@ public Game findById(Long id) { } + public String findUserTeamNameByGameId(Long id) { + String sql = "select if(g.user_type = 'home',g.home,g.away) as user_team_name from game g where g.id = " + id; + List query = template.query(sql, (rs, rowNum) -> rs.getString("user_team_name")); + return query.get(0); + } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java index 91d2f30e4..c3768f1aa 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java @@ -10,6 +10,7 @@ import javax.sql.DataSource; import java.sql.PreparedStatement; import java.sql.Statement; +import java.util.ArrayList; import java.util.List; @Component @@ -40,10 +41,17 @@ public Long save(ScoreBoard board) { public ScoreBoard findByGameIdAndTeamName(Long id, String teamName) { String sql = "select s.id, s.game,s.team from score_board s where s.game = " + id + " and s.team = '" + teamName + "'"; + return findScoreBoard(sql); + } + + public List findByGameId(Long id) { + String sql = "select s.id, s.game,s.team from score_board s where s.game = " + id; + return findScoreBoards(sql); + } + private ScoreBoard findScoreBoard(String sql) { List query = template.query(sql, (rs, rowNum) -> { - List innings = inningsDAO.findAllById(rs.getLong("id")); ScoreBoard board = new ScoreBoard( @@ -58,6 +66,24 @@ public ScoreBoard findByGameIdAndTeamName(Long id, String teamName) { return query.get(0); } + private List findScoreBoards(String sql) { + + List scoreBoards = new ArrayList<>(); + template.query(sql, (rs, rowNum) -> { + List innings = inningsDAO.findAllById(rs.getLong("id")); + + scoreBoards.add(new ScoreBoard( + rs.getLong("id"), + rs.getLong("game"), + rs.getString("team"), + innings + )); + + return null; + }); + return scoreBoards; + } + public void saveInnings(Innings innings) { String sql = "insert into innings (score_board, score, score_board_key) values (?,?,?)"; template.update(con -> { @@ -68,4 +94,5 @@ public void saveInnings(Innings innings) { return ps; }); } + } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/GameScoreDTO.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/GameScoreDTO.java new file mode 100644 index 000000000..c92f479fe --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/GameScoreDTO.java @@ -0,0 +1,22 @@ +package com.codesquad.coco.game.domain.model; + +import com.codesquad.coco.team.domain.DTO.TeamScoreDTO; + +public class GameScoreDTO { + + private TeamScoreDTO user; + private TeamScoreDTO opponent; + + public GameScoreDTO(TeamScoreDTO user, TeamScoreDTO opponent) { + this.user = user; + this.opponent = opponent; + } + + public TeamScoreDTO getUser() { + return user; + } + + public TeamScoreDTO getOpponent() { + return opponent; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamScoreDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamScoreDTO.java new file mode 100644 index 000000000..c8c8dcce2 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamScoreDTO.java @@ -0,0 +1,21 @@ +package com.codesquad.coco.team.domain.DTO; + +import java.util.List; + +public class TeamScoreDTO { + private String teamName; + private List point; + + public TeamScoreDTO(String teamName, List point) { + this.teamName = teamName; + this.point = point; + } + + public String getTeamName() { + return teamName; + } + + public List getPoint() { + return point; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java index 859f520a5..ecc2e2404 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java +++ b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java @@ -1,7 +1,10 @@ package com.codesquad.coco.utils; +import com.codesquad.coco.game.domain.model.Innings; +import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.player.domain.PlayerDTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamScoreDTO; import com.codesquad.coco.team.domain.Team; import java.util.List; @@ -15,4 +18,11 @@ public static TeamDTO teamToDTO(Team team) { .collect(Collectors.toList()); return new TeamDTO(team.getName(), opponentPlayerDTO); } + + public static TeamScoreDTO scoreToTeamScoreDTO(ScoreBoard board) { + List scores = board.getInnings().stream() + .map(Innings::getScore) + .collect(Collectors.toList()); + return new TeamScoreDTO(board.teamName(), scores); + } } From e4face93e144b007f7de68e22e58cfa4b3c8f476 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 14:12:34 +0900 Subject: [PATCH 65/96] =?UTF-8?q?feat=20:=20=EC=84=A0=EC=88=98=20=EB=AA=85?= =?UTF-8?q?=EB=8B=A8=20=ED=8C=9D=EC=97=85=20API=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - gameId를 넣으면 선수들을 보여준다 --- .../codesquad/coco/game/GameController.java | 20 ++++++- .../domain/model/{ => DTO}/GamePlayDTO.java | 2 +- .../domain/model/{ => DTO}/GameScoreDTO.java | 2 +- .../coco/player/PlayerController.java | 2 +- .../codesquad/coco/player/PlayerService.java | 2 +- .../coco/player/domain/DTO/PlayerDTO.java | 56 +++++++++++++++++++ .../domain/{ => DTO}/PlayerEventDTO.java | 4 +- .../coco/player/domain/PlayerDTO.java | 26 --------- .../coco/team/domain/DTO/TeamDTO.java | 2 +- .../codesquad/coco/utils/DTOConverter.java | 9 ++- BE/src/main/resources/data.sql | 2 +- 11 files changed, 90 insertions(+), 37 deletions(-) rename BE/src/main/java/com/codesquad/coco/game/domain/model/{ => DTO}/GamePlayDTO.java (91%) rename BE/src/main/java/com/codesquad/coco/game/domain/model/{ => DTO}/GameScoreDTO.java (89%) create mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerDTO.java rename BE/src/main/java/com/codesquad/coco/player/domain/{ => DTO}/PlayerEventDTO.java (73%) delete mode 100644 BE/src/main/java/com/codesquad/coco/player/domain/PlayerDTO.java diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index 922849282..29bafcfc2 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -1,8 +1,8 @@ package com.codesquad.coco.game; +import com.codesquad.coco.game.domain.model.DTO.GamePlayDTO; +import com.codesquad.coco.game.domain.model.DTO.GameScoreDTO; import com.codesquad.coco.game.domain.model.Game; -import com.codesquad.coco.game.domain.model.GamePlayDTO; -import com.codesquad.coco.game.domain.model.GameScoreDTO; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.TeamService; import com.codesquad.coco.team.domain.DTO.*; @@ -76,4 +76,20 @@ public GameScoreDTO gamePoint(@PathVariable Long gameId) { } return new GameScoreDTO(teamScoreDTO1, teamScoreDTO); } + + @GetMapping("/games/{gameId}/players") + @ResponseStatus(HttpStatus.OK) + public GamePlayDTO showPlayer(@PathVariable Long gameId) { + Game game = gameService.choiceGame(gameId); + String userTeamName = gameService.findUserTeamNameByGameId(gameId); + + TeamDTO homeTeam = DTOConverter.teamToDTO(game.getHome()); + TeamDTO awayTeam = DTOConverter.teamToDTO(game.getAway()); + + if (homeTeam.getTeamName().equals(userTeamName)) { + return new GamePlayDTO(gameId, homeTeam, awayTeam); + } + return new GamePlayDTO(gameId, awayTeam, homeTeam); + } + } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/GamePlayDTO.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/DTO/GamePlayDTO.java similarity index 91% rename from BE/src/main/java/com/codesquad/coco/game/domain/model/GamePlayDTO.java rename to BE/src/main/java/com/codesquad/coco/game/domain/model/DTO/GamePlayDTO.java index 541735ffc..c241a25eb 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/GamePlayDTO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/DTO/GamePlayDTO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.game.domain.model; +package com.codesquad.coco.game.domain.model.DTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/GameScoreDTO.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/DTO/GameScoreDTO.java similarity index 89% rename from BE/src/main/java/com/codesquad/coco/game/domain/model/GameScoreDTO.java rename to BE/src/main/java/com/codesquad/coco/game/domain/model/DTO/GameScoreDTO.java index c92f479fe..f089fe5a1 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/GameScoreDTO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/DTO/GameScoreDTO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.game.domain.model; +package com.codesquad.coco.game.domain.model.DTO; import com.codesquad.coco.team.domain.DTO.TeamScoreDTO; diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerController.java b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java index 6da6a2d53..9f8c3c9fe 100644 --- a/BE/src/main/java/com/codesquad/coco/player/PlayerController.java +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java @@ -1,7 +1,7 @@ package com.codesquad.coco.player; +import com.codesquad.coco.player.domain.DTO.PlayerEventDTO; import com.codesquad.coco.player.domain.Player; -import com.codesquad.coco.player.domain.PlayerEventDTO; import com.codesquad.coco.player.domain.Record; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerService.java b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java index 365b0665f..2d7c7c0c8 100644 --- a/BE/src/main/java/com/codesquad/coco/player/PlayerService.java +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java @@ -1,8 +1,8 @@ package com.codesquad.coco.player; +import com.codesquad.coco.player.domain.DTO.PlayerEventDTO; import com.codesquad.coco.player.domain.Player; import com.codesquad.coco.player.domain.PlayerDAO; -import com.codesquad.coco.player.domain.PlayerEventDTO; import com.codesquad.coco.player.domain.Record; import org.springframework.stereotype.Service; diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerDTO.java new file mode 100644 index 000000000..04e06bb2e --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerDTO.java @@ -0,0 +1,56 @@ +package com.codesquad.coco.player.domain.DTO; + +public class PlayerDTO { + + private Long id; + private String name; + private String type; + private int atBat; + private int hits; + private int out; + private double average; + + public PlayerDTO(Long id, String name, String type) { + this.id = id; + this.name = name; + this.type = type; + } + + public PlayerDTO(Long id, String name, String type, int atBat, int hits, int out, double average) { + this.id = id; + this.name = name; + this.type = type; + this.atBat = atBat; + this.hits = hits; + this.out = out; + this.average = average; + } + + public int getAtBat() { + return atBat; + } + + public int getHits() { + return hits; + } + + public int getOut() { + return out; + } + + public double getAverage() { + return average; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public String getType() { + return type; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerEventDTO.java similarity index 73% rename from BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java rename to BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerEventDTO.java index 9b138aaa3..d6d471181 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerEventDTO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerEventDTO.java @@ -1,4 +1,6 @@ -package com.codesquad.coco.player.domain; +package com.codesquad.coco.player.domain.DTO; + +import com.codesquad.coco.player.domain.RecordType; public class PlayerEventDTO { diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDTO.java deleted file mode 100644 index 7892fb27f..000000000 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDTO.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.codesquad.coco.player.domain; - -public class PlayerDTO { - - private Long id; - private String name; - private String type; - - public PlayerDTO(Long id, String name, String type) { - this.id = id; - this.name = name; - this.type = type; - } - - public Long getId() { - return id; - } - - public String getName() { - return name; - } - - public String getType() { - return type; - } -} diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java index c7258fbf7..c3cc2efcc 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java @@ -1,6 +1,6 @@ package com.codesquad.coco.team.domain.DTO; -import com.codesquad.coco.player.domain.PlayerDTO; +import com.codesquad.coco.player.domain.DTO.PlayerDTO; import java.util.List; diff --git a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java index ecc2e2404..5d4cb68b6 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java +++ b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java @@ -2,7 +2,7 @@ import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.game.domain.model.ScoreBoard; -import com.codesquad.coco.player.domain.PlayerDTO; +import com.codesquad.coco.player.domain.DTO.PlayerDTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; import com.codesquad.coco.team.domain.DTO.TeamScoreDTO; import com.codesquad.coco.team.domain.Team; @@ -14,7 +14,12 @@ public class DTOConverter { public static TeamDTO teamToDTO(Team team) { List opponentPlayerDTO = team.getPlayers().stream() - .map(player -> new PlayerDTO(player.getId(), player.getName(), player.getType())) + .map(player -> new PlayerDTO(player.getId(), player.getName(), + player.getType(), + player.getRecord().getAtBat(), + player.getRecord().getHits(), + player.getRecord().getOuts(), + player.getRecord().getAverage())) .collect(Collectors.toList()); return new TeamDTO(team.getName(), opponentPlayerDTO); } diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 414d2da17..51bfeb13f 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -144,7 +144,7 @@ VALUES insert into game(id, home, away, user_type) -values (1, '두산 베어스', 'SSG 랜더스', 'home'); +values (1, '두산 베어스', 'SSG 랜더스', 'HOME'); insert into score_board(id, game, team) values (1, 1, '두산 베어스'); From 7317fe58f7e42937bda6ef6ea5d149278039a3a8 Mon Sep 17 00:00:00 2001 From: Hoyoung Son Date: Fri, 7 May 2021 15:59:54 +0900 Subject: [PATCH 66/96] Update README.md --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 28b1e22b6..731bffdba 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + + +# **CPR** 페이지에 오신걸 환영합니다!!!!! + +## 맴버 + +| CPR Position | Name | Comment | +| :-: | :--: | :-----: | +| **BE** | [coco](https://github.com/ChoiGiSung) | | +| **FE** | [pengdori](https://github.com/dudn1933) | | +| **FE** | [Rano](https://github.com/17-sss) | | + +## CPR WIKI 😀 +- [CPR : 협업룰](https://github.com/ChoiGiSung/baseball/wiki/CPR-협업룰) +- [CPR : API 설계 (1주차)](https://github.com/ChoiGiSung/baseball/wiki/baseball-API-설계) From e407e58527ae16454927faec9a6e336890dd406b Mon Sep 17 00:00:00 2001 From: Hoyoung Son Date: Fri, 7 May 2021 16:50:25 +0900 Subject: [PATCH 67/96] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 731bffdba..4fdcfbe6e 100644 --- a/README.md +++ b/README.md @@ -24,5 +24,9 @@ | **FE** | [Rano](https://github.com/17-sss) | | ## CPR WIKI 😀 +- [CPR : WIKI](https://github.com/ChoiGiSung/baseball/wiki) - [CPR : 협업룰](https://github.com/ChoiGiSung/baseball/wiki/CPR-협업룰) - [CPR : API 설계 (1주차)](https://github.com/ChoiGiSung/baseball/wiki/baseball-API-설계) + +### Current Page (1주차) +![녹화_2021_05_07_16_42_51_966](https://user-images.githubusercontent.com/33610315/117416308-3074b280-af54-11eb-95bb-12a98737040a.gif) From b3db97ce5a79152818eaf29c72d03b72838a73eb Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 16:54:44 +0900 Subject: [PATCH 68/96] =?UTF-8?q?refactor=20:=20DAO=EB=A5=BC=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - mapper와 sql.class를 사용해서 리팩토링 - namedparameter도 사용 --- .../coco/game/domain/DAO/GameDAO.java | 34 +++---- .../coco/game/domain/DAO/InningsDAO.java | 31 +++--- .../coco/game/domain/DAO/ScoreBoardDAO.java | 94 +++++++------------ .../coco/game/domain/model/ScoreBoard.java | 14 ++- .../java/com/codesquad/coco/utils/SQL.java | 12 +++ .../coco/utils/mapper/InningsMapper.java | 17 ++++ .../coco/utils/mapper/ScoreBoardMapper.java | 18 ++++ .../coco/utils/mapper/UserTeamNameMapper.java | 14 +++ 8 files changed, 140 insertions(+), 94 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/utils/SQL.java create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/InningsMapper.java create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/UserTeamNameMapper.java diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 7ea692617..354d6cdbc 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -5,30 +5,37 @@ import com.codesquad.coco.player.domain.PlayerDAO; import com.codesquad.coco.player.domain.UserType; import com.codesquad.coco.team.domain.Team; +import com.codesquad.coco.utils.mapper.UserTeamNameMapper; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.jdbc.support.KeyHolder; import org.springframework.stereotype.Component; import javax.sql.DataSource; -import java.sql.PreparedStatement; -import java.sql.Statement; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; +import static com.codesquad.coco.utils.SQL.FIND_USER_TEAM_NAME_SQL; +import static com.codesquad.coco.utils.SQL.GAME_SAVE_SQL; + @Component public class GameDAO { private JdbcTemplate template; private PlayerDAO playerDAO; private ScoreBoardDAO boardDAO; + private UserTeamNameMapper userTeamNameMapper = new UserTeamNameMapper(); + private NamedParameterJdbcTemplate namedParameterJdbcTemplate; - public GameDAO(DataSource dataSource, PlayerDAO playerDAO, ScoreBoardDAO boardDAO) { + public GameDAO(DataSource dataSource, PlayerDAO playerDAO, ScoreBoardDAO boardDAO, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { this.template = new JdbcTemplate(dataSource); this.playerDAO = playerDAO; this.boardDAO = boardDAO; + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; } public Long save(Game game) { @@ -48,15 +55,12 @@ private Long saveScoreBoard(Game game, ScoreBoard away) { private Long saveGame(Game game) { KeyHolder keyHolder = new GeneratedKeyHolder(); - String sql = "insert into game (home,away,user_type) values (?, ?, ?)"; + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("home", game.homeTeamName()); + parameter.addValue("away", game.awayTeamName()); + parameter.addValue("user_type", game.getUserType().toString()); - template.update(con -> { - PreparedStatement ps = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); - ps.setString(1, game.homeTeamName()); - ps.setString(2, game.awayTeamName()); - ps.setString(3, game.getUserType().toString()); - return ps; - }, keyHolder); + namedParameterJdbcTemplate.update(GAME_SAVE_SQL, parameter, keyHolder); return keyHolder.getKey().longValue(); } @@ -79,7 +83,6 @@ public Game findById(Long id) { awayTeamName, playerDAO.findByTeamName(awayTeamName) ); - Game game = new Game( rs.getLong("id"), awayTeam, @@ -93,13 +96,12 @@ public Game findById(Long id) { }); return query.get(0); - } public String findUserTeamNameByGameId(Long id) { - String sql = "select if(g.user_type = 'home',g.home,g.away) as user_team_name from game g where g.id = " + id; - List query = template.query(sql, (rs, rowNum) -> rs.getString("user_team_name")); - return query.get(0); + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("id", id); + return namedParameterJdbcTemplate.queryForObject(FIND_USER_TEAM_NAME_SQL, parameter, userTeamNameMapper); } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java index d56a1186e..7334d4bc7 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java @@ -1,36 +1,31 @@ package com.codesquad.coco.game.domain.DAO; import com.codesquad.coco.game.domain.model.Innings; +import com.codesquad.coco.utils.mapper.InningsMapper; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; -import javax.sql.DataSource; -import java.util.ArrayList; import java.util.List; +import static com.codesquad.coco.utils.SQL.FIND_ALL_INNINGS_SQL; + @Component public class InningsDAO { private JdbcTemplate template; + private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private InningsMapper inningsMapper = new InningsMapper(); - public InningsDAO(DataSource dataSource) { - this.template = new JdbcTemplate(dataSource); + public InningsDAO(JdbcTemplate template, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { + this.template = template; + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; } public List findAllById(long id) { - String sql = "select i.id, i.score, i.score_board from innings i where i.score_board =" + id + " order by score_board_key"; - - List innings = new ArrayList<>(); - - template.query(sql, (rs, rowNum) -> { - innings.add(new Innings( - rs.getLong("id"), - rs.getLong("score_board"), - rs.getInt("score") - )); - return null; - }); - - return innings; + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("id", id); + return namedParameterJdbcTemplate.query(FIND_ALL_INNINGS_SQL, parameter, inningsMapper); } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java index c3768f1aa..a0b7400e4 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java @@ -2,97 +2,73 @@ import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.game.domain.model.ScoreBoard; -import org.springframework.jdbc.core.JdbcTemplate; +import com.codesquad.coco.utils.mapper.ScoreBoardMapper; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.jdbc.support.KeyHolder; import org.springframework.stereotype.Component; -import javax.sql.DataSource; -import java.sql.PreparedStatement; -import java.sql.Statement; -import java.util.ArrayList; import java.util.List; +import static com.codesquad.coco.utils.SQL.*; + @Component public class ScoreBoardDAO { - private JdbcTemplate template; private InningsDAO inningsDAO; + private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private ScoreBoardMapper scoreBoardMapper = new ScoreBoardMapper(); - public ScoreBoardDAO(DataSource dataSource, InningsDAO inningsDAO) { - this.template = new JdbcTemplate(dataSource); + public ScoreBoardDAO(InningsDAO inningsDAO, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { this.inningsDAO = inningsDAO; + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; } public Long save(ScoreBoard board) { KeyHolder keyHolder = new GeneratedKeyHolder(); - String sql = "insert into score_board (game,team) values (?, ?)"; + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("game", board.getGameId()); + parameter.addValue("team", board.teamName()); - template.update(con -> { - PreparedStatement ps = con.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS); - ps.setLong(1, board.getGameId()); - ps.setString(2, board.teamName()); - return ps; - }, keyHolder); + namedParameterJdbcTemplate.update(SCORE_BOARD_SAVE_SQL, parameter, keyHolder); return keyHolder.getKey().longValue(); } public ScoreBoard findByGameIdAndTeamName(Long id, String teamName) { - String sql = "select s.id, s.game,s.team from score_board s where s.game = " + id + " and s.team = '" + teamName + "'"; - return findScoreBoard(sql); + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("id", id); + parameter.addValue("teamName", teamName); + + ScoreBoard board = namedParameterJdbcTemplate.queryForObject(FIND_SCORE_BOARD_SQL, parameter, scoreBoardMapper); + List innings = inningsDAO.findAllById(board.getId()); + innings.forEach(board::addInnings); + return board; } public List findByGameId(Long id) { - String sql = "select s.id, s.game,s.team from score_board s where s.game = " + id; - return findScoreBoards(sql); - } - - private ScoreBoard findScoreBoard(String sql) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("id", id); - List query = template.query(sql, (rs, rowNum) -> { - List innings = inningsDAO.findAllById(rs.getLong("id")); - - ScoreBoard board = new ScoreBoard( - rs.getLong("id"), - rs.getLong("game"), - rs.getString("team"), - innings - ); - - return board; - }); - return query.get(0); - } + List scoreBoards = namedParameterJdbcTemplate.query(FIND_SCORE_BOARDS_SQL, parameter, scoreBoardMapper); - private List findScoreBoards(String sql) { - - List scoreBoards = new ArrayList<>(); - template.query(sql, (rs, rowNum) -> { - List innings = inningsDAO.findAllById(rs.getLong("id")); - - scoreBoards.add(new ScoreBoard( - rs.getLong("id"), - rs.getLong("game"), - rs.getString("team"), - innings - )); - - return null; - }); + for (ScoreBoard board : scoreBoards) { + List innings = inningsDAO.findAllById(board.getId()); + innings.forEach(board::addInnings); + } return scoreBoards; } + public void saveInnings(Innings innings) { - String sql = "insert into innings (score_board, score, score_board_key) values (?,?,?)"; - template.update(con -> { - PreparedStatement ps = con.prepareStatement(sql); - ps.setLong(1, innings.getScoreBoard()); - ps.setInt(2, innings.getScore()); - ps.setInt(3, innings.getInning()); - return ps; - }); + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("score_board", innings.getScoreBoard()); + parameter.addValue("score", innings.getScore()); + parameter.addValue("score_board_key", innings.getInning()); + + namedParameterJdbcTemplate.update(INNINGS_SAVE_SQL, parameter); } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java index 0d928af6a..29aa0cd2d 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java @@ -2,6 +2,7 @@ import org.springframework.data.annotation.Id; +import java.util.ArrayList; import java.util.List; public class ScoreBoard { @@ -11,7 +12,7 @@ public class ScoreBoard { private Long game; private String team; - private List innings; + private List innings = new ArrayList<>(); public ScoreBoard(Long id, Long game, String teamName, List innings) { @@ -21,17 +22,28 @@ public ScoreBoard(Long id, Long game, String teamName, List innings) { this.innings = innings; } + public ScoreBoard(Long id, Long game, String team) { + this.id = id; + this.game = game; + this.team = team; + } + public ScoreBoard(Long gameId, String team) { this.game = gameId; this.team = team; } + public Innings updateScore(int round, int point) { //fixme : 만약 해당 이닝에 점수가 나지 않았다면? -> 리스트는 0이 되어야함함 // fixme : 이닝이 끝날 때 마다 보내 줌 -> 해당 팀만?, 상대 팀도? return new Innings(this.id, point, round); } + public void addInnings(Innings inning) { + innings.add(inning); + } + public Long getId() { return id; } diff --git a/BE/src/main/java/com/codesquad/coco/utils/SQL.java b/BE/src/main/java/com/codesquad/coco/utils/SQL.java new file mode 100644 index 000000000..f69bce06e --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/SQL.java @@ -0,0 +1,12 @@ +package com.codesquad.coco.utils; + +public class SQL { + public static String GAME_SAVE_SQL = "insert into game (home,away,user_type) values (:home,:away,:user_type)"; + public static String FIND_USER_TEAM_NAME_SQL = "select if(g.user_type = 'home',g.home,g.away) as user_team_name from game g where g.id = :id"; + public static String FIND_ALL_INNINGS_SQL = "select i.id, i.score, i.score_board from innings i where i.score_board =:id order by score_board_key"; + public static String SCORE_BOARD_SAVE_SQL = "insert into score_board (game,team) values (:game, :team)"; + public static String FIND_SCORE_BOARD_SQL = "select s.id, s.game,s.team from score_board s where s.game =:id and s.team = :teamName "; + public static String FIND_SCORE_BOARDS_SQL = "select s.id, s.game,s.team from score_board s where s.game = :id"; + public static String INNINGS_SAVE_SQL = "insert into innings (score_board, score, score_board_key) values (:score_board,:score,:score_board_key)"; + +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/InningsMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/InningsMapper.java new file mode 100644 index 000000000..b4d95ff7d --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/InningsMapper.java @@ -0,0 +1,17 @@ +package com.codesquad.coco.utils.mapper; + +import com.codesquad.coco.game.domain.model.Innings; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class InningsMapper implements RowMapper { + @Override + public Innings mapRow(ResultSet rs, int rowNum) throws SQLException { + return new Innings( + rs.getLong("id"), + rs.getLong("score_board"), + rs.getInt("score")); + } +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java new file mode 100644 index 000000000..1b02f5861 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java @@ -0,0 +1,18 @@ +package com.codesquad.coco.utils.mapper; + +import com.codesquad.coco.game.domain.model.ScoreBoard; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class ScoreBoardMapper implements RowMapper { + @Override + public ScoreBoard mapRow(ResultSet rs, int rowNum) throws SQLException { + return new ScoreBoard( + rs.getLong("id"), + rs.getLong("game"), + rs.getString("team") + ); + } +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserTeamNameMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserTeamNameMapper.java new file mode 100644 index 000000000..1ebbd41a5 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserTeamNameMapper.java @@ -0,0 +1,14 @@ +package com.codesquad.coco.utils.mapper; + +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + + +public class UserTeamNameMapper implements RowMapper { + @Override + public String mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getString("user_team_name"); + } +} From a89f1f6d51928be728b05ba4647d2ce49538660f Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 17:33:58 +0900 Subject: [PATCH 69/96] =?UTF-8?q?refactor=20:=20team,=20player=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 이전 커밋과 동일 --- .../coco/player/domain/PlayerDAO.java | 87 +++++-------------- .../codesquad/coco/team/domain/TeamDAO.java | 25 +++--- .../java/com/codesquad/coco/utils/SQL.java | 4 + .../coco/utils/mapper/PlayerMapper.java | 27 ++++++ .../coco/utils/mapper/TeamNameMapper.java | 14 +++ 5 files changed, 78 insertions(+), 79 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/TeamNameMapper.java diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java index 6bad23e4e..f69290da6 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -1,86 +1,43 @@ package com.codesquad.coco.player.domain; -import org.springframework.jdbc.core.JdbcTemplate; +import com.codesquad.coco.utils.mapper.PlayerMapper; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; -import javax.sql.DataSource; -import java.sql.PreparedStatement; -import java.util.ArrayList; import java.util.List; +import static com.codesquad.coco.utils.SQL.*; + @Component public class PlayerDAO { - private JdbcTemplate template; + private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private PlayerMapper playerMapper = new PlayerMapper(); - public PlayerDAO(DataSource dataSource) { - this.template = new JdbcTemplate(dataSource); + public PlayerDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate) { + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; } public List findByTeamName(String teamName) { - String sql = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat, r.average " + - "FROM player p " + - "inner JOIN record r ON r.player = p.id " + - "WHERE p.team = '" + teamName + "' order by p.id;"; - - List players = new ArrayList<>(); - - template.query(sql, (rs, rowNum) -> { - Record record = new Record( - rs.getLong("rid"), - rs.getInt("at_bat"), - rs.getInt("hits"), - rs.getInt("outs"), - rs.getDouble("average") - ); - players.add(new Player( - rs.getLong("pid"), - rs.getString("name"), - rs.getString("type"), - record - )); - return null; - }); + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("teamName", teamName); + return namedParameterJdbcTemplate.query(FIND_PLAYER_BY_TEAM_NAME, parameter, playerMapper); - return players; } public Player findById(Long id) { - String sql = "select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat, r.average " + - "from player p " + - "inner JOIN record r ON r.player = p.id " + - "where p.id= " + id; - - List query = template.query(sql, (rs, rowNum) -> { - Record record = new Record( - rs.getLong("rid"), - rs.getInt("at_bat"), - rs.getInt("hits"), - rs.getInt("outs"), - rs.getDouble("average") - ); - Player player = new Player( - rs.getLong("pid"), - rs.getString("name"), - rs.getString("type"), - record - ); - return player; - }); - - return query.get(0); + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("id", id); + return namedParameterJdbcTemplate.queryForObject(FIND_PLAYER_BY_PLAYER_ID, parameter, playerMapper); } public void updateRecord(Record record) { - String sql = "update record set at_bat = ?, hits = ?, outs = ?, average = ? where id = ?"; - - template.update(con -> { - PreparedStatement ps = con.prepareStatement(sql); - ps.setInt(1, record.getAtBat()); - ps.setInt(2, record.getHits()); - ps.setInt(3, record.getOuts()); - ps.setDouble(4, record.getAverage()); - ps.setLong(5, record.getId()); - return ps; - }); + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("atBat", record.getAtBat()); + parameter.addValue("hits", record.getHits()); + parameter.addValue("outs", record.getOuts()); + parameter.addValue("average", record.getAverage()); + parameter.addValue("id", record.getId()); + namedParameterJdbcTemplate.update(UPDATE_PLAYER_RECORD, parameter); } } diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java index c713df412..a9912fa61 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java @@ -2,31 +2,28 @@ import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamNameDTO; -import org.springframework.jdbc.core.JdbcTemplate; +import com.codesquad.coco.utils.mapper.TeamNameMapper; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; -import javax.sql.DataSource; +import java.util.List; + +import static com.codesquad.coco.utils.SQL.FIND_ALL_TEAM_NAME; @Component public class TeamDAO { - private JdbcTemplate template; + private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private TeamNameMapper mapper = new TeamNameMapper(); - public TeamDAO(DataSource dataSource) { - this.template = new JdbcTemplate(dataSource); + public TeamDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate) { + this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; } public MainPageTeamDTO findAllName() { - String sql = "select t.name from team t;"; - MainPageTeamDTO mainPageTeamDTO = new MainPageTeamDTO(); - - template.query(sql, (rs, rowNum) -> { - mainPageTeamDTO.addTeamDTO(new TeamNameDTO( - rs.getString("name") - )); - return null; - }); + List query = namedParameterJdbcTemplate.query(FIND_ALL_TEAM_NAME, mapper); + query.forEach(mainPageTeamDTO::addTeamDTO); return mainPageTeamDTO; } } diff --git a/BE/src/main/java/com/codesquad/coco/utils/SQL.java b/BE/src/main/java/com/codesquad/coco/utils/SQL.java index f69bce06e..1c91e83b6 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/SQL.java +++ b/BE/src/main/java/com/codesquad/coco/utils/SQL.java @@ -8,5 +8,9 @@ public class SQL { public static String FIND_SCORE_BOARD_SQL = "select s.id, s.game,s.team from score_board s where s.game =:id and s.team = :teamName "; public static String FIND_SCORE_BOARDS_SQL = "select s.id, s.game,s.team from score_board s where s.game = :id"; public static String INNINGS_SAVE_SQL = "insert into innings (score_board, score, score_board_key) values (:score_board,:score,:score_board_key)"; + public static String FIND_PLAYER_BY_TEAM_NAME = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat, r.average FROM player p inner JOIN record r ON r.player = p.id WHERE p.team = :teamName order by p.id"; + public static String FIND_PLAYER_BY_PLAYER_ID = "select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat, r.average from player p inner JOIN record r ON r.player = p.id where p.id= :id"; + public static String UPDATE_PLAYER_RECORD = "update record set at_bat = :atBat, hits = :hits, outs = :outs, average = :average where id = :id"; + public static String FIND_ALL_TEAM_NAME = "select t.name from team t"; } diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java new file mode 100644 index 000000000..138eb32ec --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java @@ -0,0 +1,27 @@ +package com.codesquad.coco.utils.mapper; + +import com.codesquad.coco.player.domain.Player; +import com.codesquad.coco.player.domain.Record; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class PlayerMapper implements RowMapper { + @Override + public Player mapRow(ResultSet rs, int rowNum) throws SQLException { + Record record = new Record( + rs.getLong("rid"), + rs.getInt("at_bat"), + rs.getInt("hits"), + rs.getInt("outs"), + rs.getDouble("average") + ); + return new Player( + rs.getLong("pid"), + rs.getString("name"), + rs.getString("type"), + record + ); + } +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/TeamNameMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/TeamNameMapper.java new file mode 100644 index 000000000..bedd50141 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/TeamNameMapper.java @@ -0,0 +1,14 @@ +package com.codesquad.coco.utils.mapper; + +import com.codesquad.coco.team.domain.DTO.TeamNameDTO; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class TeamNameMapper implements RowMapper { + @Override + public TeamNameDTO mapRow(ResultSet rs, int rowNum) throws SQLException { + return new TeamNameDTO(rs.getString("name")); + } +} From aa807a30c1ad0b94b0a5b334906b3b1edcd8257d Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 20:33:14 +0900 Subject: [PATCH 70/96] =?UTF-8?q?refactor=20:=20gameDAO=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - game을 한번에 가져오는 것을 리팩토링 - 이제 game을 가져 오는 것이 아닌 team을 가져온다 --- .../codesquad/coco/game/GameController.java | 12 ++-- .../coco/game/domain/DAO/GameDAO.java | 57 +++++-------------- .../com/codesquad/coco/team/TeamService.java | 9 +++ .../codesquad/coco/team/domain/TeamDAO.java | 22 ++++++- .../java/com/codesquad/coco/utils/SQL.java | 4 +- ...apper.java => HomeAwayTeamNameMapper.java} | 4 +- 6 files changed, 55 insertions(+), 53 deletions(-) rename BE/src/main/java/com/codesquad/coco/utils/mapper/{UserTeamNameMapper.java => HomeAwayTeamNameMapper.java} (69%) diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index 29bafcfc2..e9d4eea29 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -34,10 +34,9 @@ public MainPageTeamDTO mainPage() { @ResponseStatus(HttpStatus.CREATED) public GamePlayDTO homeTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { Long gameId = teamService.makeHomeGame(choiceDTO); - Game game = gameService.choiceGame(gameId); - TeamDTO homeTeam = DTOConverter.teamToDTO(game.getHome()); - TeamDTO awayTeam = DTOConverter.teamToDTO(game.getAway()); + TeamDTO homeTeam = teamService.findHomeTeamByGameId(gameId); + TeamDTO awayTeam = teamService.findAwayTeamByGameId(gameId); return new GamePlayDTO(gameId, homeTeam, awayTeam); @@ -47,10 +46,9 @@ public GamePlayDTO homeTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { @ResponseStatus(HttpStatus.CREATED) public GamePlayDTO awayTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { Long gameId = teamService.makeAwayGame(choiceDTO); - Game game = gameService.choiceGame(gameId); - TeamDTO homeTeam = DTOConverter.teamToDTO(game.getHome()); - TeamDTO awayTeam = DTOConverter.teamToDTO(game.getAway()); + TeamDTO homeTeam = teamService.findHomeTeamByGameId(gameId); + TeamDTO awayTeam = teamService.findAwayTeamByGameId(gameId); return new GamePlayDTO(gameId, awayTeam, homeTeam); } @@ -71,6 +69,8 @@ public GameScoreDTO gamePoint(@PathVariable Long gameId) { TeamScoreDTO teamScoreDTO = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(0)); TeamScoreDTO teamScoreDTO1 = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(1)); + teamService.findHomeTeamByGameId(gameId); + if (teamScoreDTO.getTeamName().equals(userTeamName)) { return new GameScoreDTO(teamScoreDTO, teamScoreDTO1); } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 354d6cdbc..13956ade2 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -3,9 +3,7 @@ import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.player.domain.PlayerDAO; -import com.codesquad.coco.player.domain.UserType; -import com.codesquad.coco.team.domain.Team; -import com.codesquad.coco.utils.mapper.UserTeamNameMapper; +import com.codesquad.coco.utils.mapper.HomeAwayTeamNameMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; @@ -14,13 +12,8 @@ import org.springframework.stereotype.Component; import javax.sql.DataSource; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import static com.codesquad.coco.utils.SQL.FIND_USER_TEAM_NAME_SQL; -import static com.codesquad.coco.utils.SQL.GAME_SAVE_SQL; +import static com.codesquad.coco.utils.SQL.*; @Component public class GameDAO { @@ -28,7 +21,7 @@ public class GameDAO { private JdbcTemplate template; private PlayerDAO playerDAO; private ScoreBoardDAO boardDAO; - private UserTeamNameMapper userTeamNameMapper = new UserTeamNameMapper(); + private HomeAwayTeamNameMapper homeAwayTeamNameMapper = new HomeAwayTeamNameMapper(); private NamedParameterJdbcTemplate namedParameterJdbcTemplate; public GameDAO(DataSource dataSource, PlayerDAO playerDAO, ScoreBoardDAO boardDAO, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { @@ -65,43 +58,21 @@ private Long saveGame(Game game) { return keyHolder.getKey().longValue(); } - - public Game findById(Long id) { - String sql = "select g.id, g.home,g.away,g.user_type from game g where g.id = " + id; - - List query = template.query(sql, (rs, rowNum) -> { - String homeTeamName = rs.getString("home"); - String awayTeamName = rs.getString("away"); - - ScoreBoard homeScoreBoard = boardDAO.findByGameIdAndTeamName(id, homeTeamName); - ScoreBoard awayScoreBoard = boardDAO.findByGameIdAndTeamName(id, awayTeamName); - - Team homeTeam = new Team( - homeTeamName, playerDAO.findByTeamName(homeTeamName) - ); - Team awayTeam = new Team( - awayTeamName, playerDAO.findByTeamName(awayTeamName) - ); - - Game game = new Game( - rs.getLong("id"), - awayTeam, - homeTeam, - Collections.unmodifiableSet(new HashSet<>( - Arrays.asList(homeScoreBoard, awayScoreBoard))), - UserType.valueOf(rs.getString("user_type")) - ); - - return game; - }); - - return query.get(0); + public String findUserTeamNameByGameId(Long id) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("id", id); + return namedParameterJdbcTemplate.queryForObject(FIND_USER_TEAM_NAME_SQL, parameter, homeAwayTeamNameMapper); } + public String findHomeTeamNameByGameId(Long id) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("id", id); + return namedParameterJdbcTemplate.queryForObject(FIND_HOME_TEAM_NAME_BY_GAME_ID, parameter, homeAwayTeamNameMapper); + } - public String findUserTeamNameByGameId(Long id) { + public String findAwayTeamNameByGameId(Long id) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("id", id); - return namedParameterJdbcTemplate.queryForObject(FIND_USER_TEAM_NAME_SQL, parameter, userTeamNameMapper); + return namedParameterJdbcTemplate.queryForObject(FIND_AWAY_TEAM_NAME_BY_GAME_ID, parameter, homeAwayTeamNameMapper); } } diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamService.java b/BE/src/main/java/com/codesquad/coco/team/TeamService.java index cf5a91c99..d9351c78f 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamService.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamService.java @@ -6,6 +6,7 @@ import com.codesquad.coco.player.domain.UserType; import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; +import com.codesquad.coco.team.domain.DTO.TeamDTO; import com.codesquad.coco.team.domain.Team; import com.codesquad.coco.team.domain.TeamDAO; import org.springframework.stereotype.Service; @@ -52,4 +53,12 @@ private Team getOpponentTeam(TeamChoiceDTO choiceDTO) { String teamName = choiceDTO.getOpponent(); return new Team(teamName, playerDAO.findByTeamName(teamName)); } + + public TeamDTO findHomeTeamByGameId(Long gameId) { + return teamDAO.findHomeTeamByGameId(gameId); + } + + public TeamDTO findAwayTeamByGameId(Long gameId) { + return teamDAO.findAwayTeamByGameId(gameId); + } } diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java index a9912fa61..3b3c8ab10 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java @@ -1,7 +1,11 @@ package com.codesquad.coco.team.domain; +import com.codesquad.coco.game.domain.DAO.GameDAO; +import com.codesquad.coco.player.domain.PlayerDAO; import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamDTO; import com.codesquad.coco.team.domain.DTO.TeamNameDTO; +import com.codesquad.coco.utils.DTOConverter; import com.codesquad.coco.utils.mapper.TeamNameMapper; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; @@ -14,10 +18,14 @@ public class TeamDAO { private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private PlayerDAO playerDAO; + private GameDAO gameDAO; private TeamNameMapper mapper = new TeamNameMapper(); - public TeamDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate) { + public TeamDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate, PlayerDAO playerDAO, GameDAO gameDAO) { this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; + this.playerDAO = playerDAO; + this.gameDAO = gameDAO; } public MainPageTeamDTO findAllName() { @@ -26,4 +34,16 @@ public MainPageTeamDTO findAllName() { query.forEach(mainPageTeamDTO::addTeamDTO); return mainPageTeamDTO; } + + public TeamDTO findHomeTeamByGameId(Long gameId) { + String teamName = gameDAO.findHomeTeamNameByGameId(gameId); + Team homeTeam = new Team(teamName, playerDAO.findByTeamName(teamName)); + return DTOConverter.teamToDTO(homeTeam); + } + + public TeamDTO findAwayTeamByGameId(Long gameId) { + String teamName = gameDAO.findAwayTeamNameByGameId(gameId); + Team awayTeam = new Team(teamName, playerDAO.findByTeamName(teamName)); + return DTOConverter.teamToDTO(awayTeam); + } } diff --git a/BE/src/main/java/com/codesquad/coco/utils/SQL.java b/BE/src/main/java/com/codesquad/coco/utils/SQL.java index 1c91e83b6..80d00f68e 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/SQL.java +++ b/BE/src/main/java/com/codesquad/coco/utils/SQL.java @@ -2,7 +2,7 @@ public class SQL { public static String GAME_SAVE_SQL = "insert into game (home,away,user_type) values (:home,:away,:user_type)"; - public static String FIND_USER_TEAM_NAME_SQL = "select if(g.user_type = 'home',g.home,g.away) as user_team_name from game g where g.id = :id"; + public static String FIND_USER_TEAM_NAME_SQL = "select if(g.user_type = 'home',g.home,g.away) as team_name from game g where g.id = :id"; public static String FIND_ALL_INNINGS_SQL = "select i.id, i.score, i.score_board from innings i where i.score_board =:id order by score_board_key"; public static String SCORE_BOARD_SAVE_SQL = "insert into score_board (game,team) values (:game, :team)"; public static String FIND_SCORE_BOARD_SQL = "select s.id, s.game,s.team from score_board s where s.game =:id and s.team = :teamName "; @@ -12,5 +12,7 @@ public class SQL { public static String FIND_PLAYER_BY_PLAYER_ID = "select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat, r.average from player p inner JOIN record r ON r.player = p.id where p.id= :id"; public static String UPDATE_PLAYER_RECORD = "update record set at_bat = :atBat, hits = :hits, outs = :outs, average = :average where id = :id"; public static String FIND_ALL_TEAM_NAME = "select t.name from team t"; + public static String FIND_HOME_TEAM_NAME_BY_GAME_ID = "select g.home as team_name from game g where g.id = :id "; + public static String FIND_AWAY_TEAM_NAME_BY_GAME_ID = "select g.away as team_name from game g where g.id = :id "; } diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserTeamNameMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/HomeAwayTeamNameMapper.java similarity index 69% rename from BE/src/main/java/com/codesquad/coco/utils/mapper/UserTeamNameMapper.java rename to BE/src/main/java/com/codesquad/coco/utils/mapper/HomeAwayTeamNameMapper.java index 1ebbd41a5..a7286c439 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserTeamNameMapper.java +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/HomeAwayTeamNameMapper.java @@ -6,9 +6,9 @@ import java.sql.SQLException; -public class UserTeamNameMapper implements RowMapper { +public class HomeAwayTeamNameMapper implements RowMapper { @Override public String mapRow(ResultSet rs, int rowNum) throws SQLException { - return rs.getString("user_team_name"); + return rs.getString("team_name"); } } From 87300ee00b7cb07f8f7625b6d48bb565f3b90078 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 20:40:35 +0900 Subject: [PATCH 71/96] =?UTF-8?q?refactor=20:=20template=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 --- .../coco/game/domain/DAO/GameDAO.java | 19 +++++++------------ .../coco/game/domain/DAO/InningsDAO.java | 9 +++------ .../coco/game/domain/DAO/ScoreBoardDAO.java | 14 +++++++------- .../coco/player/domain/PlayerDAO.java | 12 ++++++------ .../codesquad/coco/team/domain/TeamDAO.java | 8 ++++---- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 13956ade2..5ce0b6804 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -4,31 +4,26 @@ import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.player.domain.PlayerDAO; import com.codesquad.coco.utils.mapper.HomeAwayTeamNameMapper; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.jdbc.support.KeyHolder; import org.springframework.stereotype.Component; -import javax.sql.DataSource; - import static com.codesquad.coco.utils.SQL.*; @Component public class GameDAO { - private JdbcTemplate template; private PlayerDAO playerDAO; private ScoreBoardDAO boardDAO; private HomeAwayTeamNameMapper homeAwayTeamNameMapper = new HomeAwayTeamNameMapper(); - private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private NamedParameterJdbcTemplate template; - public GameDAO(DataSource dataSource, PlayerDAO playerDAO, ScoreBoardDAO boardDAO, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { - this.template = new JdbcTemplate(dataSource); + public GameDAO(PlayerDAO playerDAO, ScoreBoardDAO boardDAO, NamedParameterJdbcTemplate template) { this.playerDAO = playerDAO; this.boardDAO = boardDAO; - this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; + this.template = template; } public Long save(Game game) { @@ -53,7 +48,7 @@ private Long saveGame(Game game) { parameter.addValue("away", game.awayTeamName()); parameter.addValue("user_type", game.getUserType().toString()); - namedParameterJdbcTemplate.update(GAME_SAVE_SQL, parameter, keyHolder); + template.update(GAME_SAVE_SQL, parameter, keyHolder); return keyHolder.getKey().longValue(); } @@ -61,18 +56,18 @@ private Long saveGame(Game game) { public String findUserTeamNameByGameId(Long id) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("id", id); - return namedParameterJdbcTemplate.queryForObject(FIND_USER_TEAM_NAME_SQL, parameter, homeAwayTeamNameMapper); + return template.queryForObject(FIND_USER_TEAM_NAME_SQL, parameter, homeAwayTeamNameMapper); } public String findHomeTeamNameByGameId(Long id) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("id", id); - return namedParameterJdbcTemplate.queryForObject(FIND_HOME_TEAM_NAME_BY_GAME_ID, parameter, homeAwayTeamNameMapper); + return template.queryForObject(FIND_HOME_TEAM_NAME_BY_GAME_ID, parameter, homeAwayTeamNameMapper); } public String findAwayTeamNameByGameId(Long id) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("id", id); - return namedParameterJdbcTemplate.queryForObject(FIND_AWAY_TEAM_NAME_BY_GAME_ID, parameter, homeAwayTeamNameMapper); + return template.queryForObject(FIND_AWAY_TEAM_NAME_BY_GAME_ID, parameter, homeAwayTeamNameMapper); } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java index 7334d4bc7..24a44efd8 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java @@ -2,7 +2,6 @@ import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.utils.mapper.InningsMapper; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; @@ -14,18 +13,16 @@ @Component public class InningsDAO { - private JdbcTemplate template; - private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private NamedParameterJdbcTemplate template; private InningsMapper inningsMapper = new InningsMapper(); - public InningsDAO(JdbcTemplate template, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { + public InningsDAO(NamedParameterJdbcTemplate template) { this.template = template; - this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; } public List findAllById(long id) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("id", id); - return namedParameterJdbcTemplate.query(FIND_ALL_INNINGS_SQL, parameter, inningsMapper); + return template.query(FIND_ALL_INNINGS_SQL, parameter, inningsMapper); } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java index a0b7400e4..0593164df 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java @@ -18,12 +18,12 @@ public class ScoreBoardDAO { private InningsDAO inningsDAO; - private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private NamedParameterJdbcTemplate template; private ScoreBoardMapper scoreBoardMapper = new ScoreBoardMapper(); - public ScoreBoardDAO(InningsDAO inningsDAO, NamedParameterJdbcTemplate namedParameterJdbcTemplate) { + public ScoreBoardDAO(InningsDAO inningsDAO, NamedParameterJdbcTemplate template) { this.inningsDAO = inningsDAO; - this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; + this.template = template; } public Long save(ScoreBoard board) { @@ -32,7 +32,7 @@ public Long save(ScoreBoard board) { parameter.addValue("game", board.getGameId()); parameter.addValue("team", board.teamName()); - namedParameterJdbcTemplate.update(SCORE_BOARD_SAVE_SQL, parameter, keyHolder); + template.update(SCORE_BOARD_SAVE_SQL, parameter, keyHolder); return keyHolder.getKey().longValue(); } @@ -42,7 +42,7 @@ public ScoreBoard findByGameIdAndTeamName(Long id, String teamName) { parameter.addValue("id", id); parameter.addValue("teamName", teamName); - ScoreBoard board = namedParameterJdbcTemplate.queryForObject(FIND_SCORE_BOARD_SQL, parameter, scoreBoardMapper); + ScoreBoard board = template.queryForObject(FIND_SCORE_BOARD_SQL, parameter, scoreBoardMapper); List innings = inningsDAO.findAllById(board.getId()); innings.forEach(board::addInnings); return board; @@ -52,7 +52,7 @@ public List findByGameId(Long id) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("id", id); - List scoreBoards = namedParameterJdbcTemplate.query(FIND_SCORE_BOARDS_SQL, parameter, scoreBoardMapper); + List scoreBoards = template.query(FIND_SCORE_BOARDS_SQL, parameter, scoreBoardMapper); for (ScoreBoard board : scoreBoards) { List innings = inningsDAO.findAllById(board.getId()); @@ -68,7 +68,7 @@ public void saveInnings(Innings innings) { parameter.addValue("score", innings.getScore()); parameter.addValue("score_board_key", innings.getInning()); - namedParameterJdbcTemplate.update(INNINGS_SAVE_SQL, parameter); + template.update(INNINGS_SAVE_SQL, parameter); } } diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java index f69290da6..7266c7105 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -11,24 +11,24 @@ @Component public class PlayerDAO { - private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private NamedParameterJdbcTemplate template; private PlayerMapper playerMapper = new PlayerMapper(); - public PlayerDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate) { - this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; + public PlayerDAO(NamedParameterJdbcTemplate template) { + this.template = template; } public List findByTeamName(String teamName) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("teamName", teamName); - return namedParameterJdbcTemplate.query(FIND_PLAYER_BY_TEAM_NAME, parameter, playerMapper); + return template.query(FIND_PLAYER_BY_TEAM_NAME, parameter, playerMapper); } public Player findById(Long id) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("id", id); - return namedParameterJdbcTemplate.queryForObject(FIND_PLAYER_BY_PLAYER_ID, parameter, playerMapper); + return template.queryForObject(FIND_PLAYER_BY_PLAYER_ID, parameter, playerMapper); } public void updateRecord(Record record) { @@ -38,6 +38,6 @@ public void updateRecord(Record record) { parameter.addValue("outs", record.getOuts()); parameter.addValue("average", record.getAverage()); parameter.addValue("id", record.getId()); - namedParameterJdbcTemplate.update(UPDATE_PLAYER_RECORD, parameter); + template.update(UPDATE_PLAYER_RECORD, parameter); } } diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java index 3b3c8ab10..407257d2a 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java @@ -17,20 +17,20 @@ @Component public class TeamDAO { - private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + private NamedParameterJdbcTemplate template; private PlayerDAO playerDAO; private GameDAO gameDAO; private TeamNameMapper mapper = new TeamNameMapper(); - public TeamDAO(NamedParameterJdbcTemplate namedParameterJdbcTemplate, PlayerDAO playerDAO, GameDAO gameDAO) { - this.namedParameterJdbcTemplate = namedParameterJdbcTemplate; + public TeamDAO(NamedParameterJdbcTemplate template, PlayerDAO playerDAO, GameDAO gameDAO) { + this.template = template; this.playerDAO = playerDAO; this.gameDAO = gameDAO; } public MainPageTeamDTO findAllName() { MainPageTeamDTO mainPageTeamDTO = new MainPageTeamDTO(); - List query = namedParameterJdbcTemplate.query(FIND_ALL_TEAM_NAME, mapper); + List query = template.query(FIND_ALL_TEAM_NAME, mapper); query.forEach(mainPageTeamDTO::addTeamDTO); return mainPageTeamDTO; } From 2fd12e687f2ed8fa27ad9b2edcb89c8a4274bcb1 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 20:43:20 +0900 Subject: [PATCH 72/96] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?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/codesquad/coco/player/PlayerController.java | 6 +++--- .../main/java/com/codesquad/coco/player/PlayerService.java | 6 +++--- .../java/com/codesquad/coco/player/domain/PlayerDAO.java | 2 ++ .../coco/player/domain/{ => model}/DTO/PlayerDTO.java | 2 +- .../coco/player/domain/{ => model}/DTO/PlayerEventDTO.java | 2 +- .../codesquad/coco/player/domain/{ => model}/Player.java | 2 +- .../codesquad/coco/player/domain/{ => model}/Record.java | 3 ++- .../java/com/codesquad/coco/team/domain/DTO/TeamDTO.java | 2 +- BE/src/main/java/com/codesquad/coco/team/domain/Team.java | 2 +- BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java | 2 +- .../java/com/codesquad/coco/utils/mapper/PlayerMapper.java | 4 ++-- BE/src/test/java/com/codesquad/coco/TeamTest.java | 2 +- 12 files changed, 19 insertions(+), 16 deletions(-) rename BE/src/main/java/com/codesquad/coco/player/domain/{ => model}/DTO/PlayerDTO.java (95%) rename BE/src/main/java/com/codesquad/coco/player/domain/{ => model}/DTO/PlayerEventDTO.java (86%) rename BE/src/main/java/com/codesquad/coco/player/domain/{ => model}/Player.java (94%) rename BE/src/main/java/com/codesquad/coco/player/domain/{ => model}/Record.java (92%) diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerController.java b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java index 9f8c3c9fe..93cd87273 100644 --- a/BE/src/main/java/com/codesquad/coco/player/PlayerController.java +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerController.java @@ -1,8 +1,8 @@ package com.codesquad.coco.player; -import com.codesquad.coco.player.domain.DTO.PlayerEventDTO; -import com.codesquad.coco.player.domain.Player; -import com.codesquad.coco.player.domain.Record; +import com.codesquad.coco.player.domain.model.DTO.PlayerEventDTO; +import com.codesquad.coco.player.domain.model.Player; +import com.codesquad.coco.player.domain.model.Record; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; diff --git a/BE/src/main/java/com/codesquad/coco/player/PlayerService.java b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java index 2d7c7c0c8..c3756458e 100644 --- a/BE/src/main/java/com/codesquad/coco/player/PlayerService.java +++ b/BE/src/main/java/com/codesquad/coco/player/PlayerService.java @@ -1,9 +1,9 @@ package com.codesquad.coco.player; -import com.codesquad.coco.player.domain.DTO.PlayerEventDTO; -import com.codesquad.coco.player.domain.Player; import com.codesquad.coco.player.domain.PlayerDAO; -import com.codesquad.coco.player.domain.Record; +import com.codesquad.coco.player.domain.model.DTO.PlayerEventDTO; +import com.codesquad.coco.player.domain.model.Player; +import com.codesquad.coco.player.domain.model.Record; import org.springframework.stereotype.Service; @Service diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java index 7266c7105..39e80fe9f 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -1,5 +1,7 @@ package com.codesquad.coco.player.domain; +import com.codesquad.coco.player.domain.model.Player; +import com.codesquad.coco.player.domain.model.Record; import com.codesquad.coco.utils.mapper.PlayerMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/model/DTO/PlayerDTO.java similarity index 95% rename from BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerDTO.java rename to BE/src/main/java/com/codesquad/coco/player/domain/model/DTO/PlayerDTO.java index 04e06bb2e..c97a85ea7 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerDTO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/model/DTO/PlayerDTO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.player.domain.DTO; +package com.codesquad.coco.player.domain.model.DTO; public class PlayerDTO { diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerEventDTO.java b/BE/src/main/java/com/codesquad/coco/player/domain/model/DTO/PlayerEventDTO.java similarity index 86% rename from BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerEventDTO.java rename to BE/src/main/java/com/codesquad/coco/player/domain/model/DTO/PlayerEventDTO.java index d6d471181..a773ff67e 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/DTO/PlayerEventDTO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/model/DTO/PlayerEventDTO.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.player.domain.DTO; +package com.codesquad.coco.player.domain.model.DTO; import com.codesquad.coco.player.domain.RecordType; diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Player.java b/BE/src/main/java/com/codesquad/coco/player/domain/model/Player.java similarity index 94% rename from BE/src/main/java/com/codesquad/coco/player/domain/Player.java rename to BE/src/main/java/com/codesquad/coco/player/domain/model/Player.java index 389e3b817..e7d4a7a39 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/Player.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/model/Player.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.player.domain; +package com.codesquad.coco.player.domain.model; import org.springframework.data.annotation.Id; diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java b/BE/src/main/java/com/codesquad/coco/player/domain/model/Record.java similarity index 92% rename from BE/src/main/java/com/codesquad/coco/player/domain/Record.java rename to BE/src/main/java/com/codesquad/coco/player/domain/model/Record.java index 2695e5ecf..a9723aea9 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/Record.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/model/Record.java @@ -1,5 +1,6 @@ -package com.codesquad.coco.player.domain; +package com.codesquad.coco.player.domain.model; +import com.codesquad.coco.player.domain.RecordType; import org.springframework.data.annotation.Id; public class Record { diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java index c3cc2efcc..adfb9b9c3 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/DTO/TeamDTO.java @@ -1,6 +1,6 @@ package com.codesquad.coco.team.domain.DTO; -import com.codesquad.coco.player.domain.DTO.PlayerDTO; +import com.codesquad.coco.player.domain.model.DTO.PlayerDTO; import java.util.List; diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/Team.java b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java index 7a37f27a9..685f85e54 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/Team.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/Team.java @@ -1,6 +1,6 @@ package com.codesquad.coco.team.domain; -import com.codesquad.coco.player.domain.Player; +import com.codesquad.coco.player.domain.model.Player; import org.springframework.data.annotation.Id; import java.util.List; diff --git a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java index 5d4cb68b6..ceb38fe27 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java +++ b/BE/src/main/java/com/codesquad/coco/utils/DTOConverter.java @@ -2,7 +2,7 @@ import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.game.domain.model.ScoreBoard; -import com.codesquad.coco.player.domain.DTO.PlayerDTO; +import com.codesquad.coco.player.domain.model.DTO.PlayerDTO; import com.codesquad.coco.team.domain.DTO.TeamDTO; import com.codesquad.coco.team.domain.DTO.TeamScoreDTO; import com.codesquad.coco.team.domain.Team; diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java index 138eb32ec..e84e4287d 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java @@ -1,7 +1,7 @@ package com.codesquad.coco.utils.mapper; -import com.codesquad.coco.player.domain.Player; -import com.codesquad.coco.player.domain.Record; +import com.codesquad.coco.player.domain.model.Player; +import com.codesquad.coco.player.domain.model.Record; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; diff --git a/BE/src/test/java/com/codesquad/coco/TeamTest.java b/BE/src/test/java/com/codesquad/coco/TeamTest.java index 4a6cfc5ac..95c2daeb6 100644 --- a/BE/src/test/java/com/codesquad/coco/TeamTest.java +++ b/BE/src/test/java/com/codesquad/coco/TeamTest.java @@ -1,6 +1,6 @@ package com.codesquad.coco; -import com.codesquad.coco.player.domain.Player; +import com.codesquad.coco.player.domain.model.Player; import com.codesquad.coco.team.domain.Team; import com.codesquad.coco.team.domain.TeamRepository; import org.assertj.core.api.Assertions; From 922f516a344654ecf9f3b4b9611e0930ca039481 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 21:07:58 +0900 Subject: [PATCH 73/96] =?UTF-8?q?fix=20:=20=EC=98=A4=EB=A5=98=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/codesquad/coco/game/GameController.java | 6 ++---- BE/src/main/java/com/codesquad/coco/game/GameService.java | 5 ----- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index e9d4eea29..c57679be0 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -2,7 +2,6 @@ import com.codesquad.coco.game.domain.model.DTO.GamePlayDTO; import com.codesquad.coco.game.domain.model.DTO.GameScoreDTO; -import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.TeamService; import com.codesquad.coco.team.domain.DTO.*; @@ -80,11 +79,10 @@ public GameScoreDTO gamePoint(@PathVariable Long gameId) { @GetMapping("/games/{gameId}/players") @ResponseStatus(HttpStatus.OK) public GamePlayDTO showPlayer(@PathVariable Long gameId) { - Game game = gameService.choiceGame(gameId); String userTeamName = gameService.findUserTeamNameByGameId(gameId); - TeamDTO homeTeam = DTOConverter.teamToDTO(game.getHome()); - TeamDTO awayTeam = DTOConverter.teamToDTO(game.getAway()); + TeamDTO homeTeam = teamService.findHomeTeamByGameId(gameId); + TeamDTO awayTeam = teamService.findAwayTeamByGameId(gameId); if (homeTeam.getTeamName().equals(userTeamName)) { return new GamePlayDTO(gameId, homeTeam, awayTeam); diff --git a/BE/src/main/java/com/codesquad/coco/game/GameService.java b/BE/src/main/java/com/codesquad/coco/game/GameService.java index 341a93425..653e3b108 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameService.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameService.java @@ -2,7 +2,6 @@ import com.codesquad.coco.game.domain.DAO.GameDAO; import com.codesquad.coco.game.domain.DAO.ScoreBoardDAO; -import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.domain.DTO.TeamPointDTO; @@ -21,10 +20,6 @@ public GameService(GameDAO gameDAO, ScoreBoardDAO boardDAO) { this.boardDAO = boardDAO; } - public Game choiceGame(Long id) { - return gameDAO.findById(id); - } - public ScoreBoard findScoreBoardByTeamName(Long gameId, TeamPointDTO teamPointDTO) { return boardDAO.findByGameIdAndTeamName(gameId, teamPointDTO.getTeamName()); } From 592f8653261b7395a9e5ee84144a62fe7647835f Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 7 May 2021 21:16:07 +0900 Subject: [PATCH 74/96] =?UTF-8?q?test=20:=20test=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/codesquad/coco/GameTest.java | 7 --- .../java/com/codesquad/coco/ScoreTest.java | 44 ------------------- 2 files changed, 51 deletions(-) delete mode 100644 BE/src/test/java/com/codesquad/coco/ScoreTest.java diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java index 00a88f430..cebe7288b 100644 --- a/BE/src/test/java/com/codesquad/coco/GameTest.java +++ b/BE/src/test/java/com/codesquad/coco/GameTest.java @@ -39,11 +39,4 @@ void playGame() { //todo : 게임은 만들어 지면서 스코어 보드도 만들어야 한다. } - @Test - @DisplayName("게임 찾기") - void showGame() { - Game bigMatch = gameDAO.findById(1L); - - logger.info(bigMatch.toString()); - } } \ No newline at end of file diff --git a/BE/src/test/java/com/codesquad/coco/ScoreTest.java b/BE/src/test/java/com/codesquad/coco/ScoreTest.java deleted file mode 100644 index e6774810c..000000000 --- a/BE/src/test/java/com/codesquad/coco/ScoreTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.codesquad.coco; - -import com.codesquad.coco.game.domain.DAO.GameDAO; -import com.codesquad.coco.game.domain.DAO.ScoreBoardDAO; -import com.codesquad.coco.game.domain.model.Game; -import com.codesquad.coco.game.domain.model.ScoreBoard; -import com.codesquad.coco.team.domain.Team; -import com.codesquad.coco.team.domain.TeamRepository; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.transaction.annotation.Transactional; - -@Transactional -@SpringBootTest -public class ScoreTest { - - @Autowired - TeamRepository teamRepository; - @Autowired - GameDAO gameDAO; - @Autowired - ScoreBoardDAO scoreBoardDAO; - - @Test - @DisplayName("점수판 보기") - void showScoreBoard() { - Game bigMatch = gameDAO.findById(1L); - Team home = bigMatch.getHome(); - Team away = bigMatch.getAway(); - - ScoreBoard homeBoard = new ScoreBoard(bigMatch.getId(), home.getName()); - ScoreBoard awayBoard = new ScoreBoard(bigMatch.getId(), away.getName()); - - Long homeBoardId = scoreBoardDAO.save(homeBoard); - Long awayBoardId = scoreBoardDAO.save(awayBoard); - - Assertions.assertThat(homeBoardId).isEqualTo(3L); - Assertions.assertThat(awayBoardId).isEqualTo(4L); - - } -} From 285754e93d9b0b5be07ae06d9e4cbc107780cdce Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Sun, 9 May 2021 15:48:08 +0900 Subject: [PATCH 75/96] =?UTF-8?q?feat=20:=20gitignore=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - db 정보가 들어 있어 제외 --- BE/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BE/.gitignore b/BE/.gitignore index c2065bc26..0cf89ab73 100644 --- a/BE/.gitignore +++ b/BE/.gitignore @@ -35,3 +35,6 @@ out/ ### VS Code ### .vscode/ + +### properties 제외 ### +/src/main/resources/application.properties From c10f30b5e8e7d2cf5e080bee14fd4c620bd8dbfb Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Sun, 9 May 2021 15:49:32 +0900 Subject: [PATCH 76/96] =?UTF-8?q?feat=20:=20gitignore=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/resources/application.properties | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 BE/src/main/resources/application.properties diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties deleted file mode 100644 index 0275962f3..000000000 --- a/BE/src/main/resources/application.properties +++ /dev/null @@ -1,13 +0,0 @@ -# log -logging.level.root=info -logging.level.sql=debug -#mysql database datasource -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/BASEBALL?serverTimezone=UTC&characterEncoding=UTF-8 -spring.datasource.username=dev -spring.datasource.password=1234 -#mysql database etc -spring.datasource.initialization-mode=always -spring.datasource.schema=classpath:schema.sql -#json -spring.jackson.property-naming-strategy=SNAKE_CASE \ No newline at end of file From 72c63757a8514c31052496c4582f610a607ae7a9 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Mon, 10 May 2021 16:06:01 +0900 Subject: [PATCH 77/96] =?UTF-8?q?refactor=20:=20service=EB=A1=9C=20?= =?UTF-8?q?=EC=B1=85=EC=9E=84=20=EC=9D=B4=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 게임 DTO를 받는다 --- .../codesquad/coco/game/GameController.java | 36 ++++--------------- .../com/codesquad/coco/game/GameService.java | 18 ++++++++++ .../com/codesquad/coco/team/TeamService.java | 22 ++++++++---- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index c57679be0..2121a7914 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -4,13 +4,13 @@ import com.codesquad.coco.game.domain.model.DTO.GameScoreDTO; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.TeamService; -import com.codesquad.coco.team.domain.DTO.*; -import com.codesquad.coco.utils.DTOConverter; +import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; +import com.codesquad.coco.team.domain.DTO.TeamDTO; +import com.codesquad.coco.team.domain.DTO.TeamPointDTO; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("/api") public class GameController { @@ -32,24 +32,13 @@ public MainPageTeamDTO mainPage() { @PostMapping("/games/type-home") @ResponseStatus(HttpStatus.CREATED) public GamePlayDTO homeTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { - Long gameId = teamService.makeHomeGame(choiceDTO); - - TeamDTO homeTeam = teamService.findHomeTeamByGameId(gameId); - TeamDTO awayTeam = teamService.findAwayTeamByGameId(gameId); - - return new GamePlayDTO(gameId, homeTeam, awayTeam); - + return teamService.makeHomeGameDTO(choiceDTO); } @PostMapping("/games/type-away") @ResponseStatus(HttpStatus.CREATED) public GamePlayDTO awayTeamMatch(@RequestBody TeamChoiceDTO choiceDTO) { - Long gameId = teamService.makeAwayGame(choiceDTO); - - TeamDTO homeTeam = teamService.findHomeTeamByGameId(gameId); - TeamDTO awayTeam = teamService.findAwayTeamByGameId(gameId); - - return new GamePlayDTO(gameId, awayTeam, homeTeam); + return teamService.makeAwayGameDTO(choiceDTO); } @PostMapping("/games/{gameId}/points") @@ -62,18 +51,7 @@ public void plusPoint(@PathVariable Long gameId, @RequestBody TeamPointDTO teamP @GetMapping("/games/{gameId}/points") @ResponseStatus(HttpStatus.OK) public GameScoreDTO gamePoint(@PathVariable Long gameId) { - List scoreBoard = gameService.findScoreBoardByGameId(gameId); - String userTeamName = gameService.findUserTeamNameByGameId(gameId); - - TeamScoreDTO teamScoreDTO = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(0)); - TeamScoreDTO teamScoreDTO1 = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(1)); - - teamService.findHomeTeamByGameId(gameId); - - if (teamScoreDTO.getTeamName().equals(userTeamName)) { - return new GameScoreDTO(teamScoreDTO, teamScoreDTO1); - } - return new GameScoreDTO(teamScoreDTO1, teamScoreDTO); + return gameService.findGameScoreDTOByGameId(gameId); } @GetMapping("/games/{gameId}/players") diff --git a/BE/src/main/java/com/codesquad/coco/game/GameService.java b/BE/src/main/java/com/codesquad/coco/game/GameService.java index 653e3b108..e5a7eef77 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameService.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameService.java @@ -2,9 +2,12 @@ import com.codesquad.coco.game.domain.DAO.GameDAO; import com.codesquad.coco.game.domain.DAO.ScoreBoardDAO; +import com.codesquad.coco.game.domain.model.DTO.GameScoreDTO; import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.game.domain.model.ScoreBoard; import com.codesquad.coco.team.domain.DTO.TeamPointDTO; +import com.codesquad.coco.team.domain.DTO.TeamScoreDTO; +import com.codesquad.coco.utils.DTOConverter; import org.springframework.stereotype.Service; import java.util.List; @@ -29,6 +32,19 @@ public void plusPoint(ScoreBoard scoreBoard, TeamPointDTO teamPointDTO) { boardDAO.saveInnings(innings); } + public GameScoreDTO findGameScoreDTOByGameId(Long gameId) { + List scoreBoard = findScoreBoardByGameId(gameId); + String userTeamName = findUserTeamNameByGameId(gameId); + + TeamScoreDTO teamScoreDTO = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(0)); + TeamScoreDTO teamScoreDTO1 = DTOConverter.scoreToTeamScoreDTO(scoreBoard.get(1)); + + if (teamScoreDTO.getTeamName().equals(userTeamName)) { + return new GameScoreDTO(teamScoreDTO, teamScoreDTO1); + } + return new GameScoreDTO(teamScoreDTO1, teamScoreDTO); + } + public List findScoreBoardByGameId(Long gameId) { return boardDAO.findByGameId(gameId); } @@ -36,4 +52,6 @@ public List findScoreBoardByGameId(Long gameId) { public String findUserTeamNameByGameId(Long gameId) { return gameDAO.findUserTeamNameByGameId(gameId); } + + } diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamService.java b/BE/src/main/java/com/codesquad/coco/team/TeamService.java index d9351c78f..2355005fb 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamService.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamService.java @@ -1,6 +1,7 @@ package com.codesquad.coco.team; import com.codesquad.coco.game.domain.DAO.GameDAO; +import com.codesquad.coco.game.domain.model.DTO.GamePlayDTO; import com.codesquad.coco.game.domain.model.Game; import com.codesquad.coco.player.domain.PlayerDAO; import com.codesquad.coco.player.domain.UserType; @@ -28,20 +29,29 @@ public MainPageTeamDTO findMainTeams() { return teamDAO.findAllName(); } - public Long makeHomeGame(TeamChoiceDTO choiceDTO) { + public GamePlayDTO makeHomeGameDTO(TeamChoiceDTO choiceDTO) { Team playerTeam = getPlayerTeam(choiceDTO); Team opponentTeam = getOpponentTeam(choiceDTO); - Game game = new Game(opponentTeam, playerTeam, UserType.HOME); - return gameDAO.save(game); + + Long gameId = gameDAO.save(game); + + TeamDTO homeTeam = findHomeTeamByGameId(gameId); + TeamDTO awayTeam = findAwayTeamByGameId(gameId); + return new GamePlayDTO(gameId, awayTeam, homeTeam); } - public Long makeAwayGame(TeamChoiceDTO choiceDTO) { + public GamePlayDTO makeAwayGameDTO(TeamChoiceDTO choiceDTO) { Team playerTeam = getPlayerTeam(choiceDTO); Team opponentTeam = getOpponentTeam(choiceDTO); - Game game = new Game(playerTeam, opponentTeam, UserType.AWAY); - return gameDAO.save(game); + + Long gameId = gameDAO.save(game); + + TeamDTO homeTeam = findHomeTeamByGameId(gameId); + TeamDTO awayTeam = findAwayTeamByGameId(gameId); + + return new GamePlayDTO(gameId, awayTeam, homeTeam); } private Team getPlayerTeam(TeamChoiceDTO choiceDTO) { From a73af2d5487a24a15bd57febc230c710da1c6b13 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Mon, 10 May 2021 16:24:20 +0900 Subject: [PATCH 78/96] =?UTF-8?q?refactor=20:=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=EC=9D=98=20=EC=B1=85=EC=9E=84=EC=9D=84=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - service로 이전 --- .../codesquad/coco/game/GameController.java | 10 ++-------- .../com/codesquad/coco/game/GameService.java | 20 +++++++++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index 2121a7914..5dbb8b9a3 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -6,7 +6,6 @@ import com.codesquad.coco.team.TeamService; import com.codesquad.coco.team.domain.DTO.MainPageTeamDTO; import com.codesquad.coco.team.domain.DTO.TeamChoiceDTO; -import com.codesquad.coco.team.domain.DTO.TeamDTO; import com.codesquad.coco.team.domain.DTO.TeamPointDTO; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; @@ -57,15 +56,10 @@ public GameScoreDTO gamePoint(@PathVariable Long gameId) { @GetMapping("/games/{gameId}/players") @ResponseStatus(HttpStatus.OK) public GamePlayDTO showPlayer(@PathVariable Long gameId) { - String userTeamName = gameService.findUserTeamNameByGameId(gameId); - TeamDTO homeTeam = teamService.findHomeTeamByGameId(gameId); - TeamDTO awayTeam = teamService.findAwayTeamByGameId(gameId); + return gameService.findGamePlayDTOByGameId(gameId); + - if (homeTeam.getTeamName().equals(userTeamName)) { - return new GamePlayDTO(gameId, homeTeam, awayTeam); - } - return new GamePlayDTO(gameId, awayTeam, homeTeam); } } diff --git a/BE/src/main/java/com/codesquad/coco/game/GameService.java b/BE/src/main/java/com/codesquad/coco/game/GameService.java index e5a7eef77..e35bc90c2 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameService.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameService.java @@ -2,9 +2,12 @@ import com.codesquad.coco.game.domain.DAO.GameDAO; import com.codesquad.coco.game.domain.DAO.ScoreBoardDAO; +import com.codesquad.coco.game.domain.model.DTO.GamePlayDTO; import com.codesquad.coco.game.domain.model.DTO.GameScoreDTO; import com.codesquad.coco.game.domain.model.Innings; import com.codesquad.coco.game.domain.model.ScoreBoard; +import com.codesquad.coco.team.TeamService; +import com.codesquad.coco.team.domain.DTO.TeamDTO; import com.codesquad.coco.team.domain.DTO.TeamPointDTO; import com.codesquad.coco.team.domain.DTO.TeamScoreDTO; import com.codesquad.coco.utils.DTOConverter; @@ -17,10 +20,12 @@ public class GameService { private GameDAO gameDAO; private ScoreBoardDAO boardDAO; + private TeamService teamService; - public GameService(GameDAO gameDAO, ScoreBoardDAO boardDAO) { + public GameService(GameDAO gameDAO, ScoreBoardDAO boardDAO, TeamService teamService) { this.gameDAO = gameDAO; this.boardDAO = boardDAO; + this.teamService = teamService; } public ScoreBoard findScoreBoardByTeamName(Long gameId, TeamPointDTO teamPointDTO) { @@ -49,9 +54,20 @@ public List findScoreBoardByGameId(Long gameId) { return boardDAO.findByGameId(gameId); } + public GamePlayDTO findGamePlayDTOByGameId(Long gameId) { + String userTeamName = findUserTeamNameByGameId(gameId); + + TeamDTO homeTeam = teamService.findHomeTeamByGameId(gameId); + TeamDTO awayTeam = teamService.findAwayTeamByGameId(gameId); + + if (homeTeam.getTeamName().equals(userTeamName)) { + return new GamePlayDTO(gameId, homeTeam, awayTeam); + } + return new GamePlayDTO(gameId, awayTeam, homeTeam); + } + public String findUserTeamNameByGameId(Long gameId) { return gameDAO.findUserTeamNameByGameId(gameId); } - } From 12e16672d563bcccedb9b48d906d754bb8d57bbf Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Mon, 10 May 2021 17:10:09 +0900 Subject: [PATCH 79/96] =?UTF-8?q?refactor=20:=20save=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - makeGame으로 변경 --- BE/src/main/java/com/codesquad/coco/game/GameController.java | 3 --- .../main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java | 2 +- BE/src/main/java/com/codesquad/coco/team/TeamService.java | 4 ++-- BE/src/test/java/com/codesquad/coco/GameTest.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/GameController.java b/BE/src/main/java/com/codesquad/coco/game/GameController.java index 5dbb8b9a3..9b5486ec1 100644 --- a/BE/src/main/java/com/codesquad/coco/game/GameController.java +++ b/BE/src/main/java/com/codesquad/coco/game/GameController.java @@ -56,10 +56,7 @@ public GameScoreDTO gamePoint(@PathVariable Long gameId) { @GetMapping("/games/{gameId}/players") @ResponseStatus(HttpStatus.OK) public GamePlayDTO showPlayer(@PathVariable Long gameId) { - return gameService.findGamePlayDTOByGameId(gameId); - - } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 5ce0b6804..3a08658d6 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -26,7 +26,7 @@ public GameDAO(PlayerDAO playerDAO, ScoreBoardDAO boardDAO, NamedParameterJdbcTe this.template = template; } - public Long save(Game game) { + public Long makeGame(Game game) { Long gameId = saveGame(game); ScoreBoard away = new ScoreBoard(gameId, game.awayTeamName()); ScoreBoard home = new ScoreBoard(gameId, game.homeTeamName()); diff --git a/BE/src/main/java/com/codesquad/coco/team/TeamService.java b/BE/src/main/java/com/codesquad/coco/team/TeamService.java index 2355005fb..ac849d701 100644 --- a/BE/src/main/java/com/codesquad/coco/team/TeamService.java +++ b/BE/src/main/java/com/codesquad/coco/team/TeamService.java @@ -34,7 +34,7 @@ public GamePlayDTO makeHomeGameDTO(TeamChoiceDTO choiceDTO) { Team opponentTeam = getOpponentTeam(choiceDTO); Game game = new Game(opponentTeam, playerTeam, UserType.HOME); - Long gameId = gameDAO.save(game); + Long gameId = gameDAO.makeGame(game); TeamDTO homeTeam = findHomeTeamByGameId(gameId); TeamDTO awayTeam = findAwayTeamByGameId(gameId); @@ -46,7 +46,7 @@ public GamePlayDTO makeAwayGameDTO(TeamChoiceDTO choiceDTO) { Team opponentTeam = getOpponentTeam(choiceDTO); Game game = new Game(playerTeam, opponentTeam, UserType.AWAY); - Long gameId = gameDAO.save(game); + Long gameId = gameDAO.makeGame(game); TeamDTO homeTeam = findHomeTeamByGameId(gameId); TeamDTO awayTeam = findAwayTeamByGameId(gameId); diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java index cebe7288b..61bfb545a 100644 --- a/BE/src/test/java/com/codesquad/coco/GameTest.java +++ b/BE/src/test/java/com/codesquad/coco/GameTest.java @@ -34,7 +34,7 @@ void playGame() { Team doSan = teamRepository.findTeamByName("두산 베어스").get(); Game bigMatch = new Game(ssg, doSan, UserType.HOME); - Long gameId = gameDAO.save(bigMatch); + Long gameId = gameDAO.makeGame(bigMatch); Assertions.assertThat(gameId).isEqualTo(2L); //todo : 게임은 만들어 지면서 스코어 보드도 만들어야 한다. } From 7e988b1b35ed5853dda51d6afcbd47322b01f6c5 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Mon, 10 May 2021 17:25:15 +0900 Subject: [PATCH 80/96] =?UTF-8?q?refactor=20:=20=EB=B9=8C=EB=8D=94=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=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 - 각기 다른 생성자 제거 --- .../coco/game/domain/DAO/GameDAO.java | 11 +++- .../coco/game/domain/model/ScoreBoard.java | 51 ++++++++++++------- .../coco/utils/mapper/ScoreBoardMapper.java | 10 ++-- 3 files changed, 47 insertions(+), 25 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 3a08658d6..5a21d2e0d 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -28,8 +28,15 @@ public GameDAO(PlayerDAO playerDAO, ScoreBoardDAO boardDAO, NamedParameterJdbcTe public Long makeGame(Game game) { Long gameId = saveGame(game); - ScoreBoard away = new ScoreBoard(gameId, game.awayTeamName()); - ScoreBoard home = new ScoreBoard(gameId, game.homeTeamName()); + ScoreBoard away = new ScoreBoard.Builder() + .game(gameId) + .team(game.awayTeamName()) + .build(); + ScoreBoard home = new ScoreBoard.Builder() + .game(gameId) + .team(game.homeTeamName()) + .build(); + saveScoreBoard(game, away); saveScoreBoard(game, home); return gameId; diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java index 29aa0cd2d..50698fe0b 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/model/ScoreBoard.java @@ -12,31 +12,16 @@ public class ScoreBoard { private Long game; private String team; - private List innings = new ArrayList<>(); + private List innings; - - public ScoreBoard(Long id, Long game, String teamName, List innings) { - this.id = id; - this.game = game; - this.team = teamName; - this.innings = innings; - } - - public ScoreBoard(Long id, Long game, String team) { + public ScoreBoard(Long id, Long game, String team, List innings) { this.id = id; this.game = game; this.team = team; + this.innings = innings; } - public ScoreBoard(Long gameId, String team) { - this.game = gameId; - this.team = team; - } - - public Innings updateScore(int round, int point) { - //fixme : 만약 해당 이닝에 점수가 나지 않았다면? -> 리스트는 0이 되어야함함 - // fixme : 이닝이 끝날 때 마다 보내 줌 -> 해당 팀만?, 상대 팀도? return new Innings(this.id, point, round); } @@ -74,5 +59,35 @@ public String toString() { '}'; } + public static class Builder { + private Long id; + private Long game; + private String team; + private List innings = new ArrayList<>(); + + public Builder id(Long val) { + id = val; + return this; + } + + public Builder game(Long val) { + game = val; + return this; + } + + public Builder team(String val) { + team = val; + return this; + } + + public Builder innings(List val) { + innings = val; + return this; + } + + public ScoreBoard build() { + return new ScoreBoard(id, game, team, innings); + } + } } diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java index 1b02f5861..94beb15d5 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/ScoreBoardMapper.java @@ -9,10 +9,10 @@ public class ScoreBoardMapper implements RowMapper { @Override public ScoreBoard mapRow(ResultSet rs, int rowNum) throws SQLException { - return new ScoreBoard( - rs.getLong("id"), - rs.getLong("game"), - rs.getString("team") - ); + return new ScoreBoard.Builder() + .id(rs.getLong("id")) + .game(rs.getLong("game")) + .team(rs.getString("team")) + .build(); } } From 2f3480bdef729c146e923a3e41fc8354ce910600 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Mon, 10 May 2021 17:48:23 +0900 Subject: [PATCH 81/96] =?UTF-8?q?refactor=20:=20=ED=83=80=EC=9C=A8=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DB의 타율 제거 --- .../coco/player/domain/PlayerDAO.java | 1 - .../coco/player/domain/model/Record.java | 9 +- .../java/com/codesquad/coco/utils/SQL.java | 6 +- .../coco/utils/mapper/PlayerMapper.java | 3 +- BE/src/main/resources/data.sql | 110 +++++++++--------- BE/src/main/resources/schema.sql | 13 +-- 6 files changed, 68 insertions(+), 74 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java index 39e80fe9f..fa557be6d 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -38,7 +38,6 @@ public void updateRecord(Record record) { parameter.addValue("atBat", record.getAtBat()); parameter.addValue("hits", record.getHits()); parameter.addValue("outs", record.getOuts()); - parameter.addValue("average", record.getAverage()); parameter.addValue("id", record.getId()); template.update(UPDATE_PLAYER_RECORD, parameter); } diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/model/Record.java b/BE/src/main/java/com/codesquad/coco/player/domain/model/Record.java index a9723aea9..6acbc7fce 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/model/Record.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/model/Record.java @@ -11,14 +11,12 @@ public class Record { private int atBat; private int hits; private int outs; - private double average; - public Record(Long id, int atBat, int hits, int outs, double average) { + public Record(Long id, int atBat, int hits, int outs) { this.id = id; this.atBat = atBat; this.hits = hits; this.outs = outs; - this.average = average; } public Long getId() { @@ -38,7 +36,7 @@ public int getOuts() { } public double getAverage() { - return average; + return (double) hits / atBat; } @Override @@ -48,7 +46,7 @@ public String toString() { ", atBat=" + atBat + ", hits=" + hits + ", outs=" + outs + - ", average=" + average + + ", average=" + getAverage() + '}'; } @@ -60,6 +58,5 @@ public void update(RecordType log) { if (log == RecordType.OUT) { this.outs++; } - this.average = (double) hits / atBat; } } diff --git a/BE/src/main/java/com/codesquad/coco/utils/SQL.java b/BE/src/main/java/com/codesquad/coco/utils/SQL.java index 80d00f68e..79accc25e 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/SQL.java +++ b/BE/src/main/java/com/codesquad/coco/utils/SQL.java @@ -8,9 +8,9 @@ public class SQL { public static String FIND_SCORE_BOARD_SQL = "select s.id, s.game,s.team from score_board s where s.game =:id and s.team = :teamName "; public static String FIND_SCORE_BOARDS_SQL = "select s.id, s.game,s.team from score_board s where s.game = :id"; public static String INNINGS_SAVE_SQL = "insert into innings (score_board, score, score_board_key) values (:score_board,:score,:score_board_key)"; - public static String FIND_PLAYER_BY_TEAM_NAME = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat, r.average FROM player p inner JOIN record r ON r.player = p.id WHERE p.team = :teamName order by p.id"; - public static String FIND_PLAYER_BY_PLAYER_ID = "select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat, r.average from player p inner JOIN record r ON r.player = p.id where p.id= :id"; - public static String UPDATE_PLAYER_RECORD = "update record set at_bat = :atBat, hits = :hits, outs = :outs, average = :average where id = :id"; + public static String FIND_PLAYER_BY_TEAM_NAME = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat FROM player p inner JOIN record r ON r.player = p.id WHERE p.team = :teamName order by p.id"; + public static String FIND_PLAYER_BY_PLAYER_ID = "select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat from player p inner JOIN record r ON r.player = p.id where p.id= :id"; + public static String UPDATE_PLAYER_RECORD = "update record set at_bat = :atBat, hits = :hits, outs = :outs where id = :id"; public static String FIND_ALL_TEAM_NAME = "select t.name from team t"; public static String FIND_HOME_TEAM_NAME_BY_GAME_ID = "select g.home as team_name from game g where g.id = :id "; public static String FIND_AWAY_TEAM_NAME_BY_GAME_ID = "select g.away as team_name from game g where g.id = :id "; diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java index e84e4287d..6b401ad55 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/PlayerMapper.java @@ -14,8 +14,7 @@ public Player mapRow(ResultSet rs, int rowNum) throws SQLException { rs.getLong("rid"), rs.getInt("at_bat"), rs.getInt("hits"), - rs.getInt("outs"), - rs.getDouble("average") + rs.getInt("outs") ); return new Player( rs.getLong("pid"), diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 51bfeb13f..d6fad02c2 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -79,68 +79,68 @@ VALUES INSERT INTO record - (id, player, at_bat, hits, outs, average) + (id, player, at_bat, hits, outs) VALUES -- 두산 베어스 -(1, 1, 2, 1, 1, 0.500), -(2, 2, 2, 2, 0, 1.000), -(3, 3, 2, 0, 2, 0.000), -(4, 4, 2, 3, 2, 0.304), -(5, 5, 2, 0, 2, 0.000), -(6, 6, 2, 1, 1, 0.500), -(7, 7, 2, 2, 2, 1.000), -(8, 8, 2, 1, 1, 0.500), -(9, 9, 2, 0, 0, 0.000), +(1, 1, 2, 1, 1), +(2, 2, 2, 2, 0), +(3, 3, 2, 0, 2), +(4, 4, 2, 3, 2), +(5, 5, 2, 0, 2), +(6, 6, 2, 1, 1), +(7, 7, 2, 2, 2), +(8, 8, 2, 1, 1), +(9, 9, 2, 0, 0), -- ssg 랜더스 -(10, 10, 2, 2, 2, 1.000), -(11, 11, 2, 1, 1, 0.500), -(12, 12, 2, 0, 2, 0.000), -(13, 13, 2, 2, 2, 1.000), -(14, 14, 2, 0, 2, 0.000), -(15, 15, 2, 1, 1, 0.500), -(16, 16, 2, 0, 2, 0.000), -(17, 17, 2, 1, 1, 0.500), -(18, 18, 2, 1, 1, 0.500), +(10, 10, 2, 2, 2), +(11, 11, 2, 1, 1), +(12, 12, 2, 0, 2), +(13, 13, 2, 2, 2), +(14, 14, 2, 0, 2), +(15, 15, 2, 1, 1), +(16, 16, 2, 0, 2), +(17, 17, 2, 1, 1), +(18, 18, 2, 1, 1), -- 기아 타이거즈 -(19, 19, 2, 1, 1, 0.500), -(20, 20, 2, 0, 2, 0.000), -(21, 21, 2, 1, 1, 0.500), -(22, 22, 2, 2, 2, 1.000), -(23, 23, 2, 0, 2, 0.000), -(24, 24, 2, 1, 1, 0.500), -(25, 25, 2, 2, 2, 1.000), -(26, 26, 2, 0, 2, 0.000), -(27, 27, 2, 1, 1, 0.500), +(19, 19, 2, 1, 1), +(20, 20, 2, 0, 2), +(21, 21, 2, 1, 1), +(22, 22, 2, 2, 2), +(23, 23, 2, 0, 2), +(24, 24, 2, 1, 1), +(25, 25, 2, 2, 2), +(26, 26, 2, 0, 2), +(27, 27, 2, 1, 1), -- 키움 히어로즈 -(28, 28, 2, 0, 2, 0.000), -(29, 29, 2, 1, 1, 0.500), -(30, 30, 2, 2, 2, 1.000), -(31, 31, 2, 2, 2, 1.000), -(32, 32, 2, 1, 1, 0.500), -(33, 33, 2, 2, 2, 1.000), -(34, 34, 2, 2, 2, 1.000), -(35, 35, 2, 1, 1, 0.500), -(36, 36, 2, 2, 2, 1.000), +(28, 28, 2, 0, 2), +(29, 29, 2, 1, 1), +(30, 30, 2, 2, 2), +(31, 31, 2, 2, 2), +(32, 32, 2, 1, 1), +(33, 33, 2, 2, 2), +(34, 34, 2, 2, 2), +(35, 35, 2, 1, 1), +(36, 36, 2, 2, 2), -- 한화 이글스 -(37, 37, 2, 0, 2, 0.000), -(38, 38, 2, 2, 2, 1.000), -(39, 39, 2, 2, 2, 1.000), -(40, 40, 2, 0, 2, 0.000), -(41, 41, 2, 2, 2, 1.000), -(42, 42, 2, 2, 2, 1.000), -(43, 43, 2, 1, 1, 0.500), -(44, 44, 2, 2, 2, 1.000), -(45, 45, 2, 2, 2, 1.000), +(37, 37, 2, 0, 2), +(38, 38, 2, 2, 2), +(39, 39, 2, 2, 2), +(40, 40, 2, 0, 2), +(41, 41, 2, 2, 2), +(42, 42, 2, 2, 2), +(43, 43, 2, 1, 1), +(44, 44, 2, 2, 2), +(45, 45, 2, 2, 2), -- 롯데 자이언츠 -(46, 46, 2, 2, 2, 1.000), -(47, 47, 2, 0, 2, 0.000), -(48, 48, 2, 2, 2, 1.000), -(49, 49, 2, 2, 2, 1.000), -(50, 50, 2, 2, 2, 1.000), -(51, 51, 2, 2, 2, 1.000), -(52, 52, 2, 1, 1, 0.500), -(53, 53, 2, 0, 2, 0.000), -(54, 54, 2, 2, 2, 1.000); +(46, 46, 2, 2, 2), +(47, 47, 2, 0, 2), +(48, 48, 2, 2, 2), +(49, 49, 2, 2, 2), +(50, 50, 2, 2, 2), +(51, 51, 2, 2, 2), +(52, 52, 2, 1, 1), +(53, 53, 2, 0, 2), +(54, 54, 2, 2, 2); insert into game(id, home, away, user_type) diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 2ab35fd12..23ad112ea 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -23,13 +23,12 @@ create table player create table record ( - id BIGINT auto_increment primary key, - at_bat int not null, - hits int not null, - outs int not null, - average double(4, 3 -) not null, - player BIGINT references player(id) + id BIGINT auto_increment primary key, + at_bat int not null, + hits int not null, + outs int not null, + + player BIGINT references player (id) ); create table game From cd054e212113923cdbf13f522c3e833600edb06b Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Mon, 10 May 2021 18:19:03 +0900 Subject: [PATCH 82/96] =?UTF-8?q?refactor=20:=20sql=20=EC=BD=94=ED=8B=80?= =?UTF-8?q?=EB=A6=B0=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 - 코틀린으로 변경 --- BE/build.gradle | 30 +++++--- .../coco/game/domain/DAO/GameDAO.java | 2 +- .../coco/game/domain/DAO/InningsDAO.java | 2 +- .../coco/game/domain/DAO/ScoreBoardDAO.java | 2 +- .../coco/player/domain/PlayerDAO.java | 2 +- .../codesquad/coco/team/domain/TeamDAO.java | 2 +- .../com/codesquad/coco/utils/BASEBALL_SQL.kt | 74 +++++++++++++++++++ .../java/com/codesquad/coco/utils/SQL.java | 16 ---- 8 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/utils/BASEBALL_SQL.kt diff --git a/BE/build.gradle b/BE/build.gradle index 6e2fe07ac..1828d8bae 100644 --- a/BE/build.gradle +++ b/BE/build.gradle @@ -1,7 +1,8 @@ plugins { - id 'org.springframework.boot' version '2.4.5' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id 'java' + id 'org.springframework.boot' version '2.4.5' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' + id 'org.jetbrains.kotlin.jvm' version '1.4.32' } group = 'com.codesquad' @@ -9,16 +10,27 @@ version = '0.0.1-SNAPSHOT' sourceCompatibility = '1.8' repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' - implementation 'org.springframework.boot:spring-boot-starter-web' - runtimeOnly 'mysql:mysql-connector-java' - testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-web' + runtimeOnly 'mysql:mysql-connector-java' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" } test { - useJUnitPlatform() + useJUnitPlatform() +} +compileKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = "1.8" + } } diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java index 5a21d2e0d..0257b47c4 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/GameDAO.java @@ -10,7 +10,7 @@ import org.springframework.jdbc.support.KeyHolder; import org.springframework.stereotype.Component; -import static com.codesquad.coco.utils.SQL.*; +import static com.codesquad.coco.utils.BASEBALL_SQLKt.*; @Component public class GameDAO { diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java index 24a44efd8..d430fd4f4 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/InningsDAO.java @@ -8,7 +8,7 @@ import java.util.List; -import static com.codesquad.coco.utils.SQL.FIND_ALL_INNINGS_SQL; +import static com.codesquad.coco.utils.BASEBALL_SQLKt.FIND_ALL_INNINGS_SQL; @Component public class InningsDAO { diff --git a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java index 0593164df..1d943b421 100644 --- a/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java +++ b/BE/src/main/java/com/codesquad/coco/game/domain/DAO/ScoreBoardDAO.java @@ -11,7 +11,7 @@ import java.util.List; -import static com.codesquad.coco.utils.SQL.*; +import static com.codesquad.coco.utils.BASEBALL_SQLKt.*; @Component public class ScoreBoardDAO { diff --git a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java index fa557be6d..068999d38 100644 --- a/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java +++ b/BE/src/main/java/com/codesquad/coco/player/domain/PlayerDAO.java @@ -9,7 +9,7 @@ import java.util.List; -import static com.codesquad.coco.utils.SQL.*; +import static com.codesquad.coco.utils.BASEBALL_SQLKt.*; @Component public class PlayerDAO { diff --git a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java index 407257d2a..22d7663ac 100644 --- a/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java +++ b/BE/src/main/java/com/codesquad/coco/team/domain/TeamDAO.java @@ -12,7 +12,7 @@ import java.util.List; -import static com.codesquad.coco.utils.SQL.FIND_ALL_TEAM_NAME; +import static com.codesquad.coco.utils.BASEBALL_SQLKt.FIND_ALL_TEAM_NAME; @Component public class TeamDAO { diff --git a/BE/src/main/java/com/codesquad/coco/utils/BASEBALL_SQL.kt b/BE/src/main/java/com/codesquad/coco/utils/BASEBALL_SQL.kt new file mode 100644 index 000000000..a67024ea0 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/BASEBALL_SQL.kt @@ -0,0 +1,74 @@ +package com.codesquad.coco.utils; + +const val GAME_SAVE_SQL: String = """ +insert into game (home,away,user_type) +values (:home,:away,:user_type); +""" + +const val FIND_USER_TEAM_NAME_SQL: String = """ +select if(g.user_type = 'home',g.home,g.away) as team_name +from game g where g.id = :id; +""" + +const val FIND_ALL_INNINGS_SQL: String = """ +select i.id, i.score, i.score_board +from innings i +where i.score_board =:id order by score_board_key; +""" + +const val SCORE_BOARD_SAVE_SQL: String = """ +insert into score_board (game,team) +values (:game, :team); +""" + +const val FIND_SCORE_BOARD_SQL: String = """ +select s.id, s.game,s.team +from score_board s +where s.game =:id and s.team = :teamName; +""" + +const val FIND_SCORE_BOARDS_SQL: String = """ +select s.id, s.game,s.team +from score_board s +where s.game = :id; +""" + +const val INNINGS_SAVE_SQL: String = """ +insert into innings (score_board, score, score_board_key) +values (:score_board,:score,:score_board_key); +""" + +const val FIND_PLAYER_BY_TEAM_NAME: String = """ +SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat +FROM player p +inner JOIN record r ON r.player = p.id +WHERE p.team = :teamName order by p.id; +""" + +const val FIND_PLAYER_BY_PLAYER_ID: String = """ +select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat +from player p +inner JOIN record r ON r.player = p.id +where p.id= :id; +""" + +const val UPDATE_PLAYER_RECORD: String = """ +update record set at_bat = :atBat, hits = :hits, outs = :outs +where id = :id; +""" + +const val FIND_ALL_TEAM_NAME: String = """ +select t.name +from team t +""" + +const val FIND_HOME_TEAM_NAME_BY_GAME_ID: String = """ +select g.home as team_name +from game g where g.id = :id; +""" + +const val FIND_AWAY_TEAM_NAME_BY_GAME_ID: String = """ +select g.away as team_name +from game g where g.id = :id; +""" + diff --git a/BE/src/main/java/com/codesquad/coco/utils/SQL.java b/BE/src/main/java/com/codesquad/coco/utils/SQL.java index 79accc25e..0851cef6a 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/SQL.java +++ b/BE/src/main/java/com/codesquad/coco/utils/SQL.java @@ -1,18 +1,2 @@ package com.codesquad.coco.utils; -public class SQL { - public static String GAME_SAVE_SQL = "insert into game (home,away,user_type) values (:home,:away,:user_type)"; - public static String FIND_USER_TEAM_NAME_SQL = "select if(g.user_type = 'home',g.home,g.away) as team_name from game g where g.id = :id"; - public static String FIND_ALL_INNINGS_SQL = "select i.id, i.score, i.score_board from innings i where i.score_board =:id order by score_board_key"; - public static String SCORE_BOARD_SAVE_SQL = "insert into score_board (game,team) values (:game, :team)"; - public static String FIND_SCORE_BOARD_SQL = "select s.id, s.game,s.team from score_board s where s.game =:id and s.team = :teamName "; - public static String FIND_SCORE_BOARDS_SQL = "select s.id, s.game,s.team from score_board s where s.game = :id"; - public static String INNINGS_SAVE_SQL = "insert into innings (score_board, score, score_board_key) values (:score_board,:score,:score_board_key)"; - public static String FIND_PLAYER_BY_TEAM_NAME = "SELECT p.id as pid, p.type, p.name, r.id as rid, r.outs, r.hits, r.at_bat FROM player p inner JOIN record r ON r.player = p.id WHERE p.team = :teamName order by p.id"; - public static String FIND_PLAYER_BY_PLAYER_ID = "select p.id as pid, p.name, p.type, r.id as rid, r.outs, r.hits, r.at_bat from player p inner JOIN record r ON r.player = p.id where p.id= :id"; - public static String UPDATE_PLAYER_RECORD = "update record set at_bat = :atBat, hits = :hits, outs = :outs where id = :id"; - public static String FIND_ALL_TEAM_NAME = "select t.name from team t"; - public static String FIND_HOME_TEAM_NAME_BY_GAME_ID = "select g.home as team_name from game g where g.id = :id "; - public static String FIND_AWAY_TEAM_NAME_BY_GAME_ID = "select g.away as team_name from game g where g.id = :id "; - -} From f7be75c008f4717520e2915d92083c480e09e9c2 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:37:56 +0900 Subject: [PATCH 83/96] =?UTF-8?q?feat=20:=20sql=20enum=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 - 코틀린으로 변경했기에 삭제 --- BE/src/main/java/com/codesquad/coco/utils/SQL.java | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 BE/src/main/java/com/codesquad/coco/utils/SQL.java diff --git a/BE/src/main/java/com/codesquad/coco/utils/SQL.java b/BE/src/main/java/com/codesquad/coco/utils/SQL.java deleted file mode 100644 index 0851cef6a..000000000 --- a/BE/src/main/java/com/codesquad/coco/utils/SQL.java +++ /dev/null @@ -1,2 +0,0 @@ -package com.codesquad.coco.utils; - From 19a4018b3e7a32056758ca47838ce17b81d6662a Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:38:24 +0900 Subject: [PATCH 84/96] =?UTF-8?q?feat=20:=20git=20ignore=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 - server key 올리지 않기 위해 --- BE/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BE/.gitignore b/BE/.gitignore index 0cf89ab73..c8580902f 100644 --- a/BE/.gitignore +++ b/BE/.gitignore @@ -38,3 +38,6 @@ out/ ### properties 제외 ### /src/main/resources/application.properties + +### server_secret 제외 ### +/src/main/resources/server.secret.json From 2a40c0d26a063f684a0c44831852a777cefaaec9 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:39:23 +0900 Subject: [PATCH 85/96] =?UTF-8?q?feat=20:=20=EC=88=98=EC=A0=9C=20oauth=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=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 - libs 밑에 옮겨 놨다 --- BE/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/BE/build.gradle b/BE/build.gradle index 1828d8bae..7dbc76b1e 100644 --- a/BE/build.gradle +++ b/BE/build.gradle @@ -19,6 +19,7 @@ dependencies { runtimeOnly 'mysql:mysql-connector-java' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + implementation files('build/libs/gitOauthV3.jar') } test { From d7e6798cccbd65628993653bcf954e73dfcd9f44 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:40:13 +0900 Subject: [PATCH 86/96] =?UTF-8?q?feat=20:=20user=20class=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 억세스 토큰과 리프레쉬 토큰을 DB에서 관리한다 --- .../com/codesquad/coco/user/domain/User.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/user/domain/User.java diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/User.java b/BE/src/main/java/com/codesquad/coco/user/domain/User.java new file mode 100644 index 000000000..5d20c1edd --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/user/domain/User.java @@ -0,0 +1,67 @@ +package com.codesquad.coco.user.domain; + +import org.springframework.data.annotation.Id; + +public class User { + + @Id + private Long id; + + private Long githubId; + private String login; + private String htmlUrl; + private String location; + private int followers; + private int following; + private String accessToken; + private String refreshToken; + + public User(Long id, Long githubId, String login, String htmlUrl, String location, + int followers, int following, String accessToken, String refreshToken) { + this.id = id; + this.githubId = githubId; + this.login = login; + this.htmlUrl = htmlUrl; + this.location = location; + this.followers = followers; + this.following = following; + this.accessToken = accessToken; + this.refreshToken = refreshToken; + } + + public Long getId() { + return id; + } + + public Long getGithubId() { + return githubId; + } + + public String getLogin() { + return login; + } + + public String getHtmlUrl() { + return htmlUrl; + } + + public String getLocation() { + return location; + } + + public int getFollowers() { + return followers; + } + + public int getFollowing() { + return following; + } + + public String getAccessToken() { + return accessToken; + } + + public String getRefreshToken() { + return refreshToken; + } +} From 75ca093455d13afe419e480a917bcdd053c9b4bc Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:40:58 +0900 Subject: [PATCH 87/96] =?UTF-8?q?feat=20:=20userController=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - jwt를 사용해서 관리한다 --- .../coco/user/domain/UserController.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/user/domain/UserController.java diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java b/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java new file mode 100644 index 000000000..c1f193e15 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java @@ -0,0 +1,67 @@ +package com.codesquad.coco.user.domain; + +import com.codesquad.coco.user.UserService; +import com.codesquad.coco.utils.FindSecretServerKey; +import com.gitoauth.coco.JWT.JWTUtils; +import com.gitoauth.coco.oauth.AccessToken; +import com.gitoauth.coco.oauth.Oauth; +import com.gitoauth.coco.oauth.UserInfoDTO; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Base64; + +import static com.codesquad.coco.user.domain.GitURI.*; + +@RestController +public class UserController { + + private UserService userService; + private SecretServerKey secretServerKey = FindSecretServerKey.find(); + private String key = Base64.getEncoder().encodeToString(secretServerKey.serverSecretToByteArray()); + private Oauth oauth = new Oauth(secretServerKey.getClientId(), + secretServerKey.getClientSecret(), + REDIRECT_URI.getUri(), + ACCESS_TOKEN_URI.getUri(), + AUTHORIZE_URI.getUri(), + USER_INFO_URI.getUri() + ); + + public UserController(UserService userService) { + this.userService = userService; + } + + @GetMapping("/login") + @ResponseStatus(HttpStatus.OK) + public void login(HttpServletRequest request, HttpServletResponse response) throws IOException { + String jwt = request.getHeader("Authorization"); + if (jwt != null) { + JWTUtils.validateJWT(jwt, key); + return; + } + oauth.requestCode(response); + } + + @GetMapping("/login/github") + @ResponseStatus(HttpStatus.OK) + public void callBack(@RequestParam("code") String code, HttpServletResponse response) { + AccessToken accessToken = oauth.requestAccessToken(code); + UserInfoDTO userInfoDTO = oauth.requestUserInfo(accessToken); + + userService.insertUser(userInfoDTO.getId()); + + String jwt = JWTUtils.createJWTTypeBearer(userInfoDTO.getId(), key); + + response.setHeader("Authorization", jwt); + + return; + } + + //todo : 리프레쉬 토큰 받아오기, 밑 다시 세팅 +} From 3d11e82bd490cd53ea7089f4a1525c47c75388fd Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:41:31 +0900 Subject: [PATCH 88/96] =?UTF-8?q?feat=20:=20github=20uri=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - enum으로 관리 한다 --- .../codesquad/coco/user/domain/GitURI.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/user/domain/GitURI.java diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/GitURI.java b/BE/src/main/java/com/codesquad/coco/user/domain/GitURI.java new file mode 100644 index 000000000..eb0196ec0 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/user/domain/GitURI.java @@ -0,0 +1,19 @@ +package com.codesquad.coco.user.domain; + +public enum GitURI { + + REDIRECT_URI("http://localhost:8080/login/github"), + ACCESS_TOKEN_URI("https://github.com/login/oauth/access_token"), + AUTHORIZE_URI("https://github.com/login/oauth/authorize"), + USER_INFO_URI("https://api.github.com/user"); + + private String uri; + + GitURI(String uri) { + this.uri = uri; + } + + public String getUri() { + return uri; + } +} From caaef17bf5d5e044b920b3949bc5e2e0254c3390 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:41:51 +0900 Subject: [PATCH 89/96] =?UTF-8?q?feat=20:=20user=20Table=20=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/resources/schema.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 23ad112ea..52fe80284 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -7,6 +7,7 @@ drop table if exists record; drop table if exists game; drop table if exists score_board; drop table if exists innings; +drop table if exists users; create table team ( @@ -53,3 +54,17 @@ create table innings score_board BIGINT references score_board (id), score_board_key int ); + +create table users +( + id BIGINT auto_increment primary key, + github_id varchar(64) not null, + login varchar(64) not null, + htmlUrl varchar(64) not null, + location varchar(64) not null, + followers int not null, + following int not null, + accessToken varchar(200), + refreshToken varchar(200) +); + From c384a25ce1e6949a9afe9c6d6063fa31822a6a02 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:42:57 +0900 Subject: [PATCH 90/96] =?UTF-8?q?feat=20:=20userService=20=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=83=88=EB=A1=9C=EC=9A=B4=20user=EC=9D=B8?= =?UTF-8?q?=EC=A7=80=20=EA=B2=80=EC=A6=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - github_id를 통해 새로운 user인지 체크한다 - 새로운 유저는 회원가입, 아니면 update한다 --- .../com/codesquad/coco/user/UserService.java | 26 +++++++++++++ .../codesquad/coco/user/domain/UserDao.java | 38 +++++++++++++++++++ .../java/com/codesquad/coco/utils/USER_SQL.kt | 22 +++++++++++ .../coco/utils/mapper/UserCountMapper.java | 13 +++++++ .../coco/utils/mapper/UserMapper.java | 23 +++++++++++ 5 files changed, 122 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/user/UserService.java create mode 100644 BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java create mode 100644 BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/UserCountMapper.java create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java diff --git a/BE/src/main/java/com/codesquad/coco/user/UserService.java b/BE/src/main/java/com/codesquad/coco/user/UserService.java new file mode 100644 index 000000000..ac23cea69 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/user/UserService.java @@ -0,0 +1,26 @@ +package com.codesquad.coco.user; + +import com.codesquad.coco.user.domain.User; +import com.codesquad.coco.user.domain.UserDao; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + + private UserDao userDao; + + public UserService(UserDao userDao) { + this.userDao = userDao; + } + + public User insertUser(Long id) { + + if (userDao.checkNewUser(id)) { + System.out.println("insert"); + } else { + System.out.println("update"); + } + + return null; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java b/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java new file mode 100644 index 000000000..cb8efad41 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java @@ -0,0 +1,38 @@ +package com.codesquad.coco.user.domain; + +import com.codesquad.coco.utils.mapper.UserCountMapper; +import com.codesquad.coco.utils.mapper.UserMapper; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Component; + +import static com.codesquad.coco.utils.USER_SQLKt.CHEK_NEW_USER_BY_GITHUB_ID; +import static com.codesquad.coco.utils.USER_SQLKt.FIND_USER_BY_GITHUB_ID; + +@Component +public class UserDao { + + private NamedParameterJdbcTemplate template; + private UserMapper userMapper = new UserMapper(); + private UserCountMapper countMapper = new UserCountMapper(); + + public UserDao(NamedParameterJdbcTemplate template) { + this.template = template; + } + + public User findByGitHubId(Long id) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("github_id", id); + + User user = template.queryForObject(FIND_USER_BY_GITHUB_ID, parameter, userMapper); + return user; + } + + public boolean checkNewUser(Long id) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("github_id", id); + + Integer count = template.queryForObject(CHEK_NEW_USER_BY_GITHUB_ID, parameter, countMapper); + return count == 0; + } +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt b/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt new file mode 100644 index 000000000..1ed64f7fe --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt @@ -0,0 +1,22 @@ +package com.codesquad.coco.utils; + +const val FIND_USER_BY_GITHUB_ID: String = """ +select u.id,u.github_id,u.login,u.htmlUrl,u.location,u.followers,u.following,u.accessToken,u.refreshToken +from users.u +where github_id = :github_id; +""" + + +const val CHEK_NEW_USER_BY_GITHUB_ID: String = """ +select count(*) as count +from users u +where u.github_id = :github_id; +""" + + + + + + + + diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserCountMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserCountMapper.java new file mode 100644 index 000000000..22d7d7b5b --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserCountMapper.java @@ -0,0 +1,13 @@ +package com.codesquad.coco.utils.mapper; + +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class UserCountMapper implements RowMapper { + @Override + public Integer mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getInt("count"); + } +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java new file mode 100644 index 000000000..4cc73eb2e --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java @@ -0,0 +1,23 @@ +package com.codesquad.coco.utils.mapper; + +import com.codesquad.coco.user.domain.User; +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class UserMapper implements RowMapper { + + @Override + public User mapRow(ResultSet rs, int rowNum) throws SQLException { + return new User(rs.getLong("id"), + rs.getLong("github_id"), + rs.getString("login"), + rs.getString("html_url"), + rs.getString("location"), + rs.getInt("followers"), + rs.getInt("following"), + rs.getString("access_token"), + rs.getString("refresh_token")); + } +} From 127e9a40776ac2044cfb80a078dbbbc0f855eb14 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 21:43:29 +0900 Subject: [PATCH 91/96] =?UTF-8?q?feat=20:=20secretkey=EB=A5=BC=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=9C=20class=20?= =?UTF-8?q?=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coco/user/domain/SecretServerKey.java | 26 +++++++++++++++++++ .../coco/utils/FindSecretServerKey.java | 21 +++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/user/domain/SecretServerKey.java create mode 100644 BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/SecretServerKey.java b/BE/src/main/java/com/codesquad/coco/user/domain/SecretServerKey.java new file mode 100644 index 000000000..1097da07e --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/user/domain/SecretServerKey.java @@ -0,0 +1,26 @@ +package com.codesquad.coco.user.domain; + +import java.nio.charset.StandardCharsets; + +public class SecretServerKey { + + private String clientId; + private String clientSecret; + private String serverSecret; + + public String getClientId() { + return clientId; + } + + public String getClientSecret() { + return clientSecret; + } + + public String getServerSecret() { + return serverSecret; + } + + public byte[] serverSecretToByteArray() { + return serverSecret.getBytes(StandardCharsets.UTF_8); + } +} diff --git a/BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java b/BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java new file mode 100644 index 000000000..deda07597 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java @@ -0,0 +1,21 @@ +package com.codesquad.coco.utils; + +import com.codesquad.coco.user.domain.SecretServerKey; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.IOException; +import java.io.InputStream; + +public class FindSecretServerKey { + + public static SecretServerKey find() { + try { + InputStream inputStream = FindSecretServerKey.class.getResourceAsStream("/server.secret.json"); + ObjectMapper objectMapper = new ObjectMapper(); + return objectMapper.readValue(inputStream, SecretServerKey.class); + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } +} From 101a48c4803b72da4a5d111428babef7a1669e25 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 22:23:08 +0900 Subject: [PATCH 92/96] =?UTF-8?q?feat=20:=20user=20=EA=B2=80=EC=82=AC=20?= =?UTF-8?q?=EC=8B=9C=20creat=ED=95=A0=EC=A7=80=20update=20=ED=95=A0?= =?UTF-8?q?=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 둘을 구현.새로운 user면 create, 이미 있는 user이면 update --- .../com/codesquad/coco/user/UserService.java | 31 +++++++-- .../com/codesquad/coco/user/domain/User.java | 66 ++++++++++++++++++- .../coco/user/domain/UserController.java | 2 +- .../codesquad/coco/user/domain/UserDao.java | 25 ++++++- .../java/com/codesquad/coco/utils/USER_SQL.kt | 13 +++- .../coco/utils/mapper/UserMapper.java | 20 +++--- BE/src/main/resources/schema.sql | 18 ++--- 7 files changed, 144 insertions(+), 31 deletions(-) diff --git a/BE/src/main/java/com/codesquad/coco/user/UserService.java b/BE/src/main/java/com/codesquad/coco/user/UserService.java index ac23cea69..7e4cf799b 100644 --- a/BE/src/main/java/com/codesquad/coco/user/UserService.java +++ b/BE/src/main/java/com/codesquad/coco/user/UserService.java @@ -2,6 +2,8 @@ import com.codesquad.coco.user.domain.User; import com.codesquad.coco.user.domain.UserDao; +import com.gitoauth.coco.oauth.AccessToken; +import com.gitoauth.coco.oauth.UserInfoDTO; import org.springframework.stereotype.Service; @Service @@ -13,14 +15,29 @@ public UserService(UserDao userDao) { this.userDao = userDao; } - public User insertUser(Long id) { - - if (userDao.checkNewUser(id)) { - System.out.println("insert"); - } else { - System.out.println("update"); + public void insertUser(UserInfoDTO userInfoDTO, AccessToken accessToken) { + User user = new User.Builder() + .htmlUrl(userInfoDTO.getHtmlUrl()) + .refreshToken(accessToken.getRefreshToken()) + .accessToken(accessToken.getAccessToken()) + .followers(userInfoDTO.getFollowers()) + .following(userInfoDTO.getFollowing()) + .githubId(userInfoDTO.getId()) + .location(userInfoDTO.getLocation()) + .login(userInfoDTO.getLogin()) + .builder(); + if (userDao.checkNewUser(userInfoDTO.getId())) { + createUser(user); + return; } + updateUser(user); + } + + private void updateUser(User user) { + userDao.updateUser(user); + } - return null; + public void createUser(User user) { + userDao.createUser(user); } } diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/User.java b/BE/src/main/java/com/codesquad/coco/user/domain/User.java index 5d20c1edd..ebf66f111 100644 --- a/BE/src/main/java/com/codesquad/coco/user/domain/User.java +++ b/BE/src/main/java/com/codesquad/coco/user/domain/User.java @@ -16,8 +16,8 @@ public class User { private String accessToken; private String refreshToken; - public User(Long id, Long githubId, String login, String htmlUrl, String location, - int followers, int following, String accessToken, String refreshToken) { + private User(Long githubId, String login, String htmlUrl, String location, + int followers, int following, String accessToken, String refreshToken) { this.id = id; this.githubId = githubId; this.login = login; @@ -64,4 +64,66 @@ public String getAccessToken() { public String getRefreshToken() { return refreshToken; } + + public static class Builder { + private Long id; + private Long githubId; + private String login; + private String htmlUrl; + private String location; + private int followers; + private int following; + private String accessToken; + private String refreshToken; + + public Builder id(Long val) { + id = val; + return this; + } + + public Builder githubId(Long val) { + githubId = val; + return this; + } + + public Builder login(String val) { + login = val; + return this; + } + + public Builder htmlUrl(String val) { + htmlUrl = val; + return this; + } + + public Builder location(String val) { + location = val; + return this; + } + + public Builder followers(int val) { + followers = val; + return this; + } + + public Builder following(int val) { + following = val; + return this; + } + + public Builder accessToken(String val) { + accessToken = val; + return this; + } + + public Builder refreshToken(String val) { + refreshToken = val; + return this; + } + + public User builder() { + return new User(githubId, login, htmlUrl, location, followers, following, accessToken, refreshToken); + } + + } } diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java b/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java index c1f193e15..54675f423 100644 --- a/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java +++ b/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java @@ -54,7 +54,7 @@ public void callBack(@RequestParam("code") String code, HttpServletResponse resp AccessToken accessToken = oauth.requestAccessToken(code); UserInfoDTO userInfoDTO = oauth.requestUserInfo(accessToken); - userService.insertUser(userInfoDTO.getId()); + userService.insertUser(userInfoDTO, accessToken); String jwt = JWTUtils.createJWTTypeBearer(userInfoDTO.getId(), key); diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java b/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java index cb8efad41..3a5502750 100644 --- a/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java +++ b/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java @@ -6,8 +6,7 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; -import static com.codesquad.coco.utils.USER_SQLKt.CHEK_NEW_USER_BY_GITHUB_ID; -import static com.codesquad.coco.utils.USER_SQLKt.FIND_USER_BY_GITHUB_ID; +import static com.codesquad.coco.utils.USER_SQLKt.*; @Component public class UserDao { @@ -35,4 +34,26 @@ public boolean checkNewUser(Long id) { Integer count = template.queryForObject(CHEK_NEW_USER_BY_GITHUB_ID, parameter, countMapper); return count == 0; } + + public void createUser(User user) { + insertData(CREATE_USER, user); + } + + public void updateUser(User user) { + insertData(UPDATE_USER, user); + } + + private void insertData(String updateUser, User user) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("github_id", user.getGithubId()); + parameter.addValue("login", user.getLogin()); + parameter.addValue("html_url", user.getHtmlUrl()); + parameter.addValue("location", user.getLocation()); + parameter.addValue("followers", user.getFollowers()); + parameter.addValue("following", user.getFollowing()); + parameter.addValue("access_token", user.getAccessToken()); + parameter.addValue("refresh_token", user.getRefreshToken()); + + template.update(updateUser, parameter); + } } diff --git a/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt b/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt index 1ed64f7fe..5b6455fd8 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt +++ b/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt @@ -1,7 +1,7 @@ package com.codesquad.coco.utils; const val FIND_USER_BY_GITHUB_ID: String = """ -select u.id,u.github_id,u.login,u.htmlUrl,u.location,u.followers,u.following,u.accessToken,u.refreshToken +select u.id,u.github_id,u.login,u.html_url,u.location,u.followers,u.following,u.access_token,u.refresh_token from users.u where github_id = :github_id; """ @@ -13,6 +13,17 @@ from users u where u.github_id = :github_id; """ +const val CREATE_USER: String = """ +insert into users (github_id,login,html_url,location,followers,following,access_token,refresh_token) +values (:github_id,:login,:html_url,:location,:followers,:following,:access_token,:refresh_token) +""" + +const val UPDATE_USER: String = """ +update users set +login = :login,html_url = :html_url,location = :location ,followers = :followers,following = :following,access_token = :access_token,refresh_token = :refresh_token +where github_id = :github_id +""" + diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java index 4cc73eb2e..a1e1b666f 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserMapper.java @@ -10,14 +10,16 @@ public class UserMapper implements RowMapper { @Override public User mapRow(ResultSet rs, int rowNum) throws SQLException { - return new User(rs.getLong("id"), - rs.getLong("github_id"), - rs.getString("login"), - rs.getString("html_url"), - rs.getString("location"), - rs.getInt("followers"), - rs.getInt("following"), - rs.getString("access_token"), - rs.getString("refresh_token")); + return new User.Builder() + .id(rs.getLong("id")) + .githubId(rs.getLong("github_id")) + .login(rs.getString("login")) + .htmlUrl(rs.getString("html_url")) + .location(rs.getString("location")) + .followers(rs.getInt("followers")) + .following(rs.getInt("following")) + .accessToken(rs.getString("access_token")) + .refreshToken(rs.getString("refresh_token")) + .builder(); } } diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 52fe80284..1d59af83f 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -57,14 +57,14 @@ create table innings create table users ( - id BIGINT auto_increment primary key, - github_id varchar(64) not null, - login varchar(64) not null, - htmlUrl varchar(64) not null, - location varchar(64) not null, - followers int not null, - following int not null, - accessToken varchar(200), - refreshToken varchar(200) + id BIGINT auto_increment primary key, + github_id varchar(64) not null, + login varchar(64) not null, + html_url varchar(64) not null, + location varchar(64) not null, + followers int not null, + following int not null, + access_token varchar(200), + refresh_token varchar(200) ); From d4d3bb7636f5fc1c04d6414c72756343fbe40f6d Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Wed, 12 May 2021 22:24:14 +0900 Subject: [PATCH 93/96] =?UTF-8?q?chore=20:=20=ED=8C=A8=ED=82=A4=EC=A7=80?= =?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 - serverKey는 util이 더 어울린다 --- .../codesquad/coco/user/{domain => }/UserController.java | 6 +++--- .../java/com/codesquad/coco/utils/FindSecretServerKey.java | 1 - .../com/codesquad/coco/{user/domain => utils}/GitURI.java | 2 +- .../coco/{user/domain => utils}/SecretServerKey.java | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) rename BE/src/main/java/com/codesquad/coco/user/{domain => }/UserController.java (94%) rename BE/src/main/java/com/codesquad/coco/{user/domain => utils}/GitURI.java (90%) rename BE/src/main/java/com/codesquad/coco/{user/domain => utils}/SecretServerKey.java (92%) diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java b/BE/src/main/java/com/codesquad/coco/user/UserController.java similarity index 94% rename from BE/src/main/java/com/codesquad/coco/user/domain/UserController.java rename to BE/src/main/java/com/codesquad/coco/user/UserController.java index 54675f423..5b5eccbd8 100644 --- a/BE/src/main/java/com/codesquad/coco/user/domain/UserController.java +++ b/BE/src/main/java/com/codesquad/coco/user/UserController.java @@ -1,7 +1,7 @@ -package com.codesquad.coco.user.domain; +package com.codesquad.coco.user; -import com.codesquad.coco.user.UserService; import com.codesquad.coco.utils.FindSecretServerKey; +import com.codesquad.coco.utils.SecretServerKey; import com.gitoauth.coco.JWT.JWTUtils; import com.gitoauth.coco.oauth.AccessToken; import com.gitoauth.coco.oauth.Oauth; @@ -17,7 +17,7 @@ import java.io.IOException; import java.util.Base64; -import static com.codesquad.coco.user.domain.GitURI.*; +import static com.codesquad.coco.utils.GitURI.*; @RestController public class UserController { diff --git a/BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java b/BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java index deda07597..4bd2a06a9 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java +++ b/BE/src/main/java/com/codesquad/coco/utils/FindSecretServerKey.java @@ -1,6 +1,5 @@ package com.codesquad.coco.utils; -import com.codesquad.coco.user.domain.SecretServerKey; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/GitURI.java b/BE/src/main/java/com/codesquad/coco/utils/GitURI.java similarity index 90% rename from BE/src/main/java/com/codesquad/coco/user/domain/GitURI.java rename to BE/src/main/java/com/codesquad/coco/utils/GitURI.java index eb0196ec0..6703ef714 100644 --- a/BE/src/main/java/com/codesquad/coco/user/domain/GitURI.java +++ b/BE/src/main/java/com/codesquad/coco/utils/GitURI.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.user.domain; +package com.codesquad.coco.utils; public enum GitURI { diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/SecretServerKey.java b/BE/src/main/java/com/codesquad/coco/utils/SecretServerKey.java similarity index 92% rename from BE/src/main/java/com/codesquad/coco/user/domain/SecretServerKey.java rename to BE/src/main/java/com/codesquad/coco/utils/SecretServerKey.java index 1097da07e..3da32898b 100644 --- a/BE/src/main/java/com/codesquad/coco/user/domain/SecretServerKey.java +++ b/BE/src/main/java/com/codesquad/coco/utils/SecretServerKey.java @@ -1,4 +1,4 @@ -package com.codesquad.coco.user.domain; +package com.codesquad.coco.utils; import java.nio.charset.StandardCharsets; From 94db7ab69010515e6ae93c6ebae98b699744e66d Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 13 May 2021 00:59:01 +0900 Subject: [PATCH 94/96] =?UTF-8?q?feat=20:=20Oauth=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=8B=9C=EA=B0=84=20=EC=97=B0=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - FE가 특정 url로 요청을 보내면 토큰을 다시 받아온다 - FE가 시간을 계산해서 짧게 남았으면 요청한다 --- BE/build.gradle | 2 +- .../codesquad/coco/user/UserController.java | 15 ++++++++++-- .../com/codesquad/coco/user/UserService.java | 8 +++++++ .../codesquad/coco/user/domain/UserDao.java | 23 +++++++++++++++++-- .../java/com/codesquad/coco/utils/USER_SQL.kt | 10 ++++++++ .../utils/mapper/UserRefreshTokenMapper.java | 13 +++++++++++ 6 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/utils/mapper/UserRefreshTokenMapper.java diff --git a/BE/build.gradle b/BE/build.gradle index 7dbc76b1e..e3b4013f5 100644 --- a/BE/build.gradle +++ b/BE/build.gradle @@ -19,7 +19,7 @@ dependencies { runtimeOnly 'mysql:mysql-connector-java' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - implementation files('build/libs/gitOauthV3.jar') + implementation files('build/libs/gitOauthV4.jar') } test { diff --git a/BE/src/main/java/com/codesquad/coco/user/UserController.java b/BE/src/main/java/com/codesquad/coco/user/UserController.java index 5b5eccbd8..b9aeefc61 100644 --- a/BE/src/main/java/com/codesquad/coco/user/UserController.java +++ b/BE/src/main/java/com/codesquad/coco/user/UserController.java @@ -50,7 +50,7 @@ public void login(HttpServletRequest request, HttpServletResponse response) thro @GetMapping("/login/github") @ResponseStatus(HttpStatus.OK) - public void callBack(@RequestParam("code") String code, HttpServletResponse response) { + public void requestResourceServer(@RequestParam("code") String code, HttpServletResponse response) { AccessToken accessToken = oauth.requestAccessToken(code); UserInfoDTO userInfoDTO = oauth.requestUserInfo(accessToken); @@ -63,5 +63,16 @@ public void callBack(@RequestParam("code") String code, HttpServletResponse resp return; } - //todo : 리프레쉬 토큰 받아오기, 밑 다시 세팅 + + @GetMapping("/login/refresh") + @ResponseStatus(HttpStatus.OK) + public void tokenRefresh(HttpServletRequest request) { + String jwt = request.getHeader("Authorization"); + Long githubId = Long.parseLong(String.valueOf(JWTUtils.getInfoFromJWT(jwt, key, "id"))); + String refreshToken = userService.findRefreshTokenByGithubId(githubId); + + AccessToken accessToken = oauth.requestRefreshToken(refreshToken); + + userService.updateTokenByGithubId(accessToken, githubId); + } } diff --git a/BE/src/main/java/com/codesquad/coco/user/UserService.java b/BE/src/main/java/com/codesquad/coco/user/UserService.java index 7e4cf799b..43a3abffa 100644 --- a/BE/src/main/java/com/codesquad/coco/user/UserService.java +++ b/BE/src/main/java/com/codesquad/coco/user/UserService.java @@ -40,4 +40,12 @@ private void updateUser(User user) { public void createUser(User user) { userDao.createUser(user); } + + public String findRefreshTokenByGithubId(Long githubId) { + return userDao.findRefreshTokenByGithubId(githubId); + } + + public void updateTokenByGithubId(AccessToken accessToken, Long githubId) { + userDao.updateTokenByGithubId(accessToken.getAccessToken(), accessToken.getRefreshToken(), githubId); + } } diff --git a/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java b/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java index 3a5502750..5c9693ee9 100644 --- a/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java +++ b/BE/src/main/java/com/codesquad/coco/user/domain/UserDao.java @@ -2,6 +2,7 @@ import com.codesquad.coco.utils.mapper.UserCountMapper; import com.codesquad.coco.utils.mapper.UserMapper; +import com.codesquad.coco.utils.mapper.UserRefreshTokenMapper; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.stereotype.Component; @@ -14,6 +15,7 @@ public class UserDao { private NamedParameterJdbcTemplate template; private UserMapper userMapper = new UserMapper(); private UserCountMapper countMapper = new UserCountMapper(); + private UserRefreshTokenMapper tokenMapper = new UserRefreshTokenMapper(); public UserDao(NamedParameterJdbcTemplate template) { this.template = template; @@ -43,7 +45,7 @@ public void updateUser(User user) { insertData(UPDATE_USER, user); } - private void insertData(String updateUser, User user) { + private void insertData(String SQL, User user) { MapSqlParameterSource parameter = new MapSqlParameterSource(); parameter.addValue("github_id", user.getGithubId()); parameter.addValue("login", user.getLogin()); @@ -54,6 +56,23 @@ private void insertData(String updateUser, User user) { parameter.addValue("access_token", user.getAccessToken()); parameter.addValue("refresh_token", user.getRefreshToken()); - template.update(updateUser, parameter); + template.update(SQL, parameter); + } + + public String findRefreshTokenByGithubId(Long githubId) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("github_id", githubId); + + return template.queryForObject(FIND_REFRESH_TOKEN_BY_GITHUB_ID, parameter, tokenMapper); + + } + + public void updateTokenByGithubId(String accessToken, String refreshToken, Long githubId) { + MapSqlParameterSource parameter = new MapSqlParameterSource(); + parameter.addValue("github_id", githubId); + parameter.addValue("access_token", accessToken); + parameter.addValue("refresh_token", refreshToken); + + template.update(UPDATE_TOKEN_BY_GITHUB_ID, parameter); } } diff --git a/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt b/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt index 5b6455fd8..d33af162b 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt +++ b/BE/src/main/java/com/codesquad/coco/utils/USER_SQL.kt @@ -24,7 +24,17 @@ login = :login,html_url = :html_url,location = :location ,followers = :followers where github_id = :github_id """ +const val FIND_REFRESH_TOKEN_BY_GITHUB_ID: String = """ +select u.refresh_token +from users u +where u.github_id = :github_id; +""" +const val UPDATE_TOKEN_BY_GITHUB_ID: String = """ +update users +set refresh_token = :refresh_token, access_token = :access_token +where github_id = :github_id +""" diff --git a/BE/src/main/java/com/codesquad/coco/utils/mapper/UserRefreshTokenMapper.java b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserRefreshTokenMapper.java new file mode 100644 index 000000000..2532f4a40 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/utils/mapper/UserRefreshTokenMapper.java @@ -0,0 +1,13 @@ +package com.codesquad.coco.utils.mapper; + +import org.springframework.jdbc.core.RowMapper; + +import java.sql.ResultSet; +import java.sql.SQLException; + +public class UserRefreshTokenMapper implements RowMapper { + @Override + public String mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getString("refresh_token"); + } +} From 3def2a05160bc3966e945197902bc549dc2acf86 Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Thu, 13 May 2021 00:59:55 +0900 Subject: [PATCH 95/96] =?UTF-8?q?feat=20:=20jwt=20=EC=8B=9C=EA=B0=84=20?= =?UTF-8?q?=EB=A7=8C=EB=A3=8C=20=EC=8B=9C=20=EC=98=88=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 예외 컨트롤 계획 --- .../coco/global/CustomExceptionController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 BE/src/main/java/com/codesquad/coco/global/CustomExceptionController.java diff --git a/BE/src/main/java/com/codesquad/coco/global/CustomExceptionController.java b/BE/src/main/java/com/codesquad/coco/global/CustomExceptionController.java new file mode 100644 index 000000000..836b3f0de --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/global/CustomExceptionController.java @@ -0,0 +1,15 @@ +package com.codesquad.coco.global; + + +import com.gitoauth.coco.JWT.OverTimeException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class CustomExceptionController { + + @ExceptionHandler(OverTimeException.class) + public void OverTime(OverTimeException e) { + // todo : 시간 만료 + } +} From d5113bcff003557f015dd97abb13d4e61aa9988a Mon Sep 17 00:00:00 2001 From: gisungchoi Date: Fri, 14 May 2021 23:09:38 +0900 Subject: [PATCH 96/96] =?UTF-8?q?feat=20:=203000=20=ED=8F=AC=ED=8A=B8?= =?UTF-8?q?=EB=8A=94=20cors=20=EC=97=B4=EC=96=B4=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 특정 포트의 cors 요청은 허용한다 --- BE/build.gradle | 2 +- .../java/com/codesquad/coco/WebConfig.java | 16 +++++++ .../java/com/codesquad/coco/utils/GitURI.java | 2 +- .../java/com/codesquad/coco/GameTest.java | 42 ------------------- .../java/com/codesquad/coco/TeamTest.java | 36 ---------------- 5 files changed, 18 insertions(+), 80 deletions(-) create mode 100644 BE/src/main/java/com/codesquad/coco/WebConfig.java delete mode 100644 BE/src/test/java/com/codesquad/coco/GameTest.java delete mode 100644 BE/src/test/java/com/codesquad/coco/TeamTest.java diff --git a/BE/build.gradle b/BE/build.gradle index e3b4013f5..d818653bf 100644 --- a/BE/build.gradle +++ b/BE/build.gradle @@ -19,7 +19,7 @@ dependencies { runtimeOnly 'mysql:mysql-connector-java' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - implementation files('build/libs/gitOauthV4.jar') + implementation files('build/libs/gitOauthV5.jar') } test { diff --git a/BE/src/main/java/com/codesquad/coco/WebConfig.java b/BE/src/main/java/com/codesquad/coco/WebConfig.java new file mode 100644 index 000000000..59b933933 --- /dev/null +++ b/BE/src/main/java/com/codesquad/coco/WebConfig.java @@ -0,0 +1,16 @@ +package com.codesquad.coco; + + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("http://localhost:3000") + .allowedMethods("*"); + } +} \ No newline at end of file diff --git a/BE/src/main/java/com/codesquad/coco/utils/GitURI.java b/BE/src/main/java/com/codesquad/coco/utils/GitURI.java index 6703ef714..38b480164 100644 --- a/BE/src/main/java/com/codesquad/coco/utils/GitURI.java +++ b/BE/src/main/java/com/codesquad/coco/utils/GitURI.java @@ -2,7 +2,7 @@ public enum GitURI { - REDIRECT_URI("http://localhost:8080/login/github"), + REDIRECT_URI("http://ec2-52-78-180-217.ap-northeast-2.compute.amazonaws.com/login/github"), ACCESS_TOKEN_URI("https://github.com/login/oauth/access_token"), AUTHORIZE_URI("https://github.com/login/oauth/authorize"), USER_INFO_URI("https://api.github.com/user"); diff --git a/BE/src/test/java/com/codesquad/coco/GameTest.java b/BE/src/test/java/com/codesquad/coco/GameTest.java deleted file mode 100644 index 61bfb545a..000000000 --- a/BE/src/test/java/com/codesquad/coco/GameTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.codesquad.coco; - - -import com.codesquad.coco.game.domain.DAO.GameDAO; -import com.codesquad.coco.game.domain.model.Game; -import com.codesquad.coco.player.domain.UserType; -import com.codesquad.coco.team.domain.Team; -import com.codesquad.coco.team.domain.TeamRepository; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.transaction.annotation.Transactional; - - -@Transactional -@SpringBootTest -public class GameTest { - - @Autowired - TeamRepository teamRepository; - @Autowired - GameDAO gameDAO; - - Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Test - @DisplayName("게임 만들기") - void playGame() { - Team ssg = teamRepository.findTeamByName("SSG 랜더스").get(); - Team doSan = teamRepository.findTeamByName("두산 베어스").get(); - - Game bigMatch = new Game(ssg, doSan, UserType.HOME); - Long gameId = gameDAO.makeGame(bigMatch); - Assertions.assertThat(gameId).isEqualTo(2L); - //todo : 게임은 만들어 지면서 스코어 보드도 만들어야 한다. - } - -} \ No newline at end of file diff --git a/BE/src/test/java/com/codesquad/coco/TeamTest.java b/BE/src/test/java/com/codesquad/coco/TeamTest.java deleted file mode 100644 index 95c2daeb6..000000000 --- a/BE/src/test/java/com/codesquad/coco/TeamTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.codesquad.coco; - -import com.codesquad.coco.player.domain.model.Player; -import com.codesquad.coco.team.domain.Team; -import com.codesquad.coco.team.domain.TeamRepository; -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Transactional -@SpringBootTest -public class TeamTest { - - @Autowired - TeamRepository teamRepository; - - Logger logger = LoggerFactory.getLogger(TeamTest.class); - - @Test - @DisplayName("선수 조회") - void showPlayer() { - Team ssg = teamRepository.findTeamByName("SSG 랜더스").get(); - List players = ssg.getPlayers(); - Assertions.assertThat(players).isNotNull(); - for (Player player : players) { - logger.info("선수 {}", player.toString()); - } - } -}