From d120d976294c351cf875aaeb901296f623cf3399 Mon Sep 17 00:00:00 2001 From: janeljs Date: Mon, 3 May 2021 23:05:12 +0900 Subject: [PATCH 01/56] =?UTF-8?q?feat:=20.gitignore=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/.gitignore | 187 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 BE/.gitignore diff --git a/BE/.gitignore b/BE/.gitignore new file mode 100644 index 000000000..ad405396a --- /dev/null +++ b/BE/.gitignore @@ -0,0 +1,187 @@ +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/ + + +# Created by https://www.toptal.com/developers/gitignore/api/java-web,windows,java,intellij+all +# Edit at https://www.toptal.com/developers/gitignore?templates=java-web,windows,java,intellij+all + +### Intellij+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +# Sonarlint plugin +.idea/sonarlint + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Java-Web ### +## ignoring target file +target/ + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.toptal.com/developers/gitignore/api/java-web,windows,java,intellij+all From 10f47b3787d79541c03bbbdf635a93867718d8ea Mon Sep 17 00:00:00 2001 From: janeljs Date: Mon, 3 May 2021 23:06:04 +0900 Subject: [PATCH 02/56] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20schema.sql=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/build.gradle | 32 +++ BE/gradle/wrapper/gradle-wrapper.properties | 5 + BE/gradlew | 185 ++++++++++++++++++ BE/gradlew.bat | 89 +++++++++ BE/settings.gradle | 1 + .../baseball/BaseballApplication.java | 13 ++ .../codesquad/baseball/domain/Player.java | 18 ++ .../baseball/domain/PlayerGameInfo.java | 20 ++ .../java/codesquad/baseball/domain/Team.java | 23 +++ .../baseball/domain/TeamGameScore.java | 24 +++ BE/src/main/resources/application.properties | 5 + BE/src/main/resources/data.sql | 1 + BE/src/main/resources/schema.sql | 38 ++++ .../baseball/BaseballApplicationTests.java | 13 ++ 14 files changed, 467 insertions(+) create mode 100644 BE/build.gradle 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/codesquad/baseball/BaseballApplication.java create mode 100644 BE/src/main/java/codesquad/baseball/domain/Player.java create mode 100644 BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java create mode 100644 BE/src/main/java/codesquad/baseball/domain/Team.java create mode 100644 BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java create mode 100644 BE/src/main/resources/application.properties create mode 100644 BE/src/main/resources/data.sql create mode 100644 BE/src/main/resources/schema.sql create mode 100644 BE/src/test/java/codesquad/baseball/BaseballApplicationTests.java diff --git a/BE/build.gradle b/BE/build.gradle new file mode 100644 index 000000000..a2ac9159a --- /dev/null +++ b/BE/build.gradle @@ -0,0 +1,32 @@ +plugins { + id 'org.springframework.boot' version '2.4.5' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'codesquad' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'mysql:mysql-connector-java' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +test { + useJUnitPlatform() +} 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..c1cccd8ee --- /dev/null +++ b/BE/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'baseball' diff --git a/BE/src/main/java/codesquad/baseball/BaseballApplication.java b/BE/src/main/java/codesquad/baseball/BaseballApplication.java new file mode 100644 index 000000000..cfaed7670 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/BaseballApplication.java @@ -0,0 +1,13 @@ +package codesquad.baseball; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class BaseballApplication { + + public static void main(String[] args) { + SpringApplication.run(BaseballApplication.class, args); + } + +} diff --git a/BE/src/main/java/codesquad/baseball/domain/Player.java b/BE/src/main/java/codesquad/baseball/domain/Player.java new file mode 100644 index 000000000..03f229c84 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/Player.java @@ -0,0 +1,18 @@ +package codesquad.baseball.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.annotation.Id; + +@Getter +@Setter +@AllArgsConstructor +public class Player { + @Id + private Long id; + + private String name; + + private Long teamId; +} diff --git a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java new file mode 100644 index 000000000..2e8d75fa5 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java @@ -0,0 +1,20 @@ +package codesquad.baseball.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.annotation.Id; + +@Getter +@Setter +@AllArgsConstructor +public class PlayerGameInfo { + @Id + private Long id; + private Long average; + private int battingOrder; + private int plateAppearance; + private int hits; + private int out; + +} diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java new file mode 100644 index 000000000..8da01280b --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -0,0 +1,23 @@ +package codesquad.baseball.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.springframework.data.annotation.Id; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class Team { + @Id + private Long id; + + private String name; + + private List teamGameScoreList = new ArrayList<>(); +} diff --git a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java new file mode 100644 index 000000000..c81210a12 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java @@ -0,0 +1,24 @@ +package codesquad.baseball.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.springframework.data.annotation.Id; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class TeamGameScore { + @Id + private Long id; + + private int inning; + + private int score; + + private Long teamId; + + +} diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties new file mode 100644 index 000000000..e595d4ac4 --- /dev/null +++ b/BE/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/baseball?characterEncoding=UTF-8 +spring.datasource.username=team-11 +spring.datasource.password=1234 +spring.datasource.initialization-mode=always diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql new file mode 100644 index 000000000..8bd43bf86 --- /dev/null +++ b/BE/src/main/resources/data.sql @@ -0,0 +1 @@ +insert into team(name) values ('Jung'); diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql new file mode 100644 index 000000000..bb92a34dc --- /dev/null +++ b/BE/src/main/resources/schema.sql @@ -0,0 +1,38 @@ +drop table if exists team; +create table team +( + id int auto_increment primary key, + name varchar(64) unique not null +); + +drop table if exists team_game_score; +create table team_game_score +( + id int auto_increment primary key, + inning int, + score int, + team int references team (id), + team_key int +); + +drop table if exists player; +create table player +( + id bigint(20) auto_increment primary key, + name varchar(50), + team bigint(20) references team(id) +); + +drop table if exists player_game_info; +create table player_game_info +( + id bigint(20) auto_increment primary key, + average bigint(20), + batting_order int, + plate_appearance int, + hits int, + `out` int, + player bigint(20) references player(id) +); + + diff --git a/BE/src/test/java/codesquad/baseball/BaseballApplicationTests.java b/BE/src/test/java/codesquad/baseball/BaseballApplicationTests.java new file mode 100644 index 000000000..85fdccb7d --- /dev/null +++ b/BE/src/test/java/codesquad/baseball/BaseballApplicationTests.java @@ -0,0 +1,13 @@ +package codesquad.baseball; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BaseballApplicationTests { + + @Test + void contextLoads() { + } + +} From 713965b483469968fc8628d0a8d53d387f845219 Mon Sep 17 00:00:00 2001 From: janeljs Date: Tue, 4 May 2021 00:05:50 +0900 Subject: [PATCH 03/56] =?UTF-8?q?feat:=20History,=20Match=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20#2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/controller/HomeController.java | 4 ++++ .../codesquad/baseball/domain/History.java | 13 ++++++++++++ .../java/codesquad/baseball/domain/Match.java | 20 +++++++++++++++++++ .../baseball/domain/TeamGameScore.java | 3 --- BE/src/main/resources/schema.sql | 11 +++++++++- 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 BE/src/main/java/codesquad/baseball/controller/HomeController.java create mode 100644 BE/src/main/java/codesquad/baseball/domain/History.java create mode 100644 BE/src/main/java/codesquad/baseball/domain/Match.java diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java new file mode 100644 index 000000000..743052713 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -0,0 +1,4 @@ +package codesquad.baseball.controller; + +public class HomeController { +} diff --git a/BE/src/main/java/codesquad/baseball/domain/History.java b/BE/src/main/java/codesquad/baseball/domain/History.java new file mode 100644 index 000000000..de68da7e0 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/History.java @@ -0,0 +1,13 @@ +package codesquad.baseball.domain; + +import org.springframework.data.annotation.Id; + +public class History { + @Id + private Long id; + private Long playerId; + private String actionName; + private int strike; + private int ball; + private int out; +} diff --git a/BE/src/main/java/codesquad/baseball/domain/Match.java b/BE/src/main/java/codesquad/baseball/domain/Match.java new file mode 100644 index 000000000..83aa9be1f --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/Match.java @@ -0,0 +1,20 @@ +package codesquad.baseball.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.annotation.Id; + +@Getter +@Setter +@AllArgsConstructor +public class Match { + @Id + private Long id; + + private Long myTeamId; + + private Long counterTeamId; + + private boolean isHome; +} diff --git a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java index c81210a12..e70387a46 100644 --- a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java +++ b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java @@ -18,7 +18,4 @@ public class TeamGameScore { private int score; - private Long teamId; - - } diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index bb92a34dc..be2ae1c87 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -35,4 +35,13 @@ create table player_game_info player bigint(20) references player(id) ); - +drop table if exists history; +create table history +( + id bigint(20) auto_increment primary key, + player bigint(20) references player(id), + action_name varchar(30), + strike int, + ball int, + `out` int +); From 774438c903031e8c6eaa90621b80c45bc24e43fe Mon Sep 17 00:00:00 2001 From: janeljs Date: Tue, 4 May 2021 15:56:52 +0900 Subject: [PATCH 04/56] =?UTF-8?q?feat:=20=EC=A0=84=EC=B2=B4=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 158 ++++++++++++++++++ .idea/compiler.xml | 14 ++ .idea/gradle.xml | 17 ++ .idea/jarRepositories.xml | 20 +++ .idea/misc.xml | 5 + .idea/sqldialects.xml | 6 + .idea/uiDesigner.xml | 124 ++++++++++++++ .idea/vcs.xml | 6 + .../baseball/controller/HomeController.java | 44 +++++ .../java/codesquad/baseball/domain/Match.java | 9 +- .../baseball/domain/PlayerGameInfo.java | 3 +- .../baseball/repository/MatchRepository.java | 7 + .../baseball/repository/TeamRepository.java | 8 + BE/src/main/resources/data.sql | 43 ++++- BE/src/main/resources/schema.sql | 13 +- 15 files changed, 471 insertions(+), 6 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/sqldialects.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml create mode 100644 BE/src/main/java/codesquad/baseball/repository/MatchRepository.java create mode 100644 BE/src/main/java/codesquad/baseball/repository/TeamRepository.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..a4bb87be1 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,158 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Datasource local storage ignored files +/../../../../../../../:\Users\jisun\Documents\projects\baseball\.idea/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ + +# Created by https://www.toptal.com/developers/gitignore/api/java-web,windows,java,intellij+all +# Edit at https://www.toptal.com/developers/gitignore?templates=java-web,windows,java,intellij+all + +### Intellij+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 + +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr + +# Sonarlint plugin +.idea/sonarlint + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Java-Web ### +## ignoring target file +target/ + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.toptal.com/developers/gitignore/api/java-web,windows,java,intellij+all + diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..543d6ad5c --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 000000000..d90a997f9 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..fdc392fe8 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..efc867730 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 000000000..47f2d04a1 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 000000000..e96534fb2 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..94a25f7f4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 743052713..bbcd0774e 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -1,4 +1,48 @@ package codesquad.baseball.controller; +import codesquad.baseball.domain.Match; +import codesquad.baseball.domain.Team; +import codesquad.baseball.repository.MatchRepository; +import codesquad.baseball.repository.TeamRepository; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.view.RedirectView; + +import java.net.URI; +import java.util.HashMap; +import java.util.List; + +@RestController public class HomeController { + private final TeamRepository teamRepository; + private final MatchRepository matchRepository; + + public HomeController(TeamRepository teamRepository, MatchRepository matchRepository) { + this.teamRepository = teamRepository; + this.matchRepository = matchRepository; + } + + @GetMapping + public ResponseEntity home() { + List teamList = (List) teamRepository.findAll(); + return new ResponseEntity(teamList, HttpStatus.OK); + } + + @PostMapping + public RedirectView home(@RequestBody HashMap teamInfo) { + Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); + Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); + boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); + Match match = new Match(myTeamId, counterTeamId, isHome); + matchRepository.save(match); + return new RedirectView("/game"); + } + + @GetMapping("/game") + public String start() { + return "성공"; + } + } diff --git a/BE/src/main/java/codesquad/baseball/domain/Match.java b/BE/src/main/java/codesquad/baseball/domain/Match.java index 83aa9be1f..f804555c2 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Match.java +++ b/BE/src/main/java/codesquad/baseball/domain/Match.java @@ -1,20 +1,23 @@ package codesquad.baseball.domain; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import org.springframework.data.annotation.Id; @Getter @Setter @AllArgsConstructor +@RequiredArgsConstructor public class Match { @Id private Long id; + @NonNull private Long myTeamId; + @NonNull private Long counterTeamId; + @NonNull private boolean isHome; + } diff --git a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java index 2e8d75fa5..8d91af1e4 100644 --- a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java +++ b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java @@ -11,10 +11,11 @@ public class PlayerGameInfo { @Id private Long id; - private Long average; + private int battingOrder; private int plateAppearance; private int hits; private int out; + private Long average; } diff --git a/BE/src/main/java/codesquad/baseball/repository/MatchRepository.java b/BE/src/main/java/codesquad/baseball/repository/MatchRepository.java new file mode 100644 index 000000000..05ee62338 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/repository/MatchRepository.java @@ -0,0 +1,7 @@ +package codesquad.baseball.repository; + +import codesquad.baseball.domain.Match; +import org.springframework.data.repository.CrudRepository; + +public interface MatchRepository extends CrudRepository { +} diff --git a/BE/src/main/java/codesquad/baseball/repository/TeamRepository.java b/BE/src/main/java/codesquad/baseball/repository/TeamRepository.java new file mode 100644 index 000000000..aa0dbf333 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/repository/TeamRepository.java @@ -0,0 +1,8 @@ +package codesquad.baseball.repository; + +import codesquad.baseball.domain.Team; +import org.springframework.data.repository.CrudRepository; + +public interface TeamRepository extends CrudRepository { + +} diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 8bd43bf86..96d455142 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -1 +1,42 @@ -insert into team(name) values ('Jung'); +insert into team(name) +values ('team1'); +insert into team(name) +values ('team2'); +insert into team(name) +values ('team3'); +insert into team(name) +values ('team4'); + +insert into player(name, team) +values ('eve', 1); +insert into player(name, team) +values ('jung', 1); +insert into player(name, team) +values ('jane', 2); +insert into player(name, team) +values ('adela', 2); + +insert into team_game_score(inning, score, team) +values (1, 3, 1); +insert into team_game_score(inning, score, team) +values (1, 4, 2); + + +insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) +values (2, 5, 5, 0, 1, 2); +insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) +values (1, 2, 1, 2, 0.5, 1); +insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) +values (1, 4, 3, 1, 0.75, 3); +insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) +values (2, 2, 1, 2, 0.5, 4); + +insert into history(player, action_name, strike, ball, `out`) +values (1, 'S', 2, 2, 1); +insert into history(player, action_name, strike, ball, `out`) +values (1, 'H', 2, 2, 1); +insert into history(player, action_name, strike, ball, `out`) +values (2, 'H', 2, 2, 1); + +insert into `match`(my_team_id, counter_team_id, is_home) +values (1, 2, true); diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index be2ae1c87..4677ea4b3 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -27,11 +27,11 @@ drop table if exists player_game_info; create table player_game_info ( id bigint(20) auto_increment primary key, - average bigint(20), batting_order int, plate_appearance int, hits int, `out` int, + average bigint(20), player bigint(20) references player(id) ); @@ -45,3 +45,14 @@ create table history ball int, `out` int ); + +drop table if exists `match`; +create table `match` +( + id bigint(20) auto_increment primary key, + my_team_id bigint(20), + counter_team_id bigint(20), + is_home boolean +); + + From 420b6af9e5269b5479935b7c92d4947b4478ee6e Mon Sep 17 00:00:00 2001 From: janeljs Date: Tue, 4 May 2021 21:49:16 +0900 Subject: [PATCH 05/56] =?UTF-8?q?=EC=9E=84=EC=8B=9C=20=EC=BB=A4=EB=B0=8B?= =?UTF-8?q?=20-=20DTO=20=EC=84=A4=EA=B3=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/ApiResponse.java | 18 +++++++++ .../codesquad/baseball/DTO/HistoryDTO.java | 27 +++++++++++++ .../codesquad/baseball/DTO/PlayerDTO.java | 25 ++++++++++++ .../java/codesquad/baseball/DTO/TeamDTO.java | 19 ++++++++++ .../baseball/controller/HomeController.java | 38 +++++++++++++++---- .../codesquad/baseball/domain/History.java | 9 ++++- .../java/codesquad/baseball/domain/Match.java | 1 + .../codesquad/baseball/domain/Player.java | 4 +- .../baseball/domain/PlayerGameInfo.java | 2 + .../java/codesquad/baseball/domain/Team.java | 12 ++++++ .../repository/HistoryRepository.java | 11 ++++++ BE/src/main/resources/data.sql | 38 +++++++++++-------- BE/src/main/resources/schema.sql | 16 +++++--- 13 files changed, 188 insertions(+), 32 deletions(-) create mode 100644 BE/src/main/java/codesquad/baseball/ApiResponse.java create mode 100644 BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java create mode 100644 BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java create mode 100644 BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java create mode 100644 BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java diff --git a/BE/src/main/java/codesquad/baseball/ApiResponse.java b/BE/src/main/java/codesquad/baseball/ApiResponse.java new file mode 100644 index 000000000..7ddc5b1a4 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/ApiResponse.java @@ -0,0 +1,18 @@ +package codesquad.baseball; + +import codesquad.baseball.DTO.HistoryDTO; +import codesquad.baseball.DTO.PlayerDTO; +import codesquad.baseball.DTO.TeamDTO; + +import java.util.ArrayList; +import java.util.List; + +public class ApiResponse { + TeamDTO teamLeft; + TeamDTO teamRight; + + PlayerDTO Pitcher; + PlayerDTO Hitter; + + List historyDTOList; +} diff --git a/BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java b/BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java new file mode 100644 index 000000000..796bd387f --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java @@ -0,0 +1,27 @@ +package codesquad.baseball.DTO; + +import codesquad.baseball.domain.History; +import codesquad.baseball.domain.Player; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +public class HistoryDTO { +// private String playerName; +// private int playerBattingOrder; +// private List historyList; + +// public HistoryDTO(Player player) { +// this.playerName = player.getName(); +// this.playerBattingOrder = player.getPlayerGameInfo().getBattingOrder(); +// this.historyList = player.getHistories(); +// } + + +} diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java new file mode 100644 index 000000000..da9fe8d11 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java @@ -0,0 +1,25 @@ +package codesquad.baseball.DTO; + +import codesquad.baseball.domain.Player; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class PlayerDTO { + private String role; + private String name; + private int pitchCount; + private int plateAppearances; + private int hits; + + public PlayerDTO(Player player) { + this.role = player.getPlayerGameInfo().getRole(); + this.name = player.getName(); + this.pitchCount = player.getPlayerGameInfo().getPitchCount(); + this.plateAppearances = player.getPlayerGameInfo().getPlateAppearance(); + this.hits = player.getPlayerGameInfo().getHits(); + } +} diff --git a/BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java b/BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java new file mode 100644 index 000000000..df73db5d2 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java @@ -0,0 +1,19 @@ +package codesquad.baseball.DTO; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import codesquad.baseball.domain.*; + +@Getter +@Setter +@AllArgsConstructor +public class TeamDTO { + private String name; + private int totalScore; + + public TeamDTO(Team team) { + this.name = team.getName(); + this.totalScore = team.getTotalScore(); + }//jung 실험 중 +} diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index bbcd0774e..94e3e4608 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -1,16 +1,21 @@ package codesquad.baseball.controller; +import codesquad.baseball.DTO.HistoryDTO; +import codesquad.baseball.DTO.PlayerDTO; +import codesquad.baseball.DTO.TeamDTO; +import codesquad.baseball.domain.History; import codesquad.baseball.domain.Match; +import codesquad.baseball.domain.Player; import codesquad.baseball.domain.Team; +import codesquad.baseball.repository.HistoryRepository; import codesquad.baseball.repository.MatchRepository; import codesquad.baseball.repository.TeamRepository; -import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.view.RedirectView; -import java.net.URI; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -18,10 +23,12 @@ public class HomeController { private final TeamRepository teamRepository; private final MatchRepository matchRepository; + private final HistoryRepository historyRepository; - public HomeController(TeamRepository teamRepository, MatchRepository matchRepository) { + public HomeController(TeamRepository teamRepository, MatchRepository matchRepository, HistoryRepository historyRepository) { this.teamRepository = teamRepository; this.matchRepository = matchRepository; + this.historyRepository= historyRepository; } @GetMapping @@ -36,13 +43,28 @@ public RedirectView home(@RequestBody HashMap teamInfo) { Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); Match match = new Match(myTeamId, counterTeamId, isHome); - matchRepository.save(match); - return new RedirectView("/game"); + Long matchId = matchRepository.save(match).getId(); + return new RedirectView("/game/" + matchId); } - @GetMapping("/game") - public String start() { - return "성공"; + + + @GetMapping("/game/{matchId}") + public Team game(@PathVariable Long matchId) { + System.out.println("matchId: " + matchId); + Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); + Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); + Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); + + List historyList = myTeam.getHistoryList(); + + TeamDTO teamLeft = new TeamDTO(myTeam.getName(), 5); + TeamDTO teamRight = new TeamDTO(counterTeam.getName(), 5); + + PlayerDTO Pitcher = new PlayerDTO("투수", "Jung", 39, 1, 0); + PlayerDTO Hitter = new PlayerDTO("타자", "Jane", 0, 1, 0); + + return myTeam; } } diff --git a/BE/src/main/java/codesquad/baseball/domain/History.java b/BE/src/main/java/codesquad/baseball/domain/History.java index de68da7e0..23305cbbc 100644 --- a/BE/src/main/java/codesquad/baseball/domain/History.java +++ b/BE/src/main/java/codesquad/baseball/domain/History.java @@ -1,11 +1,18 @@ package codesquad.baseball.domain; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; import org.springframework.data.annotation.Id; +@Getter +@Setter +@AllArgsConstructor +@RequiredArgsConstructor public class History { @Id private Long id; - private Long playerId; private String actionName; private int strike; private int ball; diff --git a/BE/src/main/java/codesquad/baseball/domain/Match.java b/BE/src/main/java/codesquad/baseball/domain/Match.java index f804555c2..dceed3011 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Match.java +++ b/BE/src/main/java/codesquad/baseball/domain/Match.java @@ -6,6 +6,7 @@ @Getter @Setter @AllArgsConstructor +@NoArgsConstructor @RequiredArgsConstructor public class Match { @Id diff --git a/BE/src/main/java/codesquad/baseball/domain/Player.java b/BE/src/main/java/codesquad/baseball/domain/Player.java index 03f229c84..b3a8a7300 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Player.java +++ b/BE/src/main/java/codesquad/baseball/domain/Player.java @@ -4,6 +4,7 @@ import lombok.Getter; import lombok.Setter; import org.springframework.data.annotation.Id; +import java.util.*; @Getter @Setter @@ -14,5 +15,6 @@ public class Player { private String name; - private Long teamId; + private PlayerGameInfo playerGameInfo; +// private List histories; } diff --git a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java index 8d91af1e4..6ae819303 100644 --- a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java +++ b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java @@ -13,6 +13,8 @@ public class PlayerGameInfo { private Long id; private int battingOrder; + private String role; + private int pitchCount; private int plateAppearance; private int hits; private int out; diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index 8da01280b..2525a96fd 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -19,5 +19,17 @@ public class Team { private String name; + private List historyList = new ArrayList<>(); + private List teamGameScoreList = new ArrayList<>(); + + private List playerList = new ArrayList<>(); + + public int getTotalScore() { + int total=0; + for(TeamGameScore teamGameScore: teamGameScoreList) { + total += teamGameScore.getScore(); + } + return total; + }//jung 실험 중 } diff --git a/BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java b/BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java new file mode 100644 index 000000000..9013cbef9 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java @@ -0,0 +1,11 @@ +package codesquad.baseball.repository; + +import codesquad.baseball.domain.History; +import org.springframework.data.jdbc.repository.query.Query; +import org.springframework.data.repository.CrudRepository; + +import java.util.List; +import java.util.Optional; + +public interface HistoryRepository extends CrudRepository { +} diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 96d455142..88e55d5c9 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -22,21 +22,27 @@ insert into team_game_score(inning, score, team) values (1, 4, 2); -insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) -values (2, 5, 5, 0, 1, 2); -insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) -values (1, 2, 1, 2, 0.5, 1); -insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) -values (1, 4, 3, 1, 0.75, 3); -insert into player_game_info(batting_order, plate_appearance, hits, `out`, average, player) -values (2, 2, 1, 2, 0.5, 4); +insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) +values (2, '타자', 5, 5, 0, 1, 2); +insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) +values (1, '투수', 2, 1, 2, 0.5, 1); +insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) +values (1, '타자', 4, 3, 1, 0.75, 3); +insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) +values (2, '투수', 2, 1, 2, 0.5, 4); -insert into history(player, action_name, strike, ball, `out`) -values (1, 'S', 2, 2, 1); -insert into history(player, action_name, strike, ball, `out`) -values (1, 'H', 2, 2, 1); -insert into history(player, action_name, strike, ball, `out`) -values (2, 'H', 2, 2, 1); +insert into history(player, team, action_name, strike, ball, `out`) +values (1, 1, 'S', 2, 2, 1); +insert into history(player, team, action_name, strike, ball, `out`) +values (1, 1, 'H', 2, 2, 1); +insert into history(player, team, action_name, strike, ball, `out`) +values (2, 1, 'H', 2, 2, 1); +insert into history(player, team, action_name, strike, ball, `out`) +values (3, 2, 'S', 2, 2, 1); +insert into history(player, team, action_name, strike, ball, `out`) +values (3, 2, 'H', 2, 2, 1); +insert into history(player, team, action_name, strike, ball, `out`) +values (4, 2, 'H', 2, 2, 1); -insert into `match`(my_team_id, counter_team_id, is_home) -values (1, 2, true); +-- insert into `match`(my_team_id, counter_team_id, is_home) +-- values (1, 2, true); diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 4677ea4b3..162aa9b2a 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -11,16 +11,17 @@ create table team_game_score id int auto_increment primary key, inning int, score int, - team int references team (id), + team bigint(20) references team(id), team_key int ); drop table if exists player; create table player ( - id bigint(20) auto_increment primary key, - name varchar(50), - team bigint(20) references team(id) + id bigint(20) auto_increment primary key, + name varchar(50), + team bigint(20) references team (id), + team_key int ); drop table if exists player_game_info; @@ -28,6 +29,7 @@ create table player_game_info ( id bigint(20) auto_increment primary key, batting_order int, + role varchar(20), plate_appearance int, hits int, `out` int, @@ -39,11 +41,13 @@ drop table if exists history; create table history ( id bigint(20) auto_increment primary key, - player bigint(20) references player(id), action_name varchar(30), strike int, ball int, - `out` int + `out` int, + team bigint(20) references team(id), + team_key int, + player bigint(20) references player(id) ); drop table if exists `match`; From 26e8c3b4ee829f5ebfeabbd553650c4ba9bb4ad3 Mon Sep 17 00:00:00 2001 From: rla36 Date: Wed, 5 May 2021 00:14:36 +0900 Subject: [PATCH 06/56] =?UTF-8?q?feat:=20DB=EC=84=A4=EA=B3=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20controller=EC=97=90=20play=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Team와 Player이 History와 각각 1:N관계를 맺도록 클래스에 List 추가 --- .../java/codesquad/baseball/ApiResponse.java | 17 +++++++----- .../codesquad/baseball/DTO/HistoryDTO.java | 27 ------------------- .../baseball/DTO/PlayerHistoryDTO.java | 25 +++++++++++++++++ .../java/codesquad/baseball/DTO/TeamDTO.java | 2 +- .../baseball/DTO/TeamHistoryDTO.java | 21 +++++++++++++++ .../baseball/controller/HomeController.java | 21 ++++++--------- .../codesquad/baseball/domain/History.java | 1 + .../codesquad/baseball/domain/Player.java | 6 ++++- BE/src/main/resources/data.sql | 16 +++++------ BE/src/main/resources/schema.sql | 10 ++++--- 10 files changed, 85 insertions(+), 61 deletions(-) delete mode 100644 BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java create mode 100644 BE/src/main/java/codesquad/baseball/DTO/PlayerHistoryDTO.java create mode 100644 BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java diff --git a/BE/src/main/java/codesquad/baseball/ApiResponse.java b/BE/src/main/java/codesquad/baseball/ApiResponse.java index 7ddc5b1a4..813fd5bd8 100644 --- a/BE/src/main/java/codesquad/baseball/ApiResponse.java +++ b/BE/src/main/java/codesquad/baseball/ApiResponse.java @@ -1,18 +1,21 @@ package codesquad.baseball; -import codesquad.baseball.DTO.HistoryDTO; import codesquad.baseball.DTO.PlayerDTO; import codesquad.baseball.DTO.TeamDTO; +import codesquad.baseball.DTO.TeamHistoryDTO; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; -import java.util.ArrayList; -import java.util.List; - +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"teamLeft", "teamRight", "pitcher", "hitter", "teamLog"}) public class ApiResponse { TeamDTO teamLeft; TeamDTO teamRight; - PlayerDTO Pitcher; - PlayerDTO Hitter; + PlayerDTO pitcher; + PlayerDTO hitter; - List historyDTOList; + TeamHistoryDTO teamLog; } diff --git a/BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java b/BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java deleted file mode 100644 index 796bd387f..000000000 --- a/BE/src/main/java/codesquad/baseball/DTO/HistoryDTO.java +++ /dev/null @@ -1,27 +0,0 @@ -package codesquad.baseball.DTO; - -import codesquad.baseball.domain.History; -import codesquad.baseball.domain.Player; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - -import java.util.ArrayList; -import java.util.List; - -@Getter -@Setter -@AllArgsConstructor -public class HistoryDTO { -// private String playerName; -// private int playerBattingOrder; -// private List historyList; - -// public HistoryDTO(Player player) { -// this.playerName = player.getName(); -// this.playerBattingOrder = player.getPlayerGameInfo().getBattingOrder(); -// this.historyList = player.getHistories(); -// } - - -} diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerHistoryDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerHistoryDTO.java new file mode 100644 index 000000000..b4704198e --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerHistoryDTO.java @@ -0,0 +1,25 @@ +package codesquad.baseball.DTO; + +import codesquad.baseball.domain.History; +import codesquad.baseball.domain.Player; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@Setter +@AllArgsConstructor +public class PlayerHistoryDTO { + private int playerBattingOrder; + private String playerName; + private List historyList; + + public PlayerHistoryDTO(Player player) { + this.playerBattingOrder = player.getPlayerGameInfo().getBattingOrder(); + this.playerName = player.getName(); + this.historyList = player.getHistoryList(); + } +} diff --git a/BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java b/BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java index df73db5d2..2670b1451 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/TeamDTO.java @@ -15,5 +15,5 @@ public class TeamDTO { public TeamDTO(Team team) { this.name = team.getName(); this.totalScore = team.getTotalScore(); - }//jung 실험 중 + } } diff --git a/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java b/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java new file mode 100644 index 000000000..679601fa1 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java @@ -0,0 +1,21 @@ +package codesquad.baseball.DTO; + +import codesquad.baseball.domain.Player; +import codesquad.baseball.domain.Team; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@NoArgsConstructor +public class TeamHistoryDTO { + public List playerPlayerHistoryDTOList = new ArrayList<>(); + + public TeamHistoryDTO(Team team) { + for(Player player : team.getPlayerList()) { + this.playerPlayerHistoryDTOList.add(new PlayerHistoryDTO(player)); + } + } +} diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 94e3e4608..c8f861ea9 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -1,11 +1,11 @@ package codesquad.baseball.controller; -import codesquad.baseball.DTO.HistoryDTO; +import codesquad.baseball.ApiResponse; import codesquad.baseball.DTO.PlayerDTO; import codesquad.baseball.DTO.TeamDTO; +import codesquad.baseball.DTO.TeamHistoryDTO; import codesquad.baseball.domain.History; import codesquad.baseball.domain.Match; -import codesquad.baseball.domain.Player; import codesquad.baseball.domain.Team; import codesquad.baseball.repository.HistoryRepository; import codesquad.baseball.repository.MatchRepository; @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.view.RedirectView; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -23,12 +22,10 @@ public class HomeController { private final TeamRepository teamRepository; private final MatchRepository matchRepository; - private final HistoryRepository historyRepository; - public HomeController(TeamRepository teamRepository, MatchRepository matchRepository, HistoryRepository historyRepository) { + public HomeController(TeamRepository teamRepository, MatchRepository matchRepository) { this.teamRepository = teamRepository; this.matchRepository = matchRepository; - this.historyRepository= historyRepository; } @GetMapping @@ -47,24 +44,22 @@ public RedirectView home(@RequestBody HashMap teamInfo) { return new RedirectView("/game/" + matchId); } - - @GetMapping("/game/{matchId}") - public Team game(@PathVariable Long matchId) { + public ResponseEntity game(@PathVariable Long matchId) { System.out.println("matchId: " + matchId); Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); List historyList = myTeam.getHistoryList(); - TeamDTO teamLeft = new TeamDTO(myTeam.getName(), 5); TeamDTO teamRight = new TeamDTO(counterTeam.getName(), 5); - PlayerDTO Pitcher = new PlayerDTO("투수", "Jung", 39, 1, 0); - PlayerDTO Hitter = new PlayerDTO("타자", "Jane", 0, 1, 0); + PlayerDTO Pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); + PlayerDTO Hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); - return myTeam; + ApiResponse apiResponse = new ApiResponse(teamLeft, teamRight, Pitcher, Hitter, new TeamHistoryDTO(myTeam)); + return new ResponseEntity<>(apiResponse, HttpStatus.OK); } } diff --git a/BE/src/main/java/codesquad/baseball/domain/History.java b/BE/src/main/java/codesquad/baseball/domain/History.java index 23305cbbc..d972a0065 100644 --- a/BE/src/main/java/codesquad/baseball/domain/History.java +++ b/BE/src/main/java/codesquad/baseball/domain/History.java @@ -17,4 +17,5 @@ public class History { private int strike; private int ball; private int out; + } diff --git a/BE/src/main/java/codesquad/baseball/domain/Player.java b/BE/src/main/java/codesquad/baseball/domain/Player.java index b3a8a7300..6aea4b2e4 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Player.java +++ b/BE/src/main/java/codesquad/baseball/domain/Player.java @@ -16,5 +16,9 @@ public class Player { private String name; private PlayerGameInfo playerGameInfo; -// private List histories; + private List historyList; + + public void addHistory(History history) { + historyList.add(history); + } } diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 88e55d5c9..836641c16 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -22,14 +22,14 @@ insert into team_game_score(inning, score, team) values (1, 4, 2); -insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) -values (2, '타자', 5, 5, 0, 1, 2); -insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) -values (1, '투수', 2, 1, 2, 0.5, 1); -insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) -values (1, '타자', 4, 3, 1, 0.75, 3); -insert into player_game_info(batting_order, role, plate_appearance, hits, `out`, average, player) -values (2, '투수', 2, 1, 2, 0.5, 4); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (2, '타자', 0, 5, 5, 0, 1, 2); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (1, '투수', 15, 2, 1, 2, 0.5, 1); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (1, '타자', 0, 4, 3, 1, 0.75, 3); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (2, '투수', 30, 2, 1, 2, 0.5, 4); insert into history(player, team, action_name, strike, ball, `out`) values (1, 1, 'S', 2, 2, 1); diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 162aa9b2a..adee90a8f 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -11,7 +11,7 @@ create table team_game_score id int auto_increment primary key, inning int, score int, - team bigint(20) references team(id), + team bigint(20) references team (id), team_key int ); @@ -30,11 +30,12 @@ create table player_game_info id bigint(20) auto_increment primary key, batting_order int, role varchar(20), + pitch_count int, plate_appearance int, hits int, `out` int, average bigint(20), - player bigint(20) references player(id) + player bigint(20) references player (id) ); drop table if exists history; @@ -45,9 +46,10 @@ create table history strike int, ball int, `out` int, - team bigint(20) references team(id), + team bigint(20) references team (id), team_key int, - player bigint(20) references player(id) + player bigint(20) references player (id), + player_key int ); drop table if exists `match`; From 530ace5f18fa4c7b74b9916350df9daf77f008c1 Mon Sep 17 00:00:00 2001 From: janeljs Date: Thu, 6 May 2021 16:09:12 +0900 Subject: [PATCH 07/56] =?UTF-8?q?feat:=20Mock=20API=20=EC=84=A4=EA=B3=84?= =?UTF-8?q?=20#4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/ApiResponse.java | 16 ++++++----- .../baseball/DTO/PlayerGameScoreDTO.java | 25 +++++++++++++++++ .../baseball/DTO/PlayerListPopUpDTO.java | 27 +++++++++++++++++++ .../baseball/DTO/TeamGameScoreDTO.java | 25 +++++++++++++++++ .../baseball/DTO/TeamHistoryDTO.java | 4 +-- .../baseball/controller/HomeController.java | 25 +++++++++++------ .../java/codesquad/baseball/domain/Match.java | 2 ++ .../java/codesquad/baseball/domain/Team.java | 25 ++++++++++------- .../baseball/domain/TeamGameScore.java | 2 ++ BE/src/main/resources/data.sql | 24 ++++++++++------- BE/src/main/resources/schema.sql | 7 ++--- 11 files changed, 145 insertions(+), 37 deletions(-) create mode 100644 BE/src/main/java/codesquad/baseball/DTO/PlayerGameScoreDTO.java create mode 100644 BE/src/main/java/codesquad/baseball/DTO/PlayerListPopUpDTO.java create mode 100644 BE/src/main/java/codesquad/baseball/DTO/TeamGameScoreDTO.java diff --git a/BE/src/main/java/codesquad/baseball/ApiResponse.java b/BE/src/main/java/codesquad/baseball/ApiResponse.java index 813fd5bd8..1d11fffda 100644 --- a/BE/src/main/java/codesquad/baseball/ApiResponse.java +++ b/BE/src/main/java/codesquad/baseball/ApiResponse.java @@ -1,21 +1,25 @@ package codesquad.baseball; -import codesquad.baseball.DTO.PlayerDTO; -import codesquad.baseball.DTO.TeamDTO; -import codesquad.baseball.DTO.TeamHistoryDTO; +import codesquad.baseball.DTO.*; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -@JsonPropertyOrder({"teamLeft", "teamRight", "pitcher", "hitter", "teamLog"}) +@JsonPropertyOrder({"teamLeftScore", "teamRightScore", "teamLeft", "teamRight", "pitcher", "hitter", "teamLog"}) public class ApiResponse { - TeamDTO teamLeft; - TeamDTO teamRight; + TeamGameScoreDTO homeTeamScore; + TeamGameScoreDTO leftTeamScore; + + TeamDTO homeTeam; + TeamDTO awayTeam; PlayerDTO pitcher; PlayerDTO hitter; TeamHistoryDTO teamLog; + + PlayerListPopUpDTO homeTeamPlayerList; + PlayerListPopUpDTO awayTeamPlayerList; } diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerGameScoreDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerGameScoreDTO.java new file mode 100644 index 000000000..23da4587d --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerGameScoreDTO.java @@ -0,0 +1,25 @@ +package codesquad.baseball.DTO; + +import codesquad.baseball.domain.Player; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Getter +@NoArgsConstructor +public class PlayerGameScoreDTO { + private String playerName; + private int plateAppearance; + private int hits; + private int out; + private Long average; + + public PlayerGameScoreDTO(Player player) { + this.playerName = player.getName(); + this.plateAppearance = player.getPlayerGameInfo().getPlateAppearance(); + this.hits = player.getPlayerGameInfo().getHits(); + this.out = player.getPlayerGameInfo().getOut(); + this.average = player.getPlayerGameInfo().getAverage(); + } +} diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerListPopUpDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerListPopUpDTO.java new file mode 100644 index 000000000..054cc6609 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerListPopUpDTO.java @@ -0,0 +1,27 @@ +package codesquad.baseball.DTO; + +import codesquad.baseball.domain.Player; +import codesquad.baseball.domain.Team; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@NoArgsConstructor +@JsonPropertyOrder({"teamName", "user", "playerGameScore"}) +public class PlayerListPopUpDTO { + private String teamName; + private boolean isUser; + private List playerGameScore = new ArrayList<>(); + + public PlayerListPopUpDTO (Team team) { + this.teamName = team.getName(); + this.isUser = team.isUser(); + for(Player player: team.getPlayerList()) { + playerGameScore.add(new PlayerGameScoreDTO(player)); + } + } +} diff --git a/BE/src/main/java/codesquad/baseball/DTO/TeamGameScoreDTO.java b/BE/src/main/java/codesquad/baseball/DTO/TeamGameScoreDTO.java new file mode 100644 index 000000000..9107a0889 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/DTO/TeamGameScoreDTO.java @@ -0,0 +1,25 @@ +package codesquad.baseball.DTO; + +import codesquad.baseball.domain.Team; +import codesquad.baseball.domain.TeamGameScore; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Getter +@NoArgsConstructor +@JsonPropertyOrder({"teamName", "user", "teamGameScore"}) +public class TeamGameScoreDTO { + private String teamName; + private boolean isUser; + + private List teamGameScore; + + public TeamGameScoreDTO(Team team) { + this.teamName = team.getName(); + this.isUser = team.isUser(); + this.teamGameScore = team.getTeamGameScoreList(); + } +} diff --git a/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java b/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java index 679601fa1..e55bede4b 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java @@ -11,11 +11,11 @@ @Getter @NoArgsConstructor public class TeamHistoryDTO { - public List playerPlayerHistoryDTOList = new ArrayList<>(); + public List playerHistory = new ArrayList<>(); public TeamHistoryDTO(Team team) { for(Player player : team.getPlayerList()) { - this.playerPlayerHistoryDTOList.add(new PlayerHistoryDTO(player)); + this.playerHistory.add(new PlayerHistoryDTO(player)); } } } diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index c8f861ea9..13e10fe58 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -1,11 +1,10 @@ package codesquad.baseball.controller; import codesquad.baseball.ApiResponse; -import codesquad.baseball.DTO.PlayerDTO; -import codesquad.baseball.DTO.TeamDTO; -import codesquad.baseball.DTO.TeamHistoryDTO; +import codesquad.baseball.DTO.*; import codesquad.baseball.domain.History; import codesquad.baseball.domain.Match; +import codesquad.baseball.domain.Player; import codesquad.baseball.domain.Team; import codesquad.baseball.repository.HistoryRepository; import codesquad.baseball.repository.MatchRepository; @@ -52,13 +51,23 @@ public ResponseEntity game(@PathVariable Long matchId) { Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); List historyList = myTeam.getHistoryList(); - TeamDTO teamLeft = new TeamDTO(myTeam.getName(), 5); - TeamDTO teamRight = new TeamDTO(counterTeam.getName(), 5); + TeamDTO homeTeam = new TeamDTO(myTeam.getName(), 5); + TeamDTO awayTeam = new TeamDTO(counterTeam.getName(), 5); - PlayerDTO Pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); - PlayerDTO Hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); + PlayerDTO pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); + PlayerDTO hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); + + TeamGameScoreDTO homeTeamScore = new TeamGameScoreDTO(myTeam); + TeamGameScoreDTO awayTeamScore = new TeamGameScoreDTO(counterTeam); + + PlayerListPopUpDTO homeTeamPlayerList = new PlayerListPopUpDTO(myTeam); + PlayerListPopUpDTO awayTeamPlayerList = new PlayerListPopUpDTO(counterTeam); + + TeamHistoryDTO teamLog = new TeamHistoryDTO(myTeam); + + ApiResponse apiResponse = new ApiResponse(homeTeamScore, awayTeamScore, homeTeam, awayTeam, pitcher, hitter, + teamLog, homeTeamPlayerList, awayTeamPlayerList); - ApiResponse apiResponse = new ApiResponse(teamLeft, teamRight, Pitcher, Hitter, new TeamHistoryDTO(myTeam)); return new ResponseEntity<>(apiResponse, HttpStatus.OK); } diff --git a/BE/src/main/java/codesquad/baseball/domain/Match.java b/BE/src/main/java/codesquad/baseball/domain/Match.java index dceed3011..0e99dc850 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Match.java +++ b/BE/src/main/java/codesquad/baseball/domain/Match.java @@ -14,9 +14,11 @@ public class Match { @NonNull private Long myTeamId; + //Team homeTeam; @NonNull private Long counterTeamId; + //Team awayTeam; @NonNull private boolean isHome; diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index 2525a96fd..b7dcc94ed 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -1,5 +1,6 @@ package codesquad.baseball.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -19,17 +20,23 @@ public class Team { private String name; + private boolean isUser; + + @JsonIgnore private List historyList = new ArrayList<>(); - private List teamGameScoreList = new ArrayList<>(); + @JsonIgnore + private List teamGameScoreList = new ArrayList<>(); - private List playerList = new ArrayList<>(); + @JsonIgnore + private List playerList = new ArrayList<>(); - public int getTotalScore() { - int total=0; - for(TeamGameScore teamGameScore: teamGameScoreList) { - total += teamGameScore.getScore(); - } - return total; - }//jung 실험 중 + @JsonIgnore + public int getTotalScore() { + int total = 0; + for (TeamGameScore teamGameScore : teamGameScoreList) { + total += teamGameScore.getScore(); + } + return total; + }//jung 실험 중 } diff --git a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java index e70387a46..e88247a2e 100644 --- a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java +++ b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java @@ -1,5 +1,6 @@ package codesquad.baseball.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -11,6 +12,7 @@ @NoArgsConstructor @AllArgsConstructor public class TeamGameScore { + @JsonIgnore @Id private Long id; diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 836641c16..55f3cbf09 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -1,11 +1,15 @@ -insert into team(name) -values ('team1'); -insert into team(name) -values ('team2'); -insert into team(name) -values ('team3'); -insert into team(name) -values ('team4'); +insert into team(name, is_user) +values ('Captain', false); +insert into team(name, is_user) +values ('Marvel', false); +insert into team(name, is_user) +values ('Twins', false); +insert into team(name, is_user) +values ('Tigers', false); +insert into team(name, is_user) +values ('Rockets', false); +insert into team(name, is_user) +values ('Dodgers', false); insert into player(name, team) values ('eve', 1); @@ -17,7 +21,9 @@ insert into player(name, team) values ('adela', 2); insert into team_game_score(inning, score, team) -values (1, 3, 1); +values (1, 0, 1); +insert into team_game_score(inning, score, team) +values (2, 1, 1); insert into team_game_score(inning, score, team) values (1, 4, 2); diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index adee90a8f..7a0d3c8b0 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -1,8 +1,9 @@ drop table if exists team; create table team ( - id int auto_increment primary key, - name varchar(64) unique not null + id int auto_increment primary key, + name varchar(64) unique not null, + is_user boolean ); drop table if exists team_game_score; @@ -49,7 +50,7 @@ create table history team bigint(20) references team (id), team_key int, player bigint(20) references player (id), - player_key int + player_key int ); drop table if exists `match`; From 13613a91e36de4e2a8828cefd88de77b630527e4 Mon Sep 17 00:00:00 2001 From: janeljs Date: Thu, 6 May 2021 22:09:55 +0900 Subject: [PATCH 08/56] =?UTF-8?q?feat:=20GameController=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 --- .../java/codesquad/baseball/ApiResponse.java | 19 ++-- ...layerHistoryDTO.java => PlayerLogDTO.java} | 8 +- .../{TeamHistoryDTO.java => TeamLogDTO.java} | 8 +- .../baseball/controller/GameController.java | 107 ++++++++++++++++++ .../baseball/controller/HomeController.java | 37 +----- .../codesquad/baseball/domain/Inning.java | 26 +++++ .../java/codesquad/baseball/domain/Match.java | 7 +- .../baseball/domain/PlayerGameInfo.java | 1 + .../java/codesquad/baseball/domain/Team.java | 3 + .../baseball/domain/TeamGameScore.java | 2 +- BE/src/main/resources/data.sql | 6 +- BE/src/main/resources/schema.sql | 22 +++- 12 files changed, 182 insertions(+), 64 deletions(-) rename BE/src/main/java/codesquad/baseball/DTO/{PlayerHistoryDTO.java => PlayerLogDTO.java} (75%) rename BE/src/main/java/codesquad/baseball/DTO/{TeamHistoryDTO.java => TeamLogDTO.java} (60%) create mode 100644 BE/src/main/java/codesquad/baseball/controller/GameController.java create mode 100644 BE/src/main/java/codesquad/baseball/domain/Inning.java diff --git a/BE/src/main/java/codesquad/baseball/ApiResponse.java b/BE/src/main/java/codesquad/baseball/ApiResponse.java index 1d11fffda..e1f0c90dd 100644 --- a/BE/src/main/java/codesquad/baseball/ApiResponse.java +++ b/BE/src/main/java/codesquad/baseball/ApiResponse.java @@ -1,25 +1,20 @@ package codesquad.baseball; import codesquad.baseball.DTO.*; +import codesquad.baseball.domain.Inning; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -@JsonPropertyOrder({"teamLeftScore", "teamRightScore", "teamLeft", "teamRight", "pitcher", "hitter", "teamLog"}) +@JsonPropertyOrder({"inning", "nextHitter", "leftTeam", "rightTeam", "pitcher", "hitter", "teamLog"}) public class ApiResponse { - TeamGameScoreDTO homeTeamScore; - TeamGameScoreDTO leftTeamScore; - - TeamDTO homeTeam; - TeamDTO awayTeam; - + Inning inning; + PlayerLogDTO nextHitter; + TeamDTO leftTeam; + TeamDTO rightTeam; PlayerDTO pitcher; PlayerDTO hitter; - - TeamHistoryDTO teamLog; - - PlayerListPopUpDTO homeTeamPlayerList; - PlayerListPopUpDTO awayTeamPlayerList; + TeamLogDTO teamLog; } diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerHistoryDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java similarity index 75% rename from BE/src/main/java/codesquad/baseball/DTO/PlayerHistoryDTO.java rename to BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java index b4704198e..ccb760b65 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/PlayerHistoryDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java @@ -4,6 +4,7 @@ import codesquad.baseball.domain.Player; import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import java.util.ArrayList; @@ -11,13 +12,16 @@ @Getter @Setter +@NoArgsConstructor @AllArgsConstructor -public class PlayerHistoryDTO { +public class PlayerLogDTO { private int playerBattingOrder; + private Long teamId; private String playerName; private List historyList; - public PlayerHistoryDTO(Player player) { + public PlayerLogDTO(Player player, Long teamId) { + this.teamId = teamId; this.playerBattingOrder = player.getPlayerGameInfo().getBattingOrder(); this.playerName = player.getName(); this.historyList = player.getHistoryList(); diff --git a/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java b/BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java similarity index 60% rename from BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java rename to BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java index e55bede4b..0a362224c 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/TeamHistoryDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java @@ -10,12 +10,12 @@ @Getter @NoArgsConstructor -public class TeamHistoryDTO { - public List playerHistory = new ArrayList<>(); +public class TeamLogDTO { + private List playerLog = new ArrayList<>(); - public TeamHistoryDTO(Team team) { + public TeamLogDTO(Team team) { for(Player player : team.getPlayerList()) { - this.playerHistory.add(new PlayerHistoryDTO(player)); + this.playerLog.add(new PlayerLogDTO(player, team.getId())); } } } diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java new file mode 100644 index 000000000..2d26e9246 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -0,0 +1,107 @@ +package codesquad.baseball.controller; + +import codesquad.baseball.ApiResponse; +import codesquad.baseball.DTO.*; +import codesquad.baseball.domain.*; +import codesquad.baseball.repository.MatchRepository; +import codesquad.baseball.repository.TeamRepository; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/game") +public class GameController { + + private final TeamRepository teamRepository; + private final MatchRepository matchRepository; + + public GameController(TeamRepository teamRepository, MatchRepository matchRepository) { + this.teamRepository = teamRepository; + this.matchRepository = matchRepository; + } + + @GetMapping("/{matchId}") + public ResponseEntity game(@PathVariable Long matchId) { + Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); + Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); + Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); + + List historyList = myTeam.getHistoryList(); + TeamDTO leftTeam = new TeamDTO(myTeam.getName(), 5); + TeamDTO rightTeam = new TeamDTO(counterTeam.getName(), 5); + + TeamLogDTO teamLog = new TeamLogDTO(myTeam); + Player player = myTeam.getPlayerList().get(0); + + PlayerDTO pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); + PlayerDTO hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); + //TeamLogDTO teamLog = new TeamLogDTO(myTeam); + ApiResponse apiResponse = new ApiResponse(match.getCurrentInning(), + new PlayerLogDTO(player, myTeam.getId()), leftTeam, rightTeam, pitcher, hitter, teamLog); + + return new ResponseEntity<>(apiResponse, HttpStatus.OK); + } + + @GetMapping("/{matchId}/playerListPopUp") + public ResponseEntity showPlayerList(@PathVariable Long matchId) { + Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); + Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); + Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); + PlayerListPopUpDTO LeftTeamPlayerList = new PlayerListPopUpDTO(myTeam); + PlayerListPopUpDTO rightTeamPlayerList = new PlayerListPopUpDTO(counterTeam); + return new ResponseEntity<>(new PlayerListPopUpDTO[]{LeftTeamPlayerList, rightTeamPlayerList}, HttpStatus.OK); + } + + + @GetMapping("/{matchId}/detailScore") + public ResponseEntity showDetailScoreList(@PathVariable Long matchId) { + Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); + Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); + Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); + TeamGameScoreDTO leftTeamScore = new TeamGameScoreDTO(myTeam); + TeamGameScoreDTO rightTeamScore = new TeamGameScoreDTO(counterTeam); + return new ResponseEntity<>(new TeamGameScoreDTO[]{leftTeamScore, rightTeamScore}, HttpStatus.OK); + } + + @PostMapping("/{matchId}/exchange") + public ResponseEntity exchange(@PathVariable Long matchId, @RequestBody PlayerLogDTO history) { + Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); + + //이닝 정보 얻어오기 + Inning currentInning = match.getCurrentInning(); + int playerBattingOrder = history.getPlayerBattingOrder(); + + // 현재 팀의 out 가져오기 + Team currentTeam = teamRepository.findById(history.getTeamId()).orElseThrow(RuntimeException::new); + Player nextPlayer = currentTeam.getPlayerList().get(playerBattingOrder); + int out = nextPlayer.getHistoryList().get(0).getOut(); + + // 현재 회차에 업데이트 후 저장 + currentInning.update(out); + matchRepository.save(match); + + //기타 전체 정보 조회 + ApiResponse apiResponse = getGameInfo(match, currentInning, nextPlayer, history); + return new ResponseEntity(apiResponse, HttpStatus.OK); + } + + private ApiResponse getGameInfo(Match match, Inning currentInning, Player nextPlayer, PlayerLogDTO history) { + Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); + Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); + TeamDTO leftTeam = new TeamDTO(myTeam.getName(), 5); + TeamDTO rightTeam = new TeamDTO(counterTeam.getName(), 5); + PlayerDTO pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); + PlayerDTO hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); + TeamLogDTO teamLog = new TeamLogDTO(myTeam); + PlayerLogDTO playerLog = new PlayerLogDTO(nextPlayer, history.getTeamId()); + return new ApiResponse(currentInning, playerLog, leftTeam, rightTeam, pitcher, hitter, teamLog); + } + + private boolean needExchange(Inning inning) { + return inning.getOut() == 3; + } + +} diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 13e10fe58..87d528f7b 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -2,10 +2,7 @@ import codesquad.baseball.ApiResponse; import codesquad.baseball.DTO.*; -import codesquad.baseball.domain.History; -import codesquad.baseball.domain.Match; -import codesquad.baseball.domain.Player; -import codesquad.baseball.domain.Team; +import codesquad.baseball.domain.*; import codesquad.baseball.repository.HistoryRepository; import codesquad.baseball.repository.MatchRepository; import codesquad.baseball.repository.TeamRepository; @@ -38,37 +35,9 @@ public RedirectView home(@RequestBody HashMap teamInfo) { Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); - Match match = new Match(myTeamId, counterTeamId, isHome); + Inning inning = new Inning(1L, 0, 1, "수비", "초"); + Match match = new Match(myTeamId, counterTeamId, inning, isHome); Long matchId = matchRepository.save(match).getId(); return new RedirectView("/game/" + matchId); } - - @GetMapping("/game/{matchId}") - public ResponseEntity game(@PathVariable Long matchId) { - System.out.println("matchId: " + matchId); - Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); - Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); - Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); - - List historyList = myTeam.getHistoryList(); - TeamDTO homeTeam = new TeamDTO(myTeam.getName(), 5); - TeamDTO awayTeam = new TeamDTO(counterTeam.getName(), 5); - - PlayerDTO pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); - PlayerDTO hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); - - TeamGameScoreDTO homeTeamScore = new TeamGameScoreDTO(myTeam); - TeamGameScoreDTO awayTeamScore = new TeamGameScoreDTO(counterTeam); - - PlayerListPopUpDTO homeTeamPlayerList = new PlayerListPopUpDTO(myTeam); - PlayerListPopUpDTO awayTeamPlayerList = new PlayerListPopUpDTO(counterTeam); - - TeamHistoryDTO teamLog = new TeamHistoryDTO(myTeam); - - ApiResponse apiResponse = new ApiResponse(homeTeamScore, awayTeamScore, homeTeam, awayTeam, pitcher, hitter, - teamLog, homeTeamPlayerList, awayTeamPlayerList); - - return new ResponseEntity<>(apiResponse, HttpStatus.OK); - } - } diff --git a/BE/src/main/java/codesquad/baseball/domain/Inning.java b/BE/src/main/java/codesquad/baseball/domain/Inning.java new file mode 100644 index 000000000..bca07a0d8 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/Inning.java @@ -0,0 +1,26 @@ +package codesquad.baseball.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class Inning { + + @Id + private Long id; + + private int out; + private int inningNumber; + private String role; + private String cycle; + + public void update(int out) { + this.out = out; + } + + +} diff --git a/BE/src/main/java/codesquad/baseball/domain/Match.java b/BE/src/main/java/codesquad/baseball/domain/Match.java index 0e99dc850..2982fa720 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Match.java +++ b/BE/src/main/java/codesquad/baseball/domain/Match.java @@ -14,13 +14,14 @@ public class Match { @NonNull private Long myTeamId; - //Team homeTeam; @NonNull private Long counterTeamId; - //Team awayTeam; @NonNull - private boolean isHome; + private Inning currentInning; + @NonNull + private boolean isHome; + //myteam 에 대해 isHome이 true일 경우, myTeam 수비 먼저, 공격 나중에. 초-수비/말-공격 } diff --git a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java index 6ae819303..a98bbe89e 100644 --- a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java +++ b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java @@ -15,6 +15,7 @@ public class PlayerGameInfo { private int battingOrder; private String role; private int pitchCount; + private int plateAppearance; private int hits; private int out; diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index b7dcc94ed..0b3e1d69f 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -20,6 +20,7 @@ public class Team { private String name; + @JsonIgnore private boolean isUser; @JsonIgnore @@ -39,4 +40,6 @@ public int getTotalScore() { } return total; }//jung 실험 중 + + } diff --git a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java index e88247a2e..44a010e80 100644 --- a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java +++ b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java @@ -16,7 +16,7 @@ public class TeamGameScore { @Id private Long id; - private int inning; + private int inningNumber; private int score; diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 55f3cbf09..7c6e8cca5 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -20,11 +20,11 @@ values ('jane', 2); insert into player(name, team) values ('adela', 2); -insert into team_game_score(inning, score, team) +insert into team_game_score(inning_number, score, team) values (1, 0, 1); -insert into team_game_score(inning, score, team) +insert into team_game_score(inning_number, score, team) values (2, 1, 1); -insert into team_game_score(inning, score, team) +insert into team_game_score(inning_number, score, team) values (1, 4, 2); diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index 7a0d3c8b0..be20ddb7b 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -9,11 +9,11 @@ create table team drop table if exists team_game_score; create table team_game_score ( - id int auto_increment primary key, - inning int, - score int, - team bigint(20) references team (id), - team_key int + id int auto_increment primary key, + inning_number int, + score int, + team bigint(20) references team (id), + team_key int ); drop table if exists player; @@ -60,6 +60,18 @@ create table `match` my_team_id bigint(20), counter_team_id bigint(20), is_home boolean +-- , +-- inning bigint(20) references inning(id) ); +drop table if exists inning; +create table inning +( + id bigint(20) auto_increment primary key, + `out` int, + inning_number int, + role varchar(50), + cycle varchar(50), + `match` bigint(20) references `match`(id) +) From 913df85497f1bf457e8361be7b0cc76efa8f47c5 Mon Sep 17 00:00:00 2001 From: janeljs Date: Thu, 6 May 2021 22:38:39 +0900 Subject: [PATCH 09/56] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 BE/gradle/wrapper/gradle-wrapper.jar 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 From 2220d56757a38a250ebd57becec59f64e61310c8 Mon Sep 17 00:00:00 2001 From: janeljs Date: Fri, 7 May 2021 15:34:22 +0900 Subject: [PATCH 10/56] =?UTF-8?q?fix:=20=EC=A4=91=EB=B3=B5=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20DB=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EC=97=90=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/controller/HomeController.java | 2 +- BE/src/main/java/codesquad/baseball/domain/Inning.java | 4 ---- .../java/codesquad/baseball/repository/InningRepository.java | 4 ++++ BE/src/main/resources/schema.sql | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 BE/src/main/java/codesquad/baseball/repository/InningRepository.java diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 87d528f7b..7f9b53f51 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -35,7 +35,7 @@ public RedirectView home(@RequestBody HashMap teamInfo) { Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); - Inning inning = new Inning(1L, 0, 1, "수비", "초"); + Inning inning = new Inning(0, 1, "수비", "초"); Match match = new Match(myTeamId, counterTeamId, inning, isHome); Long matchId = matchRepository.save(match).getId(); return new RedirectView("/game/" + matchId); diff --git a/BE/src/main/java/codesquad/baseball/domain/Inning.java b/BE/src/main/java/codesquad/baseball/domain/Inning.java index bca07a0d8..62ce6d8bf 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Inning.java +++ b/BE/src/main/java/codesquad/baseball/domain/Inning.java @@ -3,16 +3,12 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.data.annotation.Id; @Getter @NoArgsConstructor @AllArgsConstructor public class Inning { - @Id - private Long id; - private int out; private int inningNumber; private String role; diff --git a/BE/src/main/java/codesquad/baseball/repository/InningRepository.java b/BE/src/main/java/codesquad/baseball/repository/InningRepository.java new file mode 100644 index 000000000..2dd7bc3fe --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/repository/InningRepository.java @@ -0,0 +1,4 @@ +package codesquad.baseball.repository; + +public interface InningRepository { +} diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index be20ddb7b..ce77a88d3 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -68,10 +68,9 @@ create table `match` drop table if exists inning; create table inning ( - id bigint(20) auto_increment primary key, `out` int, inning_number int, role varchar(50), cycle varchar(50), - `match` bigint(20) references `match`(id) + `match` bigint(20) primary key references `match`(id) ) From ccf1f632a816e5d654108c6cc8c6342a2a869df1 Mon Sep 17 00:00:00 2001 From: rla36 Date: Fri, 7 May 2021 18:00:21 +0900 Subject: [PATCH 11/56] =?UTF-8?q?fix:=20CORS=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0=20=EC=9C=84=ED=95=B4=20WebConfig=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 --- .../java/codesquad/baseball/WebConfig.java | 20 +++++++++++++++++++ .../baseball/controller/GameController.java | 13 ++++++++++++ .../baseball/controller/HomeController.java | 13 ++---------- 3 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 BE/src/main/java/codesquad/baseball/WebConfig.java diff --git a/BE/src/main/java/codesquad/baseball/WebConfig.java b/BE/src/main/java/codesquad/baseball/WebConfig.java new file mode 100644 index 000000000..4dfee55a1 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/WebConfig.java @@ -0,0 +1,20 @@ +package codesquad.baseball; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@EnableWebMvc +public class WebConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedMethods("PUT", "DELETE") + .allowedOrigins("http://ec2-15-165-82-124.ap-northeast-2.compute.amazonaws.com:8080", "http://ec2-15-165-82-124.ap-northeast-2.compute.amazonaws.com:3000"); + } + +} + diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index 2d26e9246..464bb60e5 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -8,7 +8,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.view.RedirectView; +import java.util.HashMap; import java.util.List; @RestController @@ -23,6 +25,17 @@ public GameController(TeamRepository teamRepository, MatchRepository matchReposi this.matchRepository = matchRepository; } + @PostMapping + public RedirectView initialize(@RequestBody HashMap teamInfo) { + Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); + Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); + boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); + Inning inning = new Inning(0, 1, "수비", "초"); + Match match = new Match(myTeamId, counterTeamId, inning, isHome); + Long matchId = matchRepository.save(match).getId(); + return new RedirectView("/game/" + matchId); + } + @GetMapping("/{matchId}") public ResponseEntity game(@PathVariable Long matchId) { Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 7f9b53f51..5307b0b8e 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -24,20 +24,11 @@ public HomeController(TeamRepository teamRepository, MatchRepository matchReposi this.matchRepository = matchRepository; } - @GetMapping + @GetMapping("/totalTeamList") public ResponseEntity home() { List teamList = (List) teamRepository.findAll(); return new ResponseEntity(teamList, HttpStatus.OK); } - @PostMapping - public RedirectView home(@RequestBody HashMap teamInfo) { - Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); - Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); - boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); - Inning inning = new Inning(0, 1, "수비", "초"); - Match match = new Match(myTeamId, counterTeamId, inning, isHome); - Long matchId = matchRepository.save(match).getId(); - return new RedirectView("/game/" + matchId); - } + } From 8cc77ca30ad52b8169e22b016cb71b6c3b3c82f0 Mon Sep 17 00:00:00 2001 From: janeljs Date: Fri, 7 May 2021 18:34:32 +0900 Subject: [PATCH 12/56] =?UTF-8?q?fix:=20mysql=20auto=20reconnection=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=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/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index e595d4ac4..6fc158039 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/baseball?characterEncoding=UTF-8 +spring.datasource.url=jdbc:mysql://localhost:3306/baseball?characterEncoding=UTF-8&autoReconnect=true spring.datasource.username=team-11 spring.datasource.password=1234 spring.datasource.initialization-mode=always From 3cf320b763c71b334c18c54f0fe8f94aea545aba Mon Sep 17 00:00:00 2001 From: janeljs Date: Sat, 8 May 2021 19:33:37 +0900 Subject: [PATCH 13/56] =?UTF-8?q?fix:=20cross=20origin=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=84=A4=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 - WebConfig에서 전역에 cross origin을 적용하는 방법에서 컨트롤러별로 적용하는 방식으로 변경 --- .../java/codesquad/baseball/WebConfig.java | 20 ------------------- .../baseball/controller/GameController.java | 1 + .../baseball/controller/HomeController.java | 1 + 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 BE/src/main/java/codesquad/baseball/WebConfig.java diff --git a/BE/src/main/java/codesquad/baseball/WebConfig.java b/BE/src/main/java/codesquad/baseball/WebConfig.java deleted file mode 100644 index 4dfee55a1..000000000 --- a/BE/src/main/java/codesquad/baseball/WebConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package codesquad.baseball; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; - -@Configuration -@EnableWebMvc -public class WebConfig implements WebMvcConfigurer { - - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedMethods("PUT", "DELETE") - .allowedOrigins("http://ec2-15-165-82-124.ap-northeast-2.compute.amazonaws.com:8080", "http://ec2-15-165-82-124.ap-northeast-2.compute.amazonaws.com:3000"); - } - -} - diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index 464bb60e5..97d4d0339 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -13,6 +13,7 @@ import java.util.HashMap; import java.util.List; +@CrossOrigin @RestController @RequestMapping("/game") public class GameController { diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 5307b0b8e..8af6fd067 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -14,6 +14,7 @@ import java.util.HashMap; import java.util.List; +@CrossOrigin @RestController public class HomeController { private final TeamRepository teamRepository; From 897b53b75d47d9147f090f3c151d9dccbda36e7e Mon Sep 17 00:00:00 2001 From: rla36 Date: Mon, 10 May 2021 20:29:40 +0900 Subject: [PATCH 14/56] =?UTF-8?q?feat:=20Team,Match=EB=A5=BC=20=EC=B0=BE?= =?UTF-8?q?=EC=A7=80=20=EB=AA=BB=ED=95=A0=EB=95=8C=20=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=98=88=EC=99=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesquad/baseball/exception/MatchNotFoundException.java | 4 ++++ .../codesquad/baseball/exception/TeamNotFoundException.java | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java create mode 100644 BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java diff --git a/BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java b/BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java new file mode 100644 index 000000000..003cc81b0 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java @@ -0,0 +1,4 @@ +package codesquad.baseball.exception; + +public class MatchNotFoundException extends RuntimeException { +} diff --git a/BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java b/BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java new file mode 100644 index 000000000..8ece0a87a --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java @@ -0,0 +1,4 @@ +package codesquad.baseball.exception; + +public class TeamNotFoundException extends RuntimeException { +} From 0667d03331a0b9f363551666f4b1f3561a2dbb2e Mon Sep 17 00:00:00 2001 From: rla36 Date: Mon, 10 May 2021 20:30:38 +0900 Subject: [PATCH 15/56] =?UTF-8?q?feat:=20Inning=EC=97=90=20=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=88=98=EB=A5=BC=20=EB=8D=94=ED=95=98=EA=B3=A0,?= =?UTF-8?q?=20=EA=B5=90=EC=B2=B4=EA=B0=80=20=ED=95=84=EC=9A=94=ED=95=9C?= =?UTF-8?q?=EC=A7=80=20=EA=B2=80=EC=A6=9D=ED=95=98=EA=B3=A0,=20=EA=B5=90?= =?UTF-8?q?=EC=B2=B4=ED=95=98=EB=8A=94=20=EB=A9=94=EC=86=8C=EB=93=9C=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 --- .../codesquad/baseball/domain/Inning.java | 71 +++++++++++++++++-- 1 file changed, 67 insertions(+), 4 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/domain/Inning.java b/BE/src/main/java/codesquad/baseball/domain/Inning.java index 62ce6d8bf..43190f055 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Inning.java +++ b/BE/src/main/java/codesquad/baseball/domain/Inning.java @@ -1,22 +1,85 @@ package codesquad.baseball.domain; import lombok.AllArgsConstructor; -import lombok.Getter; import lombok.NoArgsConstructor; -@Getter @NoArgsConstructor -@AllArgsConstructor public class Inning { + private static final String OFFENSE = "공격"; + private static final String DEFENSE = "수비"; + private static final String TOP = "초"; + private static final String BOTTOM = "말"; + private int out; private int inningNumber; private String role; private String cycle; - public void update(int out) { + public Inning(int out, int inningNumber, String role, String cycle) { this.out = out; + this.inningNumber = inningNumber; + this.role = role; + this.cycle = cycle; + } + + public static Inning initiateInning(boolean isHome) { + if (isHome) { + return new Inning(0, 1, DEFENSE, TOP); + } + return new Inning(0, 1, OFFENSE, TOP); + } + + public int updateOut(boolean isPlayerOut) { + if(isPlayerOut) { + this.out += 1; + } + return out; } + private Inning changeRole() { + if (this.role.equals(DEFENSE)) { + this.role = OFFENSE; + return this; + } + this.role = DEFENSE; + return this; + } + + private Inning changeCycle() { + if (this.cycle.equals(TOP)) { + this.cycle = BOTTOM; + return this; + } + this.role = TOP; + this.inningNumber += 1; + return this; + } + + public boolean needChange() { + return this.out == 3; + } + public Inning changeInning() { + changeCycle(); + changeRole(); + this.out = 0; + return this; + } + + public int getOut() { + return out; + } + + public int getInningNumber() { + return inningNumber; + } + + public String getRole() { + return role; + } + + public String getCycle() { + return cycle; + } } From ee137d8c420e7cddf903ec0438d503c1c4cb7d1f Mon Sep 17 00:00:00 2001 From: rla36 Date: Mon, 10 May 2021 20:39:55 +0900 Subject: [PATCH 16/56] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9D=98=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=EC=97=90=20=EB=94=B0=EB=9D=BC=20leftTeam,=20rightTeam?= =?UTF-8?q?=EC=9D=84=20expeditionTeam,=20homeTeam=EC=9C=BC=EB=A1=9C=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 --- BE/src/main/java/codesquad/baseball/ApiResponse.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/ApiResponse.java b/BE/src/main/java/codesquad/baseball/ApiResponse.java index e1f0c90dd..2237508c1 100644 --- a/BE/src/main/java/codesquad/baseball/ApiResponse.java +++ b/BE/src/main/java/codesquad/baseball/ApiResponse.java @@ -8,12 +8,12 @@ @Getter @AllArgsConstructor -@JsonPropertyOrder({"inning", "nextHitter", "leftTeam", "rightTeam", "pitcher", "hitter", "teamLog"}) +@JsonPropertyOrder({"inning", "nextHitter", "expeditionTeam", "homeTeam", "pitcher", "hitter", "teamLog"}) public class ApiResponse { Inning inning; PlayerLogDTO nextHitter; - TeamDTO leftTeam; - TeamDTO rightTeam; + TeamDTO expeditionTeam; + TeamDTO homeTeam; PlayerDTO pitcher; PlayerDTO hitter; TeamLogDTO teamLog; From 76df5263337167bbb370916740946094279fb334 Mon Sep 17 00:00:00 2001 From: janeljs Date: Tue, 11 May 2021 01:15:49 +0900 Subject: [PATCH 17/56] =?UTF-8?q?feat:=20mysql=20data=20source=20url?= =?UTF-8?q?=EC=9D=84=20localhost=EC=97=90=EC=84=9C=20private=20ip=EB=A1=9C?= =?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 --- BE/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index 6fc158039..f5a92b615 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/baseball?characterEncoding=UTF-8&autoReconnect=true +spring.datasource.url=jdbc:mysql://10.1.1.89:3306/baseball?characterEncoding=UTF-8&autoReconnect=true spring.datasource.username=team-11 spring.datasource.password=1234 spring.datasource.initialization-mode=always From e45470230e6968b808490403d50a99c7cc06b714 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 12:38:23 +0900 Subject: [PATCH 18/56] =?UTF-8?q?feat:=20team=EC=97=90=EA=B2=8C=20?= =?UTF-8?q?=ED=88=AC=EC=88=98,=20=EC=B2=AB=20=ED=83=80=EC=9E=90,=20?= =?UTF-8?q?=EB=8B=A4=EC=9D=8C=20=ED=83=80=EC=9E=90=EB=A5=BC=20=EB=AC=BC?= =?UTF-8?q?=EC=96=B4=EB=B3=B4=EB=8A=94=20=EB=A9=94=EC=86=8C=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/domain/Team.java | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index 0b3e1d69f..4007954e8 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -1,5 +1,6 @@ package codesquad.baseball.domain; +import codesquad.baseball.exception.PlayerNotFoundException; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; @@ -39,7 +40,52 @@ public int getTotalScore() { total += teamGameScore.getScore(); } return total; - }//jung 실험 중 + } + @JsonIgnore + public void initializeTotalScore(int inningNumber) { + TeamGameScore teamGameScore = new TeamGameScore(inningNumber, 0); + } + + @JsonIgnore + public void setTotalScore(int inningNumber, int totalScore) { + teamGameScoreList.get(inningNumber-1).setScore(totalScore); + } + + @JsonIgnore + public Player getNextPlayer(int currentPlayerOrder) { + try { + return playerList.get(currentPlayerOrder); + } catch (IndexOutOfBoundsException e) { + return getFirstHitter(); + } + } + + @JsonIgnore + public Player getPitcher() { + return playerList.stream() + .filter(Player::isPitcher) + .findFirst() + .orElseThrow(PlayerNotFoundException::new); + } + + @JsonIgnore + public Player getFirstHitter() { + return playerList.get(0); + } + @JsonIgnore + public Player findPlayerByName(String name) { + return playerList.stream() + .filter(player -> player.getName().equals(name)) + .findFirst() + .orElseThrow(PlayerNotFoundException::new); + } + + @JsonIgnore + public void clearAllHistory() { + for (Player player : playerList) { + player.clearHistory(); + } + } } From 6bf1a8c756adb75f45eb6d8758a68e6b0e58737c Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 12:38:50 +0900 Subject: [PATCH 19/56] =?UTF-8?q?feat:=20=EC=B0=BE=EB=8A=94=20Player?= =?UTF-8?q?=EC=97=86=EC=9D=84=20=EC=8B=9C=20=EB=B0=9C=EC=83=9D=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EC=98=88=EC=99=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesquad/baseball/exception/PlayerNotFoundException.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java diff --git a/BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java b/BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java new file mode 100644 index 000000000..b54e4f936 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java @@ -0,0 +1,4 @@ +package codesquad.baseball.exception; + +public class PlayerNotFoundException extends RuntimeException { +} From 64d4ff5b2d52f1d79feb505f2219f82eadba8f2c Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 12:43:05 +0900 Subject: [PATCH 20/56] =?UTF-8?q?feat:=20match=EC=97=90=20=ED=99=88?= =?UTF-8?q?=ED=8C=80,=20=EC=9B=90=EC=A0=95=ED=8C=80=20id=EB=A5=BC=20?= =?UTF-8?q?=EB=A6=AC=ED=84=B4=ED=95=98=EB=8A=94=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C,=20=EA=B7=B8=EB=A6=AC=EA=B3=A0=20=EC=A3=BC=EC=96=B4?= =?UTF-8?q?=EC=A7=84=20=ED=8C=80=20id=EC=99=80=20=EB=8B=A4=EB=A5=B8=20id?= =?UTF-8?q?=EB=A5=BC=20=EB=A6=AC=ED=84=B4=ED=95=98=EB=8A=94=20=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/domain/Match.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/BE/src/main/java/codesquad/baseball/domain/Match.java b/BE/src/main/java/codesquad/baseball/domain/Match.java index 2982fa720..be41f6e22 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Match.java +++ b/BE/src/main/java/codesquad/baseball/domain/Match.java @@ -1,5 +1,6 @@ package codesquad.baseball.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.*; import org.springframework.data.annotation.Id; @@ -24,4 +25,31 @@ public class Match { @NonNull private boolean isHome; //myteam 에 대해 isHome이 true일 경우, myTeam 수비 먼저, 공격 나중에. 초-수비/말-공격 + + @JsonIgnore + public Long getHomeTeamId() { + if(isHome) { + return myTeamId; + } + return counterTeamId; + } + + @JsonIgnore + public Long getExpeditionTeamId() { + if(isHome) { + return counterTeamId; + } + return myTeamId; + } + + @JsonIgnore + public Long getOtherTeamId(Long teamId) { + if(teamId.equals(counterTeamId)) { + return myTeamId; + } + if(teamId.equals(myTeamId)) { + return counterTeamId; + } + return -1L; + } } From c380ba15a8ab4cb44816838287a643057c15feb6 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 12:43:45 +0900 Subject: [PATCH 21/56] =?UTF-8?q?feat:=20TeamGameScore=EC=97=90=20id?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=83=9D=EC=84=B1=EC=9E=90=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 --- .../main/java/codesquad/baseball/domain/TeamGameScore.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java index 44a010e80..7d76aab30 100644 --- a/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java +++ b/BE/src/main/java/codesquad/baseball/domain/TeamGameScore.java @@ -20,4 +20,9 @@ public class TeamGameScore { private int score; + public TeamGameScore(int inningNumber, int score) { + this.inningNumber = inningNumber; + this.score = score; + } + } From 1931f4e310a6e97d14823fdfc93a425f46629347 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 12:44:10 +0900 Subject: [PATCH 22/56] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20repository=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/repository/HistoryRepository.java | 11 ----------- .../baseball/repository/InningRepository.java | 4 ---- 2 files changed, 15 deletions(-) delete mode 100644 BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java delete mode 100644 BE/src/main/java/codesquad/baseball/repository/InningRepository.java diff --git a/BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java b/BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java deleted file mode 100644 index 9013cbef9..000000000 --- a/BE/src/main/java/codesquad/baseball/repository/HistoryRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package codesquad.baseball.repository; - -import codesquad.baseball.domain.History; -import org.springframework.data.jdbc.repository.query.Query; -import org.springframework.data.repository.CrudRepository; - -import java.util.List; -import java.util.Optional; - -public interface HistoryRepository extends CrudRepository { -} diff --git a/BE/src/main/java/codesquad/baseball/repository/InningRepository.java b/BE/src/main/java/codesquad/baseball/repository/InningRepository.java deleted file mode 100644 index 2dd7bc3fe..000000000 --- a/BE/src/main/java/codesquad/baseball/repository/InningRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package codesquad.baseball.repository; - -public interface InningRepository { -} From 36ff62efce54bb5283c3db5b80da103f01143e85 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 12:45:01 +0900 Subject: [PATCH 23/56] =?UTF-8?q?feat:=20Player=EC=9D=98=20=ED=9E=88?= =?UTF-8?q?=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C,=20=ED=88=AC?= =?UTF-8?q?=EC=88=98=EC=97=AC=EB=B6=80=20=EB=AC=BB=EB=8A=94=20=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesquad/baseball/domain/Player.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/domain/Player.java b/BE/src/main/java/codesquad/baseball/domain/Player.java index 6aea4b2e4..76dba35a2 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Player.java +++ b/BE/src/main/java/codesquad/baseball/domain/Player.java @@ -1,10 +1,12 @@ package codesquad.baseball.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import org.springframework.data.annotation.Id; -import java.util.*; + +import java.util.List; @Getter @Setter @@ -18,7 +20,22 @@ public class Player { private PlayerGameInfo playerGameInfo; private List historyList; - public void addHistory(History history) { - historyList.add(history); + public Player addHistory(List histories) { + historyList.addAll(histories); + return this; + } + + public void clearHistory() { + historyList.clear(); + } + + @JsonIgnore + public boolean isPitcher() { + return playerGameInfo.getRole().equals(PlayerGameInfo.PITCHER); + } + + @JsonIgnore + public void addPitchCount(int pitches) { + getPlayerGameInfo().addPitchCount(pitches); } } From 05d612733b1bf6ba54f0a732acfe894e6b91f01f Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 12:46:34 +0900 Subject: [PATCH 24/56] =?UTF-8?q?feat:=20=EC=95=A1=EC=85=98=EC=97=90=20?= =?UTF-8?q?=EB=8C=80=ED=95=9C=20=EC=8A=A4=ED=83=9C=ED=8B=B1=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EC=99=80=20=EC=95=A1=EC=85=98=EC=9D=84=20=ED=8C=90?= =?UTF-8?q?=EB=B3=84=ED=95=98=EB=8A=94=20=EB=A9=94=EC=86=8C=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/domain/History.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/BE/src/main/java/codesquad/baseball/domain/History.java b/BE/src/main/java/codesquad/baseball/domain/History.java index d972a0065..ced789be5 100644 --- a/BE/src/main/java/codesquad/baseball/domain/History.java +++ b/BE/src/main/java/codesquad/baseball/domain/History.java @@ -1,5 +1,6 @@ package codesquad.baseball.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -11,11 +12,27 @@ @AllArgsConstructor @RequiredArgsConstructor public class History { + @Id + @JsonIgnore private Long id; private String actionName; private int strike; private int ball; private int out; + private final static String STRIKE = "strike"; + private final static String BALL = "ball"; + private final static String HIT = "hit"; + private final static String OUT = "out"; + + @JsonIgnore + public boolean isActionOut() { + return actionName.equals(OUT); + } + + @JsonIgnore + public boolean isActionHit() { + return actionName.equals(HIT); + } } From c7f0ce22600f59197fef1784e8349f43b12f34f0 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:05:02 +0900 Subject: [PATCH 25/56] =?UTF-8?q?feat:=20=EC=95=88=ED=83=80/=EC=95=84?= =?UTF-8?q?=EC=9B=83/=EB=B3=BC=EB=84=B7=20=EC=A4=91=20=EC=96=B4=EB=96=A4?= =?UTF-8?q?=20=EC=95=A1=EC=85=98=EC=9C=BC=EB=A1=9C=20=ED=94=8C=EB=A0=88?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EA=B0=80=20=EA=B5=90=EC=B2=B4=EB=90=98?= =?UTF-8?q?=EC=97=88=EB=8A=94=EC=A7=80=20=ED=99=95=EC=9D=B8=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EC=9C=84=ED=95=B4=20=ED=95=84=EB=93=9C=EC=97=90=20?= =?UTF-8?q?lastAction=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/codesquad/baseball/domain/Player.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/BE/src/main/java/codesquad/baseball/domain/Player.java b/BE/src/main/java/codesquad/baseball/domain/Player.java index 76dba35a2..a30d80bf1 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Player.java +++ b/BE/src/main/java/codesquad/baseball/domain/Player.java @@ -19,6 +19,7 @@ public class Player { private PlayerGameInfo playerGameInfo; private List historyList; + private String lastAction; public Player addHistory(List histories) { historyList.addAll(histories); @@ -29,6 +30,10 @@ public void clearHistory() { historyList.clear(); } + public void clearLastAction() { + lastAction = null; + } + @JsonIgnore public boolean isPitcher() { return playerGameInfo.getRole().equals(PlayerGameInfo.PITCHER); @@ -38,4 +43,12 @@ public boolean isPitcher() { public void addPitchCount(int pitches) { getPlayerGameInfo().addPitchCount(pitches); } + + @JsonIgnore + public void updatePlayerGameInfo(String lastAction) { + boolean hitSuccess = lastAction.equals(Constants.HIT_ACTION); + boolean isOut = lastAction.equals(Constants.OUT_ACTION); + playerGameInfo.updatePlayerGameInfo(hitSuccess, isOut); + this.lastAction = lastAction; + } } From fbf6f4221c671f56a7a5e1afd753bbe8295ac9ce Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:11:35 +0900 Subject: [PATCH 26/56] =?UTF-8?q?feat:=20=ED=85=8C=EC=9D=B4=EB=B8=94=20pla?= =?UTF-8?q?yer=EC=97=90=20=ED=95=84=EB=93=9C=20lastAction=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/resources/schema.sql | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index ce77a88d3..fb27139e0 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -19,10 +19,11 @@ create table team_game_score drop table if exists player; create table player ( - id bigint(20) auto_increment primary key, - name varchar(50), - team bigint(20) references team (id), - team_key int + id bigint(20) auto_increment primary key, + name varchar(50), + last_action varchar(50), + team bigint(20) references team (id), + team_key int ); drop table if exists player_game_info; @@ -68,9 +69,9 @@ create table `match` drop table if exists inning; create table inning ( - `out` int, + `out` int, inning_number int, role varchar(50), cycle varchar(50), - `match` bigint(20) primary key references `match`(id) + `match` bigint(20) primary key references `match` (id) ) From 68a7c84b34c6150734ae96fa78b80390cd980600 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:12:16 +0900 Subject: [PATCH 27/56] =?UTF-8?q?feat:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/resources/data.sql | 102 ++++++++++++++++++--------------- 1 file changed, 57 insertions(+), 45 deletions(-) diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 7c6e8cca5..e926f6d01 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -1,54 +1,66 @@ -insert into team(name, is_user) -values ('Captain', false); -insert into team(name, is_user) -values ('Marvel', false); -insert into team(name, is_user) -values ('Twins', false); -insert into team(name, is_user) -values ('Tigers', false); -insert into team(name, is_user) -values ('Rockets', false); -insert into team(name, is_user) -values ('Dodgers', false); +use baseball; -insert into player(name, team) -values ('eve', 1); -insert into player(name, team) -values ('jung', 1); -insert into player(name, team) -values ('jane', 2); -insert into player(name, team) -values ('adela', 2); +insert into team(name, is_user) values ('Captain', false); +insert into team(name, is_user) values ('Marvel', false); +insert into team(name, is_user) values ('Twins', false); +insert into team(name, is_user) values ('Tigers', false); +insert into team(name, is_user) values ('Rockets', false); +insert into team(name, is_user) values ('Dodgers', false); -insert into team_game_score(inning_number, score, team) -values (1, 0, 1); -insert into team_game_score(inning_number, score, team) -values (2, 1, 1); -insert into team_game_score(inning_number, score, team) -values (1, 4, 2); +insert into player(name, team) values ('KimGwangJin', 1); +insert into player(name, team) values ('LeeDongKyu', 1); +insert into player(name, team) values ('KimJinSu', 1); +insert into player(name, team) values ('ParkYoungKwon', 1); +insert into player(name, team) values ('ChooJinsu', 1); +insert into player(name, team) values ('leeYongdae', 1); +insert into player(name, team) values ('RyuHeonJin', 1); +insert into player(name, team) values ('ChoiDongsu', 1); +insert into player(name, team) values ('HanYangbeom', 1); +insert into player(name, team) values ('김광진', 2); +insert into player(name, team) values ('이동규', 2); +insert into player(name, team) values ('김진수', 2); +insert into player(name, team) values ('박영권', 2); +insert into player(name, team) values ('추진수', 2); +insert into player(name, team) values ('이용대', 2); +insert into player(name, team) values ('류현진', 2); +insert into player(name, team) values ('최동수', 2); +insert into player(name, team) values ('한양범', 2); insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) -values (2, '타자', 0, 5, 5, 0, 1, 2); +values (1, '투수', 0, 0, 0, 0, 0, 1); insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) -values (1, '투수', 15, 2, 1, 2, 0.5, 1); +values (2, '타자', 0, 0, 0, 0, 0, 2); insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) -values (1, '타자', 0, 4, 3, 1, 0.75, 3); +values (3, '타자', 0, 0, 0, 0, 0, 3); insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) -values (2, '투수', 30, 2, 1, 2, 0.5, 4); - -insert into history(player, team, action_name, strike, ball, `out`) -values (1, 1, 'S', 2, 2, 1); -insert into history(player, team, action_name, strike, ball, `out`) -values (1, 1, 'H', 2, 2, 1); -insert into history(player, team, action_name, strike, ball, `out`) -values (2, 1, 'H', 2, 2, 1); -insert into history(player, team, action_name, strike, ball, `out`) -values (3, 2, 'S', 2, 2, 1); -insert into history(player, team, action_name, strike, ball, `out`) -values (3, 2, 'H', 2, 2, 1); -insert into history(player, team, action_name, strike, ball, `out`) -values (4, 2, 'H', 2, 2, 1); +values (4, '타자', 0, 0, 0, 0, 0, 4); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (5, '타자', 0, 0, 0, 0, 0, 5); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (6, '타자', 0, 0, 0, 0, 0, 6); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (7, '타자', 0, 0, 0, 0, 0, 7); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (8, '타자', 0, 0, 0, 0, 0, 8); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (9, '타자', 0, 0, 0, 0, 0, 9); --- insert into `match`(my_team_id, counter_team_id, is_home) --- values (1, 2, true); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (1, '투수', 0, 0, 0, 0, 0, 10); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (2, '타자', 0, 0, 0, 0, 0, 11); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (3, '타자', 0, 0, 0, 0, 0, 12); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (4, '타자', 0, 0, 0, 0, 0, 13); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (5, '타자', 0, 0, 0, 0, 0, 14); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (6, '타자', 0, 0, 0, 0, 0, 15); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (7, '타자', 0, 0, 0, 0, 0, 16); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (8, '타자', 0, 0, 0, 0, 0, 17); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (9, '타자', 0, 0, 0, 0, 0, 18); From 841caf7b03ee9a31d2c40c1504b3cc7c7cddfcb9 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:15:34 +0900 Subject: [PATCH 28/56] =?UTF-8?q?feat:=20request=EC=97=90=20=EC=84=A0?= =?UTF-8?q?=EC=88=98=EC=9D=98=20=EB=A7=88=EC=A7=80=EB=A7=89=EC=95=A1?= =?UTF-8?q?=EC=85=98=EA=B3=BC=20=ED=8C=80=EC=9D=98=20=ED=98=84=EC=9E=AC=20?= =?UTF-8?q?=EC=A0=90=EC=88=98=20=EB=B0=9B=EC=95=84=EC=98=AC=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=EB=8F=84=EB=A1=9D=20=ED=95=B4=EB=8B=B9=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20DTO=EC=97=90=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/java/codesquad/baseball/DTO/PlayerLogDTO.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java index ccb760b65..889328c20 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java @@ -14,10 +14,14 @@ @Setter @NoArgsConstructor @AllArgsConstructor +@JsonPropertyOrder({"teamId", "totalTeamScore", "playerBattingOrder", "playerName", "lastAction", "historyList"}) public class PlayerLogDTO { - private int playerBattingOrder; + private Long teamId; + private int totalTeamScore; + private int playerBattingOrder; private String playerName; + private String lastAction; private List historyList; public PlayerLogDTO(Player player, Long teamId) { From e1a1e99bc2e35eb6b584835aa0b47a1582177583 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:16:32 +0900 Subject: [PATCH 29/56] =?UTF-8?q?feat:=20ApiResponse=EC=97=90=20matchId=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/java/codesquad/baseball/ApiResponse.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BE/src/main/java/codesquad/baseball/ApiResponse.java b/BE/src/main/java/codesquad/baseball/ApiResponse.java index 2237508c1..f893ed90d 100644 --- a/BE/src/main/java/codesquad/baseball/ApiResponse.java +++ b/BE/src/main/java/codesquad/baseball/ApiResponse.java @@ -8,8 +8,9 @@ @Getter @AllArgsConstructor -@JsonPropertyOrder({"inning", "nextHitter", "expeditionTeam", "homeTeam", "pitcher", "hitter", "teamLog"}) +@JsonPropertyOrder({"matchId", "inning", "nextHitter", "expeditionTeam", "homeTeam", "pitcher", "hitter", "teamLog"}) public class ApiResponse { + Long matchId; Inning inning; PlayerLogDTO nextHitter; TeamDTO expeditionTeam; From 718f337ce8047d99c67a11defab4a26ce1860d4b Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:16:53 +0900 Subject: [PATCH 30/56] =?UTF-8?q?feat:=20=EB=A7=88=EC=A7=80=EB=A7=89=20?= =?UTF-8?q?=EC=95=A1=EC=85=98=20=EA=B2=80=EC=A6=9D=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesquad/baseball/DTO/PlayerLogDTO.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java index 889328c20..881046c05 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerLogDTO.java @@ -1,13 +1,15 @@ package codesquad.baseball.DTO; +import codesquad.baseball.domain.Constants; import codesquad.baseball.domain.History; import codesquad.baseball.domain.Player; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.util.ArrayList; import java.util.List; @Getter @@ -28,6 +30,18 @@ public PlayerLogDTO(Player player, Long teamId) { this.teamId = teamId; this.playerBattingOrder = player.getPlayerGameInfo().getBattingOrder(); this.playerName = player.getName(); + this.lastAction = player.getLastAction(); this.historyList = player.getHistoryList(); } + + @JsonIgnore + public boolean isLastActionOut() { + return this.lastAction.equals(Constants.OUT_ACTION); + } + + @JsonIgnore + public boolean isLastActionHit() { + return this.lastAction.equals(Constants.HIT_ACTION); + } + } From 46e82f645ab45b46490d7b33747d0ea45fd8056b Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:17:46 +0900 Subject: [PATCH 31/56] =?UTF-8?q?feat:=20=EC=84=A0=EC=88=98=20=ED=83=80?= =?UTF-8?q?=EA=B5=AC=20=EC=88=98/=ED=83=80=EC=9C=A8=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8=20=EB=A9=94=EC=86=8C=EB=93=9C=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 --- .../baseball/domain/PlayerGameInfo.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java index a98bbe89e..74d879ebb 100644 --- a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java +++ b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java @@ -1,5 +1,6 @@ package codesquad.baseball.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -9,6 +10,7 @@ @Setter @AllArgsConstructor public class PlayerGameInfo { + @Id private Long id; @@ -21,4 +23,23 @@ public class PlayerGameInfo { private int out; private Long average; + @JsonIgnore + public void addPitchCount(int pitches) { + pitchCount += pitches; + } + + @JsonIgnore + public PlayerGameInfo updatePlayerGameInfo(boolean hitSuccess, boolean isOut) { + this.plateAppearance += 1; + if (hitSuccess) { + this.hits += 1; + return this; + } + if (isOut) { + this.out += 1; + } + this.average = (long) hits / (long) plateAppearance; + return this; + } + } From efe9cc0e013f6fb8ea14e7d7f01066395c454048 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:19:17 +0900 Subject: [PATCH 32/56] =?UTF-8?q?feat:=20Constants=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80=ED=95=B4=20=EC=A0=84=EC=97=AD?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=ED=95=9C=20=EA=B3=B3=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesquad/baseball/domain/Constants.java | 18 +++++++++++ .../codesquad/baseball/domain/Inning.java | 32 ++++++++----------- .../codesquad/baseball/domain/Player.java | 2 +- 3 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 BE/src/main/java/codesquad/baseball/domain/Constants.java diff --git a/BE/src/main/java/codesquad/baseball/domain/Constants.java b/BE/src/main/java/codesquad/baseball/domain/Constants.java new file mode 100644 index 000000000..33b0a3998 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/domain/Constants.java @@ -0,0 +1,18 @@ +package codesquad.baseball.domain; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +public class Constants { + public final static String HIT_ACTION = "안타"; + public final static String OUT_ACTION = "아웃"; + public final static String FOUR_BALL_ACTION = "볼넷"; + + public final static int MAX_OUT_NUMBER = 3; + + public final static String PITCHER = "투수"; + public final static String HITTER = "타자"; + static final String OFFENSE = "공격"; + static final String DEFENSE = "수비"; + static final String TOP = "초"; + static final String BOTTOM = "말"; +} diff --git a/BE/src/main/java/codesquad/baseball/domain/Inning.java b/BE/src/main/java/codesquad/baseball/domain/Inning.java index 43190f055..7b3206758 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Inning.java +++ b/BE/src/main/java/codesquad/baseball/domain/Inning.java @@ -1,16 +1,10 @@ package codesquad.baseball.domain; -import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @NoArgsConstructor public class Inning { - private static final String OFFENSE = "공격"; - private static final String DEFENSE = "수비"; - private static final String TOP = "초"; - private static final String BOTTOM = "말"; - private int out; private int inningNumber; private String role; @@ -25,45 +19,45 @@ public Inning(int out, int inningNumber, String role, String cycle) { public static Inning initiateInning(boolean isHome) { if (isHome) { - return new Inning(0, 1, DEFENSE, TOP); + return new Inning(0, 1, Constants.DEFENSE, Constants.TOP); } - return new Inning(0, 1, OFFENSE, TOP); + return new Inning(0, 1, Constants.OFFENSE, Constants.TOP); } public int updateOut(boolean isPlayerOut) { - if(isPlayerOut) { + if (isPlayerOut) { this.out += 1; } return out; } private Inning changeRole() { - if (this.role.equals(DEFENSE)) { - this.role = OFFENSE; + if (this.role.equals(Constants.DEFENSE)) { + this.role = Constants.OFFENSE; return this; } - this.role = DEFENSE; + this.role = Constants.DEFENSE; return this; } private Inning changeCycle() { - if (this.cycle.equals(TOP)) { - this.cycle = BOTTOM; + if (this.cycle.equals(Constants.TOP)) { + this.cycle = Constants.BOTTOM; return this; } - this.role = TOP; + this.cycle = Constants.TOP; this.inningNumber += 1; return this; } public boolean needChange() { - return this.out == 3; + return this.out == Constants.MAX_OUT_NUMBER; } public Inning changeInning() { - changeCycle(); - changeRole(); - this.out = 0; + changeCycle(); + changeRole(); + this.out = 0; return this; } diff --git a/BE/src/main/java/codesquad/baseball/domain/Player.java b/BE/src/main/java/codesquad/baseball/domain/Player.java index a30d80bf1..47eaff4bf 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Player.java +++ b/BE/src/main/java/codesquad/baseball/domain/Player.java @@ -36,7 +36,7 @@ public void clearLastAction() { @JsonIgnore public boolean isPitcher() { - return playerGameInfo.getRole().equals(PlayerGameInfo.PITCHER); + return playerGameInfo.getRole().equals(Constants.PITCHER); } @JsonIgnore From fb2f3ae497f77fe81dad1378616c976ea3a27999 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:22:58 +0900 Subject: [PATCH 33/56] =?UTF-8?q?feat:=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?= =?UTF-8?q?=EB=9F=AC=EC=97=90=20=EC=95=BC=EA=B5=AC=EA=B2=8C=EC=9E=84=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/controller/GameController.java | 107 ++++++++---------- .../baseball/controller/HomeController.java | 7 +- 2 files changed, 50 insertions(+), 64 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index 97d4d0339..8edfe2c08 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -2,16 +2,18 @@ import codesquad.baseball.ApiResponse; import codesquad.baseball.DTO.*; -import codesquad.baseball.domain.*; +import codesquad.baseball.domain.Inning; +import codesquad.baseball.domain.Match; +import codesquad.baseball.domain.Player; +import codesquad.baseball.domain.Team; +import codesquad.baseball.exception.TeamNotFoundException; import codesquad.baseball.repository.MatchRepository; import codesquad.baseball.repository.TeamRepository; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.view.RedirectView; import java.util.HashMap; -import java.util.List; @CrossOrigin @RestController @@ -31,34 +33,60 @@ public RedirectView initialize(@RequestBody HashMap teamInfo) { Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); - Inning inning = new Inning(0, 1, "수비", "초"); + Inning inning = Inning.initiateInning(isHome); Match match = new Match(myTeamId, counterTeamId, inning, isHome); + Long matchId = matchRepository.save(match).getId(); return new RedirectView("/game/" + matchId); } - @GetMapping("/{matchId}") - public ResponseEntity game(@PathVariable Long matchId) { + @PostMapping("/{matchId}/exchange") + public ResponseEntity exchange(@PathVariable Long matchId, @RequestBody PlayerLogDTO playerLog) { Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); - Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); - Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); - - List historyList = myTeam.getHistoryList(); - TeamDTO leftTeam = new TeamDTO(myTeam.getName(), 5); - TeamDTO rightTeam = new TeamDTO(counterTeam.getName(), 5); - - TeamLogDTO teamLog = new TeamLogDTO(myTeam); - Player player = myTeam.getPlayerList().get(0); + Inning currentInning = match.getCurrentInning(); - PlayerDTO pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); - PlayerDTO hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); - //TeamLogDTO teamLog = new TeamLogDTO(myTeam); - ApiResponse apiResponse = new ApiResponse(match.getCurrentInning(), - new PlayerLogDTO(player, myTeam.getId()), leftTeam, rightTeam, pitcher, hitter, teamLog); + Long offenseTeamId = playerLog.getTeamId(); + Team offenseTeam = teamRepository.findById(offenseTeamId).orElseThrow(RuntimeException::new); + Player hitter = offenseTeam.findPlayerByName(playerLog.getPlayerName()); + hitter.addHistory(playerLog.getHistoryList()); + hitter.updatePlayerGameInfo(playerLog.getLastAction()); + offenseTeam.setTotalScore(currentInning.getInningNumber(), playerLog.getTotalTeamScore()); + teamRepository.save(offenseTeam); + + Long defenseTeamId = match.getOtherTeamId(offenseTeamId); + Team defenseTeam = teamRepository.findById(defenseTeamId).orElseThrow(RuntimeException::new); + Player pitcher = defenseTeam.getPitcher(); + pitcher.addPitchCount(playerLog.getHistoryList().size() + 1); + teamRepository.save(defenseTeam); + + currentInning.updateOut(playerLog.isLastActionOut()); + + Player nextHitter = offenseTeam.getNextPlayer(playerLog.getPlayerBattingOrder()); + + if (currentInning.needChange()) { + currentInning = currentInning.changeInning(); + offenseTeam.clearAllHistory(); + teamRepository.save(offenseTeam); + + offenseTeam = teamRepository.findById(defenseTeamId).orElseThrow(RuntimeException::new); + defenseTeam = teamRepository.findById(offenseTeamId).orElseThrow(RuntimeException::new); + nextHitter = offenseTeam.getFirstHitter(); + pitcher = defenseTeam.getPitcher(); + offenseTeam.initializeTotalScore(currentInning.getInningNumber()); + teamRepository.save(offenseTeam); + } + + TeamLogDTO teamLogDTO = new TeamLogDTO(offenseTeam); + matchRepository.save(match); + Team homeTeam = teamRepository.findById(match.getHomeTeamId()).orElseThrow(TeamNotFoundException::new); + Team expeditionTeam = teamRepository.findById(match.getExpeditionTeamId()).orElseThrow(TeamNotFoundException::new); - return new ResponseEntity<>(apiResponse, HttpStatus.OK); + ApiResponse apiResponse = new ApiResponse(matchId, currentInning, new PlayerLogDTO(nextHitter, offenseTeamId), + new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), new PlayerDTO(pitcher), new PlayerDTO(nextHitter), teamLogDTO); + return new ResponseEntity(apiResponse, HttpStatus.OK); } + @GetMapping("/{matchId}/playerListPopUp") public ResponseEntity showPlayerList(@PathVariable Long matchId) { Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); @@ -80,42 +108,5 @@ public ResponseEntity showDetailScoreList(@PathVariable Long return new ResponseEntity<>(new TeamGameScoreDTO[]{leftTeamScore, rightTeamScore}, HttpStatus.OK); } - @PostMapping("/{matchId}/exchange") - public ResponseEntity exchange(@PathVariable Long matchId, @RequestBody PlayerLogDTO history) { - Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); - - //이닝 정보 얻어오기 - Inning currentInning = match.getCurrentInning(); - int playerBattingOrder = history.getPlayerBattingOrder(); - - // 현재 팀의 out 가져오기 - Team currentTeam = teamRepository.findById(history.getTeamId()).orElseThrow(RuntimeException::new); - Player nextPlayer = currentTeam.getPlayerList().get(playerBattingOrder); - int out = nextPlayer.getHistoryList().get(0).getOut(); - - // 현재 회차에 업데이트 후 저장 - currentInning.update(out); - matchRepository.save(match); - - //기타 전체 정보 조회 - ApiResponse apiResponse = getGameInfo(match, currentInning, nextPlayer, history); - return new ResponseEntity(apiResponse, HttpStatus.OK); - } - - private ApiResponse getGameInfo(Match match, Inning currentInning, Player nextPlayer, PlayerLogDTO history) { - Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); - Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); - TeamDTO leftTeam = new TeamDTO(myTeam.getName(), 5); - TeamDTO rightTeam = new TeamDTO(counterTeam.getName(), 5); - PlayerDTO pitcher = new PlayerDTO("Pitcher", "Jung", 39, 1, 0); - PlayerDTO hitter = new PlayerDTO("Hitter", "Jane", 0, 1, 0); - TeamLogDTO teamLog = new TeamLogDTO(myTeam); - PlayerLogDTO playerLog = new PlayerLogDTO(nextPlayer, history.getTeamId()); - return new ApiResponse(currentInning, playerLog, leftTeam, rightTeam, pitcher, hitter, teamLog); - } - - private boolean needExchange(Inning inning) { - return inning.getOut() == 3; - } } diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 8af6fd067..3dc593596 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -1,17 +1,12 @@ package codesquad.baseball.controller; -import codesquad.baseball.ApiResponse; -import codesquad.baseball.DTO.*; import codesquad.baseball.domain.*; -import codesquad.baseball.repository.HistoryRepository; import codesquad.baseball.repository.MatchRepository; import codesquad.baseball.repository.TeamRepository; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.view.RedirectView; -import java.util.HashMap; import java.util.List; @CrossOrigin @@ -26,7 +21,7 @@ public HomeController(TeamRepository teamRepository, MatchRepository matchReposi } @GetMapping("/totalTeamList") - public ResponseEntity home() { + public ResponseEntity> home() { List teamList = (List) teamRepository.findAll(); return new ResponseEntity(teamList, HttpStatus.OK); } From cb00e98fe7c4f526ef887b368bab8d79ddc7a7a6 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:25:42 +0900 Subject: [PATCH 34/56] =?UTF-8?q?fix:=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?= =?UTF-8?q?=EB=9F=AC=EC=97=90=20Redirect=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/controller/GameController.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index 8edfe2c08..4b980e4cb 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -29,7 +29,7 @@ public GameController(TeamRepository teamRepository, MatchRepository matchReposi } @PostMapping - public RedirectView initialize(@RequestBody HashMap teamInfo) { + public ResponseEntity initialize(@RequestBody HashMap teamInfo) { Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); @@ -37,7 +37,23 @@ public RedirectView initialize(@RequestBody HashMap teamInfo) { Match match = new Match(myTeamId, counterTeamId, inning, isHome); Long matchId = matchRepository.save(match).getId(); - return new RedirectView("/game/" + matchId); + + Team homeTeam = teamRepository.findById(match.getHomeTeamId()).orElseThrow(TeamNotFoundException::new); + Team expeditionTeam = teamRepository.findById(match.getExpeditionTeamId()).orElseThrow(TeamNotFoundException::new); + Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(TeamNotFoundException::new); + myTeam.setUser(true); + teamRepository.save(myTeam); + + Team offenseTeam = isHome ? expeditionTeam : homeTeam; + offenseTeam.initializeTotalScore(1); + teamRepository.save(offenseTeam); + + Player firstHitter = isHome ? expeditionTeam.getFirstHitter() : homeTeam.getFirstHitter(); + Player pitcher = isHome ? homeTeam.getPitcher() : expeditionTeam.getPitcher(); + + ApiResponse apiResponse = new ApiResponse(matchId, match.getCurrentInning(), + new PlayerLogDTO(firstHitter, homeTeam.getId()), new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), new PlayerDTO(pitcher), new PlayerDTO(firstHitter), new TeamLogDTO(homeTeam)); + return new ResponseEntity<>(apiResponse, HttpStatus.OK); } @PostMapping("/{matchId}/exchange") From d7ef2f00230d37910b15d068e035ad6d6fdac928 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 15:26:26 +0900 Subject: [PATCH 35/56] =?UTF-8?q?fix:=20=EC=9D=B4=EB=8B=9D=EB=B3=84=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A0=90=EC=88=98=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=ED=99=94=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/java/codesquad/baseball/domain/Team.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index 4007954e8..b93b2a4c2 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -45,11 +45,12 @@ public int getTotalScore() { @JsonIgnore public void initializeTotalScore(int inningNumber) { TeamGameScore teamGameScore = new TeamGameScore(inningNumber, 0); + teamGameScoreList.add(teamGameScore); } @JsonIgnore public void setTotalScore(int inningNumber, int totalScore) { - teamGameScoreList.get(inningNumber-1).setScore(totalScore); + teamGameScoreList.get(inningNumber - 1).setScore(totalScore); } @JsonIgnore @@ -86,6 +87,7 @@ public Player findPlayerByName(String name) { public void clearAllHistory() { for (Player player : playerList) { player.clearHistory(); + player.clearLastAction(); } } } From ff0b13c289cb3898bf4bc7d7966b82d43afd9edf Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 18:26:56 +0900 Subject: [PATCH 36/56] =?UTF-8?q?feat:=20=EC=84=A0=EC=88=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/resources/data.sql | 136 ++++++++++++++++++++++++++++++--- 1 file changed, 127 insertions(+), 9 deletions(-) diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index e926f6d01..746e71c1d 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -7,15 +7,15 @@ insert into team(name, is_user) values ('Tigers', false); insert into team(name, is_user) values ('Rockets', false); insert into team(name, is_user) values ('Dodgers', false); -insert into player(name, team) values ('KimGwangJin', 1); -insert into player(name, team) values ('LeeDongKyu', 1); -insert into player(name, team) values ('KimJinSu', 1); -insert into player(name, team) values ('ParkYoungKwon', 1); -insert into player(name, team) values ('ChooJinsu', 1); -insert into player(name, team) values ('leeYongdae', 1); -insert into player(name, team) values ('RyuHeonJin', 1); -insert into player(name, team) values ('ChoiDongsu', 1); -insert into player(name, team) values ('HanYangbeom', 1); +insert into player(name, team) values ('신데렐라', 1); +insert into player(name, team) values ('모아나', 1); +insert into player(name, team) values ('벨', 1); +insert into player(name, team) values ('애리얼', 1); +insert into player(name, team) values ('라푼젤', 1); +insert into player(name, team) values ('뮬란', 1); +insert into player(name, team) values ('자스민', 1); +insert into player(name, team) values ('포카혼타스', 1); +insert into player(name, team) values ('메리다', 1); insert into player(name, team) values ('김광진', 2); insert into player(name, team) values ('이동규', 2); @@ -27,6 +27,48 @@ insert into player(name, team) values ('류현진', 2); insert into player(name, team) values ('최동수', 2); insert into player(name, team) values ('한양범', 2); +insert into player(name, team) values ('엘사', 3); +insert into player(name, team) values ('안나', 3); +insert into player(name, team) values ('올라프', 3); +insert into player(name, team) values ('스벤', 3); +insert into player(name, team) values ('크리스토프', 3); +insert into player(name, team) values ('트롤', 3); +insert into player(name, team) values ('얼음괴물', 3); +insert into player(name, team) values ('한스', 3); +insert into player(name, team) values ('스벤당근', 3); + +insert into player(name, team) values ('이승만', 4); +insert into player(name, team) values ('장면', 4); +insert into player(name, team) values ('최규하', 4); +insert into player(name, team) values ('전두환', 4); +insert into player(name, team) values ('노태우', 4); +insert into player(name, team) values ('김영삼', 4); +insert into player(name, team) values ('김대중', 4); +insert into player(name, team) values ('노무현', 4); +insert into player(name, team) values ('이명박', 4); + +insert into player(name, team) values ('버즈', 5); +insert into player(name, team) values ('우디', 5); +insert into player(name, team) values ('제시', 5); +insert into player(name, team) values ('보핍', 5); +insert into player(name, team) values ('포키', 5); +insert into player(name, team) values ('렉스', 5); +insert into player(name, team) values ('햄', 5); +insert into player(name, team) values ('포테이토헤드', 5); +insert into player(name, team) values ('에일리언', 5); + +insert into player(name, team) values ('아이언맨', 6); +insert into player(name, team) values ('캡틴아메리카', 6); +insert into player(name, team) values ('스파이더맨', 6); +insert into player(name, team) values ('헐크', 6); +insert into player(name, team) values ('스칼렛위치', 6); +insert into player(name, team) values ('블랙위도우', 6); +insert into player(name, team) values ('블랙팬서', 6); +insert into player(name, team) values ('토르', 6); +insert into player(name, team) values ('그루트', 6); + + + insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) values (1, '투수', 0, 0, 0, 0, 0, 1); insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) @@ -64,3 +106,79 @@ insert into player_game_info(batting_order, role, pitch_count, plate_appearance, values (8, '타자', 0, 0, 0, 0, 0, 17); insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) values (9, '타자', 0, 0, 0, 0, 0, 18); + +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (1, '투수', 0, 0, 0, 0, 0, 19); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (2, '타자', 0, 0, 0, 0, 0, 20); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (3, '타자', 0, 0, 0, 0, 0, 21); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (4, '타자', 0, 0, 0, 0, 0, 22); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (5, '타자', 0, 0, 0, 0, 0, 23); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (6, '타자', 0, 0, 0, 0, 0, 24); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (7, '타자', 0, 0, 0, 0, 0, 25); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (8, '타자', 0, 0, 0, 0, 0, 26); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (9, '타자', 0, 0, 0, 0, 0, 27); + +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (1, '투수', 0, 0, 0, 0, 0, 28); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (2, '타자', 0, 0, 0, 0, 0, 29); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (3, '타자', 0, 0, 0, 0, 0, 30); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (4, '타자', 0, 0, 0, 0, 0, 31); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (5, '타자', 0, 0, 0, 0, 0, 32); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (6, '타자', 0, 0, 0, 0, 0, 33); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (7, '타자', 0, 0, 0, 0, 0, 34); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (8, '타자', 0, 0, 0, 0, 0, 35); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (9, '타자', 0, 0, 0, 0, 0, 36); + +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (1, '투수', 0, 0, 0, 0, 0, 37); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (2, '타자', 0, 0, 0, 0, 0, 38); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (3, '타자', 0, 0, 0, 0, 0, 39); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (4, '타자', 0, 0, 0, 0, 0, 40); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (5, '타자', 0, 0, 0, 0, 0, 41); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (6, '타자', 0, 0, 0, 0, 0, 42); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (7, '타자', 0, 0, 0, 0, 0, 43); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (8, '타자', 0, 0, 0, 0, 0, 44); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (9, '타자', 0, 0, 0, 0, 0, 45); + +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (1, '투수', 0, 0, 0, 0, 0, 46); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (2, '타자', 0, 0, 0, 0, 0, 47); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (3, '타자', 0, 0, 0, 0, 0, 48); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (4, '타자', 0, 0, 0, 0, 0, 49); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (5, '타자', 0, 0, 0, 0, 0, 50); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (6, '타자', 0, 0, 0, 0, 0, 51); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (7, '타자', 0, 0, 0, 0, 0, 52); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (8, '타자', 0, 0, 0, 0, 0, 53); +insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) +values (9, '타자', 0, 0, 0, 0, 0, 54); From 2e7594cfb3910bb9c98b2396f6d94b00715bb2cf Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 18:28:16 +0900 Subject: [PATCH 37/56] =?UTF-8?q?feat:=20PlayerDTO=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EC=9E=90=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=EC=97=90=20rol?= =?UTF-8?q?e=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java b/BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java index da9fe8d11..cd80bb94d 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/PlayerDTO.java @@ -15,8 +15,8 @@ public class PlayerDTO { private int plateAppearances; private int hits; - public PlayerDTO(Player player) { - this.role = player.getPlayerGameInfo().getRole(); + public PlayerDTO(String role, Player player) { + this.role = role; this.name = player.getName(); this.pitchCount = player.getPlayerGameInfo().getPitchCount(); this.plateAppearances = player.getPlayerGameInfo().getPlateAppearance(); From 4febe7c5c999f80a107dbb33d40f403ed9a78eb8 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 18:28:56 +0900 Subject: [PATCH 38/56] =?UTF-8?q?feat:=20totalScore=EC=9D=84=20=EA=B8=B0?= =?UTF-8?q?=EC=A1=B4=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=20append?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/java/codesquad/baseball/domain/Team.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index b93b2a4c2..3d779bc18 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -48,6 +48,12 @@ public void initializeTotalScore(int inningNumber) { teamGameScoreList.add(teamGameScore); } + @JsonIgnore + public void addTotalScore(int inningNumber) { + TeamGameScore teamGameScore = new TeamGameScore(inningNumber, 0); + teamGameScoreList.add(teamGameScore); + } + @JsonIgnore public void setTotalScore(int inningNumber, int totalScore) { teamGameScoreList.get(inningNumber - 1).setScore(totalScore); From a15c249b9b70836e3ba707566fae63bda158530d Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 18:29:45 +0900 Subject: [PATCH 39/56] =?UTF-8?q?fix:=20TeamLogDTO=EC=97=90=20=EB=B2=A0?= =?UTF-8?q?=ED=8C=85=EC=9D=84=20=EC=99=84=EB=A3=8C=ED=95=9C=20=EC=84=A0?= =?UTF-8?q?=EC=88=98=EC=9D=98=20=ED=9E=88=EC=8A=A4=ED=86=A0=EB=A6=AC?= =?UTF-8?q?=EB=A7=8C=20=EB=9C=A8=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java b/BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java index 0a362224c..67532a523 100644 --- a/BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java +++ b/BE/src/main/java/codesquad/baseball/DTO/TeamLogDTO.java @@ -13,9 +13,12 @@ public class TeamLogDTO { private List playerLog = new ArrayList<>(); - public TeamLogDTO(Team team) { - for(Player player : team.getPlayerList()) { - this.playerLog.add(new PlayerLogDTO(player, team.getId())); + public TeamLogDTO(Team team, Player player) { + int playerIndex = team.getPlayerList().indexOf(player); + for (int i = 0; i < playerIndex; i++) { + Player targetPlayer = team.getPlayerList().get(i); + this.playerLog.add(new PlayerLogDTO(targetPlayer, team.getId())); } + } } From 9c8c7caab1dcb28dda644ea7cc0a90d08e337433 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 18:30:34 +0900 Subject: [PATCH 40/56] =?UTF-8?q?fix:=20=EC=A0=95=EB=A0=AC=20=EB=B0=8F=20?= =?UTF-8?q?=EC=93=B0=EC=9D=B4=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codesquad/baseball/controller/GameController.java | 8 ++------ .../codesquad/baseball/controller/HomeController.java | 10 ++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index 4b980e4cb..ebba20c89 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -12,7 +12,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; - import java.util.HashMap; @CrossOrigin @@ -52,7 +51,8 @@ public ResponseEntity initialize(@RequestBody HashMap(apiResponse, HttpStatus.OK); } @@ -102,7 +102,6 @@ public ResponseEntity exchange(@PathVariable Long matchId, @Request return new ResponseEntity(apiResponse, HttpStatus.OK); } - @GetMapping("/{matchId}/playerListPopUp") public ResponseEntity showPlayerList(@PathVariable Long matchId) { Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); @@ -113,7 +112,6 @@ public ResponseEntity showPlayerList(@PathVariable Long ma return new ResponseEntity<>(new PlayerListPopUpDTO[]{LeftTeamPlayerList, rightTeamPlayerList}, HttpStatus.OK); } - @GetMapping("/{matchId}/detailScore") public ResponseEntity showDetailScoreList(@PathVariable Long matchId) { Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); @@ -123,6 +121,4 @@ public ResponseEntity showDetailScoreList(@PathVariable Long TeamGameScoreDTO rightTeamScore = new TeamGameScoreDTO(counterTeam); return new ResponseEntity<>(new TeamGameScoreDTO[]{leftTeamScore, rightTeamScore}, HttpStatus.OK); } - - } diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index 3dc593596..b6849d69a 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -1,30 +1,24 @@ package codesquad.baseball.controller; import codesquad.baseball.domain.*; -import codesquad.baseball.repository.MatchRepository; import codesquad.baseball.repository.TeamRepository; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; - import java.util.List; @CrossOrigin @RestController public class HomeController { private final TeamRepository teamRepository; - private final MatchRepository matchRepository; - public HomeController(TeamRepository teamRepository, MatchRepository matchRepository) { + public HomeController(TeamRepository teamRepository) { this.teamRepository = teamRepository; - this.matchRepository = matchRepository; } @GetMapping("/totalTeamList") public ResponseEntity> home() { List teamList = (List) teamRepository.findAll(); - return new ResponseEntity(teamList, HttpStatus.OK); + return new ResponseEntity<>(teamList, HttpStatus.OK); } - - } From 44b57c4df45b29e77eeff47b287557f6e5612387 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 18:31:24 +0900 Subject: [PATCH 41/56] =?UTF-8?q?fix:=20totalScore=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=ED=99=94=20=EC=8B=9C=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=ED=9B=84=20totalScore=EC=B6=94=EA=B0=80=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/java/codesquad/baseball/domain/Team.java | 1 + 1 file changed, 1 insertion(+) diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index 3d779bc18..91e3126e8 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -45,6 +45,7 @@ public int getTotalScore() { @JsonIgnore public void initializeTotalScore(int inningNumber) { TeamGameScore teamGameScore = new TeamGameScore(inningNumber, 0); + teamGameScoreList.clear(); teamGameScoreList.add(teamGameScore); } From 56b7bbfda51b1b1348eaaaaece326ac725a0b1ee Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 18:32:10 +0900 Subject: [PATCH 42/56] =?UTF-8?q?fix:=20=EB=B0=94=EB=80=90=20=EB=A9=94?= =?UTF-8?q?=EC=86=8C=EB=93=9C=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/controller/GameController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index ebba20c89..d4f4d4a9a 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -88,17 +88,17 @@ public ResponseEntity exchange(@PathVariable Long matchId, @Request defenseTeam = teamRepository.findById(offenseTeamId).orElseThrow(RuntimeException::new); nextHitter = offenseTeam.getFirstHitter(); pitcher = defenseTeam.getPitcher(); - offenseTeam.initializeTotalScore(currentInning.getInningNumber()); + offenseTeam.addTotalScore(currentInning.getInningNumber()); teamRepository.save(offenseTeam); } - TeamLogDTO teamLogDTO = new TeamLogDTO(offenseTeam); + TeamLogDTO teamLogDTO = new TeamLogDTO(offenseTeam, nextHitter); matchRepository.save(match); Team homeTeam = teamRepository.findById(match.getHomeTeamId()).orElseThrow(TeamNotFoundException::new); Team expeditionTeam = teamRepository.findById(match.getExpeditionTeamId()).orElseThrow(TeamNotFoundException::new); ApiResponse apiResponse = new ApiResponse(matchId, currentInning, new PlayerLogDTO(nextHitter, offenseTeamId), - new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), new PlayerDTO(pitcher), new PlayerDTO(nextHitter), teamLogDTO); + new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), new PlayerDTO("투수", pitcher), new PlayerDTO("타자", nextHitter), teamLogDTO); return new ResponseEntity(apiResponse, HttpStatus.OK); } From eec1665bc1e1a7f89586580fee471f4931b6d650 Mon Sep 17 00:00:00 2001 From: rla36 Date: Tue, 11 May 2021 20:13:59 +0900 Subject: [PATCH 43/56] =?UTF-8?q?feat:=20service=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/service/GameService.java | 48 +++++++++++++++++++ .../baseball/service/MatchService.java | 4 ++ 2 files changed, 52 insertions(+) create mode 100644 BE/src/main/java/codesquad/baseball/service/GameService.java create mode 100644 BE/src/main/java/codesquad/baseball/service/MatchService.java diff --git a/BE/src/main/java/codesquad/baseball/service/GameService.java b/BE/src/main/java/codesquad/baseball/service/GameService.java new file mode 100644 index 000000000..f4e678974 --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/service/GameService.java @@ -0,0 +1,48 @@ +package codesquad.baseball.service; + +import codesquad.baseball.ApiResponse; +import codesquad.baseball.domain.Inning; +import codesquad.baseball.domain.Match; +import codesquad.baseball.domain.Team; +import codesquad.baseball.exception.MatchNotFoundException; +import codesquad.baseball.exception.TeamNotFoundException; +import codesquad.baseball.repository.MatchRepository; +import codesquad.baseball.repository.TeamRepository; +import org.springframework.stereotype.Service; + +import java.util.HashMap; + +@Service +public class GameService { + + private final MatchRepository matchRepository; + private final TeamRepository teamRepository; + + public GameService(MatchRepository matchRepository, TeamRepository teamRepository) { + this.matchRepository = matchRepository; + this.teamRepository = teamRepository; + } + + public Match findMatch(Long matchId) { + return matchRepository.findById(matchId).orElseThrow(MatchNotFoundException::new); + } + + public Team findTeam(Long teamId) { + return teamRepository.findById(teamId).orElseThrow(TeamNotFoundException::new); + } + + public Match createMatch(HashMap teamInfo) { + Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); + Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); + boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); + Inning inning = Inning.initiateInning(isHome); + return new Match(myTeamId, counterTeamId, inning, isHome); + } + + public Long saveMatch(Match match) { + return matchRepository.save(match).getId(); + } + + public void createApiResponse(Long matchId) { + } +} diff --git a/BE/src/main/java/codesquad/baseball/service/MatchService.java b/BE/src/main/java/codesquad/baseball/service/MatchService.java new file mode 100644 index 000000000..7a6fa393c --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/service/MatchService.java @@ -0,0 +1,4 @@ +package codesquad.baseball.service; + +public class MatchService { +} From 8d99756eb286cd9fcfe4a2690c853fd7df2ab26f Mon Sep 17 00:00:00 2001 From: janeljs Date: Tue, 11 May 2021 22:40:10 +0900 Subject: [PATCH 44/56] =?UTF-8?q?refactor:=20=EC=A0=84=EC=B2=B4=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=EB=A6=AC=ED=8C=A9=ED=86=A0?= =?UTF-8?q?=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/controller/GameController.java | 102 ++------------- .../baseball/controller/HomeController.java | 12 +- .../codesquad/baseball/domain/Constants.java | 27 ++-- .../codesquad/baseball/domain/History.java | 9 +- .../java/codesquad/baseball/domain/Match.java | 9 +- .../codesquad/baseball/domain/Player.java | 3 +- .../baseball/domain/PlayerGameInfo.java | 5 +- .../java/codesquad/baseball/domain/Team.java | 9 +- .../exception/ElementNotFoundException.java | 7 + .../exception/GlobalExceptionHandler.java | 16 +++ .../exception/MatchNotFoundException.java | 5 +- .../exception/PlayerNotFoundException.java | 5 +- .../exception/TeamNotFoundException.java | 5 +- .../baseball/service/GameService.java | 122 ++++++++++++++++-- .../baseball/service/MatchService.java | 4 - BE/src/main/resources/application.properties | 2 +- BE/src/main/resources/data.sql | 1 - BE/src/main/resources/schema.sql | 2 - 18 files changed, 201 insertions(+), 144 deletions(-) create mode 100644 BE/src/main/java/codesquad/baseball/exception/ElementNotFoundException.java create mode 100644 BE/src/main/java/codesquad/baseball/exception/GlobalExceptionHandler.java delete mode 100644 BE/src/main/java/codesquad/baseball/service/MatchService.java diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index d4f4d4a9a..3a70b2f61 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -2,16 +2,11 @@ import codesquad.baseball.ApiResponse; import codesquad.baseball.DTO.*; -import codesquad.baseball.domain.Inning; -import codesquad.baseball.domain.Match; -import codesquad.baseball.domain.Player; -import codesquad.baseball.domain.Team; -import codesquad.baseball.exception.TeamNotFoundException; -import codesquad.baseball.repository.MatchRepository; -import codesquad.baseball.repository.TeamRepository; +import codesquad.baseball.service.GameService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; + import java.util.HashMap; @CrossOrigin @@ -19,106 +14,31 @@ @RequestMapping("/game") public class GameController { - private final TeamRepository teamRepository; - private final MatchRepository matchRepository; + private final GameService gameService; - public GameController(TeamRepository teamRepository, MatchRepository matchRepository) { - this.teamRepository = teamRepository; - this.matchRepository = matchRepository; + public GameController(GameService gameService) { + this.gameService = gameService; } @PostMapping public ResponseEntity initialize(@RequestBody HashMap teamInfo) { - Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); - Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); - boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); - Inning inning = Inning.initiateInning(isHome); - Match match = new Match(myTeamId, counterTeamId, inning, isHome); - - Long matchId = matchRepository.save(match).getId(); - - Team homeTeam = teamRepository.findById(match.getHomeTeamId()).orElseThrow(TeamNotFoundException::new); - Team expeditionTeam = teamRepository.findById(match.getExpeditionTeamId()).orElseThrow(TeamNotFoundException::new); - Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(TeamNotFoundException::new); - myTeam.setUser(true); - teamRepository.save(myTeam); - - Team offenseTeam = isHome ? expeditionTeam : homeTeam; - offenseTeam.initializeTotalScore(1); - teamRepository.save(offenseTeam); - - Player firstHitter = isHome ? expeditionTeam.getFirstHitter() : homeTeam.getFirstHitter(); - Player pitcher = isHome ? homeTeam.getPitcher() : expeditionTeam.getPitcher(); - - ApiResponse apiResponse = new ApiResponse(matchId, match.getCurrentInning(), - new PlayerLogDTO(firstHitter, homeTeam.getId()), new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), - new PlayerDTO("투수", pitcher), new PlayerDTO("타자", firstHitter), new TeamLogDTO(homeTeam, firstHitter)); + ApiResponse apiResponse = gameService.getGameInfo(teamInfo); return new ResponseEntity<>(apiResponse, HttpStatus.OK); } @PostMapping("/{matchId}/exchange") - public ResponseEntity exchange(@PathVariable Long matchId, @RequestBody PlayerLogDTO playerLog) { - Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); - Inning currentInning = match.getCurrentInning(); - - Long offenseTeamId = playerLog.getTeamId(); - Team offenseTeam = teamRepository.findById(offenseTeamId).orElseThrow(RuntimeException::new); - Player hitter = offenseTeam.findPlayerByName(playerLog.getPlayerName()); - hitter.addHistory(playerLog.getHistoryList()); - hitter.updatePlayerGameInfo(playerLog.getLastAction()); - offenseTeam.setTotalScore(currentInning.getInningNumber(), playerLog.getTotalTeamScore()); - teamRepository.save(offenseTeam); - - Long defenseTeamId = match.getOtherTeamId(offenseTeamId); - Team defenseTeam = teamRepository.findById(defenseTeamId).orElseThrow(RuntimeException::new); - Player pitcher = defenseTeam.getPitcher(); - pitcher.addPitchCount(playerLog.getHistoryList().size() + 1); - teamRepository.save(defenseTeam); - - currentInning.updateOut(playerLog.isLastActionOut()); - - Player nextHitter = offenseTeam.getNextPlayer(playerLog.getPlayerBattingOrder()); - - if (currentInning.needChange()) { - currentInning = currentInning.changeInning(); - offenseTeam.clearAllHistory(); - teamRepository.save(offenseTeam); - - offenseTeam = teamRepository.findById(defenseTeamId).orElseThrow(RuntimeException::new); - defenseTeam = teamRepository.findById(offenseTeamId).orElseThrow(RuntimeException::new); - nextHitter = offenseTeam.getFirstHitter(); - pitcher = defenseTeam.getPitcher(); - offenseTeam.addTotalScore(currentInning.getInningNumber()); - teamRepository.save(offenseTeam); - } - - TeamLogDTO teamLogDTO = new TeamLogDTO(offenseTeam, nextHitter); - matchRepository.save(match); - Team homeTeam = teamRepository.findById(match.getHomeTeamId()).orElseThrow(TeamNotFoundException::new); - Team expeditionTeam = teamRepository.findById(match.getExpeditionTeamId()).orElseThrow(TeamNotFoundException::new); - - ApiResponse apiResponse = new ApiResponse(matchId, currentInning, new PlayerLogDTO(nextHitter, offenseTeamId), - new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), new PlayerDTO("투수", pitcher), new PlayerDTO("타자", nextHitter), teamLogDTO); - return new ResponseEntity(apiResponse, HttpStatus.OK); + public ResponseEntity exchangePlayer(@PathVariable Long matchId, @RequestBody PlayerLogDTO playerLog) { + ApiResponse apiResponse = gameService.exchangePlayer(matchId, playerLog); + return new ResponseEntity<>(apiResponse, HttpStatus.OK); } @GetMapping("/{matchId}/playerListPopUp") public ResponseEntity showPlayerList(@PathVariable Long matchId) { - Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); - Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); - Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); - PlayerListPopUpDTO LeftTeamPlayerList = new PlayerListPopUpDTO(myTeam); - PlayerListPopUpDTO rightTeamPlayerList = new PlayerListPopUpDTO(counterTeam); - return new ResponseEntity<>(new PlayerListPopUpDTO[]{LeftTeamPlayerList, rightTeamPlayerList}, HttpStatus.OK); + return new ResponseEntity<>(gameService.getPlayerInfo(matchId), HttpStatus.OK); } @GetMapping("/{matchId}/detailScore") public ResponseEntity showDetailScoreList(@PathVariable Long matchId) { - Match match = matchRepository.findById(matchId).orElseThrow(RuntimeException::new); - Team myTeam = teamRepository.findById(match.getMyTeamId()).orElseThrow(RuntimeException::new); - Team counterTeam = teamRepository.findById(match.getCounterTeamId()).orElseThrow(RuntimeException::new); - TeamGameScoreDTO leftTeamScore = new TeamGameScoreDTO(myTeam); - TeamGameScoreDTO rightTeamScore = new TeamGameScoreDTO(counterTeam); - return new ResponseEntity<>(new TeamGameScoreDTO[]{leftTeamScore, rightTeamScore}, HttpStatus.OK); + return new ResponseEntity<>(gameService.getTeamGameScores(matchId), HttpStatus.OK); } } diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java index b6849d69a..bd2107f13 100644 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ b/BE/src/main/java/codesquad/baseball/controller/HomeController.java @@ -2,23 +2,25 @@ import codesquad.baseball.domain.*; import codesquad.baseball.repository.TeamRepository; +import codesquad.baseball.service.GameService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; + import java.util.List; @CrossOrigin @RestController public class HomeController { - private final TeamRepository teamRepository; + private final GameService gameService; - public HomeController(TeamRepository teamRepository) { - this.teamRepository = teamRepository; + public HomeController(GameService gameService) { + this.gameService = gameService; } @GetMapping("/totalTeamList") - public ResponseEntity> home() { - List teamList = (List) teamRepository.findAll(); + public ResponseEntity> selectTeam() { + List teamList = gameService.findTeams(); return new ResponseEntity<>(teamList, HttpStatus.OK); } } diff --git a/BE/src/main/java/codesquad/baseball/domain/Constants.java b/BE/src/main/java/codesquad/baseball/domain/Constants.java index 33b0a3998..a79af5562 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Constants.java +++ b/BE/src/main/java/codesquad/baseball/domain/Constants.java @@ -1,18 +1,23 @@ package codesquad.baseball.domain; -import com.fasterxml.jackson.annotation.JsonIgnore; + public class Constants { - public final static String HIT_ACTION = "안타"; - public final static String OUT_ACTION = "아웃"; - public final static String FOUR_BALL_ACTION = "볼넷"; + public static final String HIT_ACTION = "안타"; + public static final String OUT_ACTION = "아웃"; + public static final String FOUR_BALL_ACTION = "볼넷"; + + public static final int MAX_OUT_NUMBER = 3; - public final static int MAX_OUT_NUMBER = 3; + public static final String PITCHER = "투수"; + public static final String HITTER = "타자"; + public static final String OFFENSE = "공격"; + public static final String DEFENSE = "수비"; + public static final String TOP = "초"; + public static final String BOTTOM = "말"; - public final static String PITCHER = "투수"; - public final static String HITTER = "타자"; - static final String OFFENSE = "공격"; - static final String DEFENSE = "수비"; - static final String TOP = "초"; - static final String BOTTOM = "말"; + public static final String STRIKE = "strike"; + public static final String BALL = "ball"; + public static final String HIT = "hit"; + public static final String OUT = "out"; } diff --git a/BE/src/main/java/codesquad/baseball/domain/History.java b/BE/src/main/java/codesquad/baseball/domain/History.java index ced789be5..280584bcc 100644 --- a/BE/src/main/java/codesquad/baseball/domain/History.java +++ b/BE/src/main/java/codesquad/baseball/domain/History.java @@ -7,12 +7,14 @@ import lombok.Setter; import org.springframework.data.annotation.Id; +import static codesquad.baseball.domain.Constants.HIT; +import static codesquad.baseball.domain.Constants.OUT; + @Getter @Setter @AllArgsConstructor @RequiredArgsConstructor public class History { - @Id @JsonIgnore private Long id; @@ -21,11 +23,6 @@ public class History { private int ball; private int out; - private final static String STRIKE = "strike"; - private final static String BALL = "ball"; - private final static String HIT = "hit"; - private final static String OUT = "out"; - @JsonIgnore public boolean isActionOut() { return actionName.equals(OUT); diff --git a/BE/src/main/java/codesquad/baseball/domain/Match.java b/BE/src/main/java/codesquad/baseball/domain/Match.java index be41f6e22..c3b10a66b 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Match.java +++ b/BE/src/main/java/codesquad/baseball/domain/Match.java @@ -24,11 +24,10 @@ public class Match { @NonNull private boolean isHome; - //myteam 에 대해 isHome이 true일 경우, myTeam 수비 먼저, 공격 나중에. 초-수비/말-공격 @JsonIgnore public Long getHomeTeamId() { - if(isHome) { + if (isHome) { return myTeamId; } return counterTeamId; @@ -36,7 +35,7 @@ public Long getHomeTeamId() { @JsonIgnore public Long getExpeditionTeamId() { - if(isHome) { + if (isHome) { return counterTeamId; } return myTeamId; @@ -44,10 +43,10 @@ public Long getExpeditionTeamId() { @JsonIgnore public Long getOtherTeamId(Long teamId) { - if(teamId.equals(counterTeamId)) { + if (teamId.equals(counterTeamId)) { return myTeamId; } - if(teamId.equals(myTeamId)) { + if (teamId.equals(myTeamId)) { return counterTeamId; } return -1L; diff --git a/BE/src/main/java/codesquad/baseball/domain/Player.java b/BE/src/main/java/codesquad/baseball/domain/Player.java index 47eaff4bf..f14183c6f 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Player.java +++ b/BE/src/main/java/codesquad/baseball/domain/Player.java @@ -21,9 +21,8 @@ public class Player { private List historyList; private String lastAction; - public Player addHistory(List histories) { + public void addHistory(List histories) { historyList.addAll(histories); - return this; } public void clearHistory() { diff --git a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java index 74d879ebb..0f7c58291 100644 --- a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java +++ b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java @@ -29,17 +29,16 @@ public void addPitchCount(int pitches) { } @JsonIgnore - public PlayerGameInfo updatePlayerGameInfo(boolean hitSuccess, boolean isOut) { + public void updatePlayerGameInfo(boolean hitSuccess, boolean isOut) { this.plateAppearance += 1; if (hitSuccess) { this.hits += 1; - return this; + return; } if (isOut) { this.out += 1; } this.average = (long) hits / (long) plateAppearance; - return this; } } diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index 91e3126e8..518092309 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -43,9 +43,14 @@ public int getTotalScore() { } @JsonIgnore - public void initializeTotalScore(int inningNumber) { - TeamGameScore teamGameScore = new TeamGameScore(inningNumber, 0); + public Team initializeTotalScore() { teamGameScoreList.clear(); + return this; + } + + @JsonIgnore + public void addDefaultScore(int inningNumber) { + TeamGameScore teamGameScore = new TeamGameScore(inningNumber, 0); teamGameScoreList.add(teamGameScore); } diff --git a/BE/src/main/java/codesquad/baseball/exception/ElementNotFoundException.java b/BE/src/main/java/codesquad/baseball/exception/ElementNotFoundException.java new file mode 100644 index 000000000..f605558db --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/exception/ElementNotFoundException.java @@ -0,0 +1,7 @@ +package codesquad.baseball.exception; + +public class ElementNotFoundException extends RuntimeException { + public ElementNotFoundException(String message) { + super(message); + } +} diff --git a/BE/src/main/java/codesquad/baseball/exception/GlobalExceptionHandler.java b/BE/src/main/java/codesquad/baseball/exception/GlobalExceptionHandler.java new file mode 100644 index 000000000..08645480d --- /dev/null +++ b/BE/src/main/java/codesquad/baseball/exception/GlobalExceptionHandler.java @@ -0,0 +1,16 @@ +package codesquad.baseball.exception; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class); + + @ExceptionHandler(ElementNotFoundException.class) + public void handleElementNotFoundException(ElementNotFoundException e) { + logger.error(e.getMessage()); + } +} diff --git a/BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java b/BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java index 003cc81b0..c2fae69ea 100644 --- a/BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java +++ b/BE/src/main/java/codesquad/baseball/exception/MatchNotFoundException.java @@ -1,4 +1,7 @@ package codesquad.baseball.exception; -public class MatchNotFoundException extends RuntimeException { +public class MatchNotFoundException extends ElementNotFoundException { + public MatchNotFoundException() { + super("해당 아이디의 게임을 찾을 수 없습니다."); + } } diff --git a/BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java b/BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java index b54e4f936..b8a7262ef 100644 --- a/BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java +++ b/BE/src/main/java/codesquad/baseball/exception/PlayerNotFoundException.java @@ -1,4 +1,7 @@ package codesquad.baseball.exception; -public class PlayerNotFoundException extends RuntimeException { +public class PlayerNotFoundException extends ElementNotFoundException { + public PlayerNotFoundException() { + super("해당 아이디의 플레이어를 찾을 수 없습니다."); + } } diff --git a/BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java b/BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java index 8ece0a87a..ca209fe49 100644 --- a/BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java +++ b/BE/src/main/java/codesquad/baseball/exception/TeamNotFoundException.java @@ -1,4 +1,7 @@ package codesquad.baseball.exception; -public class TeamNotFoundException extends RuntimeException { +public class TeamNotFoundException extends ElementNotFoundException { + public TeamNotFoundException() { + super("해당 아이디의 팀을 찾을 수 없습니다."); + } } diff --git a/BE/src/main/java/codesquad/baseball/service/GameService.java b/BE/src/main/java/codesquad/baseball/service/GameService.java index f4e678974..cfed23f6d 100644 --- a/BE/src/main/java/codesquad/baseball/service/GameService.java +++ b/BE/src/main/java/codesquad/baseball/service/GameService.java @@ -1,8 +1,10 @@ package codesquad.baseball.service; import codesquad.baseball.ApiResponse; +import codesquad.baseball.DTO.*; import codesquad.baseball.domain.Inning; import codesquad.baseball.domain.Match; +import codesquad.baseball.domain.Player; import codesquad.baseball.domain.Team; import codesquad.baseball.exception.MatchNotFoundException; import codesquad.baseball.exception.TeamNotFoundException; @@ -11,26 +13,83 @@ import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; @Service public class GameService { - private final MatchRepository matchRepository; private final TeamRepository teamRepository; + private final MatchRepository matchRepository; - public GameService(MatchRepository matchRepository, TeamRepository teamRepository) { - this.matchRepository = matchRepository; + public GameService(TeamRepository teamRepository, MatchRepository matchRepository) { this.teamRepository = teamRepository; + this.matchRepository = matchRepository; } - public Match findMatch(Long matchId) { - return matchRepository.findById(matchId).orElseThrow(MatchNotFoundException::new); + public ApiResponse getGameInfo(HashMap teamInfo) { + Match match = createMatch(teamInfo); + + Team myTeam = findTeam(match.getMyTeamId()); + myTeam.setUser(true); + saveTeam(myTeam); + + Team homeTeam = findTeam(match.getHomeTeamId()); + Team expeditionTeam = findTeam(match.getExpeditionTeamId()); + + Team offenseTeam = match.isHome() ? expeditionTeam : homeTeam; + saveTeam(homeTeam.initializeTotalScore()); + saveTeam(expeditionTeam.initializeTotalScore()); + offenseTeam.addDefaultScore(1); + saveTeam(offenseTeam); + + Player firstHitter = match.isHome() ? expeditionTeam.getFirstHitter() : homeTeam.getFirstHitter(); + Player pitcher = match.isHome() ? homeTeam.getPitcher() : expeditionTeam.getPitcher(); + + return new ApiResponse(getSavedMatchId(match), match.getCurrentInning(), + new PlayerLogDTO(firstHitter, homeTeam.getId()), new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), + new PlayerDTO("투수", pitcher), new PlayerDTO("타자", firstHitter), new TeamLogDTO(homeTeam, firstHitter)); + } + + public PlayerListPopUpDTO[] getPlayerInfo(Long matchId) { + Match match = findMatch(matchId); + Team myTeam = findTeam(match.getMyTeamId()); + Team counterTeam = findTeam(match.getCounterTeamId()); + PlayerListPopUpDTO LeftTeamPlayerList = new PlayerListPopUpDTO(myTeam); + PlayerListPopUpDTO rightTeamPlayerList = new PlayerListPopUpDTO(counterTeam); + return new PlayerListPopUpDTO[]{LeftTeamPlayerList, rightTeamPlayerList}; + } + + public TeamGameScoreDTO[] getTeamGameScores(Long matchId) { + Match match = findMatch(matchId); + Team homeTeam = findTeam(match.getHomeTeamId()); + Team expeditionTeam = findTeam(match.getExpeditionTeamId()); + return new TeamGameScoreDTO[]{new TeamGameScoreDTO(expeditionTeam), new TeamGameScoreDTO(homeTeam)}; } public Team findTeam(Long teamId) { return teamRepository.findById(teamId).orElseThrow(TeamNotFoundException::new); } + public List findTeams() { + return (List) teamRepository.findAll(); + } + + public Team saveTeam(Team team) { + return teamRepository.save(team); + } + + public Match findMatch(Long matchId) { + return matchRepository.findById(matchId).orElseThrow(MatchNotFoundException::new); + } + + public Long getSavedMatchId(Match match) { + return matchRepository.save(match).getId(); + } + + public Match saveMatch(Match match) { + return matchRepository.save(match); + } + public Match createMatch(HashMap teamInfo) { Long myTeamId = Long.valueOf(teamInfo.get("myTeamId")); Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); @@ -39,10 +98,57 @@ public Match createMatch(HashMap teamInfo) { return new Match(myTeamId, counterTeamId, inning, isHome); } - public Long saveMatch(Match match) { - return matchRepository.save(match).getId(); + public ApiResponse exchangePlayer(Long matchId, PlayerLogDTO playerLog) { + Match match = findMatch(matchId); + Inning currentInning = match.getCurrentInning(); + + Team offenseTeam = updateOffenseTeam(playerLog, currentInning.getInningNumber()); + Long offenseTeamId = offenseTeam.getId(); + + Long defenseTeamId = match.getOtherTeamId(offenseTeamId); + Team defenseTeam = findTeam(defenseTeamId); + Player pitcher = defenseTeam.getPitcher(); + pitcher.addPitchCount(playerLog.getHistoryList().size() + 1); + saveTeam(defenseTeam); + + currentInning.updateOut(playerLog.isLastActionOut()); + + Player nextHitter = offenseTeam.getNextPlayer(playerLog.getPlayerBattingOrder()); + + if (currentInning.needChange()) { + currentInning = currentInning.changeInning(); + clearHistoryAndSave(offenseTeam); + + defenseTeam = findTeam(offenseTeamId); + pitcher = defenseTeam.getPitcher(); + + offenseTeam = findTeam(defenseTeamId); + nextHitter = offenseTeam.getFirstHitter(); + offenseTeam.addTotalScore(currentInning.getInningNumber()); + saveTeam(offenseTeam); + } + + TeamLogDTO teamLogDTO = new TeamLogDTO(offenseTeam, nextHitter); + saveMatch(match); + Team homeTeam = findTeam(match.getHomeTeamId()); + Team expeditionTeam = findTeam(match.getExpeditionTeamId()); + + return new ApiResponse(matchId, currentInning, new PlayerLogDTO(nextHitter, offenseTeamId), + new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), new PlayerDTO("투수", pitcher), new PlayerDTO("타자", nextHitter), teamLogDTO); + } + + public Team updateOffenseTeam(PlayerLogDTO playerLog, int inningNumber) { + Long offenseTeamId = playerLog.getTeamId(); + Team offenseTeam = findTeam(offenseTeamId); + Player hitter = offenseTeam.findPlayerByName(playerLog.getPlayerName()); + hitter.addHistory(playerLog.getHistoryList()); + hitter.updatePlayerGameInfo(playerLog.getLastAction()); + offenseTeam.setTotalScore(inningNumber, playerLog.getTotalTeamScore()); + return saveTeam(offenseTeam); } - public void createApiResponse(Long matchId) { + public void clearHistoryAndSave(Team offenseTeam) { + offenseTeam.clearAllHistory(); + saveTeam(offenseTeam); } } diff --git a/BE/src/main/java/codesquad/baseball/service/MatchService.java b/BE/src/main/java/codesquad/baseball/service/MatchService.java deleted file mode 100644 index 7a6fa393c..000000000 --- a/BE/src/main/java/codesquad/baseball/service/MatchService.java +++ /dev/null @@ -1,4 +0,0 @@ -package codesquad.baseball.service; - -public class MatchService { -} diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index f5a92b615..e595d4ac4 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://10.1.1.89:3306/baseball?characterEncoding=UTF-8&autoReconnect=true +spring.datasource.url=jdbc:mysql://localhost:3306/baseball?characterEncoding=UTF-8 spring.datasource.username=team-11 spring.datasource.password=1234 spring.datasource.initialization-mode=always diff --git a/BE/src/main/resources/data.sql b/BE/src/main/resources/data.sql index 746e71c1d..a406845e9 100644 --- a/BE/src/main/resources/data.sql +++ b/BE/src/main/resources/data.sql @@ -68,7 +68,6 @@ insert into player(name, team) values ('토르', 6); insert into player(name, team) values ('그루트', 6); - insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) values (1, '투수', 0, 0, 0, 0, 0, 1); insert into player_game_info(batting_order, role, pitch_count, plate_appearance, hits, `out`, average, player) diff --git a/BE/src/main/resources/schema.sql b/BE/src/main/resources/schema.sql index fb27139e0..631809596 100644 --- a/BE/src/main/resources/schema.sql +++ b/BE/src/main/resources/schema.sql @@ -61,8 +61,6 @@ create table `match` my_team_id bigint(20), counter_team_id bigint(20), is_home boolean --- , --- inning bigint(20) references inning(id) ); From 85c903a4dda25142469973b3299a82d5f02378bc Mon Sep 17 00:00:00 2001 From: rla36 Date: Wed, 12 May 2021 12:53:13 +0900 Subject: [PATCH 45/56] =?UTF-8?q?fix:=20gameService=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/service/GameService.java | 60 +++++++++++++++---- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/service/GameService.java b/BE/src/main/java/codesquad/baseball/service/GameService.java index cfed23f6d..f521939b0 100644 --- a/BE/src/main/java/codesquad/baseball/service/GameService.java +++ b/BE/src/main/java/codesquad/baseball/service/GameService.java @@ -29,25 +29,60 @@ public GameService(TeamRepository teamRepository, MatchRepository matchRepositor public ApiResponse getGameInfo(HashMap teamInfo) { Match match = createMatch(teamInfo); + setMyTeamIsUserToTrue(match); + + initializeTeamScore(match); + + Team offenseTeam = findFirstOffenseTeam(match); + setOffenseTeamDefaultScore(offenseTeam); + + Player firstHitter = offenseTeam.getFirstHitter(); + Player pitcher = findFirstDefenseTeam(match).getPitcher(); + return createApiResponse(match, offenseTeam, firstHitter, pitcher); + } + + public ApiResponse createApiResponse(Match match, Team offenseTeam, Player hitter, Player pitcher) { + return new ApiResponse(match.getId(), match.getCurrentInning(), + new PlayerLogDTO(hitter, offenseTeam.getId()), new TeamDTO(findExpeditionTeam(match)), new TeamDTO(findHomeTeam(match)), + new PlayerDTO("투수", pitcher), new PlayerDTO("타자", hitter), new TeamLogDTO(offenseTeam, hitter)); + } + + private void setMyTeamIsUserToTrue(Match match) { Team myTeam = findTeam(match.getMyTeamId()); myTeam.setUser(true); saveTeam(myTeam); + } - Team homeTeam = findTeam(match.getHomeTeamId()); - Team expeditionTeam = findTeam(match.getExpeditionTeamId()); + private void initializeTeamScore(Match match) { + saveTeam(findExpeditionTeam(match).initializeTotalScore()); + saveTeam(findHomeTeam(match).initializeTotalScore()); + } - Team offenseTeam = match.isHome() ? expeditionTeam : homeTeam; - saveTeam(homeTeam.initializeTotalScore()); - saveTeam(expeditionTeam.initializeTotalScore()); + private void setOffenseTeamDefaultScore(Team offenseTeam) { offenseTeam.addDefaultScore(1); saveTeam(offenseTeam); + } - Player firstHitter = match.isHome() ? expeditionTeam.getFirstHitter() : homeTeam.getFirstHitter(); - Player pitcher = match.isHome() ? homeTeam.getPitcher() : expeditionTeam.getPitcher(); + private Team findHomeTeam(Match match) { + return findTeam(match.getHomeTeamId()); + } + + private Team findExpeditionTeam(Match match) { + return findTeam(match.getExpeditionTeamId()); + } - return new ApiResponse(getSavedMatchId(match), match.getCurrentInning(), - new PlayerLogDTO(firstHitter, homeTeam.getId()), new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), - new PlayerDTO("투수", pitcher), new PlayerDTO("타자", firstHitter), new TeamLogDTO(homeTeam, firstHitter)); + private Team findFirstOffenseTeam(Match match) { + if(match.isHome()) { + return findTeam(match.getExpeditionTeamId()); + } + return findTeam(match.getHomeTeamId()); + } + + private Team findFirstDefenseTeam(Match match) { + if(match.isHome()){ + return findTeam(match.getHomeTeamId()); + } + return findTeam(match.getExpeditionTeamId()); } public PlayerListPopUpDTO[] getPlayerInfo(Long matchId) { @@ -95,7 +130,7 @@ public Match createMatch(HashMap teamInfo) { Long counterTeamId = Long.valueOf(teamInfo.get("counterTeamId")); boolean isHome = Boolean.parseBoolean(teamInfo.get("isHome")); Inning inning = Inning.initiateInning(isHome); - return new Match(myTeamId, counterTeamId, inning, isHome); + return saveMatch(new Match(myTeamId, counterTeamId, inning, isHome)); } public ApiResponse exchangePlayer(Long matchId, PlayerLogDTO playerLog) { @@ -134,7 +169,8 @@ public ApiResponse exchangePlayer(Long matchId, PlayerLogDTO playerLog) { Team expeditionTeam = findTeam(match.getExpeditionTeamId()); return new ApiResponse(matchId, currentInning, new PlayerLogDTO(nextHitter, offenseTeamId), - new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), new PlayerDTO("투수", pitcher), new PlayerDTO("타자", nextHitter), teamLogDTO); + new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), + new PlayerDTO("투수", pitcher), new PlayerDTO("타자", nextHitter), teamLogDTO); } public Team updateOffenseTeam(PlayerLogDTO playerLog, int inningNumber) { From a76e16276e6651095689b1557b8afebe4cf4d45a Mon Sep 17 00:00:00 2001 From: rla36 Date: Wed, 12 May 2021 14:59:57 +0900 Subject: [PATCH 46/56] =?UTF-8?q?fix:=20service=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codesquad/baseball/domain/Team.java | 2 +- .../baseball/service/GameService.java | 48 ++++++++++--------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/BE/src/main/java/codesquad/baseball/domain/Team.java b/BE/src/main/java/codesquad/baseball/domain/Team.java index 518092309..fe3c5da12 100644 --- a/BE/src/main/java/codesquad/baseball/domain/Team.java +++ b/BE/src/main/java/codesquad/baseball/domain/Team.java @@ -55,7 +55,7 @@ public void addDefaultScore(int inningNumber) { } @JsonIgnore - public void addTotalScore(int inningNumber) { + public void createTotalScore(int inningNumber) { TeamGameScore teamGameScore = new TeamGameScore(inningNumber, 0); teamGameScoreList.add(teamGameScore); } diff --git a/BE/src/main/java/codesquad/baseball/service/GameService.java b/BE/src/main/java/codesquad/baseball/service/GameService.java index f521939b0..8941edda0 100644 --- a/BE/src/main/java/codesquad/baseball/service/GameService.java +++ b/BE/src/main/java/codesquad/baseball/service/GameService.java @@ -29,10 +29,9 @@ public GameService(TeamRepository teamRepository, MatchRepository matchRepositor public ApiResponse getGameInfo(HashMap teamInfo) { Match match = createMatch(teamInfo); - setMyTeamIsUserToTrue(match); + setMyTeamIsUserTrue(match); initializeTeamScore(match); - Team offenseTeam = findFirstOffenseTeam(match); setOffenseTeamDefaultScore(offenseTeam); @@ -47,7 +46,7 @@ public ApiResponse createApiResponse(Match match, Team offenseTeam, Player hitte new PlayerDTO("투수", pitcher), new PlayerDTO("타자", hitter), new TeamLogDTO(offenseTeam, hitter)); } - private void setMyTeamIsUserToTrue(Match match) { + private void setMyTeamIsUserTrue(Match match) { Team myTeam = findTeam(match.getMyTeamId()); myTeam.setUser(true); saveTeam(myTeam); @@ -72,14 +71,14 @@ private Team findExpeditionTeam(Match match) { } private Team findFirstOffenseTeam(Match match) { - if(match.isHome()) { + if (match.isHome()) { return findTeam(match.getExpeditionTeamId()); } return findTeam(match.getHomeTeamId()); } private Team findFirstDefenseTeam(Match match) { - if(match.isHome()){ + if (match.isHome()) { return findTeam(match.getHomeTeamId()); } return findTeam(match.getExpeditionTeamId()); @@ -89,15 +88,15 @@ public PlayerListPopUpDTO[] getPlayerInfo(Long matchId) { Match match = findMatch(matchId); Team myTeam = findTeam(match.getMyTeamId()); Team counterTeam = findTeam(match.getCounterTeamId()); - PlayerListPopUpDTO LeftTeamPlayerList = new PlayerListPopUpDTO(myTeam); - PlayerListPopUpDTO rightTeamPlayerList = new PlayerListPopUpDTO(counterTeam); - return new PlayerListPopUpDTO[]{LeftTeamPlayerList, rightTeamPlayerList}; + PlayerListPopUpDTO expeditionTeamPlayerList = new PlayerListPopUpDTO(myTeam); + PlayerListPopUpDTO homeTeamPlayerList = new PlayerListPopUpDTO(counterTeam); + return new PlayerListPopUpDTO[]{expeditionTeamPlayerList, homeTeamPlayerList}; } public TeamGameScoreDTO[] getTeamGameScores(Long matchId) { Match match = findMatch(matchId); - Team homeTeam = findTeam(match.getHomeTeamId()); - Team expeditionTeam = findTeam(match.getExpeditionTeamId()); + Team homeTeam = findHomeTeam(match); + Team expeditionTeam = findExpeditionTeam(match); return new TeamGameScoreDTO[]{new TeamGameScoreDTO(expeditionTeam), new TeamGameScoreDTO(homeTeam)}; } @@ -142,16 +141,16 @@ public ApiResponse exchangePlayer(Long matchId, PlayerLogDTO playerLog) { Long defenseTeamId = match.getOtherTeamId(offenseTeamId); Team defenseTeam = findTeam(defenseTeamId); - Player pitcher = defenseTeam.getPitcher(); - pitcher.addPitchCount(playerLog.getHistoryList().size() + 1); - saveTeam(defenseTeam); + Player pitcher = updatePitcher(defenseTeam, playerLog); currentInning.updateOut(playerLog.isLastActionOut()); + saveMatch(match); Player nextHitter = offenseTeam.getNextPlayer(playerLog.getPlayerBattingOrder()); if (currentInning.needChange()) { currentInning = currentInning.changeInning(); + saveMatch(match); clearHistoryAndSave(offenseTeam); defenseTeam = findTeam(offenseTeamId); @@ -159,23 +158,21 @@ public ApiResponse exchangePlayer(Long matchId, PlayerLogDTO playerLog) { offenseTeam = findTeam(defenseTeamId); nextHitter = offenseTeam.getFirstHitter(); - offenseTeam.addTotalScore(currentInning.getInningNumber()); + offenseTeam.createTotalScore(currentInning.getInningNumber()); saveTeam(offenseTeam); } - TeamLogDTO teamLogDTO = new TeamLogDTO(offenseTeam, nextHitter); - saveMatch(match); - Team homeTeam = findTeam(match.getHomeTeamId()); - Team expeditionTeam = findTeam(match.getExpeditionTeamId()); + return createApiResponse(match, offenseTeam, nextHitter, pitcher); + } - return new ApiResponse(matchId, currentInning, new PlayerLogDTO(nextHitter, offenseTeamId), - new TeamDTO(expeditionTeam), new TeamDTO(homeTeam), - new PlayerDTO("투수", pitcher), new PlayerDTO("타자", nextHitter), teamLogDTO); + private Player updatePitcher(Team defenseTeam, PlayerLogDTO playerLog) { + Player pitcher = defenseTeam.getPitcher(); + pitcher.addPitchCount(playerLog.getHistoryList().size() + 1); + return saveTeam(defenseTeam).getPitcher(); } public Team updateOffenseTeam(PlayerLogDTO playerLog, int inningNumber) { - Long offenseTeamId = playerLog.getTeamId(); - Team offenseTeam = findTeam(offenseTeamId); + Team offenseTeam = findOffenseTeam(playerLog); Player hitter = offenseTeam.findPlayerByName(playerLog.getPlayerName()); hitter.addHistory(playerLog.getHistoryList()); hitter.updatePlayerGameInfo(playerLog.getLastAction()); @@ -183,6 +180,11 @@ public Team updateOffenseTeam(PlayerLogDTO playerLog, int inningNumber) { return saveTeam(offenseTeam); } + private Team findOffenseTeam(PlayerLogDTO playerLog) { + Long offenseTeamId = playerLog.getTeamId(); + return findTeam(offenseTeamId); + } + public void clearHistoryAndSave(Team offenseTeam) { offenseTeam.clearAllHistory(); saveTeam(offenseTeam); From 3193beba8903a901d2da83fb7c956e98f80b1103 Mon Sep 17 00:00:00 2001 From: rla36 Date: Thu, 13 May 2021 14:45:47 +0900 Subject: [PATCH 47/56] =?UTF-8?q?fix:=20mysql=EC=97=B0=EA=B2=B0=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BE/src/main/resources/application.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index e595d4ac4..05ec41f96 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,5 +1,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/baseball?characterEncoding=UTF-8 +spring.datasource.url=jdbc:mysql://10.1.1.89:3306/baseball?characterEncoding=UTF-8&autoReconnect=true spring.datasource.username=team-11 spring.datasource.password=1234 spring.datasource.initialization-mode=always + +spring.profiles.include=github From 076990e82cffcf89a5674c62870e9db9e12f68ee Mon Sep 17 00:00:00 2001 From: janeljs Date: Thu, 13 May 2021 15:21:12 +0900 Subject: [PATCH 48/56] =?UTF-8?q?fix:=20url=20=EC=84=A4=EA=B3=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20#25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseball/controller/GameController.java | 14 +++++++--- .../baseball/controller/HomeController.java | 26 ------------------- 2 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 BE/src/main/java/codesquad/baseball/controller/HomeController.java diff --git a/BE/src/main/java/codesquad/baseball/controller/GameController.java b/BE/src/main/java/codesquad/baseball/controller/GameController.java index 3a70b2f61..382fed0c9 100644 --- a/BE/src/main/java/codesquad/baseball/controller/GameController.java +++ b/BE/src/main/java/codesquad/baseball/controller/GameController.java @@ -2,16 +2,18 @@ import codesquad.baseball.ApiResponse; import codesquad.baseball.DTO.*; +import codesquad.baseball.domain.Team; import codesquad.baseball.service.GameService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.List; @CrossOrigin @RestController -@RequestMapping("/game") +@RequestMapping("/api/game") public class GameController { private final GameService gameService; @@ -20,6 +22,12 @@ public GameController(GameService gameService) { this.gameService = gameService; } + @GetMapping("/teams") + public ResponseEntity> selectTeam() { + List teamList = gameService.findTeams(); + return new ResponseEntity<>(teamList, HttpStatus.OK); + } + @PostMapping public ResponseEntity initialize(@RequestBody HashMap teamInfo) { ApiResponse apiResponse = gameService.getGameInfo(teamInfo); @@ -32,12 +40,12 @@ public ResponseEntity exchangePlayer(@PathVariable Long matchId, @R return new ResponseEntity<>(apiResponse, HttpStatus.OK); } - @GetMapping("/{matchId}/playerListPopUp") + @GetMapping("/{matchId}/record/players") public ResponseEntity showPlayerList(@PathVariable Long matchId) { return new ResponseEntity<>(gameService.getPlayerInfo(matchId), HttpStatus.OK); } - @GetMapping("/{matchId}/detailScore") + @GetMapping("/{matchId}/record/teams") public ResponseEntity showDetailScoreList(@PathVariable Long matchId) { return new ResponseEntity<>(gameService.getTeamGameScores(matchId), HttpStatus.OK); } diff --git a/BE/src/main/java/codesquad/baseball/controller/HomeController.java b/BE/src/main/java/codesquad/baseball/controller/HomeController.java deleted file mode 100644 index bd2107f13..000000000 --- a/BE/src/main/java/codesquad/baseball/controller/HomeController.java +++ /dev/null @@ -1,26 +0,0 @@ -package codesquad.baseball.controller; - -import codesquad.baseball.domain.*; -import codesquad.baseball.repository.TeamRepository; -import codesquad.baseball.service.GameService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@CrossOrigin -@RestController -public class HomeController { - private final GameService gameService; - - public HomeController(GameService gameService) { - this.gameService = gameService; - } - - @GetMapping("/totalTeamList") - public ResponseEntity> selectTeam() { - List teamList = gameService.findTeams(); - return new ResponseEntity<>(teamList, HttpStatus.OK); - } -} From 37b0f5df5d19954517d95bd349e4cdbec66e126d Mon Sep 17 00:00:00 2001 From: janeljs Date: Thu, 13 May 2021 18:08:19 +0900 Subject: [PATCH 49/56] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=A0=ED=8A=B8=20?= =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20#27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 3 + .idea/vcs.xml | 2 + BE/baseball | 1 + BE/build.gradle | 73 ++++++++++++++---- .../baseball/domain/PlayerGameInfo.java | 8 ++ .../baseball/repository/TeamRepository.java | 1 - .../baseball/service/GameService.java | 12 ++- BE/src/main/resources/application.properties | 4 +- .../main/resources/static/asset-manifest.json | 20 +++++ BE/src/main/resources/static/favicon.ico | Bin 0 -> 3870 bytes BE/src/main/resources/static/index.html | 1 + .../static/static/css/main.8b613c40.chunk.css | 2 + .../static/css/main.8b613c40.chunk.css.map | 1 + .../static/static/js/2.02da2f73.chunk.js | 3 + .../static/js/2.02da2f73.chunk.js.LICENSE.txt | 50 ++++++++++++ .../static/static/js/2.02da2f73.chunk.js.map | 1 + .../static/static/js/main.052b6ba5.chunk.js | 2 + .../static/js/main.052b6ba5.chunk.js.map | 1 + .../static/static/js/main.166dbeef.chunk.js | 2 + .../static/js/main.166dbeef.chunk.js.map | 1 + .../static/static/js/runtime-main.7abb31cb.js | 2 + .../static/js/runtime-main.7abb31cb.js.map | 1 + 22 files changed, 172 insertions(+), 19 deletions(-) create mode 160000 BE/baseball create mode 100644 BE/src/main/resources/static/asset-manifest.json create mode 100644 BE/src/main/resources/static/favicon.ico create mode 100644 BE/src/main/resources/static/index.html create mode 100644 BE/src/main/resources/static/static/css/main.8b613c40.chunk.css create mode 100644 BE/src/main/resources/static/static/css/main.8b613c40.chunk.css.map create mode 100644 BE/src/main/resources/static/static/js/2.02da2f73.chunk.js create mode 100644 BE/src/main/resources/static/static/js/2.02da2f73.chunk.js.LICENSE.txt create mode 100644 BE/src/main/resources/static/static/js/2.02da2f73.chunk.js.map create mode 100644 BE/src/main/resources/static/static/js/main.052b6ba5.chunk.js create mode 100644 BE/src/main/resources/static/static/js/main.052b6ba5.chunk.js.map create mode 100644 BE/src/main/resources/static/static/js/main.166dbeef.chunk.js create mode 100644 BE/src/main/resources/static/static/js/main.166dbeef.chunk.js.map create mode 100644 BE/src/main/resources/static/static/js/runtime-main.7abb31cb.js create mode 100644 BE/src/main/resources/static/static/js/runtime-main.7abb31cb.js.map diff --git a/.idea/misc.xml b/.idea/misc.xml index efc867730..01906c478 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,8 @@ + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7f4..c8ad841b5 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,7 @@ + + \ No newline at end of file diff --git a/BE/baseball b/BE/baseball new file mode 160000 index 000000000..f765604c4 --- /dev/null +++ b/BE/baseball @@ -0,0 +1 @@ +Subproject commit f765604c4b0c9583c736558df14aa0de81d75514 diff --git a/BE/build.gradle b/BE/build.gradle index a2ac9159a..ef45245d1 100644 --- a/BE/build.gradle +++ b/BE/build.gradle @@ -1,7 +1,7 @@ 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' } group = 'codesquad' @@ -9,24 +9,69 @@ version = '0.0.1-SNAPSHOT' sourceCompatibility = '11' configurations { - compileOnly { - extendsFrom annotationProcessor - } + compileOnly { + extendsFrom annotationProcessor + } } repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' - implementation 'org.springframework.boot:spring-boot-starter-web' - compileOnly 'org.projectlombok:lombok' - runtimeOnly 'mysql:mysql-connector-java' - annotationProcessor 'org.projectlombok:lombok' - 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' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'mysql:mysql-connector-java' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } test { - useJUnitPlatform() + useJUnitPlatform() +} + +def webappDir = "$projectDir/baseball/fe" + +sourceSets { + main { + resources { + srcDirs = ["$webappDir/build", "$projectDir/src/main/resources"] + } + } +} + +processResources { + dependsOn "copyWebApp" +} + +task copyWebApp(type: Copy) { + dependsOn "buildReact" + from "$webappDir/build" + into "$projectDir/src/main/resources/static" +} + +task buildReact(type: Exec) { + dependsOn "installReact" + workingDir "$webappDir" + inputs.dir "$webappDir" + group = BasePlugin.BUILD_GROUP + if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) { + commandLine "npm.cmd", "run-script", "build" + } else { + commandLine "npm", "run-script", "build" + } +} + +task installReact(type: Exec) { + workingDir "$webappDir" + inputs.dir "$webappDir" + group = BasePlugin.BUILD_GROUP + if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) { + commandLine "npm.cmd", "audit", "fix" + commandLine 'npm.cmd', 'install' + } else { + commandLine "npm", "audit", "fix" + commandLine 'npm', 'install' + } } diff --git a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java index 0f7c58291..33fb964cc 100644 --- a/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java +++ b/BE/src/main/java/codesquad/baseball/domain/PlayerGameInfo.java @@ -23,6 +23,14 @@ public class PlayerGameInfo { private int out; private Long average; + public void reset() { + pitchCount =0; + plateAppearance = 0; + hits = 0; + out = 0; + average = 0L; + } + @JsonIgnore public void addPitchCount(int pitches) { pitchCount += pitches; diff --git a/BE/src/main/java/codesquad/baseball/repository/TeamRepository.java b/BE/src/main/java/codesquad/baseball/repository/TeamRepository.java index aa0dbf333..461f99c1e 100644 --- a/BE/src/main/java/codesquad/baseball/repository/TeamRepository.java +++ b/BE/src/main/java/codesquad/baseball/repository/TeamRepository.java @@ -4,5 +4,4 @@ import org.springframework.data.repository.CrudRepository; public interface TeamRepository extends CrudRepository { - } diff --git a/BE/src/main/java/codesquad/baseball/service/GameService.java b/BE/src/main/java/codesquad/baseball/service/GameService.java index 8941edda0..cea0e5cd8 100644 --- a/BE/src/main/java/codesquad/baseball/service/GameService.java +++ b/BE/src/main/java/codesquad/baseball/service/GameService.java @@ -30,16 +30,24 @@ public ApiResponse getGameInfo(HashMap teamInfo) { Match match = createMatch(teamInfo); setMyTeamIsUserTrue(match); - initializeTeamScore(match); Team offenseTeam = findFirstOffenseTeam(match); + reset(offenseTeam); + Team defenseTeam = findFirstDefenseTeam(match); + reset(defenseTeam); setOffenseTeamDefaultScore(offenseTeam); Player firstHitter = offenseTeam.getFirstHitter(); - Player pitcher = findFirstDefenseTeam(match).getPitcher(); + Player pitcher = defenseTeam.getPitcher(); return createApiResponse(match, offenseTeam, firstHitter, pitcher); } + private void reset(Team team) { + for (Player player : team.getPlayerList()) { + player.getPlayerGameInfo().reset(); + } + } + public ApiResponse createApiResponse(Match match, Team offenseTeam, Player hitter, Player pitcher) { return new ApiResponse(match.getId(), match.getCurrentInning(), new PlayerLogDTO(hitter, offenseTeam.getId()), new TeamDTO(findExpeditionTeam(match)), new TeamDTO(findHomeTeam(match)), diff --git a/BE/src/main/resources/application.properties b/BE/src/main/resources/application.properties index 05ec41f96..de8ee70cb 100644 --- a/BE/src/main/resources/application.properties +++ b/BE/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://10.1.1.89:3306/baseball?characterEncoding=UTF-8&autoReconnect=true +spring.datasource.url=jdbc:mysql://localhost:3306/baseball?characterEncoding=UTF-8&autoReconnect=true +#spring.datasource.url=jdbc:mysql://10.1.1.89:3306/baseball?characterEncoding=UTF-8&autoReconnect=true spring.datasource.username=team-11 spring.datasource.password=1234 spring.datasource.initialization-mode=always -spring.profiles.include=github diff --git a/BE/src/main/resources/static/asset-manifest.json b/BE/src/main/resources/static/asset-manifest.json new file mode 100644 index 000000000..9c43d7d8e --- /dev/null +++ b/BE/src/main/resources/static/asset-manifest.json @@ -0,0 +1,20 @@ +{ + "files": { + "main.css": "/static/css/main.8b613c40.chunk.css", + "main.js": "/static/js/main.052b6ba5.chunk.js", + "main.js.map": "/static/js/main.052b6ba5.chunk.js.map", + "runtime-main.js": "/static/js/runtime-main.7abb31cb.js", + "runtime-main.js.map": "/static/js/runtime-main.7abb31cb.js.map", + "static/js/2.02da2f73.chunk.js": "/static/js/2.02da2f73.chunk.js", + "static/js/2.02da2f73.chunk.js.map": "/static/js/2.02da2f73.chunk.js.map", + "index.html": "/index.html", + "static/css/main.8b613c40.chunk.css.map": "/static/css/main.8b613c40.chunk.css.map", + "static/js/2.02da2f73.chunk.js.LICENSE.txt": "/static/js/2.02da2f73.chunk.js.LICENSE.txt" + }, + "entrypoints": [ + "static/js/runtime-main.7abb31cb.js", + "static/js/2.02da2f73.chunk.js", + "static/css/main.8b613c40.chunk.css", + "static/js/main.052b6ba5.chunk.js" + ] +} \ No newline at end of file diff --git a/BE/src/main/resources/static/favicon.ico b/BE/src/main/resources/static/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..a11777cc471a4344702741ab1c8a588998b1311a GIT binary patch literal 3870 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 baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@ literal 0 HcmV?d00001 diff --git a/BE/src/main/resources/static/index.html b/BE/src/main/resources/static/index.html new file mode 100644 index 000000000..2c3f89a8a --- /dev/null +++ b/BE/src/main/resources/static/index.html @@ -0,0 +1 @@ +Baseball Game

\ No newline at end of file diff --git a/BE/src/main/resources/static/static/css/main.8b613c40.chunk.css b/BE/src/main/resources/static/static/css/main.8b613c40.chunk.css new file mode 100644 index 000000000..573ddffb6 --- /dev/null +++ b/BE/src/main/resources/static/static/css/main.8b613c40.chunk.css @@ -0,0 +1,2 @@ +body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI","Roboto","Oxygen","Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}code{font-family:source-code-pro,Menlo,Monaco,Consolas,"Courier New",monospace}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video,​ html{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}table{border-collapse:collapse;border-spacing:0} +/*# sourceMappingURL=main.8b613c40.chunk.css.map */ \ No newline at end of file diff --git a/BE/src/main/resources/static/static/css/main.8b613c40.chunk.css.map b/BE/src/main/resources/static/static/css/main.8b613c40.chunk.css.map new file mode 100644 index 000000000..e3f3be915 --- /dev/null +++ b/BE/src/main/resources/static/static/css/main.8b613c40.chunk.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack://src/index.css","webpack://src/reset.css"],"names":[],"mappings":"AAAA,KACE,QAAS,CACT,mJAA8J,CAC9J,kCAAmC,CACnC,iCACF,CAEA,KACE,yEACF,CCLA,6ZAiFE,QAAS,CACT,SAAU,CACV,QAAS,CACT,cAAe,CACf,YAAa,CACb,uBACF,CAEA,8EAWE,aACF,CACA,KACE,aACF,CACA,MAEE,eACF,CACA,aAEE,WACF,CACA,oDAIE,UAAW,CACX,YACF,CACA,MACE,wBAAyB,CACzB,gBACF","file":"main.8b613c40.chunk.css","sourcesContent":["body {\r\n margin: 0;\r\n font-family: -apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Roboto\", \"Oxygen\", \"Ubuntu\", \"Cantarell\", \"Fira Sans\", \"Droid Sans\", \"Helvetica Neue\", sans-serif;\r\n -webkit-font-smoothing: antialiased;\r\n -moz-osx-font-smoothing: grayscale;\r\n}\r\n\r\ncode {\r\n font-family: source-code-pro, Menlo, Monaco, Consolas, \"Courier New\", monospace;\r\n}\r\n","/* http://meyerweb.com/eric/tools/css/reset/ \r\n v2.0 | 20110126\r\n License: none (public domain)\r\n*/\r\n​ html,\r\nbody,\r\ndiv,\r\nspan,\r\napplet,\r\nobject,\r\niframe,\r\nh1,\r\nh2,\r\nh3,\r\nh4,\r\nh5,\r\nh6,\r\np,\r\nblockquote,\r\npre,\r\na,\r\nabbr,\r\nacronym,\r\naddress,\r\nbig,\r\ncite,\r\ncode,\r\ndel,\r\ndfn,\r\nem,\r\nimg,\r\nins,\r\nkbd,\r\nq,\r\ns,\r\nsamp,\r\nsmall,\r\nstrike,\r\nstrong,\r\nsub,\r\nsup,\r\ntt,\r\nvar,\r\nb,\r\nu,\r\ni,\r\ncenter,\r\ndl,\r\ndt,\r\ndd,\r\nol,\r\nul,\r\nli,\r\nfieldset,\r\nform,\r\nlabel,\r\nlegend,\r\ntable,\r\ncaption,\r\ntbody,\r\ntfoot,\r\nthead,\r\ntr,\r\nth,\r\ntd,\r\narticle,\r\naside,\r\ncanvas,\r\ndetails,\r\nembed,\r\nfigure,\r\nfigcaption,\r\nfooter,\r\nheader,\r\nhgroup,\r\nmenu,\r\nnav,\r\noutput,\r\nruby,\r\nsection,\r\nsummary,\r\ntime,\r\nmark,\r\naudio,\r\nvideo {\r\n margin: 0;\r\n padding: 0;\r\n border: 0;\r\n font-size: 100%;\r\n font: inherit;\r\n vertical-align: baseline;\r\n}\r\n/* HTML5 display-role reset for older browsers */\r\narticle,\r\naside,\r\ndetails,\r\nfigcaption,\r\nfigure,\r\nfooter,\r\nheader,\r\nhgroup,\r\nmenu,\r\nnav,\r\nsection {\r\n display: block;\r\n}\r\nbody {\r\n line-height: 1;\r\n}\r\nol,\r\nul {\r\n list-style: none;\r\n}\r\nblockquote,\r\nq {\r\n quotes: none;\r\n}\r\nblockquote:before,\r\nblockquote:after,\r\nq:before,\r\nq:after {\r\n content: \"\";\r\n content: none;\r\n}\r\ntable {\r\n border-collapse: collapse;\r\n border-spacing: 0;\r\n}\r\n"]} \ No newline at end of file diff --git a/BE/src/main/resources/static/static/js/2.02da2f73.chunk.js b/BE/src/main/resources/static/static/js/2.02da2f73.chunk.js new file mode 100644 index 000000000..c570b64f2 --- /dev/null +++ b/BE/src/main/resources/static/static/js/2.02da2f73.chunk.js @@ -0,0 +1,3 @@ +/*! For license information please see 2.02da2f73.chunk.js.LICENSE.txt */ +(this.webpackJsonpfe=this.webpackJsonpfe||[]).push([[2],[function(e,t,n){"use strict";e.exports=n(37)},function(e,t,n){"use strict";e.exports=n(30)},function(e,t,n){"use strict";function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function a(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function o(e){for(var t=1;t1?t-1:0),r=1;r0?" Args: "+n.join(", "):""))}var C=function(){function e(e){this.groupSizes=new Uint32Array(512),this.length=512,this.tag=e}var t=e.prototype;return t.indexOfGroup=function(e){for(var t=0,n=0;n=this.groupSizes.length){for(var n=this.groupSizes,r=n.length,a=r;e>=a;)(a<<=1)<0&&x(16,""+e);this.groupSizes=new Uint32Array(a),this.groupSizes.set(n),this.length=a;for(var o=r;o=this.length||0===this.groupSizes[e])return t;for(var n=this.groupSizes[e],r=this.indexOfGroup(e),a=r+n,o=r;o=0;n--){var r=t[n];if(r&&1===r.nodeType&&r.hasAttribute(k))return r}}(n),o=void 0!==a?a.nextSibling:null;r.setAttribute(k,"active"),r.setAttribute("data-styled-version","5.2.3");var i=z();return i&&r.setAttribute("nonce",i),n.insertBefore(r,o),r},M=function(){function e(e){var t=this.element=D(e);t.appendChild(document.createTextNode("")),this.sheet=function(e){if(e.sheet)return e.sheet;for(var t=document.styleSheets,n=0,r=t.length;n=0){var n=document.createTextNode(t),r=this.nodes[e];return this.element.insertBefore(n,r||null),this.length++,!0}return!1},t.deleteRule=function(e){this.element.removeChild(this.nodes[e]),this.length--},t.getRule=function(e){return e0&&(c+=e+",")})),r+=""+l+u+'{content:"'+c+'"}/*!sc*/\n'}}}return r}(this)},e}(),B=/(a)(d)/gi,V=function(e){return String.fromCharCode(e+(e>25?39:97))};function K(e){var t,n="";for(t=Math.abs(e);t>52;t=t/52|0)n=V(t%52)+n;return(V(t%52)+n).replace(B,"$1-$2")}var Q=function(e,t){for(var n=t.length;n;)e=33*e^t.charCodeAt(--n);return e},q=function(e){return Q(5381,e)};function Y(e){for(var t=0;t>>0);if(!t.hasNameForId(r,i)){var l=n(o,"."+i,void 0,r);t.insertRules(r,i,l)}a.push(i),this.staticRulesId=i}else{for(var u=this.rules.length,c=Q(this.baseHash,n.hash),s="",f=0;f>>0);if(!t.hasNameForId(r,m)){var v=n(s,"."+m,void 0,r);t.insertRules(r,m,v)}a.push(m)}}return a.join(" ")},e}(),J=/^\s*\/\/.*$/gm,Z=[":","[",".","#"];function ee(e){var t,n,r,a,o=void 0===e?g:e,i=o.options,l=void 0===i?g:i,c=o.plugins,s=void 0===c?v:c,f=new u.a(l),d=[],p=function(e){function t(t){if(t)try{e(t+"}")}catch(e){}}return function(n,r,a,o,i,l,u,c,s,f){switch(n){case 1:if(0===s&&64===r.charCodeAt(0))return e(r+";"),"";break;case 2:if(0===c)return r+"/*|*/";break;case 3:switch(c){case 102:case 112:return e(a[0]+r),"";default:return r+(0===f?"/*|*/":"")}case-2:r.split("/*|*/}").forEach(t)}}}((function(e){d.push(e)})),h=function(e,r,o){return 0===r&&-1!==Z.indexOf(o[n.length])||o.match(a)?e:"."+t};function m(e,o,i,l){void 0===l&&(l="&");var u=e.replace(J,""),c=o&&i?i+" "+o+" { "+u+" }":u;return t=l,n=o,r=new RegExp("\\"+n+"\\b","g"),a=new RegExp("(\\"+n+"\\b){2,}"),f(i||!o?"":o,c)}return f.use([].concat(s,[function(e,t,a){2===e&&a.length&&a[0].lastIndexOf(n)>0&&(a[0]=a[0].replace(r,h))},p,function(e){if(-2===e){var t=d;return d=[],t}}])),m.hash=s.length?s.reduce((function(e,t){return t.name||x(15),Q(e,t.name)}),5381).toString():"",m}var te=o.a.createContext(),ne=(te.Consumer,o.a.createContext()),re=(ne.Consumer,new W),ae=ee();function oe(){return Object(a.useContext)(te)||re}function ie(){return Object(a.useContext)(ne)||ae}function le(e){var t=Object(a.useState)(e.stylisPlugins),n=t[0],r=t[1],i=oe(),u=Object(a.useMemo)((function(){var t=i;return e.sheet?t=e.sheet:e.target&&(t=t.reconstructWithOptions({target:e.target},!1)),e.disableCSSOMInjection&&(t=t.reconstructWithOptions({useCSSOMInjection:!1})),t}),[e.disableCSSOMInjection,e.sheet,e.target]),c=Object(a.useMemo)((function(){return ee({options:{prefix:!e.disableVendorPrefixes},plugins:n})}),[e.disableVendorPrefixes,n]);return Object(a.useEffect)((function(){l()(n,e.stylisPlugins)||r(e.stylisPlugins)}),[e.stylisPlugins]),o.a.createElement(te.Provider,{value:u},o.a.createElement(ne.Provider,{value:c},e.children))}var ue=function(){function e(e,t){var n=this;this.inject=function(e,t){void 0===t&&(t=ae);var r=n.name+t.hash;e.hasNameForId(n.id,r)||e.insertRules(n.id,r,t(n.rules,r,"@keyframes"))},this.toString=function(){return x(12,String(n.name))},this.name=e,this.id="sc-keyframes-"+e,this.rules=t}return e.prototype.getName=function(e){return void 0===e&&(e=ae),this.name+e.hash},e}(),ce=/([A-Z])/,se=/([A-Z])/g,fe=/^ms-/,de=function(e){return"-"+e.toLowerCase()};function pe(e){return ce.test(e)?e.replace(se,de).replace(fe,"-ms-"):e}var he=function(e){return null==e||!1===e||""===e};function me(e,t,n,r){if(Array.isArray(e)){for(var a,o=[],i=0,l=e.length;i1?t-1:0),r=1;r?@[\\\]^`{|}~-]+/g,be=/(^-|-$)/g;function we(e){return e.replace(ye,"-").replace(be,"")}var ke=function(e){return K(q(e)>>>0)};function Se(e){return"string"==typeof e&&!0}var Ee=function(e){return"function"==typeof e||"object"==typeof e&&null!==e&&!Array.isArray(e)},xe=function(e){return"__proto__"!==e&&"constructor"!==e&&"prototype"!==e};function Ce(e,t,n){var r=e[n];Ee(t)&&Ee(r)?_e(r,t):e[n]=t}function _e(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r=0||(a[n]=e[n]);return a}(t,["componentId"]),o=r&&r+"-"+(Se(e)?e:we(b(e)));return Te(e,p({},a,{attrs:S,componentId:o}),n)},Object.defineProperty(x,"defaultProps",{get:function(){return this._foldedDefaultProps},set:function(t){this._foldedDefaultProps=r?_e({},e.defaultProps,t):t}}),x.toString=function(){return"."+x.styledComponentId},i&&d()(x,e,{attrs:!0,componentStyle:!0,displayName:!0,foldedComponentIds:!0,shouldForwardProp:!0,styledComponentId:!0,target:!0,withComponent:!0}),x}var Le=function(e){return function e(t,n,a){if(void 0===a&&(a=g),!Object(r.isValidElementType)(n))return x(1,String(n));var o=function(){return t(n,a,ve.apply(void 0,arguments))};return o.withConfig=function(r){return e(t,n,p({},a,{},r))},o.attrs=function(r){return e(t,n,p({},a,{attrs:Array.prototype.concat(a.attrs,r).filter(Boolean)}))},o}(Te,e)};["a","abbr","address","area","article","aside","audio","b","base","bdi","bdo","big","blockquote","body","br","button","canvas","caption","cite","code","col","colgroup","data","datalist","dd","del","details","dfn","dialog","div","dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe","img","input","ins","kbd","keygen","label","legend","li","link","main","map","mark","marquee","menu","menuitem","meta","meter","nav","noscript","object","ol","optgroup","option","output","p","param","picture","pre","progress","q","rp","rt","ruby","s","samp","script","section","select","small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","title","tr","track","u","ul","var","video","wbr","circle","clipPath","defs","ellipse","foreignObject","g","image","line","linearGradient","marker","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","svg","text","tspan"].forEach((function(e){Le[e]=Le(e)}));!function(){function e(e,t){this.rules=e,this.componentId=t,this.isStatic=Y(e),W.registerId(this.componentId+1)}var t=e.prototype;t.createStyles=function(e,t,n,r){var a=r(me(this.rules,t,n,r).join(""),""),o=this.componentId+e;n.insertRules(o,o,a)},t.removeStyles=function(e,t){t.clearRules(this.componentId+e)},t.renderStyles=function(e,t,n,r){e>2&&W.registerId(this.componentId+e),this.removeStyles(e,n),this.createStyles(e,t,n,r)}}();!function(){function e(){var e=this;this._emitSheetCSS=function(){var t=e.instance.toString(),n=z();return""},this.getStyleTags=function(){return e.sealed?x(2):e._emitSheetCSS()},this.getStyleElement=function(){var t;if(e.sealed)return x(2);var n=((t={})[k]="",t["data-styled-version"]="5.2.3",t.dangerouslySetInnerHTML={__html:e.instance.toString()},t),r=z();return r&&(n.nonce=r),[o.a.createElement("style",p({},n,{key:"sc-0-0"}))]},this.seal=function(){e.sealed=!0},this.instance=new W({isServer:!0}),this.sealed=!1}var t=e.prototype;t.collectStyles=function(e){return this.sealed?x(2):o.a.createElement(le,{sheet:this.instance},e)},t.interleaveWithNodeStream=function(e){return x(3)}}();t.a=Le}).call(this,n(44))},function(e,t,n){"use strict";n.d(t,"a",(function(){return b})),n.d(t,"b",(function(){return m})),n.d(t,"c",(function(){return C})),n.d(t,"d",(function(){return h})),n.d(t,"e",(function(){return y}));var r=n(8),a=n(1),o=n.n(a),i=(n(15),n(9)),l=n(23),u=n(7),c=n(6),s=n(24),f=n.n(s),d=(n(16),n(13)),p=(n(18),function(e){var t=Object(l.a)();return t.displayName=e,t}("Router-History")),h=function(e){var t=Object(l.a)();return t.displayName=e,t}("Router"),m=function(e){function t(t){var n;return(n=e.call(this,t)||this).state={location:t.history.location},n._isMounted=!1,n._pendingLocation=null,t.staticContext||(n.unlisten=t.history.listen((function(e){n._isMounted?n.setState({location:e}):n._pendingLocation=e}))),n}Object(r.a)(t,e),t.computeRootMatch=function(e){return{path:"/",url:"/",params:{},isExact:"/"===e}};var n=t.prototype;return n.componentDidMount=function(){this._isMounted=!0,this._pendingLocation&&this.setState({location:this._pendingLocation})},n.componentWillUnmount=function(){this.unlisten&&this.unlisten()},n.render=function(){return o.a.createElement(h.Provider,{value:{history:this.props.history,location:this.state.location,match:t.computeRootMatch(this.state.location.pathname),staticContext:this.props.staticContext}},o.a.createElement(p.Provider,{children:this.props.children||null,value:this.props.history}))},t}(o.a.Component);o.a.Component;o.a.Component;var v={},g=0;function y(e,t){void 0===t&&(t={}),("string"===typeof t||Array.isArray(t))&&(t={path:t});var n=t,r=n.path,a=n.exact,o=void 0!==a&&a,i=n.strict,l=void 0!==i&&i,u=n.sensitive,c=void 0!==u&&u;return[].concat(r).reduce((function(t,n){if(!n&&""!==n)return null;if(t)return t;var r=function(e,t){var n=""+t.end+t.strict+t.sensitive,r=v[n]||(v[n]={});if(r[e])return r[e];var a=[],o={regexp:f()(e,a,t),keys:a};return g<1e4&&(r[e]=o,g++),o}(n,{end:o,strict:l,sensitive:c}),a=r.regexp,i=r.keys,u=a.exec(e);if(!u)return null;var s=u[0],d=u.slice(1),p=e===s;return o&&!p?null:{path:n,url:"/"===n&&""===s?"/":s,isExact:p,params:i.reduce((function(e,t,n){return e[t.name]=d[n],e}),{})}}),null)}var b=function(e){function t(){return e.apply(this,arguments)||this}return Object(r.a)(t,e),t.prototype.render=function(){var e=this;return o.a.createElement(h.Consumer,null,(function(t){t||Object(u.a)(!1);var n=e.props.location||t.location,r=e.props.computedMatch?e.props.computedMatch:e.props.path?y(n.pathname,e.props):t.match,a=Object(c.a)({},t,{location:n,match:r}),i=e.props,l=i.children,s=i.component,f=i.render;return Array.isArray(l)&&0===l.length&&(l=null),o.a.createElement(h.Provider,{value:a},a.match?l?"function"===typeof l?l(a):l:s?o.a.createElement(s,a):f?f(a):null:"function"===typeof l?l(a):null)}))},t}(o.a.Component);function w(e){return"/"===e.charAt(0)?e:"/"+e}function k(e,t){if(!e)return t;var n=w(e);return 0!==t.pathname.indexOf(n)?t:Object(c.a)({},t,{pathname:t.pathname.substr(n.length)})}function S(e){return"string"===typeof e?e:Object(i.e)(e)}function E(e){return function(){Object(u.a)(!1)}}function x(){}o.a.Component;var C=function(e){function t(){return e.apply(this,arguments)||this}return Object(r.a)(t,e),t.prototype.render=function(){var e=this;return o.a.createElement(h.Consumer,null,(function(t){t||Object(u.a)(!1);var n,r,a=e.props.location||t.location;return o.a.Children.forEach(e.props.children,(function(e){if(null==r&&o.a.isValidElement(e)){n=e;var i=e.props.path||e.props.from;r=i?y(a.pathname,Object(c.a)({},e.props,{path:i})):t.match}})),r?o.a.cloneElement(n,{location:a,computedMatch:r}):null}))},t}(o.a.Component);o.a.useContext},function(e,t,n){"use strict";function r(){return(r=Object.assign||function(e){for(var t=1;t=0;d--){var p=i[d];"."===p?o(i,d):".."===p?(o(i,d),f++):f&&(o(i,d),f--)}if(!c)for(;f--;f)i.unshift("..");!c||""===i[0]||i[0]&&a(i[0])||i.unshift("");var h=i.join("/");return n&&"/"!==h.substr(-1)&&(h+="/"),h};function l(e){return e.valueOf?e.valueOf():Object.prototype.valueOf.call(e)}var u=function e(t,n){if(t===n)return!0;if(null==t||null==n)return!1;if(Array.isArray(t))return Array.isArray(n)&&t.length===n.length&&t.every((function(t,r){return e(t,n[r])}));if("object"===typeof t||"object"===typeof n){var r=l(t),a=l(n);return r!==t||a!==n?e(r,a):Object.keys(Object.assign({},t,n)).every((function(r){return e(t[r],n[r])}))}return!1},c=n(7);function s(e){return"/"===e.charAt(0)?e:"/"+e}function f(e){return"/"===e.charAt(0)?e.substr(1):e}function d(e,t){return function(e,t){return 0===e.toLowerCase().indexOf(t.toLowerCase())&&-1!=="/?#".indexOf(e.charAt(t.length))}(e,t)?e.substr(t.length):e}function p(e){return"/"===e.charAt(e.length-1)?e.slice(0,-1):e}function h(e){var t=e.pathname,n=e.search,r=e.hash,a=t||"/";return n&&"?"!==n&&(a+="?"===n.charAt(0)?n:"?"+n),r&&"#"!==r&&(a+="#"===r.charAt(0)?r:"#"+r),a}function m(e,t,n,a){var o;"string"===typeof e?(o=function(e){var t=e||"/",n="",r="",a=t.indexOf("#");-1!==a&&(r=t.substr(a),t=t.substr(0,a));var o=t.indexOf("?");return-1!==o&&(n=t.substr(o),t=t.substr(0,o)),{pathname:t,search:"?"===n?"":n,hash:"#"===r?"":r}}(e)).state=t:(void 0===(o=Object(r.a)({},e)).pathname&&(o.pathname=""),o.search?"?"!==o.search.charAt(0)&&(o.search="?"+o.search):o.search="",o.hash?"#"!==o.hash.charAt(0)&&(o.hash="#"+o.hash):o.hash="",void 0!==t&&void 0===o.state&&(o.state=t));try{o.pathname=decodeURI(o.pathname)}catch(l){throw l instanceof URIError?new URIError('Pathname "'+o.pathname+'" could not be decoded. This is likely caused by an invalid percent-encoding.'):l}return n&&(o.key=n),a?o.pathname?"/"!==o.pathname.charAt(0)&&(o.pathname=i(o.pathname,a.pathname)):o.pathname=a.pathname:o.pathname||(o.pathname="/"),o}function v(e,t){return e.pathname===t.pathname&&e.search===t.search&&e.hash===t.hash&&e.key===t.key&&u(e.state,t.state)}function g(){var e=null;var t=[];return{setPrompt:function(t){return e=t,function(){e===t&&(e=null)}},confirmTransitionTo:function(t,n,r,a){if(null!=e){var o="function"===typeof e?e(t,n):e;"string"===typeof o?"function"===typeof r?r(o,a):a(!0):a(!1!==o)}else a(!0)},appendListener:function(e){var n=!0;function r(){n&&e.apply(void 0,arguments)}return t.push(r),function(){n=!1,t=t.filter((function(e){return e!==r}))}},notifyListeners:function(){for(var e=arguments.length,n=new Array(e),r=0;rt?n.splice(t,n.length-t,a):n.push(a),f({action:r,location:a,index:t,entries:n})}}))},replace:function(e,t){var r="REPLACE",a=m(e,t,d(),w.location);s.confirmTransitionTo(a,r,n,(function(e){e&&(w.entries[w.index]=a,f({action:r,location:a}))}))},go:b,goBack:function(){b(-1)},goForward:function(){b(1)},canGo:function(e){var t=w.index+e;return t>=0&&t=0||(a[n]=e[n]);return a}n.d(t,"a",(function(){return r}))},function(e,t,n){"use strict";function r(e,t,n,r,a,o,i){try{var l=e[o](i),u=l.value}catch(c){return void n(c)}l.done?t(u):Promise.resolve(u).then(r,a)}function a(e){return function(){var t=this,n=arguments;return new Promise((function(a,o){var i=e.apply(t,n);function l(e){r(i,a,o,l,u,"next",e)}function u(e){r(i,a,o,l,u,"throw",e)}l(void 0)}))}}n.d(t,"a",(function(){return a}))},function(e,t,n){e.exports=n(39)()},function(e,t,n){"use strict";e.exports=n(43)},function(e,t,n){"use strict";function r(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);np)&&(F=(H=H.replace(" ",":")).length),0r&&(r=(t=t.trim()).charCodeAt(0)),r){case 38:return t.replace(v,"$1"+e.trim());case 58:return e.trim()+t.replace(v,"$1"+e.trim());default:if(0<1*n&&0u.charCodeAt(8))break;case 115:i=i.replace(u,"-webkit-"+u)+";"+i;break;case 207:case 102:i=i.replace(u,"-webkit-"+(102r.charCodeAt(0)&&(r=r.trim()),r=[r],0