From e967ab9360f512a85f326617b6067c7444b5a9f2 Mon Sep 17 00:00:00 2001 From: leegwichan Date: Tue, 10 Dec 2024 09:51:34 +0900 Subject: [PATCH 01/38] =?UTF-8?q?feat:=20=EC=B4=88=EA=B8=B0=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 37 +++ build.gradle | 42 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../debatetimer/DebateTimerApplication.java | 13 + .../java/com/debatetimer/controller/.gitkeep | 0 src/main/java/com/debatetimer/domain/.gitkeep | 0 .../java/com/debatetimer/repository/.gitkeep | 0 .../java/com/debatetimer/service/.gitkeep | 0 src/main/resources/application.yml | 3 + .../DebateTimerApplicationTest.java | 13 + 15 files changed, 465 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/debatetimer/DebateTimerApplication.java create mode 100644 src/main/java/com/debatetimer/controller/.gitkeep create mode 100644 src/main/java/com/debatetimer/domain/.gitkeep create mode 100644 src/main/java/com/debatetimer/repository/.gitkeep create mode 100644 src/main/java/com/debatetimer/service/.gitkeep create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/debatetimer/DebateTimerApplicationTest.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..8af972cd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..68db8d79 --- /dev/null +++ b/build.gradle @@ -0,0 +1,42 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.0' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'com' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testImplementation 'io.rest-assured:rest-assured:5.5.0' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..e2847c82 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..f5feea6d --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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=. +@rem This is normally unused +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% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..2bfef168 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'debatetimer' diff --git a/src/main/java/com/debatetimer/DebateTimerApplication.java b/src/main/java/com/debatetimer/DebateTimerApplication.java new file mode 100644 index 00000000..0d8907b7 --- /dev/null +++ b/src/main/java/com/debatetimer/DebateTimerApplication.java @@ -0,0 +1,13 @@ +package com.debatetimer; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DebateTimerApplication { + + public static void main(String[] args) { + SpringApplication.run(DebateTimerApplication.class, args); + } + +} diff --git a/src/main/java/com/debatetimer/controller/.gitkeep b/src/main/java/com/debatetimer/controller/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/debatetimer/domain/.gitkeep b/src/main/java/com/debatetimer/domain/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/debatetimer/repository/.gitkeep b/src/main/java/com/debatetimer/repository/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/debatetimer/service/.gitkeep b/src/main/java/com/debatetimer/service/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..d74c444c --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,3 @@ +spring: + profiles: + active: local diff --git a/src/test/java/com/debatetimer/DebateTimerApplicationTest.java b/src/test/java/com/debatetimer/DebateTimerApplicationTest.java new file mode 100644 index 00000000..74e86662 --- /dev/null +++ b/src/test/java/com/debatetimer/DebateTimerApplicationTest.java @@ -0,0 +1,13 @@ +package com.debatetimer; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DebateTimerApplicationTest { + + @Test + void contextLoads() { + } + +} From 6831baedb0d4b5d613b5084b23f2e9a4f98b4439 Mon Sep 17 00:00:00 2001 From: leegwichan Date: Tue, 10 Dec 2024 10:14:00 +0900 Subject: [PATCH 02/38] =?UTF-8?q?docs:=20=EC=9D=B4=EC=8A=88=20=ED=85=9C?= =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/docs-template.md | 13 +++++++++++++ .github/ISSUE_TEMPLATE/feat-template.md | 13 +++++++++++++ .github/ISSUE_TEMPLATE/fix-template.md | 13 +++++++++++++ .github/ISSUE_TEMPLATE/issue-template.md | 12 ------------ .github/ISSUE_TEMPLATE/refactor-template.md | 13 +++++++++++++ .github/ISSUE_TEMPLATE/test-template.md | 13 +++++++++++++ 6 files changed, 65 insertions(+), 12 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/docs-template.md create mode 100644 .github/ISSUE_TEMPLATE/feat-template.md create mode 100644 .github/ISSUE_TEMPLATE/fix-template.md delete mode 100644 .github/ISSUE_TEMPLATE/issue-template.md create mode 100644 .github/ISSUE_TEMPLATE/refactor-template.md create mode 100644 .github/ISSUE_TEMPLATE/test-template.md diff --git a/.github/ISSUE_TEMPLATE/docs-template.md b/.github/ISSUE_TEMPLATE/docs-template.md new file mode 100644 index 00000000..d31516ac --- /dev/null +++ b/.github/ISSUE_TEMPLATE/docs-template.md @@ -0,0 +1,13 @@ +--- +name: "Docs Template" +about: 문서화 이슈 템플릿 +title: '[DOCS] ' +labels: docs +assignees: '' + +--- + +### ✨ Description + + +### ✨ Time(마감기한) diff --git a/.github/ISSUE_TEMPLATE/feat-template.md b/.github/ISSUE_TEMPLATE/feat-template.md new file mode 100644 index 00000000..cf2f908b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feat-template.md @@ -0,0 +1,13 @@ +--- +name: "Feat Template" +about: 기능 추가 이슈 템플릿 +title: "[FEAT] " +labels: feat +assignees: '' + +--- + +### ✨ Description + + +### ✨ Time(마감기한) diff --git a/.github/ISSUE_TEMPLATE/fix-template.md b/.github/ISSUE_TEMPLATE/fix-template.md new file mode 100644 index 00000000..04665164 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/fix-template.md @@ -0,0 +1,13 @@ +--- +name: "Fix Template" +about: 기능 수정 이슈 템플릿 +title: "[FIX] " +labels: fix +assignees: '' + +--- + +### ✨ Description + + +### ✨ Time(마감기한) diff --git a/.github/ISSUE_TEMPLATE/issue-template.md b/.github/ISSUE_TEMPLATE/issue-template.md deleted file mode 100644 index ad0c1a88..00000000 --- a/.github/ISSUE_TEMPLATE/issue-template.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -name: Issue Template -about: Describe this issue template's purpose here. -title: '' -labels: '' -assignees: '' - ---- - -### ✨ Description - -### ✨ Time(마감기한) diff --git a/.github/ISSUE_TEMPLATE/refactor-template.md b/.github/ISSUE_TEMPLATE/refactor-template.md new file mode 100644 index 00000000..87e55ee4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/refactor-template.md @@ -0,0 +1,13 @@ +--- +name: "Refactor Template" +about: 리팩토링 이슈 템플릿 +title: "[REFACTOR] " +labels: refactor +assignees: '' + +--- + +### ✨ Description + + +### ✨ Time(마감기한) diff --git a/.github/ISSUE_TEMPLATE/test-template.md b/.github/ISSUE_TEMPLATE/test-template.md new file mode 100644 index 00000000..144a5f92 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/test-template.md @@ -0,0 +1,13 @@ +--- +name: "Test Template" +about: 테스트 이슈 템플릿 +title: "[TEST] " +labels: test +assignees: '' + +--- + +### ✨ Description + + +### ✨ Time(마감기한) From 05ffbc401feb420d21213a5b92d9a5fed9ba6a3c Mon Sep 17 00:00:00 2001 From: leegwichan Date: Tue, 10 Dec 2024 10:23:46 +0900 Subject: [PATCH 03/38] =?UTF-8?q?feat:=20=EC=9D=B4=EC=8A=88=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=20=EC=9E=90=EB=8F=99=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?Assignees=20=ED=95=A0=EB=8B=B9=20=EA=B8=B0=EB=8A=A5=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 --- .github/workflows/Auto_Issue_Setting.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/Auto_Issue_Setting.yml diff --git a/.github/workflows/Auto_Issue_Setting.yml b/.github/workflows/Auto_Issue_Setting.yml new file mode 100644 index 00000000..d377a0ea --- /dev/null +++ b/.github/workflows/Auto_Issue_Setting.yml @@ -0,0 +1,14 @@ +name: Auto Issue Setting + +on: + issues: + types: [opened] + +jobs: + auto-assign: + runs-on: ubuntu-latest + steps: + - name: Auto-assign issue creator + uses: pozil/auto-assign-issue@v2 + with: + assignees: ${{ github.actor }} From ead2e49f3972bbde0543fb62cf6c58449daba26e Mon Sep 17 00:00:00 2001 From: leegwichan Date: Tue, 10 Dec 2024 10:32:17 +0900 Subject: [PATCH 04/38] =?UTF-8?q?docs:=20=ED=95=AB=ED=94=BD=EC=8A=A4=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=ED=85=9C=ED=94=8C=EB=A6=BF=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 --- .github/ISSUE_TEMPLATE/hotfix-template.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/hotfix-template.md diff --git a/.github/ISSUE_TEMPLATE/hotfix-template.md b/.github/ISSUE_TEMPLATE/hotfix-template.md new file mode 100644 index 00000000..76b3d38b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/hotfix-template.md @@ -0,0 +1,15 @@ +--- +name: "Hot-Fix Template" +about: 핫픽스 이슈 템플릿 +title: "[HOTFIX] " +labels: hotfix +assignees: '' + +--- + +### ✨ Description + + +### ✨ Time(마감기한) + +- ASAP From 9c3fb4cfced53030b11de477849521309150080c Mon Sep 17 00:00:00 2001 From: leegwichan Date: Wed, 11 Dec 2024 10:57:47 +0900 Subject: [PATCH 05/38] =?UTF-8?q?docs:=20=EA=B8=B0=ED=83=80=20=ED=85=9C?= =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/chore-template.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/chore-template.md diff --git a/.github/ISSUE_TEMPLATE/chore-template.md b/.github/ISSUE_TEMPLATE/chore-template.md new file mode 100644 index 00000000..f648ffba --- /dev/null +++ b/.github/ISSUE_TEMPLATE/chore-template.md @@ -0,0 +1,13 @@ +--- +name: "Chore Template" +about: 기타 이슈 템플릿 +title: '[CHORE] ' +labels: chore +assignees: '' + +--- + +### ✨ Description + + +### ✨ Time(마감기한) From 0f544010f95d92f9a8986200597e189fb5d9e417 Mon Sep 17 00:00:00 2001 From: leegwichan Date: Wed, 11 Dec 2024 11:15:46 +0900 Subject: [PATCH 06/38] =?UTF-8?q?chore:=20application-local.yml=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 --- src/main/resources/application-local.yml | 0 src/main/resources/application.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/main/resources/application-local.yml diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d74c444c..74559710 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: local + default: local From 267a107dc4b8ab9f552c1c3054a9a8c5f3e18ae7 Mon Sep 17 00:00:00 2001 From: coli-geonwoo Date: Wed, 11 Dec 2024 21:04:19 +0900 Subject: [PATCH 07/38] =?UTF-8?q?chore:=20openapi=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 68db8d79..d8c31c5d 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,8 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testImplementation 'io.rest-assured:rest-assured:5.5.0' + + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' } tasks.named('test') { From 2f31f34ede11526ae641eff61cfb7f694e2333eb Mon Sep 17 00:00:00 2001 From: coli-geonwoo Date: Wed, 11 Dec 2024 21:11:57 +0900 Subject: [PATCH 08/38] =?UTF-8?q?chore:=20swagger=20=EC=84=A4=EC=A0=95=20y?= =?UTF-8?q?ml=ED=8C=8C=EC=9D=BC=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 --- src/main/resources/application.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 74559710..d05e3529 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,17 @@ spring: profiles: default: local + +springdoc: + default-consumes-media-type: application/json;charset=UTF-8 + default-produces-media-type: application/json;charset=UTF-8 + api-docs: + path: /api-docs + swagger-ui: + disable-swagger-default-url: true + display-request-duration: true + operations-sorter: alpha + enabled: true + persist-authorization: true + filter: true + From 79c5eb3ea1adac39dcd288b3f8ac56cbda3549d4 Mon Sep 17 00:00:00 2001 From: coli-geonwoo Date: Wed, 11 Dec 2024 21:15:06 +0900 Subject: [PATCH 09/38] =?UTF-8?q?chore:=20swaggerConfig=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swagger/config/SwaggerConfig.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java diff --git a/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java b/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java new file mode 100644 index 00000000..9cade38f --- /dev/null +++ b/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java @@ -0,0 +1,35 @@ +package com.debatetimer.swagger.config; + +import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; +import io.swagger.v3.oas.annotations.security.SecurityScheme; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@SecurityScheme( + name = "Authorization", + type = SecuritySchemeType.HTTP, + bearerFormat = "JWT", + scheme = "bearer" +) +public class SwaggerConfig { + + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .addServersItem(server()) + .info(getInfo()); + } + + private Server server() { + return new Server().url("/"); + } + + private Info getInfo() { + return new Info().title("디베이트 타이머 API 문서") + .version("1.0.0"); + } +} From 5e9f0d8e86209e2885222e6d99f093bb80ab0228 Mon Sep 17 00:00:00 2001 From: coli-geonwoo Date: Wed, 11 Dec 2024 21:21:22 +0900 Subject: [PATCH 10/38] =?UTF-8?q?chore:=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=95=A0=EB=84=88=ED=85=8C=EC=9D=B4=EC=85=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 --- .../swagger/annotation/ErrorCode400.java | 24 ++++++++++++++++++ .../swagger/annotation/ErrorCode401.java | 24 ++++++++++++++++++ .../swagger/annotation/ErrorCode404.java | 23 +++++++++++++++++ .../swagger/annotation/ErrorCode500.java | 25 +++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java create mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java create mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java create mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java new file mode 100644 index 00000000..d9847236 --- /dev/null +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java @@ -0,0 +1,24 @@ +package com.debatetimer.swagger.annotation; + +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.springframework.core.annotation.AliasFor; +import org.springframework.http.ProblemDetail; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "400", + description = "클라이언트 입력 오류", + content = @Content(schema = @Schema(implementation = ProblemDetail.class)) +) +public @interface ErrorCode400 { + + @AliasFor(annotation = ApiResponse.class, attribute = "description") + String description() default "클라이언트 입력 오류"; +} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java new file mode 100644 index 00000000..1ed90c77 --- /dev/null +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java @@ -0,0 +1,24 @@ +package com.debatetimer.swagger.annotation; + +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.springframework.core.annotation.AliasFor; +import org.springframework.http.ProblemDetail; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "401", + description = "인증되지 않은 사용자", + content = @Content(schema = @Schema(implementation = ProblemDetail.class)) +) +public @interface ErrorCode401 { + + @AliasFor(annotation = ApiResponse.class, attribute = "description") + String description() default "인증되지 않은 사용자"; +} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java new file mode 100644 index 00000000..1656dcda --- /dev/null +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java @@ -0,0 +1,23 @@ +package com.debatetimer.swagger.annotation; + +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.springframework.core.annotation.AliasFor; +import org.springframework.http.ProblemDetail; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "404", + content = @Content(schema = @Schema(implementation = ProblemDetail.class)) +) +public @interface ErrorCode404 { + + @AliasFor(annotation = ApiResponse.class, attribute = "description") + String description(); +} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java new file mode 100644 index 00000000..d4d96ecf --- /dev/null +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java @@ -0,0 +1,25 @@ +package com.debatetimer.swagger.annotation; + +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.springframework.core.annotation.AliasFor; +import org.springframework.http.ProblemDetail; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@ApiResponse( + responseCode = "500", + description = "서버 오류", + content = @Content(schema = @Schema(implementation = ProblemDetail.class)) +) +public @interface ErrorCode500 { + + @AliasFor(annotation = ApiResponse.class, attribute = "description") + String description() default ""; + +} From 306d05a9e9a38b8ac5e6ccbb3a7ac8b3dd156b4f Mon Sep 17 00:00:00 2001 From: coli-geonwoo Date: Wed, 11 Dec 2024 21:52:13 +0900 Subject: [PATCH 11/38] =?UTF-8?q?chore:=20=EC=9D=B8=EC=A6=9D=20=EC=8A=A4?= =?UTF-8?q?=ED=82=A4=EB=A7=88=20=EC=84=A4=EC=A0=95=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/debatetimer/swagger/config/SwaggerConfig.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java b/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java index 9cade38f..3f71b9e6 100644 --- a/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java +++ b/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java @@ -9,12 +9,6 @@ import org.springframework.context.annotation.Configuration; @Configuration -@SecurityScheme( - name = "Authorization", - type = SecuritySchemeType.HTTP, - bearerFormat = "JWT", - scheme = "bearer" -) public class SwaggerConfig { @Bean From d4bc30230348c9191d5a4b5cb61f966521ab0154 Mon Sep 17 00:00:00 2001 From: coli-geonwoo Date: Thu, 12 Dec 2024 01:52:58 +0900 Subject: [PATCH 12/38] =?UTF-8?q?style:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20import=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java b/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java index 3f71b9e6..0914920e 100644 --- a/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java +++ b/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java @@ -1,7 +1,5 @@ package com.debatetimer.swagger.config; -import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; -import io.swagger.v3.oas.annotations.security.SecurityScheme; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.servers.Server; From d6a3bfff64975340a9c0ea7d699c0816aa1cb8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:24:58 +0900 Subject: [PATCH 13/38] =?UTF-8?q?[FIX]=20=EC=9D=B4=EC=8A=88=20=ED=85=9C?= =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EC=9E=91=EC=84=B1=20=EC=8B=9C,=20Assignee?= =?UTF-8?q?s=20=EC=9E=90=EB=8F=99=20=ED=95=A0=EB=8B=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Auto_Issue_Setting.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Auto_Issue_Setting.yml b/.github/workflows/Auto_Issue_Setting.yml index d377a0ea..1410e400 100644 --- a/.github/workflows/Auto_Issue_Setting.yml +++ b/.github/workflows/Auto_Issue_Setting.yml @@ -11,4 +11,5 @@ jobs: - name: Auto-assign issue creator uses: pozil/auto-assign-issue@v2 with: + repo-token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} assignees: ${{ github.actor }} From bcd13a8d430a497558ab87f68642035ed6269717 Mon Sep 17 00:00:00 2001 From: SANGHUN OH <121424793+unifolio0@users.noreply.github.com> Date: Thu, 12 Dec 2024 18:11:34 +0900 Subject: [PATCH 14/38] =?UTF-8?q?[REFACTOR]=20/noti=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EC=88=98=EC=A0=95=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 리뷰 코멘트에서 /noti 기능 추가 * feat: /noti 기능 이슈에도 작동하도록 추갸 & 하나의 job으로 통합 * feat: Notify Discord에 대한 조건 추가 * docs: 이슈 템플릿 추가 * feat: 이슈 생성 시 자동으로 Assignees 할당 기능 추가 * docs: 핫픽스 이슈 템플릿 추가 * docs: 기타 템플릿 추가 * feat: 초기 프로젝트 세팅 * chore: application-local.yml 추가 * [FIX] 이슈 템플릿 작성 시, Assignees 자동 할당 --------- Co-authored-by: leegwichan Co-authored-by: 커찬 <44027393+leegwichan@users.noreply.github.com> --- .github/workflows/PR_Comment_Notification.yml | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/.github/workflows/PR_Comment_Notification.yml b/.github/workflows/PR_Comment_Notification.yml index 952dd7ab..70c87de1 100644 --- a/.github/workflows/PR_Comment_Notification.yml +++ b/.github/workflows/PR_Comment_Notification.yml @@ -3,36 +3,63 @@ name: Discord Notification on PR Comment on: issue_comment: types: [ created, edited ] + pull_request_review: + types: [ submitted ] jobs: notify-discord: - if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} runs-on: ubuntu-latest steps: - name: Set Environment Variables - env: - TITLE: ${{ github.event.issue.title }} run: | echo "AVATAR_URL=${{ secrets.DISCORD_AVATAR_URL }}" >> $GITHUB_ENV - echo "COMMENT_BODY= 🤚백엔드 친구들 모여라~ 🔊" >> $GITHUB_ENV - echo "USERNAME=망나뇽" >> $GITHUB_ENV + echo "USERNAME=디코봇" >> $GITHUB_ENV echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV + - name: Set Environment Variables for PR Comments + if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} + run: | + echo "COMMENT_AUTHOR=${{ github.event.comment.user.login }}" >> $GITHUB_ENV + echo "PR_URL=${{ github.event.issue.pull_request.html_url }}" >> $GITHUB_ENV + echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV + echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "COMMENT_BODY=${{ github.event.issue.title }}" >> $GITHUB_ENV + + - name: Set Environment Variables for PR Review Comment + if: ${{ contains(github.event.review.body, '/noti') }} + run: | + echo "COMMENT_AUTHOR=${{ github.event.review.user.login }}" >> $GITHUB_ENV + echo "PR_URL=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV + echo "AUTHOR_URL=${{ github.event.review.user.avatar_url }}" >> $GITHUB_ENV + echo "CONTENT=$(echo '${{ github.event.review.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "COMMENT_BODY=${{ github.event.pull_request.title }}" >> $GITHUB_ENV + + - name: Set Environment Variables for Issue + if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} + run: | + echo "COMMENT_AUTHOR=${{ github.event.comment.user.login }}" >> $GITHUB_ENV + echo "PR_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV + echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV + echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "COMMENT_BODY=${{ github.event.issue.title }}" >> $GITHUB_ENV + - name: Notify Discord + if: ${{ env.COMMENT_AUTHOR && env.PR_URL && env.AUTHOR_URL && env.CONTENT && env.COMMENT_BODY }} env: - COMMENT_BODY: ${{ env.COMMENT_BODY }} - COMMENT_AUTHOR: ${{ github.event.comment.user.login }} - PR_URL: ${{ github.event.issue.pull_request.html_url }} - AUTHOR_URL: ${{ github.event.comment.user.avatar_url }} AVATAR_URL: ${{ env.AVATAR_URL }} - CONTENT: ${{ github.event.comment.body }} + COMMENT_BODY: ${{ env.COMMENT_BODY }} USERNAME: ${{ env.USERNAME }} WEB_HOOK: ${{ env.WEB_HOOK }} + COMMENT_AUTHOR: ${{ env.COMMENT_AUTHOR }} + PR_URL: ${{ env.PR_URL }} + AUTHOR_URL: ${{ env.AUTHOR_URL }} + CONTENT: ${{ env.CONTENT }} run: | + CONTENT_DECODED=$(echo "$CONTENT" | base64 --decode) if [ -n "$WEB_HOOK" ]; then JSON_PAYLOAD=$(jq -n \ - --arg content "$CONTENT" \ + --arg content "$CONTENT_DECODED" \ --arg description "$COMMENT_BODY" \ --arg username "$USERNAME" \ --arg avatar_url "$AVATAR_URL" \ From 55a3a9242a7421dbff52c4612bae060f32a5d39c Mon Sep 17 00:00:00 2001 From: unifolio0 Date: Sun, 15 Dec 2024 12:47:06 +0900 Subject: [PATCH 15/38] =?UTF-8?q?refactor:=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Comment_Notification.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/PR_Comment_Notification.yml b/.github/workflows/PR_Comment_Notification.yml index 70c87de1..e62dabbd 100644 --- a/.github/workflows/PR_Comment_Notification.yml +++ b/.github/workflows/PR_Comment_Notification.yml @@ -25,6 +25,7 @@ jobs: echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV echo "COMMENT_BODY=${{ github.event.issue.title }}" >> $GITHUB_ENV + echo "TITLE=Pull Request" >> $GITHUB_ENV - name: Set Environment Variables for PR Review Comment if: ${{ contains(github.event.review.body, '/noti') }} @@ -34,6 +35,7 @@ jobs: echo "AUTHOR_URL=${{ github.event.review.user.avatar_url }}" >> $GITHUB_ENV echo "CONTENT=$(echo '${{ github.event.review.body }}' | base64 -w 0)" >> $GITHUB_ENV echo "COMMENT_BODY=${{ github.event.pull_request.title }}" >> $GITHUB_ENV + echo "TITLE=Pull Request" >> $GITHUB_ENV - name: Set Environment Variables for Issue if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} @@ -43,6 +45,7 @@ jobs: echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV echo "COMMENT_BODY=${{ github.event.issue.title }}" >> $GITHUB_ENV + echo "TITLE=Issue" >> $GITHUB_ENV - name: Notify Discord if: ${{ env.COMMENT_AUTHOR && env.PR_URL && env.AUTHOR_URL && env.CONTENT && env.COMMENT_BODY }} @@ -55,6 +58,7 @@ jobs: PR_URL: ${{ env.PR_URL }} AUTHOR_URL: ${{ env.AUTHOR_URL }} CONTENT: ${{ env.CONTENT }} + TITLE: ${{ env.TITLE }} run: | CONTENT_DECODED=$(echo "$CONTENT" | base64 --decode) if [ -n "$WEB_HOOK" ]; then @@ -63,7 +67,7 @@ jobs: --arg description "$COMMENT_BODY" \ --arg username "$USERNAME" \ --arg avatar_url "$AVATAR_URL" \ - --arg title "Pull Request Command" \ + --arg title "$TITLE" \ --arg url "$PR_URL" \ --arg author_url "$AUTHOR_URL" \ --arg author_name "$COMMENT_AUTHOR" \ From edd7dfb384d8b8e2b1298c5a3c968abb68463878 Mon Sep 17 00:00:00 2001 From: GOEN WOO KIM <148152234+coli-geonwoo@users.noreply.github.com> Date: Sun, 15 Dec 2024 18:52:13 +0900 Subject: [PATCH 16/38] =?UTF-8?q?[CHORE]=20=20CI=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=9E=91=EC=84=B1=20(#21)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: jacoco 의존성 추가 * chore: CI 스크립트 작성 * chore: 스크립트 수정 * chore: test report 경로 수정 * chore: write 권한 부여 * chore: gradle 캐싱 로직 추가 * chore: 스크립트 이름 변경 Backend_Dev_CI.yml > Dev_CI.yml * chore: dto와 lombok 코드를 테스트 대상에서 제외 * chore: local 환경에서는 Test_Report가 작동하지 않도록 수정 * chore: test report에 if always 추가 * chore: 권한 변경 * chore: 권한에 PR 추가 * chore: 타임아웃 3분으로 변경 * chore: 이벤트 트리거 원상 복구 --------- Co-authored-by: coli-geonwoo --- .github/workflows/Dev_CI.yml | 61 ++++++++++++++++++++++++++++++++++++ build.gradle | 27 ++++++++++++++++ src/lombok.config | 1 + 3 files changed, 89 insertions(+) create mode 100644 .github/workflows/Dev_CI.yml create mode 100644 src/lombok.config diff --git a/.github/workflows/Dev_CI.yml b/.github/workflows/Dev_CI.yml new file mode 100644 index 00000000..400938fb --- /dev/null +++ b/.github/workflows/Dev_CI.yml @@ -0,0 +1,61 @@ +name: dev-ci + +on: + pull_request: + branches: + - develop + +permissions: + contents: read + checks: write + pull-requests: write + +jobs: + build-and-push: + runs-on: ubuntu-latest + timeout-minutes: 3 + env: + TEST_REPORT: true + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Grant Permission + run: chmod +x ./gradlew + + - name: Clean And Test With Gradle + run: ./gradlew clean test + + - name: Publish Test Results + uses: EnricoMi/publish-unit-test-result-action@v2 + if: always() + with: + files: ${{ github.workspace }}/build/test-results/**/*.xml + + - name: JUnit Report Action + uses: mikepenz/action-junit-report@v4 + if: always() + with: + report_paths: ${{ github.workspace }}/build/test-results/**/*.xml + + - name: Report test Coverage to PR + id: jacoco + uses: madrapps/jacoco-report@v1.6.1 + if: always() + with: + title: 📝 Test Coverage Report + paths: ${{ github.workspace }}/build/reports/jacoco/test/jacocoTestReport.xml + token: ${{ secrets.GITHUB_TOKEN }} + min-coverage-overall: 80 + min-coverage-changed-files: 80 + update-comment: true + debug-mode: true diff --git a/build.gradle b/build.gradle index d8c31c5d..ab37c477 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'jacoco' id 'org.springframework.boot' version '3.4.0' id 'io.spring.dependency-management' version '1.1.6' } @@ -39,6 +40,32 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' } +jacoco { + toolVersion = '0.8.9' +} + tasks.named('test') { useJUnitPlatform() + finalizedBy jacocoTestReport +} + +jacocoTestReport { + dependsOn test + reports { + xml.required.set(true) + csv.required.set(false) + html.required.set(false) + } + + afterEvaluate { + classDirectories.setFrom(files(classDirectories.files.collect { + fileTree(dir: it, exclude: [ + "com/debatetimer/**/dto/**" + ]) + })) + } + + onlyIf { + return System.getenv('TEST_REPORT') == 'true' + } } diff --git a/src/lombok.config b/src/lombok.config new file mode 100644 index 00000000..7a21e880 --- /dev/null +++ b/src/lombok.config @@ -0,0 +1 @@ +lombok.addLombokGeneratedAnnotation = true From 43329b9335e62fb8131dc119fe77fe7b272e19e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Tue, 17 Dec 2024 15:28:45 +0900 Subject: [PATCH 17/38] =?UTF-8?q?[CHORE]=20/noti=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=EC=97=90=20=EB=A9=98=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Comment_Notification.yml | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/.github/workflows/PR_Comment_Notification.yml b/.github/workflows/PR_Comment_Notification.yml index e62dabbd..436c2e15 100644 --- a/.github/workflows/PR_Comment_Notification.yml +++ b/.github/workflows/PR_Comment_Notification.yml @@ -1,4 +1,4 @@ -name: Discord Notification on PR Comment +name: Discord Notification on Issue & PR Comment on: issue_comment: @@ -47,8 +47,29 @@ jobs: echo "COMMENT_BODY=${{ github.event.issue.title }}" >> $GITHUB_ENV echo "TITLE=Issue" >> $GITHUB_ENV + - name : Set Discord Content + if: ${{ env.CONTENT }} + env: + CONTENT: ${{ env.CONTENT }} + run: | + IFS=',' read -r -a user_github_discord_pair <<< "${{ secrets.PAIR_GITHUB_DISCORD_USER }}" + IFS=',' read -r -a role_github_discord_pair <<< "${{ secrets.PAIR_GITHUB_DISCORD_ROLE }}" + content=$(echo "$CONTENT" | base64 --decode) + + for ((i = 0; i < ${#user_github_discord_pair[@]}; i += 2)); do + search=${user_github_discord_pair[i]} + replace=${user_github_discord_pair[i+1]} + content=$(echo "$content" | sed "s|@${search}|<@${replace}>|g") + done + for ((i = 0; i < ${#role_github_discord_pair[@]}; i += 2)); do + search=${role_github_discord_pair[i]} + replace=${role_github_discord_pair[i+1]} + content=$(echo "$content" | sed "s|@${search}|<@\&${replace}>|g") + done + echo "DISCORD_CONTENT=$(echo $content | base64 -w 0)" >> $GITHUB_ENV + - name: Notify Discord - if: ${{ env.COMMENT_AUTHOR && env.PR_URL && env.AUTHOR_URL && env.CONTENT && env.COMMENT_BODY }} + if: ${{ env.COMMENT_AUTHOR && env.PR_URL && env.AUTHOR_URL && env.DISCORD_CONTENT && env.COMMENT_BODY }} env: AVATAR_URL: ${{ env.AVATAR_URL }} COMMENT_BODY: ${{ env.COMMENT_BODY }} @@ -57,10 +78,10 @@ jobs: COMMENT_AUTHOR: ${{ env.COMMENT_AUTHOR }} PR_URL: ${{ env.PR_URL }} AUTHOR_URL: ${{ env.AUTHOR_URL }} - CONTENT: ${{ env.CONTENT }} + DISCORD_CONTENT: ${{ env.DISCORD_CONTENT }} TITLE: ${{ env.TITLE }} run: | - CONTENT_DECODED=$(echo "$CONTENT" | base64 --decode) + CONTENT_DECODED=$(echo "$DISCORD_CONTENT" | base64 --decode) if [ -n "$WEB_HOOK" ]; then JSON_PAYLOAD=$(jq -n \ --arg content "$CONTENT_DECODED" \ @@ -77,6 +98,9 @@ jobs: content: $content, username: $username, avatar_url: $avatar_url, + allowed_mentions: { + parse: ["users", "roles"] + }, embeds: [{ title: $title, url: $url, From 89fc1c0dbdeae9e60ef797281a64838c8332c1a9 Mon Sep 17 00:00:00 2001 From: SANGHUN OH <121424793+unifolio0@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:24:14 +0900 Subject: [PATCH 18/38] =?UTF-8?q?[TEST]=20BaseXXXTest=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=20=EC=84=B8=ED=8C=85=ED=95=98=EA=B8=B0=20(#30)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/debatetimer/BaseControllerTest.java | 20 ++++++++ .../com/debatetimer/BaseRepositoryTest.java | 7 +++ .../java/com/debatetimer/BaseServiceTest.java | 9 ++++ .../java/com/debatetimer/DataBaseCleaner.java | 48 +++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 src/test/java/com/debatetimer/BaseControllerTest.java create mode 100644 src/test/java/com/debatetimer/BaseRepositoryTest.java create mode 100644 src/test/java/com/debatetimer/BaseServiceTest.java create mode 100644 src/test/java/com/debatetimer/DataBaseCleaner.java diff --git a/src/test/java/com/debatetimer/BaseControllerTest.java b/src/test/java/com/debatetimer/BaseControllerTest.java new file mode 100644 index 00000000..38b802a4 --- /dev/null +++ b/src/test/java/com/debatetimer/BaseControllerTest.java @@ -0,0 +1,20 @@ +package com.debatetimer; + +import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; + +@ExtendWith(DataBaseCleaner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public abstract class BaseControllerTest { + + @LocalServerPort + private int port; + + @BeforeEach + void setPort() { + RestAssured.port = port; + } +} diff --git a/src/test/java/com/debatetimer/BaseRepositoryTest.java b/src/test/java/com/debatetimer/BaseRepositoryTest.java new file mode 100644 index 00000000..851a9f56 --- /dev/null +++ b/src/test/java/com/debatetimer/BaseRepositoryTest.java @@ -0,0 +1,7 @@ +package com.debatetimer; + +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +@DataJpaTest +public abstract class BaseRepositoryTest { +} diff --git a/src/test/java/com/debatetimer/BaseServiceTest.java b/src/test/java/com/debatetimer/BaseServiceTest.java new file mode 100644 index 00000000..c2a1b701 --- /dev/null +++ b/src/test/java/com/debatetimer/BaseServiceTest.java @@ -0,0 +1,9 @@ +package com.debatetimer; + +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.boot.test.context.SpringBootTest; + +@ExtendWith(DataBaseCleaner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +public abstract class BaseServiceTest { +} diff --git a/src/test/java/com/debatetimer/DataBaseCleaner.java b/src/test/java/com/debatetimer/DataBaseCleaner.java new file mode 100644 index 00000000..4e1bb9ee --- /dev/null +++ b/src/test/java/com/debatetimer/DataBaseCleaner.java @@ -0,0 +1,48 @@ +package com.debatetimer; + +import jakarta.persistence.EntityManager; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.transaction.support.TransactionTemplate; + +import java.util.List; + +public class DataBaseCleaner implements BeforeEachCallback { + + @Override + public void beforeEach(ExtensionContext extensionContext) throws Exception { + ApplicationContext context = SpringExtension.getApplicationContext(extensionContext); + cleanup(context); + } + + private void cleanup(ApplicationContext context) { + EntityManager em = context.getBean(EntityManager.class); + TransactionTemplate transactionTemplate = context.getBean(TransactionTemplate.class); + + transactionTemplate.execute(action -> { + em.clear(); + truncateTables(em); + return null; + }); + } + + private void truncateTables(EntityManager em) { + em.createNativeQuery("SET REFERENTIAL_INTEGRITY FALSE").executeUpdate(); + for (String tableName : findTableNames(em)) { + em.createNativeQuery("TRUNCATE TABLE %s RESTART IDENTITY".formatted(tableName)).executeUpdate(); + } + em.createNativeQuery("SET REFERENTIAL_INTEGRITY TRUE").executeUpdate(); + } + + @SuppressWarnings("unchecked") + private List findTableNames(EntityManager em) { + String tableNameSelectQuery = """ + SELECT TABLE_NAME + FROM INFORMATION_SCHEMA.TABLES + WHERE TABLE_SCHEMA = 'PUBLIC' + """; + return em.createNativeQuery(tableNameSelectQuery).getResultList(); + } +} From 5a2ce8bfd10f4d8e3d109860d1e74e605f641b76 Mon Sep 17 00:00:00 2001 From: SANGHUN OH <121424793+unifolio0@users.noreply.github.com> Date: Mon, 23 Dec 2024 13:48:19 +0900 Subject: [PATCH 19/38] =?UTF-8?q?[FEAT]=20Entity=20=EB=B0=8F=20DB=20?= =?UTF-8?q?=EC=84=B8=ED=8C=85=20(#32)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/debatetimer/domain/.gitkeep | 0 .../java/com/debatetimer/domain/BoxType.java | 10 +++ .../java/com/debatetimer/domain/Member.java | 40 +++++++++++ .../java/com/debatetimer/domain/Stance.java | 8 +++ .../ParliamentaryTable.java | 61 +++++++++++++++++ .../ParliamentaryTimeBox.java | 67 +++++++++++++++++++ src/main/resources/application-local.yml | 18 +++++ .../com/debatetimer/domain/MemberTest.java | 30 +++++++++ .../ParliamentaryTableTest.java | 42 ++++++++++++ .../ParliamentaryTimeBoxTest.java | 31 +++++++++ 10 files changed, 307 insertions(+) delete mode 100644 src/main/java/com/debatetimer/domain/.gitkeep create mode 100644 src/main/java/com/debatetimer/domain/BoxType.java create mode 100644 src/main/java/com/debatetimer/domain/Member.java create mode 100644 src/main/java/com/debatetimer/domain/Stance.java create mode 100644 src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTable.java create mode 100644 src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBox.java create mode 100644 src/test/java/com/debatetimer/domain/MemberTest.java create mode 100644 src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTableTest.java create mode 100644 src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBoxTest.java diff --git a/src/main/java/com/debatetimer/domain/.gitkeep b/src/main/java/com/debatetimer/domain/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/debatetimer/domain/BoxType.java b/src/main/java/com/debatetimer/domain/BoxType.java new file mode 100644 index 00000000..0018f886 --- /dev/null +++ b/src/main/java/com/debatetimer/domain/BoxType.java @@ -0,0 +1,10 @@ +package com.debatetimer.domain; + +public enum BoxType { + + OPENING, + REBUTTAL, + CROSS, + CLOSING, + TIME_OUT, +} diff --git a/src/main/java/com/debatetimer/domain/Member.java b/src/main/java/com/debatetimer/domain/Member.java new file mode 100644 index 00000000..bc46f53c --- /dev/null +++ b/src/main/java/com/debatetimer/domain/Member.java @@ -0,0 +1,40 @@ +package com.debatetimer.domain; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Member { + + private static final String NICKNAME_REGEX = "^[a-zA-Z가-힣]+$"; + public static final int NICKNAME_MAX_LENGTH = 10; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotNull + private String nickname; + + public Member(String nickname) { + validate(nickname); + this.nickname = nickname; + } + + private void validate(String nickname) { + if (nickname.isEmpty() || nickname.length() > NICKNAME_MAX_LENGTH) { + throw new IllegalArgumentException("닉네임은 1자 이상 %d자 이하여야 합니다".formatted(NICKNAME_MAX_LENGTH)); + } + if (!nickname.matches(NICKNAME_REGEX)) { + throw new IllegalArgumentException("닉네임은 영문/한글만 가능합니다"); + } + } +} diff --git a/src/main/java/com/debatetimer/domain/Stance.java b/src/main/java/com/debatetimer/domain/Stance.java new file mode 100644 index 00000000..bc9dc559 --- /dev/null +++ b/src/main/java/com/debatetimer/domain/Stance.java @@ -0,0 +1,8 @@ +package com.debatetimer.domain; + +public enum Stance { + + PROS, + CONS, + NEUTRAL, +} diff --git a/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTable.java b/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTable.java new file mode 100644 index 00000000..b6e58313 --- /dev/null +++ b/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTable.java @@ -0,0 +1,61 @@ +package com.debatetimer.domain.parliamentary_debate; + +import com.debatetimer.domain.Member; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ParliamentaryTable { + + private static final String NAME_REGEX = "^[a-zA-Z가-힣]+$"; + public static final int NAME_MAX_LENGTH = 20; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @NotNull + private String name; + + @NotNull + private String agenda; + + @NotNull + private int duration; + + public ParliamentaryTable(Member member, String name, String agenda, int duration) { + validate(name, duration); + this.member = member; + this.name = name; + this.agenda = agenda; + this.duration = duration; + } + + private void validate(String name, int duration) { + if (name.isEmpty() || name.length() > NAME_MAX_LENGTH) { + throw new IllegalArgumentException("테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(NAME_MAX_LENGTH)); + } + if (!name.matches(NAME_REGEX)) { + throw new IllegalArgumentException("테이블 이름은 영문/한글만 가능합니다"); + } + if (duration <= 0) { + throw new IllegalArgumentException("시간은 양수만 가능합니다"); + } + } +} diff --git a/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBox.java b/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBox.java new file mode 100644 index 00000000..d3152ec5 --- /dev/null +++ b/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBox.java @@ -0,0 +1,67 @@ +package com.debatetimer.domain.parliamentary_debate; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ParliamentaryTimeBox { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotNull + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "table_id") + private ParliamentaryTable parliamentaryTable; + + @NotNull + private int sequence; + + @NotNull + @Enumerated(EnumType.STRING) + private Stance stance; + + @NotNull + @Enumerated(EnumType.STRING) + private BoxType type; + + @NotNull + private int time; + + private Integer speaker; + + public ParliamentaryTimeBox(ParliamentaryTable parliamentaryTable, int sequence, Stance stance, BoxType type, int time, Integer speaker) { + validate(sequence, time); + this.parliamentaryTable = parliamentaryTable; + this.sequence = sequence; + this.stance = stance; + this.type = type; + this.time = time; + this.speaker = speaker; + } + + private void validate(int sequence, int time) { + if (sequence <= 0) { + throw new IllegalArgumentException("순서는 양수만 가능합니다"); + } + if (time <= 0) { + throw new IllegalArgumentException("시간은 양수만 가능합니다"); + } + } +} diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index e69de29b..3fc623ce 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -0,0 +1,18 @@ +spring: + datasource: + driver-class-name: org.h2.Driver + url: jdbc:h2:mem:database + username: sa + password: + h2: + console: + enabled: true + path: /h2-console + jpa: + show-sql: true + properties: + hibernate: + format_sql: true + hibernate: + ddl-auto: create-drop + defer-datasource-initialization: true diff --git a/src/test/java/com/debatetimer/domain/MemberTest.java b/src/test/java/com/debatetimer/domain/MemberTest.java new file mode 100644 index 00000000..c8f0e491 --- /dev/null +++ b/src/test/java/com/debatetimer/domain/MemberTest.java @@ -0,0 +1,30 @@ +package com.debatetimer.domain; + +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class MemberTest { + + @Nested + class Validate { + + @ParameterizedTest + @ValueSource(ints = {0, Member.NICKNAME_MAX_LENGTH + 1}) + void 닉네임은_정해진_길이_이내여야_한다(int length) { + assertThatThrownBy(() -> new Member("f".repeat(length))) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("닉네임은 1자 이상 %d자 이하여야 합니다".formatted(Member.NICKNAME_MAX_LENGTH)); + } + + @ParameterizedTest + @ValueSource(strings = {"abc12", "가나다12"}) + void 닉네임은_영문과_한글만_가능하다(String nickname) { + assertThatThrownBy(() -> new Member(nickname)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("닉네임은 영문/한글만 가능합니다"); + } + } +} diff --git a/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTableTest.java b/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTableTest.java new file mode 100644 index 00000000..48ef9776 --- /dev/null +++ b/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTableTest.java @@ -0,0 +1,42 @@ +package com.debatetimer.domain.parliamentary_debate; + +import com.debatetimer.domain.Member; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class ParliamentaryTableTest { + + @Nested + class Validate { + + @ParameterizedTest + @ValueSource(ints = {0, ParliamentaryTable.NAME_MAX_LENGTH + 1}) + void 테이블_이름은_정해진_길이_이내여야_한다(int length) { + Member member = new Member("member"); + assertThatThrownBy(() -> new ParliamentaryTable(member, "f".repeat(length), "agenda", 10)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(ParliamentaryTable.NAME_MAX_LENGTH)); + } + + @ParameterizedTest + @ValueSource(strings = {"abc12", "가나다12"}) + void 테이블_이름은_영문과_한글만_가능하다(String name) { + Member member = new Member("member"); + assertThatThrownBy(() -> new ParliamentaryTable(member, name, "agenda", 10)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("테이블 이름은 영문/한글만 가능합니다"); + } + + @Test + void 테이블_시간은_양수만_가능하다() { + Member member = new Member("member"); + assertThatThrownBy(() -> new ParliamentaryTable(member, "name", "agenda", 0)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("시간은 양수만 가능합니다"); + } + } +} diff --git a/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBoxTest.java b/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBoxTest.java new file mode 100644 index 00000000..3e88c545 --- /dev/null +++ b/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBoxTest.java @@ -0,0 +1,31 @@ +package com.debatetimer.domain.parliamentary_debate; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class ParliamentaryTimeBoxTest { + + @Nested + class Validate { + + @Test + void 순서는_양수만_가능하다() { + ParliamentaryTable table = new ParliamentaryTable(); + assertThatThrownBy(() -> new ParliamentaryTimeBox(table, 0, Stance.CONS, BoxType.OPENING, 10, 1)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("순서는 양수만 가능합니다"); + } + + @Test + void 시간은_양수만_가능하다() { + ParliamentaryTable table = new ParliamentaryTable(); + assertThatThrownBy(() -> new ParliamentaryTimeBox(table, 1, Stance.CONS, BoxType.OPENING, 0, 1)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("시간은 양수만 가능합니다"); + } + } +} From 09287ab26f644b5947e14deb1396c88711b06a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 27 Dec 2024 20:01:03 +0900 Subject: [PATCH 20/38] =?UTF-8?q?[FEAT]=20=EB=A9=A4=EB=B2=84=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20API=20=EA=B5=AC=ED=98=84=20(#34)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/debatetimer/controller/.gitkeep | 0 .../controller/member/MemberController.java | 34 +++++++++++ .../member/MemberControllerSwagger.java | 45 +++++++++++++++ .../domain/{ => member}/Member.java | 2 +- .../ParliamentaryTable.java | 8 +-- .../ParliamentaryTimeBox.java | 2 +- .../dto/member/MemberCreateRequest.java | 14 +++++ .../dto/member/MemberCreateResponse.java | 17 ++++++ .../debatetimer/dto/member/TableResponse.java | 20 +++++++ .../dto/member/TableResponses.java | 22 +++++++ .../com/debatetimer/dto/member/TableType.java | 7 +++ .../java/com/debatetimer/repository/.gitkeep | 0 .../repository/member/MemberRepository.java | 11 ++++ .../ParliamentaryTableRepository.java | 11 ++++ .../java/com/debatetimer/service/.gitkeep | 0 .../service/member/MemberService.java | 34 +++++++++++ .../com/debatetimer/BaseControllerTest.java | 9 +++ .../java/com/debatetimer/BaseServiceTest.java | 9 +++ .../member/MemberControllerTest.java | 57 +++++++++++++++++++ .../domain/{ => member}/MemberTest.java | 2 +- .../ParliamentaryTableTest.java | 38 +++++++++---- .../ParliamentaryTimeBoxTest.java | 2 +- .../service/member/MemberServiceTest.java | 52 +++++++++++++++++ 23 files changed, 378 insertions(+), 18 deletions(-) delete mode 100644 src/main/java/com/debatetimer/controller/.gitkeep create mode 100644 src/main/java/com/debatetimer/controller/member/MemberController.java create mode 100644 src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java rename src/main/java/com/debatetimer/domain/{ => member}/Member.java (96%) rename src/main/java/com/debatetimer/domain/{parliamentary_debate => parliamentary}/ParliamentaryTable.java (87%) rename src/main/java/com/debatetimer/domain/{parliamentary_debate => parliamentary}/ParliamentaryTimeBox.java (97%) create mode 100644 src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java create mode 100644 src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java create mode 100644 src/main/java/com/debatetimer/dto/member/TableResponse.java create mode 100644 src/main/java/com/debatetimer/dto/member/TableResponses.java create mode 100644 src/main/java/com/debatetimer/dto/member/TableType.java delete mode 100644 src/main/java/com/debatetimer/repository/.gitkeep create mode 100644 src/main/java/com/debatetimer/repository/member/MemberRepository.java create mode 100644 src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java delete mode 100644 src/main/java/com/debatetimer/service/.gitkeep create mode 100644 src/main/java/com/debatetimer/service/member/MemberService.java create mode 100644 src/test/java/com/debatetimer/controller/member/MemberControllerTest.java rename src/test/java/com/debatetimer/domain/{ => member}/MemberTest.java (96%) rename src/test/java/com/debatetimer/domain/{parliamentary_debate => parliamentary}/ParliamentaryTableTest.java (51%) rename src/test/java/com/debatetimer/domain/{parliamentary_debate => parliamentary}/ParliamentaryTimeBoxTest.java (95%) create mode 100644 src/test/java/com/debatetimer/service/member/MemberServiceTest.java diff --git a/src/main/java/com/debatetimer/controller/.gitkeep b/src/main/java/com/debatetimer/controller/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/debatetimer/controller/member/MemberController.java b/src/main/java/com/debatetimer/controller/member/MemberController.java new file mode 100644 index 00000000..7730699a --- /dev/null +++ b/src/main/java/com/debatetimer/controller/member/MemberController.java @@ -0,0 +1,34 @@ +package com.debatetimer.controller.member; + +import com.debatetimer.dto.member.MemberCreateRequest; +import com.debatetimer.dto.member.MemberCreateResponse; +import com.debatetimer.dto.member.TableResponses; +import com.debatetimer.service.member.MemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +public class MemberController implements MemberControllerSwagger{ + + private final MemberService memberService; + + @Override + @GetMapping("/api/table") + public TableResponses getTables(@RequestParam Long memberId) { + return memberService.getTables(memberId); + } + + @Override + @PostMapping("/api/member") + @ResponseStatus(HttpStatus.CREATED) + public MemberCreateResponse createMember(@RequestBody MemberCreateRequest request) { + return memberService.createMember(request); + } +} diff --git a/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java b/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java new file mode 100644 index 00000000..6db2b076 --- /dev/null +++ b/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java @@ -0,0 +1,45 @@ +package com.debatetimer.controller.member; + +import com.debatetimer.dto.member.MemberCreateRequest; +import com.debatetimer.dto.member.MemberCreateResponse; +import com.debatetimer.dto.member.TableResponses; +import com.debatetimer.swagger.annotation.ErrorCode400; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.parameters.RequestBody; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.tags.Tag; + +@Tag(name = "Member API") +public interface MemberControllerSwagger { + + @Operation( + summary = "멤버의 토론 시간표 조회", + responses = { + @ApiResponse( + responseCode = "200", + description = "멤버의 토론 시간표 조회 성공", + content = @Content(schema = @Schema(implementation = TableResponses.class)) + ) + } + ) + @ErrorCode400 + TableResponses getTables(Long memberId); + + @Operation( + summary = "멤버 생성", + requestBody = @RequestBody( + content = @Content(schema = @Schema(implementation = MemberCreateRequest.class)) + ), + responses = { + @ApiResponse( + responseCode = "201", + description = "멤버 생성 성공", + content = @Content(schema = @Schema(implementation = MemberCreateResponse.class)) + ) + } + ) + @ErrorCode400 + MemberCreateResponse createMember(MemberCreateRequest request); +} diff --git a/src/main/java/com/debatetimer/domain/Member.java b/src/main/java/com/debatetimer/domain/member/Member.java similarity index 96% rename from src/main/java/com/debatetimer/domain/Member.java rename to src/main/java/com/debatetimer/domain/member/Member.java index bc46f53c..4681a8bf 100644 --- a/src/main/java/com/debatetimer/domain/Member.java +++ b/src/main/java/com/debatetimer/domain/member/Member.java @@ -1,4 +1,4 @@ -package com.debatetimer.domain; +package com.debatetimer.domain.member; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTable.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java similarity index 87% rename from src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTable.java rename to src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java index b6e58313..86e49375 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTable.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java @@ -1,6 +1,6 @@ -package com.debatetimer.domain.parliamentary_debate; +package com.debatetimer.domain.parliamentary; -import com.debatetimer.domain.Member; +import com.debatetimer.domain.member.Member; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; @@ -18,7 +18,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class ParliamentaryTable { - private static final String NAME_REGEX = "^[a-zA-Z가-힣]+$"; + private static final String NAME_REGEX = "^[a-zA-Z가-힣 ]+$"; public static final int NAME_MAX_LENGTH = 20; @Id @@ -48,7 +48,7 @@ public ParliamentaryTable(Member member, String name, String agenda, int duratio } private void validate(String name, int duration) { - if (name.isEmpty() || name.length() > NAME_MAX_LENGTH) { + if (name.isBlank() || name.length() > NAME_MAX_LENGTH) { throw new IllegalArgumentException("테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(NAME_MAX_LENGTH)); } if (!name.matches(NAME_REGEX)) { diff --git a/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBox.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java similarity index 97% rename from src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBox.java rename to src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java index d3152ec5..38e86ac7 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBox.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java @@ -1,4 +1,4 @@ -package com.debatetimer.domain.parliamentary_debate; +package com.debatetimer.domain.parliamentary; import com.debatetimer.domain.BoxType; import com.debatetimer.domain.Stance; diff --git a/src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java b/src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java new file mode 100644 index 00000000..d8f9e0f2 --- /dev/null +++ b/src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java @@ -0,0 +1,14 @@ +package com.debatetimer.dto.member; + +import com.debatetimer.domain.member.Member; +import io.swagger.v3.oas.annotations.media.Schema; + +public record MemberCreateRequest( + @Schema(description = "멤버 닉네임", example = "콜리") + String nickname +) { + + public Member toMember() { + return new Member(nickname); + } +} diff --git a/src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java b/src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java new file mode 100644 index 00000000..3eafd93b --- /dev/null +++ b/src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java @@ -0,0 +1,17 @@ +package com.debatetimer.dto.member; + +import com.debatetimer.domain.member.Member; +import io.swagger.v3.oas.annotations.media.Schema; + +public record MemberCreateResponse( + @Schema(description = "멤버 아이디", example = "1") + long id, + + @Schema(description = "멤버 닉네임", example = "콜리") + String nickname +) { + + public MemberCreateResponse(Member member) { + this(member.getId(), member.getNickname()); + } +} diff --git a/src/main/java/com/debatetimer/dto/member/TableResponse.java b/src/main/java/com/debatetimer/dto/member/TableResponse.java new file mode 100644 index 00000000..288115d2 --- /dev/null +++ b/src/main/java/com/debatetimer/dto/member/TableResponse.java @@ -0,0 +1,20 @@ +package com.debatetimer.dto.member; + +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import io.swagger.v3.oas.annotations.media.Schema; + +public record TableResponse( + @Schema(description = "테이블 이름", example = "테이블1") + String name, + + @Schema(description = "토론 타입", example = "PARLIAMENTARY") + TableType type, + + @Schema(description = "소요 시간 (초 단위)", example = "1800") + int duration +) { + + public TableResponse(ParliamentaryTable parliamentaryTable) { + this(parliamentaryTable.getName(), TableType.PARLIAMENTARY, parliamentaryTable.getDuration()); + } +} diff --git a/src/main/java/com/debatetimer/dto/member/TableResponses.java b/src/main/java/com/debatetimer/dto/member/TableResponses.java new file mode 100644 index 00000000..a5c3b6b0 --- /dev/null +++ b/src/main/java/com/debatetimer/dto/member/TableResponses.java @@ -0,0 +1,22 @@ +package com.debatetimer.dto.member; + +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; + +public record TableResponses( + @ArraySchema(schema = @Schema(description = "테이블들", implementation = TableResponse.class)) + List tables +) { + + public static TableResponses from(List parliamentaryTables) { + return new TableResponses(toTableResponses(parliamentaryTables)); + } + + private static List toTableResponses(List parliamentaryTables) { + return parliamentaryTables.stream() + .map(TableResponse::new) + .toList(); + } +} diff --git a/src/main/java/com/debatetimer/dto/member/TableType.java b/src/main/java/com/debatetimer/dto/member/TableType.java new file mode 100644 index 00000000..4d634420 --- /dev/null +++ b/src/main/java/com/debatetimer/dto/member/TableType.java @@ -0,0 +1,7 @@ +package com.debatetimer.dto.member; + +public enum TableType { + + PARLIAMENTARY, + ; +} diff --git a/src/main/java/com/debatetimer/repository/.gitkeep b/src/main/java/com/debatetimer/repository/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/debatetimer/repository/member/MemberRepository.java b/src/main/java/com/debatetimer/repository/member/MemberRepository.java new file mode 100644 index 00000000..03330675 --- /dev/null +++ b/src/main/java/com/debatetimer/repository/member/MemberRepository.java @@ -0,0 +1,11 @@ +package com.debatetimer.repository.member; + +import com.debatetimer.domain.member.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberRepository extends JpaRepository { + + default Member getById(Long id) { + return findById(id).orElseThrow(() -> new IllegalArgumentException("해당 회원이 존재하지 않습니다")); + } +} diff --git a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java new file mode 100644 index 00000000..a2ac3356 --- /dev/null +++ b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java @@ -0,0 +1,11 @@ +package com.debatetimer.repository.parliamentary; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ParliamentaryTableRepository extends JpaRepository { + + List findAllByMember(Member member); +} diff --git a/src/main/java/com/debatetimer/service/.gitkeep b/src/main/java/com/debatetimer/service/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/debatetimer/service/member/MemberService.java b/src/main/java/com/debatetimer/service/member/MemberService.java new file mode 100644 index 00000000..d17e8c11 --- /dev/null +++ b/src/main/java/com/debatetimer/service/member/MemberService.java @@ -0,0 +1,34 @@ +package com.debatetimer.service.member; + +import com.debatetimer.dto.member.MemberCreateRequest; +import com.debatetimer.dto.member.MemberCreateResponse; +import com.debatetimer.dto.member.TableResponses; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.repository.member.MemberRepository; +import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; + private final ParliamentaryTableRepository parliamentaryTableRepository; + + @Transactional(readOnly = true) + public TableResponses getTables(Long memberId) { + Member member = memberRepository.getById(memberId); + List parliamentaryTable = parliamentaryTableRepository.findAllByMember(member); + return TableResponses.from(parliamentaryTable); + } + + @Transactional + public MemberCreateResponse createMember(MemberCreateRequest request) { + Member member = memberRepository.save(request.toMember()); + return new MemberCreateResponse(member); + } +} diff --git a/src/test/java/com/debatetimer/BaseControllerTest.java b/src/test/java/com/debatetimer/BaseControllerTest.java index 38b802a4..b9aceadf 100644 --- a/src/test/java/com/debatetimer/BaseControllerTest.java +++ b/src/test/java/com/debatetimer/BaseControllerTest.java @@ -1,8 +1,11 @@ package com.debatetimer; +import com.debatetimer.repository.member.MemberRepository; +import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import io.restassured.RestAssured; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; @@ -17,4 +20,10 @@ public abstract class BaseControllerTest { void setPort() { RestAssured.port = port; } + + @Autowired + protected MemberRepository memberRepository; + + @Autowired + protected ParliamentaryTableRepository parliamentaryTableRepository; } diff --git a/src/test/java/com/debatetimer/BaseServiceTest.java b/src/test/java/com/debatetimer/BaseServiceTest.java index c2a1b701..3d51eaa2 100644 --- a/src/test/java/com/debatetimer/BaseServiceTest.java +++ b/src/test/java/com/debatetimer/BaseServiceTest.java @@ -1,9 +1,18 @@ package com.debatetimer; +import com.debatetimer.repository.member.MemberRepository; +import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @ExtendWith(DataBaseCleaner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) public abstract class BaseServiceTest { + + @Autowired + protected MemberRepository memberRepository; + + @Autowired + protected ParliamentaryTableRepository parliamentaryTableRepository; } diff --git a/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java b/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java new file mode 100644 index 00000000..d6814082 --- /dev/null +++ b/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java @@ -0,0 +1,57 @@ +package com.debatetimer.controller.member; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.debatetimer.BaseControllerTest; +import com.debatetimer.dto.member.MemberCreateRequest; +import com.debatetimer.dto.member.MemberCreateResponse; +import com.debatetimer.dto.member.TableResponses; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +class MemberControllerTest extends BaseControllerTest { + + @Nested + class CreateMember { + + @Test + void 회원을_생성한다() { + MemberCreateRequest request = new MemberCreateRequest("커찬"); + + MemberCreateResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(request) + .when().post("/api/member") + .then().log().all() + .statusCode(201) + .extract().as(MemberCreateResponse.class); + + assertThat(response.nickname()).isEqualTo(request.nickname()); + } + } + + @Nested + class getTables { + + @Test + void 회원의_전체_토론_시간표를_조회한다() { + Member member = memberRepository.save(new Member("커찬")); + parliamentaryTableRepository.save(new ParliamentaryTable(member, "토론 시간표 A", "주제", 1800)); + parliamentaryTableRepository.save(new ParliamentaryTable(member, "토론 시간표 B", "주제", 1900)); + + TableResponses response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .queryParam("memberId", member.getId()) + .when().get("/api/table") + .then().log().all() + .statusCode(200) + .extract().as(TableResponses.class); + + assertThat(response.tables()).hasSize(2); + } + } +} diff --git a/src/test/java/com/debatetimer/domain/MemberTest.java b/src/test/java/com/debatetimer/domain/member/MemberTest.java similarity index 96% rename from src/test/java/com/debatetimer/domain/MemberTest.java rename to src/test/java/com/debatetimer/domain/member/MemberTest.java index c8f0e491..232b0f07 100644 --- a/src/test/java/com/debatetimer/domain/MemberTest.java +++ b/src/test/java/com/debatetimer/domain/member/MemberTest.java @@ -1,4 +1,4 @@ -package com.debatetimer.domain; +package com.debatetimer.domain.member; import org.junit.jupiter.api.Nested; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTableTest.java b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java similarity index 51% rename from src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTableTest.java rename to src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java index 48ef9776..79a900fa 100644 --- a/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTableTest.java +++ b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java @@ -1,18 +1,26 @@ -package com.debatetimer.domain.parliamentary_debate; +package com.debatetimer.domain.parliamentary; -import com.debatetimer.domain.Member; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import com.debatetimer.domain.member.Member; import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - class ParliamentaryTableTest { @Nested class Validate { + @ParameterizedTest + @ValueSource(strings = {"a bc가다", "가나 다ab"}) + void 테이블_이름은_영문과_한글_띄어쓰기만_가능하다(String name) { + Member member = new Member("member"); + assertThatCode(() -> new ParliamentaryTable(member, name, "agenda", 10)) + .doesNotThrowAnyException(); + } + @ParameterizedTest @ValueSource(ints = {0, ParliamentaryTable.NAME_MAX_LENGTH + 1}) void 테이블_이름은_정해진_길이_이내여야_한다(int length) { @@ -23,18 +31,28 @@ class Validate { } @ParameterizedTest - @ValueSource(strings = {"abc12", "가나다12"}) - void 테이블_이름은_영문과_한글만_가능하다(String name) { + @ValueSource(strings = {"", "\t", "\n"}) + void 테이블_이름은_적어도_한_자_있어야_한다(String name) { + Member member = new Member("member"); + assertThatThrownBy(() -> new ParliamentaryTable(member, name, "agenda", 10)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(ParliamentaryTable.NAME_MAX_LENGTH)); + } + + @ParameterizedTest + @ValueSource(strings = {"abc12", "가나다12", "abc\tde"}) + void 허용된_글자_이외의_문자는_불가능하다(String name) { Member member = new Member("member"); assertThatThrownBy(() -> new ParliamentaryTable(member, name, "agenda", 10)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("테이블 이름은 영문/한글만 가능합니다"); } - @Test - void 테이블_시간은_양수만_가능하다() { + @ParameterizedTest + @ValueSource(ints = {0, -1, -60}) + void 테이블_시간은_양수만_가능하다(int duration) { Member member = new Member("member"); - assertThatThrownBy(() -> new ParliamentaryTable(member, "name", "agenda", 0)) + assertThatThrownBy(() -> new ParliamentaryTable(member, "name", "agenda", duration)) .isInstanceOf(IllegalArgumentException.class) .hasMessage("시간은 양수만 가능합니다"); } diff --git a/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBoxTest.java b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java similarity index 95% rename from src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBoxTest.java rename to src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java index 3e88c545..41ac68ea 100644 --- a/src/test/java/com/debatetimer/domain/parliamentary_debate/ParliamentaryTimeBoxTest.java +++ b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java @@ -1,4 +1,4 @@ -package com.debatetimer.domain.parliamentary_debate; +package com.debatetimer.domain.parliamentary; import com.debatetimer.domain.BoxType; import com.debatetimer.domain.Stance; diff --git a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java new file mode 100644 index 00000000..14c02b2a --- /dev/null +++ b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java @@ -0,0 +1,52 @@ +package com.debatetimer.service.member; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +import com.debatetimer.BaseServiceTest; +import com.debatetimer.dto.member.MemberCreateRequest; +import com.debatetimer.dto.member.MemberCreateResponse; +import com.debatetimer.dto.member.TableResponses; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +class MemberServiceTest extends BaseServiceTest { + + @Autowired + private MemberService memberService; + + @Nested + class CreateMember { + + @Test + void 회원를_생성한다() { + MemberCreateRequest request = new MemberCreateRequest("커찬"); + + MemberCreateResponse actual = memberService.createMember(request); + + long memberCount = memberRepository.count(); + assertAll( + () -> assertThat(actual.nickname()).isEqualTo(request.nickname()), + () -> assertThat(memberCount).isEqualTo(1L) + ); + } + } + + @Nested + class GetTables { + + @Test + void 회원의_전체_토론_시간표를_조회한다() { + Member member = memberRepository.save(new Member("커찬")); + parliamentaryTableRepository.save(new ParliamentaryTable(member, "토론 시간표 A", "주제", 1800)); + parliamentaryTableRepository.save(new ParliamentaryTable(member, "토론 시간표 B", "주제", 1900)); + + TableResponses response = memberService.getTables(member.getId()); + + assertThat(response.tables()).hasSize(2); + } + } +} From b6bf707c31d33361216968e69f5c8558598c5aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 27 Dec 2024 20:14:49 +0900 Subject: [PATCH 21/38] =?UTF-8?q?[FIX]=20=EB=94=94=EC=8A=A4=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=95=8C=EB=A6=BC=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Comment_Notification.yml | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/PR_Comment_Notification.yml b/.github/workflows/PR_Comment_Notification.yml index 436c2e15..f8a2ebf5 100644 --- a/.github/workflows/PR_Comment_Notification.yml +++ b/.github/workflows/PR_Comment_Notification.yml @@ -13,8 +13,6 @@ jobs: steps: - name: Set Environment Variables run: | - echo "AVATAR_URL=${{ secrets.DISCORD_AVATAR_URL }}" >> $GITHUB_ENV - echo "USERNAME=디코봇" >> $GITHUB_ENV echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV - name: Set Environment Variables for PR Comments @@ -24,8 +22,8 @@ jobs: echo "PR_URL=${{ github.event.issue.pull_request.html_url }}" >> $GITHUB_ENV echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV - echo "COMMENT_BODY=${{ github.event.issue.title }}" >> $GITHUB_ENV - echo "TITLE=Pull Request" >> $GITHUB_ENV + echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV + echo "COMMENT_BODY=Pull Request" >> $GITHUB_ENV - name: Set Environment Variables for PR Review Comment if: ${{ contains(github.event.review.body, '/noti') }} @@ -34,8 +32,8 @@ jobs: echo "PR_URL=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV echo "AUTHOR_URL=${{ github.event.review.user.avatar_url }}" >> $GITHUB_ENV echo "CONTENT=$(echo '${{ github.event.review.body }}' | base64 -w 0)" >> $GITHUB_ENV - echo "COMMENT_BODY=${{ github.event.pull_request.title }}" >> $GITHUB_ENV - echo "TITLE=Pull Request" >> $GITHUB_ENV + echo "TITLE=${{ github.event.pull_request.title }}" >> $GITHUB_ENV + echo "COMMENT_BODY=Pull Request" >> $GITHUB_ENV - name: Set Environment Variables for Issue if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} @@ -44,8 +42,8 @@ jobs: echo "PR_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV - echo "COMMENT_BODY=${{ github.event.issue.title }}" >> $GITHUB_ENV - echo "TITLE=Issue" >> $GITHUB_ENV + echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV + echo "COMMENT_BODY=Issue" >> $GITHUB_ENV - name : Set Discord Content if: ${{ env.CONTENT }} @@ -71,9 +69,7 @@ jobs: - name: Notify Discord if: ${{ env.COMMENT_AUTHOR && env.PR_URL && env.AUTHOR_URL && env.DISCORD_CONTENT && env.COMMENT_BODY }} env: - AVATAR_URL: ${{ env.AVATAR_URL }} COMMENT_BODY: ${{ env.COMMENT_BODY }} - USERNAME: ${{ env.USERNAME }} WEB_HOOK: ${{ env.WEB_HOOK }} COMMENT_AUTHOR: ${{ env.COMMENT_AUTHOR }} PR_URL: ${{ env.PR_URL }} @@ -86,8 +82,6 @@ jobs: JSON_PAYLOAD=$(jq -n \ --arg content "$CONTENT_DECODED" \ --arg description "$COMMENT_BODY" \ - --arg username "$USERNAME" \ - --arg avatar_url "$AVATAR_URL" \ --arg title "$TITLE" \ --arg url "$PR_URL" \ --arg author_url "$AUTHOR_URL" \ @@ -96,8 +90,8 @@ jobs: --arg timestamp "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \ '{ content: $content, - username: $username, - avatar_url: $avatar_url, + username: $author_name, + avatar_url: $author_url, allowed_mentions: { parse: ["users", "roles"] }, From 70558ab7a8e245d6c5fc55db1b46a70e1db30fa2 Mon Sep 17 00:00:00 2001 From: GOEN WOO KIM <148152234+coli-geonwoo@users.noreply.github.com> Date: Fri, 27 Dec 2024 20:54:59 +0900 Subject: [PATCH 22/38] =?UTF-8?q?[CHORE]=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EB=B0=8F=20=ED=95=B8=EB=93=A4=EB=9F=AC=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20(#35)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: coli-geonwoo --- .../controller/exception/ErrorResponse.java | 13 +++ .../custom/DTClientErrorException.java | 10 ++ .../exception/custom/DTException.java | 15 +++ .../custom/DTServerErrorException.java | 10 ++ .../exception/errorcode/ClientErrorCode.java | 25 +++++ .../exception/errorcode/ErrorCode.java | 10 ++ .../exception/errorcode/ServerErrorCode.java | 19 ++++ .../handler/GlobalExceptionHandler.java | 99 +++++++++++++++++++ .../swagger/annotation/ErrorCode400.java | 4 +- .../swagger/annotation/ErrorCode401.java | 4 +- .../swagger/annotation/ErrorCode404.java | 4 +- .../swagger/annotation/ErrorCode500.java | 4 +- 12 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/debatetimer/controller/exception/ErrorResponse.java create mode 100644 src/main/java/com/debatetimer/controller/exception/custom/DTClientErrorException.java create mode 100644 src/main/java/com/debatetimer/controller/exception/custom/DTException.java create mode 100644 src/main/java/com/debatetimer/controller/exception/custom/DTServerErrorException.java create mode 100644 src/main/java/com/debatetimer/controller/exception/errorcode/ClientErrorCode.java create mode 100644 src/main/java/com/debatetimer/controller/exception/errorcode/ErrorCode.java create mode 100644 src/main/java/com/debatetimer/controller/exception/errorcode/ServerErrorCode.java create mode 100644 src/main/java/com/debatetimer/controller/exception/handler/GlobalExceptionHandler.java diff --git a/src/main/java/com/debatetimer/controller/exception/ErrorResponse.java b/src/main/java/com/debatetimer/controller/exception/ErrorResponse.java new file mode 100644 index 00000000..0f9f9398 --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/ErrorResponse.java @@ -0,0 +1,13 @@ +package com.debatetimer.controller.exception; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; + +@Schema(description = "예외 객체") +public record ErrorResponse( + @Schema(description = "사용자에게 보여줄 예외 메시지") + @NotBlank + String message +) { + +} diff --git a/src/main/java/com/debatetimer/controller/exception/custom/DTClientErrorException.java b/src/main/java/com/debatetimer/controller/exception/custom/DTClientErrorException.java new file mode 100644 index 00000000..f9dd78a8 --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/custom/DTClientErrorException.java @@ -0,0 +1,10 @@ +package com.debatetimer.controller.exception.custom; + +import com.debatetimer.controller.exception.errorcode.ClientErrorCode; + +public class DTClientErrorException extends DTException { + + public DTClientErrorException(ClientErrorCode clientErrorCode) { + super(clientErrorCode.getMessage(), clientErrorCode.getStatus()); + } +} diff --git a/src/main/java/com/debatetimer/controller/exception/custom/DTException.java b/src/main/java/com/debatetimer/controller/exception/custom/DTException.java new file mode 100644 index 00000000..ae4e0bc3 --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/custom/DTException.java @@ -0,0 +1,15 @@ +package com.debatetimer.controller.exception.custom; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public abstract class DTException extends RuntimeException { + + private final HttpStatus httpStatus; + + public DTException(String message, HttpStatus httpStatus) { + super(message); + this.httpStatus = httpStatus; + } +} diff --git a/src/main/java/com/debatetimer/controller/exception/custom/DTServerErrorException.java b/src/main/java/com/debatetimer/controller/exception/custom/DTServerErrorException.java new file mode 100644 index 00000000..3a46ac8a --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/custom/DTServerErrorException.java @@ -0,0 +1,10 @@ +package com.debatetimer.controller.exception.custom; + +import com.debatetimer.controller.exception.errorcode.ServerErrorCode; + +public class DTServerErrorException extends DTException { + + public DTServerErrorException(ServerErrorCode serverErrorCode) { + super(serverErrorCode.getMessage(), serverErrorCode.getStatus()); + } +} diff --git a/src/main/java/com/debatetimer/controller/exception/errorcode/ClientErrorCode.java b/src/main/java/com/debatetimer/controller/exception/errorcode/ClientErrorCode.java new file mode 100644 index 00000000..d696ea6b --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/errorcode/ClientErrorCode.java @@ -0,0 +1,25 @@ +package com.debatetimer.controller.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum ClientErrorCode implements ErrorCode { + + FIELD_ERROR(HttpStatus.BAD_REQUEST, "입력이 잘못되었습니다."), + URL_PARAMETER_ERROR(HttpStatus.BAD_REQUEST, "입력이 잘못되었습니다."), + METHOD_ARGUMENT_TYPE_MISMATCH(HttpStatus.BAD_REQUEST, "입력한 값의 타입이 잘못되었습니다."), + NO_RESOURCE_FOUND(HttpStatus.NOT_FOUND, "요청한 리소스를 찾을 수 없습니다."), + METHOD_NOT_SUPPORTED(HttpStatus.METHOD_NOT_ALLOWED, "허용되지 않은 메서드입니다."), + MEDIA_TYPE_NOT_SUPPORTED(HttpStatus.UNSUPPORTED_MEDIA_TYPE, "허용되지 않은 미디어 타입입니다."), + ALREADY_DISCONNECTED(HttpStatus.BAD_REQUEST, "이미 클라이언트에서 요청이 종료되었습니다."), + ; + + private final HttpStatus status; + private final String message; + + ClientErrorCode(HttpStatus status, String message) { + this.status = status; + this.message = message; + } +} diff --git a/src/main/java/com/debatetimer/controller/exception/errorcode/ErrorCode.java b/src/main/java/com/debatetimer/controller/exception/errorcode/ErrorCode.java new file mode 100644 index 00000000..d23c7ad5 --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/errorcode/ErrorCode.java @@ -0,0 +1,10 @@ +package com.debatetimer.controller.exception.errorcode; + +import org.springframework.http.HttpStatus; + +public interface ErrorCode { + + HttpStatus getStatus(); + + String getMessage(); +} diff --git a/src/main/java/com/debatetimer/controller/exception/errorcode/ServerErrorCode.java b/src/main/java/com/debatetimer/controller/exception/errorcode/ServerErrorCode.java new file mode 100644 index 00000000..c62d9b7e --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/errorcode/ServerErrorCode.java @@ -0,0 +1,19 @@ +package com.debatetimer.controller.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum ServerErrorCode implements ErrorCode { + + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 오류가 발생했습니다. 관리자에게 문의하세요."), + ; + + private final HttpStatus status; + private final String message; + + ServerErrorCode(HttpStatus status, String message) { + this.status = status; + this.message = message; + } +} diff --git a/src/main/java/com/debatetimer/controller/exception/handler/GlobalExceptionHandler.java b/src/main/java/com/debatetimer/controller/exception/handler/GlobalExceptionHandler.java new file mode 100644 index 00000000..2c3258ce --- /dev/null +++ b/src/main/java/com/debatetimer/controller/exception/handler/GlobalExceptionHandler.java @@ -0,0 +1,99 @@ +package com.debatetimer.controller.exception.handler; + +import com.debatetimer.controller.exception.ErrorResponse; +import com.debatetimer.controller.exception.custom.DTClientErrorException; +import com.debatetimer.controller.exception.custom.DTServerErrorException; +import com.debatetimer.controller.exception.errorcode.ClientErrorCode; +import com.debatetimer.controller.exception.errorcode.ErrorCode; +import com.debatetimer.controller.exception.errorcode.ServerErrorCode; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.apache.catalina.connector.ClientAbortException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindException; +import org.springframework.web.HttpMediaTypeNotSupportedException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; +import org.springframework.web.servlet.resource.NoResourceFoundException; + +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(BindException.class) + public ResponseEntity handleBindingException(BindException exception) { + log.warn("message: {}", exception.getMessage()); + return toResponse(ClientErrorCode.FIELD_ERROR); + } + + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity handleConstraintViolationException(ConstraintViolationException exception) { + log.warn("message: {}", exception.getMessage()); + return toResponse(ClientErrorCode.URL_PARAMETER_ERROR); + } + + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public ResponseEntity handleMethodArgumentTypeMismatchException( + MethodArgumentTypeMismatchException exception) { + log.warn("message: {}", exception.getMessage()); + return toResponse(ClientErrorCode.METHOD_ARGUMENT_TYPE_MISMATCH); + } + + @ExceptionHandler(ClientAbortException.class) + public ResponseEntity handleClientAbortException(ClientAbortException exception) { + log.warn("message: {}", exception.getMessage()); + return toResponse(ClientErrorCode.ALREADY_DISCONNECTED); + } + + @ExceptionHandler(HttpRequestMethodNotSupportedException.class) + public ResponseEntity handleHttpRequestMethodNotSupportedException( + HttpRequestMethodNotSupportedException exception + ) { + log.warn("message: {}", exception.getMessage()); + return toResponse(ClientErrorCode.METHOD_NOT_SUPPORTED); + } + + @ExceptionHandler(HttpMediaTypeNotSupportedException.class) + public ResponseEntity handleHttpMediaTypeNotSupportedException( + HttpMediaTypeNotSupportedException exception + ) { + log.warn("message: {}", exception.getMessage()); + return toResponse(ClientErrorCode.MEDIA_TYPE_NOT_SUPPORTED); + } + + @ExceptionHandler(NoResourceFoundException.class) + public ResponseEntity handleNoResourceFoundException(NoResourceFoundException exception) { + return toResponse(ClientErrorCode.NO_RESOURCE_FOUND); + } + + @ExceptionHandler(DTClientErrorException.class) + public ResponseEntity handleClientException(DTClientErrorException exception) { + log.warn("message: {}", exception.getMessage()); + return toResponse(exception.getHttpStatus(), exception.getMessage()); + } + + @ExceptionHandler(DTServerErrorException.class) + public ResponseEntity handleServerException(DTServerErrorException exception) { + log.warn("message: {}", exception.getMessage()); + return toResponse(exception.getHttpStatus(), exception.getMessage()); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception exception) { + log.error("exception: {}", exception); + return toResponse(ServerErrorCode.INTERNAL_SERVER_ERROR); + } + + private ResponseEntity toResponse(ErrorCode errorCode) { + return toResponse(errorCode.getStatus(), errorCode.getMessage()); + } + + private ResponseEntity toResponse(HttpStatus httpStatus, String message) { + ErrorResponse errorResponse = new ErrorResponse(message); + return ResponseEntity.status(httpStatus) + .body(errorResponse); + } +} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java index d9847236..19df8cf0 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java @@ -1,5 +1,6 @@ package com.debatetimer.swagger.annotation; +import com.debatetimer.controller.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -8,14 +9,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.core.annotation.AliasFor; -import org.springframework.http.ProblemDetail; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @ApiResponse( responseCode = "400", description = "클라이언트 입력 오류", - content = @Content(schema = @Schema(implementation = ProblemDetail.class)) + content = @Content(schema = @Schema(implementation = ErrorResponse.class)) ) public @interface ErrorCode400 { diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java index 1ed90c77..104f6069 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java @@ -1,5 +1,6 @@ package com.debatetimer.swagger.annotation; +import com.debatetimer.controller.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -8,14 +9,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.core.annotation.AliasFor; -import org.springframework.http.ProblemDetail; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @ApiResponse( responseCode = "401", description = "인증되지 않은 사용자", - content = @Content(schema = @Schema(implementation = ProblemDetail.class)) + content = @Content(schema = @Schema(implementation = ErrorResponse.class)) ) public @interface ErrorCode401 { diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java index 1656dcda..3cbd4f01 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java @@ -1,5 +1,6 @@ package com.debatetimer.swagger.annotation; +import com.debatetimer.controller.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -8,13 +9,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.core.annotation.AliasFor; -import org.springframework.http.ProblemDetail; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @ApiResponse( responseCode = "404", - content = @Content(schema = @Schema(implementation = ProblemDetail.class)) + content = @Content(schema = @Schema(implementation = ErrorResponse.class)) ) public @interface ErrorCode404 { diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java index d4d96ecf..280f73f3 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java @@ -1,5 +1,6 @@ package com.debatetimer.swagger.annotation; +import com.debatetimer.controller.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -8,14 +9,13 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.core.annotation.AliasFor; -import org.springframework.http.ProblemDetail; @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @ApiResponse( responseCode = "500", description = "서버 오류", - content = @Content(schema = @Schema(implementation = ProblemDetail.class)) + content = @Content(schema = @Schema(implementation = ErrorResponse.class)) ) public @interface ErrorCode500 { From 62ff4396dc05e11d2fdd01dc4fde6e838dea6b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B1=B4=EC=9A=B0?= Date: Wed, 1 Jan 2025 04:31:03 -0800 Subject: [PATCH 23/38] =?UTF-8?q?[FEAT]=20TimeBox=20CRUD=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20(#38)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/AuthMemberArgumentResolver.java | 44 ++++++ .../com/debatetimer/config/WebConfig.java | 20 +++ .../controller/auth/AuthMember.java | 12 ++ .../controller/member/MemberController.java | 9 +- .../member/MemberControllerSwagger.java | 3 +- .../ParliamentaryController.java | 62 ++++++++ .../ParliamentaryControllerSwagger.java | 79 ++++++++++ .../java/com/debatetimer/domain/BoxType.java | 21 ++- .../com/debatetimer/domain/member/Member.java | 2 +- .../parliamentary/ParliamentaryTable.java | 11 ++ .../parliamentary/ParliamentaryTimeBox.java | 11 +- .../parliamentary/ParliamentaryTimeBoxes.java | 19 +++ .../ParliamentaryTableCreateRequest.java | 35 +++++ .../request/TableInfoCreateRequest.java | 22 +++ .../request/TimeBoxCreateRequest.java | 38 +++++ .../response/ParliamentaryTableResponse.java | 37 +++++ .../response/TableInfoResponse.java | 17 ++ .../response/TimeBoxResponse.java | 27 ++++ .../exception/ErrorResponse.java | 2 +- .../custom/DTClientErrorException.java | 4 +- .../exception/custom/DTException.java | 2 +- .../custom/DTServerErrorException.java | 4 +- .../exception/errorcode/ClientErrorCode.java | 6 +- .../exception/errorcode/ErrorCode.java | 2 +- .../exception/errorcode/ServerErrorCode.java | 2 +- .../handler/GlobalExceptionHandler.java | 14 +- .../repository/member/MemberRepository.java | 5 +- .../ParliamentaryTableRepository.java | 7 + .../ParliamentaryTimeBoxRepository.java | 17 ++ .../service/member/MemberService.java | 4 +- .../parliamentary/ParliamentaryService.java | 88 +++++++++++ .../swagger/annotation/ErrorCode400.java | 2 +- .../swagger/annotation/ErrorCode401.java | 2 +- .../swagger/annotation/ErrorCode404.java | 2 +- .../swagger/annotation/ErrorCode500.java | 2 +- src/main/resources/application.yml | 1 + .../com/debatetimer/BaseControllerTest.java | 20 ++- .../com/debatetimer/BaseRepositoryTest.java | 7 + .../java/com/debatetimer/BaseServiceTest.java | 12 ++ .../java/com/debatetimer/DataBaseCleaner.java | 3 +- .../DebateTimerApplicationTest.java | 6 +- .../member/MemberControllerTest.java | 4 +- .../ParliamentaryControllerTest.java | 122 +++++++++++++++ .../debatetimer/domain/member/MemberTest.java | 12 +- .../ParliamentaryTimeBoxTest.java | 20 ++- .../ParliamentaryTimeBoxesTest.java | 32 ++++ .../com/debatetimer/fixture/DtoGenerator.java | 38 +++++ .../debatetimer/fixture/FixtureGenerator.java | 51 ++++++ .../ParliamentaryTableRepositoryTest.java | 58 +++++++ .../ParliamentaryTimeBoxRepositoryTest.java | 38 +++++ .../service/member/MemberServiceTest.java | 4 +- .../ParliamentaryServiceTest.java | 148 ++++++++++++++++++ 52 files changed, 1153 insertions(+), 57 deletions(-) create mode 100644 src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java create mode 100644 src/main/java/com/debatetimer/config/WebConfig.java create mode 100644 src/main/java/com/debatetimer/controller/auth/AuthMember.java create mode 100644 src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java create mode 100644 src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java create mode 100644 src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java create mode 100644 src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java create mode 100644 src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java create mode 100644 src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java create mode 100644 src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java create mode 100644 src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java create mode 100644 src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java rename src/main/java/com/debatetimer/{controller => }/exception/ErrorResponse.java (86%) rename src/main/java/com/debatetimer/{controller => }/exception/custom/DTClientErrorException.java (63%) rename src/main/java/com/debatetimer/{controller => }/exception/custom/DTException.java (85%) rename src/main/java/com/debatetimer/{controller => }/exception/custom/DTServerErrorException.java (63%) rename src/main/java/com/debatetimer/{controller => }/exception/errorcode/ClientErrorCode.java (76%) rename src/main/java/com/debatetimer/{controller => }/exception/errorcode/ErrorCode.java (70%) rename src/main/java/com/debatetimer/{controller => }/exception/errorcode/ServerErrorCode.java (89%) rename src/main/java/com/debatetimer/{controller => }/exception/handler/GlobalExceptionHandler.java (89%) create mode 100644 src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java create mode 100644 src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java create mode 100644 src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java create mode 100644 src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxesTest.java create mode 100644 src/test/java/com/debatetimer/fixture/DtoGenerator.java create mode 100644 src/test/java/com/debatetimer/fixture/FixtureGenerator.java create mode 100644 src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java create mode 100644 src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java create mode 100644 src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java diff --git a/src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java b/src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java new file mode 100644 index 00000000..ec404045 --- /dev/null +++ b/src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java @@ -0,0 +1,44 @@ +package com.debatetimer.config; + +import com.debatetimer.controller.auth.AuthMember; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.custom.DTException; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import com.debatetimer.repository.member.MemberRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.MethodParameter; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +@Slf4j +@RequiredArgsConstructor +public class AuthMemberArgumentResolver implements HandlerMethodArgumentResolver { + + private final MemberRepository memberRepository; + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.hasParameterAnnotation(AuthMember.class); + } + + @Override + public Object resolveArgument( + MethodParameter parameter, + ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, + WebDataBinderFactory binderFactory + ) { + try { + Long memberId = Long.parseLong(webRequest.getParameter("memberId")); + return memberRepository.getById(memberId); + } catch (DTException | NumberFormatException exception) { + log.warn(exception.getMessage()); + throw new DTClientErrorException(ClientErrorCode.UNAUTHORIZED_MEMBER); + } + } +} + + diff --git a/src/main/java/com/debatetimer/config/WebConfig.java b/src/main/java/com/debatetimer/config/WebConfig.java new file mode 100644 index 00000000..a983c443 --- /dev/null +++ b/src/main/java/com/debatetimer/config/WebConfig.java @@ -0,0 +1,20 @@ +package com.debatetimer.config; + +import com.debatetimer.repository.member.MemberRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@RequiredArgsConstructor +public class WebConfig implements WebMvcConfigurer { + + private final MemberRepository memberRepository; + + @Override + public void addArgumentResolvers(List argumentResolvers) { + argumentResolvers.add(new AuthMemberArgumentResolver(memberRepository)); + } +} diff --git a/src/main/java/com/debatetimer/controller/auth/AuthMember.java b/src/main/java/com/debatetimer/controller/auth/AuthMember.java new file mode 100644 index 00000000..3d34af2c --- /dev/null +++ b/src/main/java/com/debatetimer/controller/auth/AuthMember.java @@ -0,0 +1,12 @@ +package com.debatetimer.controller.auth; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface AuthMember { + +} diff --git a/src/main/java/com/debatetimer/controller/member/MemberController.java b/src/main/java/com/debatetimer/controller/member/MemberController.java index 7730699a..fc591008 100644 --- a/src/main/java/com/debatetimer/controller/member/MemberController.java +++ b/src/main/java/com/debatetimer/controller/member/MemberController.java @@ -1,5 +1,7 @@ package com.debatetimer.controller.member; +import com.debatetimer.controller.auth.AuthMember; +import com.debatetimer.domain.member.Member; import com.debatetimer.dto.member.MemberCreateRequest; import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; @@ -9,20 +11,19 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -public class MemberController implements MemberControllerSwagger{ +public class MemberController implements MemberControllerSwagger { private final MemberService memberService; @Override @GetMapping("/api/table") - public TableResponses getTables(@RequestParam Long memberId) { - return memberService.getTables(memberId); + public TableResponses getTables(@AuthMember Member member) { + return memberService.getTables(member.getId()); } @Override diff --git a/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java b/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java index 6db2b076..be4bb0bd 100644 --- a/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java +++ b/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java @@ -1,5 +1,6 @@ package com.debatetimer.controller.member; +import com.debatetimer.domain.member.Member; import com.debatetimer.dto.member.MemberCreateRequest; import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; @@ -25,7 +26,7 @@ public interface MemberControllerSwagger { } ) @ErrorCode400 - TableResponses getTables(Long memberId); + TableResponses getTables(Member member); @Operation( summary = "멤버 생성", diff --git a/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java b/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java new file mode 100644 index 00000000..3dd8f4da --- /dev/null +++ b/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java @@ -0,0 +1,62 @@ +package com.debatetimer.controller.parliamentary; + +import com.debatetimer.controller.auth.AuthMember; +import com.debatetimer.domain.member.Member; +import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; +import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; +import com.debatetimer.service.parliamentary.ParliamentaryService; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +public class ParliamentaryController implements ParliamentaryControllerSwagger { + + private final ParliamentaryService parliamentaryService; + + @PostMapping("/api/table/parliamentary") + @ResponseStatus(HttpStatus.CREATED) + public ParliamentaryTableResponse save( + @Valid @RequestBody ParliamentaryTableCreateRequest tableCreateRequest, + @AuthMember Member member + ) { + return parliamentaryService.save(tableCreateRequest, member); + } + + @GetMapping("/api/table/parliamentary/{tableId}") + @ResponseStatus(HttpStatus.OK) + public ParliamentaryTableResponse getTable( + @PathVariable Long tableId, + @AuthMember Member member + ) { + return parliamentaryService.findTable(tableId, member); + } + + @PutMapping("/api/table/parliamentary/{tableId}") + @ResponseStatus(HttpStatus.OK) + public ParliamentaryTableResponse updateTable( + @Valid @RequestBody ParliamentaryTableCreateRequest tableCreateRequest, + @PathVariable Long tableId, + @AuthMember Member member + ) { + return parliamentaryService.updateTable(tableCreateRequest, tableId, member); + } + + @DeleteMapping("/api/table/parliamentary/{tableId}") + @ResponseStatus(HttpStatus.NO_CONTENT) + public void deleteTable( + @PathVariable Long tableId, + @AuthMember Member member + ) { + parliamentaryService.deleteTable(tableId, member); + } +} diff --git a/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java b/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java new file mode 100644 index 00000000..fb5c573c --- /dev/null +++ b/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java @@ -0,0 +1,79 @@ +package com.debatetimer.controller.parliamentary; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; +import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; +import com.debatetimer.swagger.annotation.ErrorCode400; +import com.debatetimer.swagger.annotation.ErrorCode404; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.tags.Tag; + +@Tag(name = "ParliamentaryTable API") +public interface ParliamentaryControllerSwagger { + + @Operation( + summary = "새로운 의회식 토론 시간표 생성", + responses = { + @ApiResponse( + responseCode = "201", + description = "의회식 토론 시간표 생성 성공", + content = @Content(schema = @Schema(implementation = ParliamentaryTableResponse.class)) + ) + } + ) + @ErrorCode400 + ParliamentaryTableResponse save( + ParliamentaryTableCreateRequest tableCreateRequest, + @Parameter(hidden = true) Member member + ); + + @Operation( + summary = "의회식 토론 시간표 조회", + responses = { + @ApiResponse( + responseCode = "200", + description = "토론 시간표 조회 성공", + content = @Content(schema = @Schema(implementation = ParliamentaryTableResponse.class)) + ) + } + ) + @ErrorCode400 + @ErrorCode404(description = "회원 테이블이 없는 경우") + ParliamentaryTableResponse getTable( + Long tableId, + @Parameter(hidden = true) Member member + ); + + @Operation( + summary = "의회식 토론 시간표 수정", + responses = { + @ApiResponse( + responseCode = "200", + description = "의회식 토론 시간표 수정 성공", + content = @Content(schema = @Schema(implementation = ParliamentaryTableResponse.class)) + ) + } + ) + @ErrorCode400 + @ErrorCode404(description = "회원 테이블이 없는 경우") + ParliamentaryTableResponse updateTable( + ParliamentaryTableCreateRequest tableCreateRequest, + Long tableId, + @Parameter(hidden = true) Member member + ); + + @Operation( + summary = "의회식 토론 시간표 삭제", + responses = @ApiResponse(responseCode = "204", description = "의회식 토론 시간표 삭제 성공") + ) + @ErrorCode400 + @ErrorCode404(description = "회원 테이블이 없는 경우") + void deleteTable( + Long tableId, + @Parameter(hidden = true) Member member + ); +} diff --git a/src/main/java/com/debatetimer/domain/BoxType.java b/src/main/java/com/debatetimer/domain/BoxType.java index 0018f886..88771570 100644 --- a/src/main/java/com/debatetimer/domain/BoxType.java +++ b/src/main/java/com/debatetimer/domain/BoxType.java @@ -1,10 +1,21 @@ package com.debatetimer.domain; +import java.util.Set; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor public enum BoxType { - OPENING, - REBUTTAL, - CROSS, - CLOSING, - TIME_OUT, + OPENING(Set.of(Stance.PROS, Stance.CONS)), + REBUTTAL(Set.of(Stance.PROS, Stance.CONS)), + CROSS(Set.of(Stance.PROS, Stance.CONS)), + CLOSING(Set.of(Stance.PROS, Stance.CONS)), + TIME_OUT(Set.of(Stance.NEUTRAL)), + ; + + private final Set availableStances; + + public boolean isAvailable(Stance stance) { + return availableStances.contains(stance); + } } diff --git a/src/main/java/com/debatetimer/domain/member/Member.java b/src/main/java/com/debatetimer/domain/member/Member.java index 4681a8bf..4f1767ea 100644 --- a/src/main/java/com/debatetimer/domain/member/Member.java +++ b/src/main/java/com/debatetimer/domain/member/Member.java @@ -14,7 +14,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Member { - private static final String NICKNAME_REGEX = "^[a-zA-Z가-힣]+$"; + private static final String NICKNAME_REGEX = "^[a-zA-Z가-힣 ]+$"; public static final int NICKNAME_MAX_LENGTH = 10; @Id diff --git a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java index 86e49375..70f5a525 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java @@ -9,6 +9,7 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.validation.constraints.NotNull; +import java.util.Objects; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -58,4 +59,14 @@ private void validate(String name, int duration) { throw new IllegalArgumentException("시간은 양수만 가능합니다"); } } + + public void update(ParliamentaryTable renewTable) { + this.name = renewTable.getName(); + this.agenda = renewTable.getAgenda(); + this.duration = renewTable.getDuration(); + } + + public boolean isOwner(long memberId) { + return Objects.equals(this.member.getId(), memberId); + } } diff --git a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java index 38e86ac7..138bfcd8 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java @@ -46,8 +46,9 @@ public class ParliamentaryTimeBox { private Integer speaker; - public ParliamentaryTimeBox(ParliamentaryTable parliamentaryTable, int sequence, Stance stance, BoxType type, int time, Integer speaker) { - validate(sequence, time); + public ParliamentaryTimeBox(ParliamentaryTable parliamentaryTable, int sequence, Stance stance, BoxType type, + int time, Integer speaker) { + validate(sequence, time, stance, type); this.parliamentaryTable = parliamentaryTable; this.sequence = sequence; this.stance = stance; @@ -56,12 +57,16 @@ public ParliamentaryTimeBox(ParliamentaryTable parliamentaryTable, int sequence, this.speaker = speaker; } - private void validate(int sequence, int time) { + private void validate(int sequence, int time, Stance stance, BoxType boxType) { if (sequence <= 0) { throw new IllegalArgumentException("순서는 양수만 가능합니다"); } if (time <= 0) { throw new IllegalArgumentException("시간은 양수만 가능합니다"); } + + if (!boxType.isAvailable(stance)) { + throw new IllegalArgumentException("타임박스 유형과 일치하지 않는 입장입니다."); + } } } diff --git a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java new file mode 100644 index 00000000..b993443a --- /dev/null +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java @@ -0,0 +1,19 @@ +package com.debatetimer.domain.parliamentary; + +import java.util.Comparator; +import java.util.List; +import lombok.Getter; + +@Getter +public class ParliamentaryTimeBoxes { + + private static final Comparator TIME_BOX_COMPARATOR = Comparator + .comparing(ParliamentaryTimeBox::getSequence); + + private final List timeBoxes; + + public ParliamentaryTimeBoxes(List timeBoxes) { + timeBoxes.sort(TIME_BOX_COMPARATOR); + this.timeBoxes = timeBoxes; + } +} diff --git a/src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java b/src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java new file mode 100644 index 00000000..a2f6e16a --- /dev/null +++ b/src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java @@ -0,0 +1,35 @@ +package com.debatetimer.dto.parliamentary.request; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBoxes; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +public record ParliamentaryTableCreateRequest( + @Schema(description = "테이블 기본 정보", implementation = TableInfoCreateRequest.class) + TableInfoCreateRequest info, + + @ArraySchema(schema = @Schema(description = "테이블 타임박스들", implementation = TimeBoxCreateRequest.class)) + List table +) { + + public ParliamentaryTable toTable(Member member) { + return info.toTable(member, sumOfTime()); + } + + private int sumOfTime() { + return table.stream() + .mapToInt(TimeBoxCreateRequest::time) + .sum(); + } + + public ParliamentaryTimeBoxes toTimeBoxes(ParliamentaryTable parliamentaryTable) { + return IntStream.range(0, table.size()) + .mapToObj(i -> table.get(i).toTimeBox(parliamentaryTable, i + 1)) + .collect(Collectors.collectingAndThen(Collectors.toList(), ParliamentaryTimeBoxes::new)); + } +} diff --git a/src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java b/src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java new file mode 100644 index 00000000..a31b711d --- /dev/null +++ b/src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java @@ -0,0 +1,22 @@ +package com.debatetimer.dto.parliamentary.request; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record TableInfoCreateRequest( + @Schema(description = "테이블 이름", example = "테이블1") + @NotBlank + String name, + + @Schema(description = "토론 주제", example = "촉법소년 연령 인하") + @NotNull + String agenda +) { + + public ParliamentaryTable toTable(Member member, int duration) { + return new ParliamentaryTable(member, name, agenda, duration); + } +} diff --git a/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java b/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java new file mode 100644 index 00000000..02a78315 --- /dev/null +++ b/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java @@ -0,0 +1,38 @@ +package com.debatetimer.dto.parliamentary.request; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Positive; + +public record TimeBoxCreateRequest( + @Schema(description = "입장", example = "PROS") + @NotBlank + String stance, + + @Schema(description = "발언 유형", example = "OPENING") + @NotBlank + String type, + + @Schema(description = "발언 시간(초)", example = "175") + @Positive + int time, + + @Schema(description = "발언자 번호", example = "1", nullable = true) + Integer speakerNumber +) { + + public ParliamentaryTimeBox toTimeBox(ParliamentaryTable parliamentaryTable, int sequence) { + return new ParliamentaryTimeBox( + parliamentaryTable, + sequence, + Stance.valueOf(stance), + BoxType.valueOf(type), + time, + speakerNumber + ); + } +} diff --git a/src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java b/src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java new file mode 100644 index 00000000..a6c8eb84 --- /dev/null +++ b/src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java @@ -0,0 +1,37 @@ +package com.debatetimer.dto.parliamentary.response; + +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBoxes; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; + +public record ParliamentaryTableResponse( + @Schema(description = "테이블 아이디", example = "1") + long id, + + @Schema(description = "테이블 기본 정보", implementation = TableInfoResponse.class) + TableInfoResponse info, + + @ArraySchema(schema = @Schema(description = "타임박스들", implementation = TimeBoxResponse.class)) + List table +) { + + public ParliamentaryTableResponse( + ParliamentaryTable parliamentaryTable, + ParliamentaryTimeBoxes parliamentaryTimeBoxes + ) { + this( + parliamentaryTable.getId(), + new TableInfoResponse(parliamentaryTable), + toTimeBoxResponses(parliamentaryTimeBoxes) + ); + } + + private static List toTimeBoxResponses(ParliamentaryTimeBoxes parliamentaryTimeBoxes) { + return parliamentaryTimeBoxes.getTimeBoxes() + .stream() + .map(TimeBoxResponse::new) + .toList(); + } +} diff --git a/src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java b/src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java new file mode 100644 index 00000000..c7b37233 --- /dev/null +++ b/src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java @@ -0,0 +1,17 @@ +package com.debatetimer.dto.parliamentary.response; + +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import io.swagger.v3.oas.annotations.media.Schema; + +public record TableInfoResponse( + @Schema(description = "테이블 이름", example = "테이블1") + String name, + + @Schema(description = "토론 주제", example = "촉법소년 연령 인하") + String agenda +) { + + public TableInfoResponse(ParliamentaryTable parliamentaryTable) { + this(parliamentaryTable.getName(), parliamentaryTable.getAgenda()); + } +} diff --git a/src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java b/src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java new file mode 100644 index 00000000..0c11789a --- /dev/null +++ b/src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java @@ -0,0 +1,27 @@ +package com.debatetimer.dto.parliamentary.response; + +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import io.swagger.v3.oas.annotations.media.Schema; + +public record TimeBoxResponse( + @Schema(description = "입장", example = "PROS") + String stance, + + @Schema(description = "발언 유형", example = "OPENING") + String type, + + @Schema(description = "발언 시간(초)", example = "175") + int time, + + @Schema(description = "발언자 번호", example = "1", nullable = true) + Integer speakerNumber +) { + + public TimeBoxResponse(ParliamentaryTimeBox parliamentaryTimeBox) { + this(parliamentaryTimeBox.getStance().name(), + parliamentaryTimeBox.getType().name(), + parliamentaryTimeBox.getTime(), + parliamentaryTimeBox.getSpeaker() + ); + } +} diff --git a/src/main/java/com/debatetimer/controller/exception/ErrorResponse.java b/src/main/java/com/debatetimer/exception/ErrorResponse.java similarity index 86% rename from src/main/java/com/debatetimer/controller/exception/ErrorResponse.java rename to src/main/java/com/debatetimer/exception/ErrorResponse.java index 0f9f9398..aaafeb6d 100644 --- a/src/main/java/com/debatetimer/controller/exception/ErrorResponse.java +++ b/src/main/java/com/debatetimer/exception/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.debatetimer.controller.exception; +package com.debatetimer.exception; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/debatetimer/controller/exception/custom/DTClientErrorException.java b/src/main/java/com/debatetimer/exception/custom/DTClientErrorException.java similarity index 63% rename from src/main/java/com/debatetimer/controller/exception/custom/DTClientErrorException.java rename to src/main/java/com/debatetimer/exception/custom/DTClientErrorException.java index f9dd78a8..bd2b0e75 100644 --- a/src/main/java/com/debatetimer/controller/exception/custom/DTClientErrorException.java +++ b/src/main/java/com/debatetimer/exception/custom/DTClientErrorException.java @@ -1,6 +1,6 @@ -package com.debatetimer.controller.exception.custom; +package com.debatetimer.exception.custom; -import com.debatetimer.controller.exception.errorcode.ClientErrorCode; +import com.debatetimer.exception.errorcode.ClientErrorCode; public class DTClientErrorException extends DTException { diff --git a/src/main/java/com/debatetimer/controller/exception/custom/DTException.java b/src/main/java/com/debatetimer/exception/custom/DTException.java similarity index 85% rename from src/main/java/com/debatetimer/controller/exception/custom/DTException.java rename to src/main/java/com/debatetimer/exception/custom/DTException.java index ae4e0bc3..d2770e1c 100644 --- a/src/main/java/com/debatetimer/controller/exception/custom/DTException.java +++ b/src/main/java/com/debatetimer/exception/custom/DTException.java @@ -1,4 +1,4 @@ -package com.debatetimer.controller.exception.custom; +package com.debatetimer.exception.custom; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/debatetimer/controller/exception/custom/DTServerErrorException.java b/src/main/java/com/debatetimer/exception/custom/DTServerErrorException.java similarity index 63% rename from src/main/java/com/debatetimer/controller/exception/custom/DTServerErrorException.java rename to src/main/java/com/debatetimer/exception/custom/DTServerErrorException.java index 3a46ac8a..1e26c354 100644 --- a/src/main/java/com/debatetimer/controller/exception/custom/DTServerErrorException.java +++ b/src/main/java/com/debatetimer/exception/custom/DTServerErrorException.java @@ -1,6 +1,6 @@ -package com.debatetimer.controller.exception.custom; +package com.debatetimer.exception.custom; -import com.debatetimer.controller.exception.errorcode.ServerErrorCode; +import com.debatetimer.exception.errorcode.ServerErrorCode; public class DTServerErrorException extends DTException { diff --git a/src/main/java/com/debatetimer/controller/exception/errorcode/ClientErrorCode.java b/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java similarity index 76% rename from src/main/java/com/debatetimer/controller/exception/errorcode/ClientErrorCode.java rename to src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java index d696ea6b..1b10799d 100644 --- a/src/main/java/com/debatetimer/controller/exception/errorcode/ClientErrorCode.java +++ b/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java @@ -1,4 +1,4 @@ -package com.debatetimer.controller.exception.errorcode; +package com.debatetimer.exception.errorcode; import lombok.Getter; import org.springframework.http.HttpStatus; @@ -13,6 +13,10 @@ public enum ClientErrorCode implements ErrorCode { METHOD_NOT_SUPPORTED(HttpStatus.METHOD_NOT_ALLOWED, "허용되지 않은 메서드입니다."), MEDIA_TYPE_NOT_SUPPORTED(HttpStatus.UNSUPPORTED_MEDIA_TYPE, "허용되지 않은 미디어 타입입니다."), ALREADY_DISCONNECTED(HttpStatus.BAD_REQUEST, "이미 클라이언트에서 요청이 종료되었습니다."), + + TABLE_NOT_FOUND(HttpStatus.NOT_FOUND, "토론 테이블을 찾을 수 없습니다."), + NOT_TABLE_OWNER(HttpStatus.UNAUTHORIZED, "테이블을 소유한 회원이 아닙니다."), + UNAUTHORIZED_MEMBER(HttpStatus.UNAUTHORIZED, "접근 권한이 없습니다"), ; private final HttpStatus status; diff --git a/src/main/java/com/debatetimer/controller/exception/errorcode/ErrorCode.java b/src/main/java/com/debatetimer/exception/errorcode/ErrorCode.java similarity index 70% rename from src/main/java/com/debatetimer/controller/exception/errorcode/ErrorCode.java rename to src/main/java/com/debatetimer/exception/errorcode/ErrorCode.java index d23c7ad5..fc9fe3f4 100644 --- a/src/main/java/com/debatetimer/controller/exception/errorcode/ErrorCode.java +++ b/src/main/java/com/debatetimer/exception/errorcode/ErrorCode.java @@ -1,4 +1,4 @@ -package com.debatetimer.controller.exception.errorcode; +package com.debatetimer.exception.errorcode; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/debatetimer/controller/exception/errorcode/ServerErrorCode.java b/src/main/java/com/debatetimer/exception/errorcode/ServerErrorCode.java similarity index 89% rename from src/main/java/com/debatetimer/controller/exception/errorcode/ServerErrorCode.java rename to src/main/java/com/debatetimer/exception/errorcode/ServerErrorCode.java index c62d9b7e..ce05541b 100644 --- a/src/main/java/com/debatetimer/controller/exception/errorcode/ServerErrorCode.java +++ b/src/main/java/com/debatetimer/exception/errorcode/ServerErrorCode.java @@ -1,4 +1,4 @@ -package com.debatetimer.controller.exception.errorcode; +package com.debatetimer.exception.errorcode; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/debatetimer/controller/exception/handler/GlobalExceptionHandler.java b/src/main/java/com/debatetimer/exception/handler/GlobalExceptionHandler.java similarity index 89% rename from src/main/java/com/debatetimer/controller/exception/handler/GlobalExceptionHandler.java rename to src/main/java/com/debatetimer/exception/handler/GlobalExceptionHandler.java index 2c3258ce..a0d381c3 100644 --- a/src/main/java/com/debatetimer/controller/exception/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/debatetimer/exception/handler/GlobalExceptionHandler.java @@ -1,11 +1,11 @@ -package com.debatetimer.controller.exception.handler; +package com.debatetimer.exception.handler; -import com.debatetimer.controller.exception.ErrorResponse; -import com.debatetimer.controller.exception.custom.DTClientErrorException; -import com.debatetimer.controller.exception.custom.DTServerErrorException; -import com.debatetimer.controller.exception.errorcode.ClientErrorCode; -import com.debatetimer.controller.exception.errorcode.ErrorCode; -import com.debatetimer.controller.exception.errorcode.ServerErrorCode; +import com.debatetimer.exception.ErrorResponse; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.custom.DTServerErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import com.debatetimer.exception.errorcode.ErrorCode; +import com.debatetimer.exception.errorcode.ServerErrorCode; import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; import org.apache.catalina.connector.ClientAbortException; diff --git a/src/main/java/com/debatetimer/repository/member/MemberRepository.java b/src/main/java/com/debatetimer/repository/member/MemberRepository.java index 03330675..8fe49629 100644 --- a/src/main/java/com/debatetimer/repository/member/MemberRepository.java +++ b/src/main/java/com/debatetimer/repository/member/MemberRepository.java @@ -5,7 +5,8 @@ public interface MemberRepository extends JpaRepository { - default Member getById(Long id) { - return findById(id).orElseThrow(() -> new IllegalArgumentException("해당 회원이 존재하지 않습니다")); + default Member getById(long id) { + return findById(id) + .orElseThrow(() -> new IllegalArgumentException("해당 회원이 존재하지 않습니다")); } } diff --git a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java index a2ac3356..14f7fabf 100644 --- a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java +++ b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java @@ -2,10 +2,17 @@ import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; public interface ParliamentaryTableRepository extends JpaRepository { List findAllByMember(Member member); + + default ParliamentaryTable getById(long tableId) { + return findById(tableId) + .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.TABLE_NOT_FOUND)); + } } diff --git a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java new file mode 100644 index 00000000..74673d2d --- /dev/null +++ b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java @@ -0,0 +1,17 @@ +package com.debatetimer.repository.parliamentary; + +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBoxes; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ParliamentaryTimeBoxRepository extends JpaRepository { + + default ParliamentaryTimeBoxes findTableTimeBoxes(ParliamentaryTable table) { + List timeBoxes = findAllByParliamentaryTable(table); + return new ParliamentaryTimeBoxes(timeBoxes); + } + + List findAllByParliamentaryTable(ParliamentaryTable table); +} diff --git a/src/main/java/com/debatetimer/service/member/MemberService.java b/src/main/java/com/debatetimer/service/member/MemberService.java index d17e8c11..67a9ded9 100644 --- a/src/main/java/com/debatetimer/service/member/MemberService.java +++ b/src/main/java/com/debatetimer/service/member/MemberService.java @@ -1,10 +1,10 @@ package com.debatetimer.service.member; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.dto.member.MemberCreateRequest; import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; -import com.debatetimer.domain.member.Member; -import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.repository.member.MemberRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import java.util.List; diff --git a/src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java b/src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java new file mode 100644 index 00000000..d7a318d9 --- /dev/null +++ b/src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java @@ -0,0 +1,88 @@ +package com.debatetimer.service.parliamentary; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBoxes; +import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; +import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; +import com.debatetimer.repository.parliamentary.ParliamentaryTimeBoxRepository; +import jakarta.persistence.EntityManager; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ParliamentaryService { + + private final ParliamentaryTableRepository tableRepository; + private final ParliamentaryTimeBoxRepository timeBoxRepository; + private final EntityManager entityManager; + + @Transactional + public ParliamentaryTableResponse save(ParliamentaryTableCreateRequest tableCreateRequest, Member member) { + ParliamentaryTable table = tableCreateRequest.toTable(member); + ParliamentaryTable savedTable = tableRepository.save(table); + + ParliamentaryTimeBoxes savedTimeBoxes = saveTimeBoxes(tableCreateRequest, savedTable); + return new ParliamentaryTableResponse(savedTable, savedTimeBoxes); + } + + @Transactional(readOnly = true) + public ParliamentaryTableResponse findTable(long tableId, Member member) { + ParliamentaryTable table = getOwnerTable(tableId, member.getId()); + ParliamentaryTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(table); + return new ParliamentaryTableResponse(table, timeBoxes); + } + + @Transactional + public ParliamentaryTableResponse updateTable( + ParliamentaryTableCreateRequest tableCreateRequest, + long tableId, + Member member + ) { + ParliamentaryTable existingTable = getOwnerTable(tableId, member.getId()); + ParliamentaryTable renewedTable = tableCreateRequest.toTable(member); + existingTable.update(renewedTable); + + ParliamentaryTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(existingTable); + timeBoxRepository.deleteAllInBatch(timeBoxes.getTimeBoxes()); + ParliamentaryTimeBoxes savedTimeBoxes = saveTimeBoxes(tableCreateRequest, existingTable); + return new ParliamentaryTableResponse(existingTable, savedTimeBoxes); + } + + @Transactional + public void deleteTable(Long tableId, Member member) { + ParliamentaryTable table = getOwnerTable(tableId, member.getId()); + ParliamentaryTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(table); + timeBoxRepository.deleteAllInBatch(timeBoxes.getTimeBoxes()); + entityManager.clear(); + tableRepository.delete(table); + } + + private ParliamentaryTimeBoxes saveTimeBoxes( + ParliamentaryTableCreateRequest tableCreateRequest, + ParliamentaryTable table + ) { + ParliamentaryTimeBoxes timeBoxes = tableCreateRequest.toTimeBoxes(table); + List savedTimeBoxes = timeBoxRepository.saveAll(timeBoxes.getTimeBoxes()); + return new ParliamentaryTimeBoxes(savedTimeBoxes); + } + + private ParliamentaryTable getOwnerTable(long tableId, long memberId) { + ParliamentaryTable foundTable = tableRepository.getById(tableId); + validateOwn(foundTable, memberId); + return foundTable; + } + + private void validateOwn(ParliamentaryTable table, long memberId) { + if (!table.isOwner(memberId)) { + throw new DTClientErrorException(ClientErrorCode.NOT_TABLE_OWNER); + } + } +} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java index 19df8cf0..d4148c99 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java @@ -1,6 +1,6 @@ package com.debatetimer.swagger.annotation; -import com.debatetimer.controller.exception.ErrorResponse; +import com.debatetimer.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java index 104f6069..941e0a21 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java @@ -1,6 +1,6 @@ package com.debatetimer.swagger.annotation; -import com.debatetimer.controller.exception.ErrorResponse; +import com.debatetimer.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java index 3cbd4f01..61e1d440 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java @@ -1,6 +1,6 @@ package com.debatetimer.swagger.annotation; -import com.debatetimer.controller.exception.ErrorResponse; +import com.debatetimer.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java index 280f73f3..21bf7476 100644 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java +++ b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java @@ -1,6 +1,6 @@ package com.debatetimer.swagger.annotation; -import com.debatetimer.controller.exception.ErrorResponse; +import com.debatetimer.exception.ErrorResponse; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d05e3529..6fc036c7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,4 +14,5 @@ springdoc: enabled: true persist-authorization: true filter: true + override-with-generic-response: false diff --git a/src/test/java/com/debatetimer/BaseControllerTest.java b/src/test/java/com/debatetimer/BaseControllerTest.java index b9aceadf..c62a73d2 100644 --- a/src/test/java/com/debatetimer/BaseControllerTest.java +++ b/src/test/java/com/debatetimer/BaseControllerTest.java @@ -1,5 +1,7 @@ package com.debatetimer; +import com.debatetimer.fixture.DtoGenerator; +import com.debatetimer.fixture.FixtureGenerator; import com.debatetimer.repository.member.MemberRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import io.restassured.RestAssured; @@ -13,6 +15,18 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public abstract class BaseControllerTest { + @Autowired + protected MemberRepository memberRepository; + + @Autowired + protected ParliamentaryTableRepository parliamentaryTableRepository; + + @Autowired + protected FixtureGenerator fixtureGenerator; + + @Autowired + protected DtoGenerator dtoGenerator; + @LocalServerPort private int port; @@ -20,10 +34,4 @@ public abstract class BaseControllerTest { void setPort() { RestAssured.port = port; } - - @Autowired - protected MemberRepository memberRepository; - - @Autowired - protected ParliamentaryTableRepository parliamentaryTableRepository; } diff --git a/src/test/java/com/debatetimer/BaseRepositoryTest.java b/src/test/java/com/debatetimer/BaseRepositoryTest.java index 851a9f56..ac27f886 100644 --- a/src/test/java/com/debatetimer/BaseRepositoryTest.java +++ b/src/test/java/com/debatetimer/BaseRepositoryTest.java @@ -1,7 +1,14 @@ package com.debatetimer; +import com.debatetimer.fixture.FixtureGenerator; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.context.annotation.Import; +@Import({FixtureGenerator.class}) @DataJpaTest public abstract class BaseRepositoryTest { + + @Autowired + protected FixtureGenerator fixtureGenerator; } diff --git a/src/test/java/com/debatetimer/BaseServiceTest.java b/src/test/java/com/debatetimer/BaseServiceTest.java index 3d51eaa2..45f18cb2 100644 --- a/src/test/java/com/debatetimer/BaseServiceTest.java +++ b/src/test/java/com/debatetimer/BaseServiceTest.java @@ -1,7 +1,10 @@ package com.debatetimer; +import com.debatetimer.fixture.DtoGenerator; +import com.debatetimer.fixture.FixtureGenerator; import com.debatetimer.repository.member.MemberRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; +import com.debatetimer.repository.parliamentary.ParliamentaryTimeBoxRepository; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -15,4 +18,13 @@ public abstract class BaseServiceTest { @Autowired protected ParliamentaryTableRepository parliamentaryTableRepository; + + @Autowired + protected ParliamentaryTimeBoxRepository timeBoxRepository; + + @Autowired + protected FixtureGenerator fixtureGenerator; + + @Autowired + protected DtoGenerator dtoGenerator; } diff --git a/src/test/java/com/debatetimer/DataBaseCleaner.java b/src/test/java/com/debatetimer/DataBaseCleaner.java index 4e1bb9ee..3474ee83 100644 --- a/src/test/java/com/debatetimer/DataBaseCleaner.java +++ b/src/test/java/com/debatetimer/DataBaseCleaner.java @@ -1,14 +1,13 @@ package com.debatetimer; import jakarta.persistence.EntityManager; +import java.util.List; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.springframework.context.ApplicationContext; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.support.TransactionTemplate; -import java.util.List; - public class DataBaseCleaner implements BeforeEachCallback { @Override diff --git a/src/test/java/com/debatetimer/DebateTimerApplicationTest.java b/src/test/java/com/debatetimer/DebateTimerApplicationTest.java index 74e86662..aad9bc29 100644 --- a/src/test/java/com/debatetimer/DebateTimerApplicationTest.java +++ b/src/test/java/com/debatetimer/DebateTimerApplicationTest.java @@ -6,8 +6,8 @@ @SpringBootTest class DebateTimerApplicationTest { - @Test - void contextLoads() { - } + @Test + void contextLoads() { + } } diff --git a/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java b/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java index d6814082..77d8e662 100644 --- a/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java +++ b/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java @@ -3,11 +3,11 @@ import static org.assertj.core.api.Assertions.assertThat; import com.debatetimer.BaseControllerTest; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.dto.member.MemberCreateRequest; import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; -import com.debatetimer.domain.member.Member; -import com.debatetimer.domain.parliamentary.ParliamentaryTable; import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.junit.jupiter.api.Nested; diff --git a/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java new file mode 100644 index 00000000..5c02b3e5 --- /dev/null +++ b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java @@ -0,0 +1,122 @@ +package com.debatetimer.controller.parliamentary; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +import com.debatetimer.BaseControllerTest; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; +import com.debatetimer.dto.parliamentary.request.TableInfoCreateRequest; +import com.debatetimer.dto.parliamentary.request.TimeBoxCreateRequest; +import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import java.util.List; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +class ParliamentaryControllerTest extends BaseControllerTest { + + @Nested + class save { + + @Test + void 토론_테이블을_생성한다() { + Member bito = fixtureGenerator.generateMember("비토"); + ParliamentaryTableCreateRequest bitoTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest("비토 테이블"); + TableInfoCreateRequest requestTableInfo = bitoTableRequest.info(); + List requestTimeBoxes = bitoTableRequest.table(); + + ParliamentaryTableResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .queryParam("memberId", bito.getId()) + .body(bitoTableRequest) + .when().post("/api/table/parliamentary") + .then().log().all() + .statusCode(201) + .extract().as(ParliamentaryTableResponse.class); + + assertAll( + () -> assertThat(response.info().name()).isEqualTo(requestTableInfo.name()), + () -> assertThat(response.table()).hasSize(requestTimeBoxes.size()) + ); + } + } + + @Nested + class getTable { + + @Test + void 의회식_테이블을_조회한다() { + Member bito = fixtureGenerator.generateMember("비토"); + ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); + fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 1); + fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); + + ParliamentaryTableResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .queryParam("memberId", bito.getId()) + .pathParam("tableId", bitoTable.getId()) + .when().get("/api/table/parliamentary/{tableId}") + .then().log().all() + .statusCode(200) + .extract().as(ParliamentaryTableResponse.class); + + assertAll( + () -> assertThat(response.id()).isEqualTo(bitoTable.getId()), + () -> assertThat(response.table()).hasSize(2) + ); + } + } + + @Nested + class updateTable { + + @Test + void 의회식_토론_테이블을_업데이트한다() { + Member bito = fixtureGenerator.generateMember("커찬"); + ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); + ParliamentaryTableCreateRequest renewTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( + "새로운 테이블"); + TableInfoCreateRequest renewTableInfo = renewTableRequest.info(); + List renewTimeBoxes = renewTableRequest.table(); + + ParliamentaryTableResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .queryParam("memberId", bito.getId()) + .pathParam("tableId", bitoTable.getId()) + .body(renewTableRequest) + .when().put("/api/table/parliamentary/{tableId}") + .then().log().all() + .statusCode(200) + .extract().as(ParliamentaryTableResponse.class); + + assertAll( + () -> assertThat(response.id()).isEqualTo(bitoTable.getId()), + () -> assertThat(response.info().name()).isEqualTo(renewTableInfo.name()), + () -> assertThat(response.table()).hasSize(renewTimeBoxes.size()) + ); + } + } + + @Nested + class deleteTable { + + @Test + void 의회식_토론_테이블을_삭제한다() { + Member bito = fixtureGenerator.generateMember("비토"); + ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); + fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 1); + fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .queryParam("memberId", bito.getId()) + .pathParam("tableId", bitoTable.getId()) + .when().delete("/api/table/parliamentary/{tableId}") + .then().log().all() + .statusCode(204); + } + } +} diff --git a/src/test/java/com/debatetimer/domain/member/MemberTest.java b/src/test/java/com/debatetimer/domain/member/MemberTest.java index 232b0f07..1642a72c 100644 --- a/src/test/java/com/debatetimer/domain/member/MemberTest.java +++ b/src/test/java/com/debatetimer/domain/member/MemberTest.java @@ -1,16 +1,24 @@ package com.debatetimer.domain.member; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import org.junit.jupiter.api.Nested; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - class MemberTest { @Nested class Validate { + @ParameterizedTest + @ValueSource(strings = {"a bc가다", "가나 다ab"}) + void 닉네임은_영문과_한글_띄어쓰기만_가능하다(String nickname) { + assertThatCode(() -> new Member(nickname)) + .doesNotThrowAnyException(); + } + @ParameterizedTest @ValueSource(ints = {0, Member.NICKNAME_MAX_LENGTH + 1}) void 닉네임은_정해진_길이_이내여야_한다(int length) { diff --git a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java index 41ac68ea..7681f484 100644 --- a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java +++ b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java @@ -1,12 +1,13 @@ package com.debatetimer.domain.parliamentary; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.debatetimer.domain.BoxType; import com.debatetimer.domain.Stance; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - class ParliamentaryTimeBoxTest { @Nested @@ -27,5 +28,20 @@ class Validate { .isInstanceOf(IllegalArgumentException.class) .hasMessage("시간은 양수만 가능합니다"); } + + @Test + void 박스타입에_가능한_입장을_검증한다() { + ParliamentaryTable table = new ParliamentaryTable(); + assertThatCode(() -> new ParliamentaryTimeBox(table, 1, Stance.CONS, BoxType.OPENING, 10, 1)) + .doesNotThrowAnyException(); + } + + @Test + void 박스타입에_불가한_입장으로_생성을_시도하면_예외를_발생시킨다() { + ParliamentaryTable table = new ParliamentaryTable(); + assertThatThrownBy(() -> new ParliamentaryTimeBox(table, 1, Stance.NEUTRAL, BoxType.OPENING, 10, 1)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("타임박스 유형과 일치하지 않는 입장입니다."); + } } } diff --git a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxesTest.java b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxesTest.java new file mode 100644 index 00000000..9376f493 --- /dev/null +++ b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxesTest.java @@ -0,0 +1,32 @@ +package com.debatetimer.domain.parliamentary; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import com.debatetimer.domain.member.Member; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +class ParliamentaryTimeBoxesTest { + + @Nested + class SortedBySequence { + + @Test + void 타임박스의_순서에_따라_정렬된다() { + Member member = new Member("콜리"); + ParliamentaryTable testTable = new ParliamentaryTable(member, "토론 테이블", "주제", 1800); + ParliamentaryTimeBox firstBox = new ParliamentaryTimeBox(testTable, 1, Stance.PROS, BoxType.OPENING, 300, 1); + ParliamentaryTimeBox secondBox = new ParliamentaryTimeBox(testTable, 2, Stance.PROS, BoxType.OPENING, 300, 1); + List timeBoxes = new ArrayList<>(Arrays.asList(secondBox, firstBox)); + + ParliamentaryTimeBoxes actual = new ParliamentaryTimeBoxes(timeBoxes); + + assertThat(actual.getTimeBoxes()).containsExactly(firstBox, secondBox); + } + } +} diff --git a/src/test/java/com/debatetimer/fixture/DtoGenerator.java b/src/test/java/com/debatetimer/fixture/DtoGenerator.java new file mode 100644 index 00000000..6f66a328 --- /dev/null +++ b/src/test/java/com/debatetimer/fixture/DtoGenerator.java @@ -0,0 +1,38 @@ +package com.debatetimer.fixture; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; +import com.debatetimer.dto.parliamentary.request.TableInfoCreateRequest; +import com.debatetimer.dto.parliamentary.request.TimeBoxCreateRequest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.springframework.stereotype.Component; + +@Component +public class DtoGenerator { + + public TableInfoCreateRequest generateTableInfoCreateRequest(String tableName) { + return new TableInfoCreateRequest(tableName, "주제"); + } + + public List generateTimeBoxCreateRequests() { + return new ArrayList<>( + Arrays.asList( + generateTimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 180), + generateTimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 180) + ) + ); + } + + public TimeBoxCreateRequest generateTimeBoxCreateRequest(Stance stance, BoxType boxType, int time) { + return new TimeBoxCreateRequest(stance.name(), boxType.name(), time, 1); + } + + public ParliamentaryTableCreateRequest generateParliamentaryTableCreateRequest(String tableName) { + TableInfoCreateRequest tableInfoCreateRequest = generateTableInfoCreateRequest(tableName); + List timeBoxCreateRequests = generateTimeBoxCreateRequests(); + return new ParliamentaryTableCreateRequest(tableInfoCreateRequest, timeBoxCreateRequests); + } +} diff --git a/src/test/java/com/debatetimer/fixture/FixtureGenerator.java b/src/test/java/com/debatetimer/fixture/FixtureGenerator.java new file mode 100644 index 00000000..8df35183 --- /dev/null +++ b/src/test/java/com/debatetimer/fixture/FixtureGenerator.java @@ -0,0 +1,51 @@ +package com.debatetimer.fixture; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import com.debatetimer.repository.member.MemberRepository; +import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; +import com.debatetimer.repository.parliamentary.ParliamentaryTimeBoxRepository; +import org.springframework.stereotype.Component; + +@Component +public class FixtureGenerator { + + private final MemberRepository memberRepository; + private final ParliamentaryTableRepository parliamentaryTableRepository; + private final ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository; + + public FixtureGenerator( + MemberRepository memberRepository, + ParliamentaryTableRepository parliamentaryTableRepository, + ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository + ) { + this.memberRepository = memberRepository; + this.parliamentaryTableRepository = parliamentaryTableRepository; + this.parliamentaryTimeBoxRepository = parliamentaryTimeBoxRepository; + } + + public Member generateMember(String nickname) { + return memberRepository.save(new Member(nickname)); + } + + public Member generateMember() { + return generateMember("테스트용 멤버"); + } + + public ParliamentaryTable generateParliamentaryTable(Member member) { + ParliamentaryTable table = new ParliamentaryTable(member, "토론 테이블", "주제", 1800); + return parliamentaryTableRepository.save(table); + } + + public ParliamentaryTable generateParliamentaryTable() { + return generateParliamentaryTable(generateMember()); + } + + public ParliamentaryTimeBox generateParliamentaryTimeBox(ParliamentaryTable testTable, int sequence) { + ParliamentaryTimeBox timeBox = new ParliamentaryTimeBox(testTable, sequence, Stance.PROS, BoxType.OPENING, 180, 1); + return parliamentaryTimeBoxRepository.save(timeBox); + } +} diff --git a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java new file mode 100644 index 00000000..eb065556 --- /dev/null +++ b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java @@ -0,0 +1,58 @@ +package com.debatetimer.repository.parliamentary; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import com.debatetimer.BaseRepositoryTest; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import java.util.List; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +class ParliamentaryTableRepositoryTest extends BaseRepositoryTest { + + @Autowired + private ParliamentaryTableRepository tableRepository; + + @Nested + class findAllByMember { + + @Test + void 특정_회원의_테이블만_조회한다() { + Member chan = fixtureGenerator.generateMember("커찬"); + Member bito = fixtureGenerator.generateMember("비토"); + ParliamentaryTable chanTable1 = fixtureGenerator.generateParliamentaryTable(chan); + ParliamentaryTable chanTable2 = fixtureGenerator.generateParliamentaryTable(chan); + ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); + + List foundKeoChanTables = tableRepository.findAllByMember(chan); + + assertThat(foundKeoChanTables).containsExactly(chanTable1, chanTable2); + } + } + + @Nested + class getById { + + @Test + void 특정_아이디의_테이블을_조회한다() { + Member chan = fixtureGenerator.generateMember("커찬"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + + ParliamentaryTable foundChanTable = tableRepository.getById(chanTable.getId()); + + assertThat(foundChanTable).usingRecursiveComparison().isEqualTo(chanTable); + } + + @Test + void 특정_아이디의_테이블이_없으면_에러를_발생시킨다() { + assertThatThrownBy(() -> tableRepository.getById(1L)) + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.TABLE_NOT_FOUND.getMessage()); + } + } +} diff --git a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java new file mode 100644 index 00000000..bc7f6e60 --- /dev/null +++ b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java @@ -0,0 +1,38 @@ +package com.debatetimer.repository.parliamentary; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.debatetimer.BaseRepositoryTest; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import java.util.List; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +class ParliamentaryTimeBoxRepositoryTest extends BaseRepositoryTest { + + @Autowired + private ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository; + + @Nested + class findAllByParliamentaryTable { + + @Test + void 특정_테이블의_타임박스를_모두_조회한다() { + Member chan = fixtureGenerator.generateMember("커찬"); + Member bito = fixtureGenerator.generateMember("비토"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); + ParliamentaryTimeBox chanBox1 = fixtureGenerator.generateParliamentaryTimeBox(chanTable, 1); + ParliamentaryTimeBox chanBox2 = fixtureGenerator.generateParliamentaryTimeBox(chanTable, 2); + ParliamentaryTimeBox bitoBox1 = fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); + ParliamentaryTimeBox bitoBox2 = fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); + + List foundBoxes = parliamentaryTimeBoxRepository.findAllByParliamentaryTable(chanTable); + + assertThat(foundBoxes).containsExactly(chanBox1, chanBox2); + } + } +} diff --git a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java index 14c02b2a..44937deb 100644 --- a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java +++ b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java @@ -4,11 +4,11 @@ import static org.junit.jupiter.api.Assertions.assertAll; import com.debatetimer.BaseServiceTest; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.dto.member.MemberCreateRequest; import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; -import com.debatetimer.domain.member.Member; -import com.debatetimer.domain.parliamentary.ParliamentaryTable; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java new file mode 100644 index 00000000..553d3ccf --- /dev/null +++ b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java @@ -0,0 +1,148 @@ +package com.debatetimer.service.parliamentary; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertAll; + +import com.debatetimer.BaseServiceTest; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; +import com.debatetimer.dto.parliamentary.request.TableInfoCreateRequest; +import com.debatetimer.dto.parliamentary.request.TimeBoxCreateRequest; +import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import java.util.List; +import java.util.Optional; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +class ParliamentaryServiceTest extends BaseServiceTest { + + @Autowired + private ParliamentaryService parliamentaryService; + + @Nested + class save { + + @Test + void 의회식_토론_테이블을_생성한다() { + Member chan = fixtureGenerator.generateMember("커찬"); + ParliamentaryTableCreateRequest chanTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( + "커찬의 토론 테이블"); + TableInfoCreateRequest requestTableInfo = chanTableRequest.info(); + List requestTimeBoxes = chanTableRequest.table(); + + ParliamentaryTableResponse savedTableResponse = parliamentaryService.save(chanTableRequest, chan); + Optional foundTable = parliamentaryTableRepository.findById(savedTableResponse.id()); + List foundTimeBoxes = timeBoxRepository.findAllByParliamentaryTable(foundTable.get()); + + assertAll( + () -> assertThat(foundTable.get().getName()).isEqualTo(requestTableInfo.name()), + () -> assertThat(foundTimeBoxes).hasSize(requestTimeBoxes.size()) + ); + } + } + + @Nested + class findTable { + + @Test + void 의회식_토론_테이블을_조회한다() { + Member chan = fixtureGenerator.generateMember("커찬"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + fixtureGenerator.generateParliamentaryTimeBox(chanTable, 1); + fixtureGenerator.generateParliamentaryTimeBox(chanTable, 2); + + ParliamentaryTableResponse foundResponse = parliamentaryService.findTable(chanTable.getId(), chan); + + assertAll( + () -> assertThat(foundResponse.id()).isEqualTo(chanTable.getId()), + () -> assertThat(foundResponse.table()).hasSize(2) + ); + } + + @Test + void 회원_소유가_아닌_테이블_조회_시_예외를_발생시킨다() { + Member chan = fixtureGenerator.generateMember("커찬"); + Member coli = fixtureGenerator.generateMember("콜리"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + + assertThatThrownBy(() -> parliamentaryService.findTable(chanTable.getId(), coli)) + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.NOT_TABLE_OWNER.getMessage()); + } + } + + @Nested + class updateTable { + + @Test + void 의회식_토론_테이블을_수정한다() { + Member chan = fixtureGenerator.generateMember("커찬"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + ParliamentaryTableCreateRequest renewTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( + "새로운 테이블"); + TableInfoCreateRequest renewTableInfo = renewTableRequest.info(); + List renewTimeBoxes = renewTableRequest.table(); + + ParliamentaryTableResponse updatedTable = parliamentaryService.updateTable(renewTableRequest, + chanTable.getId(), chan); + + assertAll( + () -> assertThat(updatedTable.id()).isEqualTo(chanTable.getId()), + () -> assertThat(updatedTable.info().name()).isEqualTo(renewTableInfo.name()), + () -> assertThat(updatedTable.table()).hasSize(renewTimeBoxes.size()) + ); + } + + @Test + void 회원_소유가_아닌_테이블_수정_시_예외를_발생시킨다() { + Member chan = fixtureGenerator.generateMember("커찬"); + Member coli = fixtureGenerator.generateMember("콜리"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + ParliamentaryTableCreateRequest renewTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( + "새로운 테이블"); + + assertThatThrownBy(() -> parliamentaryService.updateTable(renewTableRequest, chanTable.getId(), coli)) + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.NOT_TABLE_OWNER.getMessage()); + } + } + + @Nested + class deleteTable { + + @Test + void 의회식_토론_테이블을_삭제한다() { + Member chan = fixtureGenerator.generateMember("커찬"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + fixtureGenerator.generateParliamentaryTimeBox(chanTable, 1); + fixtureGenerator.generateParliamentaryTimeBox(chanTable, 2); + + parliamentaryService.deleteTable(chanTable.getId(), chan); + + Optional foundTable = parliamentaryTableRepository.findById(chanTable.getId()); + List timeBoxes = timeBoxRepository.findAllByParliamentaryTable(chanTable); + + assertAll( + () -> assertThat(foundTable).isNotPresent(), + () -> assertThat(timeBoxes).isEmpty() + ); + } + + @Test + void 회원_소유가_아닌_테이블_삭제_시_예외를_발생시킨다() { + Member chan = fixtureGenerator.generateMember("커찬"); + Member coli = fixtureGenerator.generateMember("콜리"); + ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + + assertThatThrownBy(() -> parliamentaryService.deleteTable(chanTable.getId(), coli)) + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.NOT_TABLE_OWNER.getMessage()); + } + } +} From dc876e6d15aa6f43d741e63a1b32bf89bc1c97a9 Mon Sep 17 00:00:00 2001 From: SANGHUN OH <121424793+unifolio0@users.noreply.github.com> Date: Sun, 5 Jan 2025 14:53:14 +0900 Subject: [PATCH 24/38] =?UTF-8?q?[REFACTOR]=20=EC=9E=90=EB=B0=94=20?= =?UTF-8?q?=ED=91=9C=EC=A4=80=20=EC=98=88=EC=99=B8=EB=A5=BC=20=EC=BB=A4?= =?UTF-8?q?=EC=8A=A4=ED=85=80=20=EC=98=88=EC=99=B8=EB=A1=9C=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/AuthMemberArgumentResolver.java | 2 +- .../com/debatetimer/domain/member/Member.java | 6 +++-- .../parliamentary/ParliamentaryTable.java | 8 ++++--- .../parliamentary/ParliamentaryTimeBox.java | 8 ++++--- .../exception/custom/DTException.java | 2 +- .../exception/errorcode/ClientErrorCode.java | 24 +++++++++++++++++++ .../repository/member/MemberRepository.java | 4 +++- .../service/member/MemberService.java | 2 +- .../debatetimer/domain/member/MemberTest.java | 10 ++++---- .../parliamentary/ParliamentaryTableTest.java | 18 +++++++------- .../ParliamentaryTimeBoxTest.java | 14 ++++++----- .../ParliamentaryTableRepositoryTest.java | 2 +- 12 files changed, 69 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java b/src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java index ec404045..0a542f60 100644 --- a/src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java +++ b/src/main/java/com/debatetimer/config/AuthMemberArgumentResolver.java @@ -32,7 +32,7 @@ public Object resolveArgument( WebDataBinderFactory binderFactory ) { try { - Long memberId = Long.parseLong(webRequest.getParameter("memberId")); + long memberId = Long.parseLong(webRequest.getParameter("memberId")); return memberRepository.getById(memberId); } catch (DTException | NumberFormatException exception) { log.warn(exception.getMessage()); diff --git a/src/main/java/com/debatetimer/domain/member/Member.java b/src/main/java/com/debatetimer/domain/member/Member.java index 4f1767ea..5b05b538 100644 --- a/src/main/java/com/debatetimer/domain/member/Member.java +++ b/src/main/java/com/debatetimer/domain/member/Member.java @@ -1,5 +1,7 @@ package com.debatetimer.domain.member; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -31,10 +33,10 @@ public Member(String nickname) { private void validate(String nickname) { if (nickname.isEmpty() || nickname.length() > NICKNAME_MAX_LENGTH) { - throw new IllegalArgumentException("닉네임은 1자 이상 %d자 이하여야 합니다".formatted(NICKNAME_MAX_LENGTH)); + throw new DTClientErrorException(ClientErrorCode.INVALID_MEMBER_NICKNAME_LENGTH); } if (!nickname.matches(NICKNAME_REGEX)) { - throw new IllegalArgumentException("닉네임은 영문/한글만 가능합니다"); + throw new DTClientErrorException(ClientErrorCode.INVALID_MEMBER_NICKNAME_FORM); } } } diff --git a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java index 70f5a525..74dec942 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java @@ -1,6 +1,8 @@ package com.debatetimer.domain.parliamentary; import com.debatetimer.domain.member.Member; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; @@ -50,13 +52,13 @@ public ParliamentaryTable(Member member, String name, String agenda, int duratio private void validate(String name, int duration) { if (name.isBlank() || name.length() > NAME_MAX_LENGTH) { - throw new IllegalArgumentException("테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(NAME_MAX_LENGTH)); + throw new DTClientErrorException(ClientErrorCode.INVALID_TABLE_NAME_LENGTH); } if (!name.matches(NAME_REGEX)) { - throw new IllegalArgumentException("테이블 이름은 영문/한글만 가능합니다"); + throw new DTClientErrorException(ClientErrorCode.INVALID_TABLE_NAME_FORM); } if (duration <= 0) { - throw new IllegalArgumentException("시간은 양수만 가능합니다"); + throw new DTClientErrorException(ClientErrorCode.INVALID_TABLE_TIME); } } diff --git a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java index 138bfcd8..b2f8236d 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBox.java @@ -2,6 +2,8 @@ import com.debatetimer.domain.BoxType; import com.debatetimer.domain.Stance; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -59,14 +61,14 @@ public ParliamentaryTimeBox(ParliamentaryTable parliamentaryTable, int sequence, private void validate(int sequence, int time, Stance stance, BoxType boxType) { if (sequence <= 0) { - throw new IllegalArgumentException("순서는 양수만 가능합니다"); + throw new DTClientErrorException(ClientErrorCode.INVALID_TIME_BOX_SEQUENCE); } if (time <= 0) { - throw new IllegalArgumentException("시간은 양수만 가능합니다"); + throw new DTClientErrorException(ClientErrorCode.INVALID_TIME_BOX_TIME); } if (!boxType.isAvailable(stance)) { - throw new IllegalArgumentException("타임박스 유형과 일치하지 않는 입장입니다."); + throw new DTClientErrorException(ClientErrorCode.INVALID_TIME_BOX_STANCE); } } } diff --git a/src/main/java/com/debatetimer/exception/custom/DTException.java b/src/main/java/com/debatetimer/exception/custom/DTException.java index d2770e1c..51157630 100644 --- a/src/main/java/com/debatetimer/exception/custom/DTException.java +++ b/src/main/java/com/debatetimer/exception/custom/DTException.java @@ -8,7 +8,7 @@ public abstract class DTException extends RuntimeException { private final HttpStatus httpStatus; - public DTException(String message, HttpStatus httpStatus) { + protected DTException(String message, HttpStatus httpStatus) { super(message); this.httpStatus = httpStatus; } diff --git a/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java b/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java index 1b10799d..30c8b5e2 100644 --- a/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java +++ b/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java @@ -1,11 +1,33 @@ package com.debatetimer.exception.errorcode; +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter public enum ClientErrorCode implements ErrorCode { + INVALID_MEMBER_NICKNAME_LENGTH( + HttpStatus.BAD_REQUEST, + "닉네임은 1자 이상 %d자 이하여야 합니다".formatted(Member.NICKNAME_MAX_LENGTH) + ), + INVALID_MEMBER_NICKNAME_FORM(HttpStatus.BAD_REQUEST, "닉네임은 영문/한글만 가능합니다"), + + INVALID_TABLE_NAME_LENGTH( + HttpStatus.BAD_REQUEST, + "테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(ParliamentaryTable.NAME_MAX_LENGTH) + ), + INVALID_TABLE_NAME_FORM( + HttpStatus.BAD_REQUEST, + "테이블 이름은 영문/한글만 가능합니다" + ), + INVALID_TABLE_TIME(HttpStatus.BAD_REQUEST, "시간은 양수만 가능합니다"), + + INVALID_TIME_BOX_SEQUENCE(HttpStatus.BAD_REQUEST, "순서는 양수만 가능합니다"), + INVALID_TIME_BOX_TIME(HttpStatus.BAD_REQUEST, "시간은 양수만 가능합니다"), + INVALID_TIME_BOX_STANCE(HttpStatus.BAD_REQUEST, "타임박스 유형과 일치하지 않는 입장입니다."), + FIELD_ERROR(HttpStatus.BAD_REQUEST, "입력이 잘못되었습니다."), URL_PARAMETER_ERROR(HttpStatus.BAD_REQUEST, "입력이 잘못되었습니다."), METHOD_ARGUMENT_TYPE_MISMATCH(HttpStatus.BAD_REQUEST, "입력한 값의 타입이 잘못되었습니다."), @@ -17,6 +39,8 @@ public enum ClientErrorCode implements ErrorCode { TABLE_NOT_FOUND(HttpStatus.NOT_FOUND, "토론 테이블을 찾을 수 없습니다."), NOT_TABLE_OWNER(HttpStatus.UNAUTHORIZED, "테이블을 소유한 회원이 아닙니다."), UNAUTHORIZED_MEMBER(HttpStatus.UNAUTHORIZED, "접근 권한이 없습니다"), + + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 회원이 존재하지 않습니다"), ; private final HttpStatus status; diff --git a/src/main/java/com/debatetimer/repository/member/MemberRepository.java b/src/main/java/com/debatetimer/repository/member/MemberRepository.java index 8fe49629..284f257c 100644 --- a/src/main/java/com/debatetimer/repository/member/MemberRepository.java +++ b/src/main/java/com/debatetimer/repository/member/MemberRepository.java @@ -1,12 +1,14 @@ package com.debatetimer.repository.member; import com.debatetimer.domain.member.Member; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import org.springframework.data.jpa.repository.JpaRepository; public interface MemberRepository extends JpaRepository { default Member getById(long id) { return findById(id) - .orElseThrow(() -> new IllegalArgumentException("해당 회원이 존재하지 않습니다")); + .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.MEMBER_NOT_FOUND)); } } diff --git a/src/main/java/com/debatetimer/service/member/MemberService.java b/src/main/java/com/debatetimer/service/member/MemberService.java index 67a9ded9..e752a179 100644 --- a/src/main/java/com/debatetimer/service/member/MemberService.java +++ b/src/main/java/com/debatetimer/service/member/MemberService.java @@ -20,7 +20,7 @@ public class MemberService { private final ParliamentaryTableRepository parliamentaryTableRepository; @Transactional(readOnly = true) - public TableResponses getTables(Long memberId) { + public TableResponses getTables(long memberId) { Member member = memberRepository.getById(memberId); List parliamentaryTable = parliamentaryTableRepository.findAllByMember(member); return TableResponses.from(parliamentaryTable); diff --git a/src/test/java/com/debatetimer/domain/member/MemberTest.java b/src/test/java/com/debatetimer/domain/member/MemberTest.java index 1642a72c..0637e45e 100644 --- a/src/test/java/com/debatetimer/domain/member/MemberTest.java +++ b/src/test/java/com/debatetimer/domain/member/MemberTest.java @@ -3,6 +3,8 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import org.junit.jupiter.api.Nested; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -23,16 +25,16 @@ class Validate { @ValueSource(ints = {0, Member.NICKNAME_MAX_LENGTH + 1}) void 닉네임은_정해진_길이_이내여야_한다(int length) { assertThatThrownBy(() -> new Member("f".repeat(length))) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("닉네임은 1자 이상 %d자 이하여야 합니다".formatted(Member.NICKNAME_MAX_LENGTH)); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_MEMBER_NICKNAME_LENGTH.getMessage()); } @ParameterizedTest @ValueSource(strings = {"abc12", "가나다12"}) void 닉네임은_영문과_한글만_가능하다(String nickname) { assertThatThrownBy(() -> new Member(nickname)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("닉네임은 영문/한글만 가능합니다"); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_MEMBER_NICKNAME_FORM.getMessage()); } } } diff --git a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java index 79a900fa..94f0b68b 100644 --- a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java +++ b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java @@ -4,6 +4,8 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.debatetimer.domain.member.Member; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import org.junit.jupiter.api.Nested; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -26,8 +28,8 @@ class Validate { void 테이블_이름은_정해진_길이_이내여야_한다(int length) { Member member = new Member("member"); assertThatThrownBy(() -> new ParliamentaryTable(member, "f".repeat(length), "agenda", 10)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(ParliamentaryTable.NAME_MAX_LENGTH)); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_TABLE_NAME_LENGTH.getMessage()); } @ParameterizedTest @@ -35,8 +37,8 @@ class Validate { void 테이블_이름은_적어도_한_자_있어야_한다(String name) { Member member = new Member("member"); assertThatThrownBy(() -> new ParliamentaryTable(member, name, "agenda", 10)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("테이블 이름은 1자 이상 %d자 이하여야 합니다".formatted(ParliamentaryTable.NAME_MAX_LENGTH)); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_TABLE_NAME_LENGTH.getMessage()); } @ParameterizedTest @@ -44,8 +46,8 @@ class Validate { void 허용된_글자_이외의_문자는_불가능하다(String name) { Member member = new Member("member"); assertThatThrownBy(() -> new ParliamentaryTable(member, name, "agenda", 10)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("테이블 이름은 영문/한글만 가능합니다"); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_TABLE_NAME_FORM.getMessage()); } @ParameterizedTest @@ -53,8 +55,8 @@ class Validate { void 테이블_시간은_양수만_가능하다(int duration) { Member member = new Member("member"); assertThatThrownBy(() -> new ParliamentaryTable(member, "name", "agenda", duration)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("시간은 양수만 가능합니다"); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_TABLE_TIME.getMessage()); } } } diff --git a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java index 7681f484..d698b8e2 100644 --- a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java +++ b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxTest.java @@ -5,6 +5,8 @@ import com.debatetimer.domain.BoxType; import com.debatetimer.domain.Stance; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -17,16 +19,16 @@ class Validate { void 순서는_양수만_가능하다() { ParliamentaryTable table = new ParliamentaryTable(); assertThatThrownBy(() -> new ParliamentaryTimeBox(table, 0, Stance.CONS, BoxType.OPENING, 10, 1)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("순서는 양수만 가능합니다"); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_TIME_BOX_SEQUENCE.getMessage()); } @Test void 시간은_양수만_가능하다() { ParliamentaryTable table = new ParliamentaryTable(); assertThatThrownBy(() -> new ParliamentaryTimeBox(table, 1, Stance.CONS, BoxType.OPENING, 0, 1)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("시간은 양수만 가능합니다"); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_TIME_BOX_TIME.getMessage()); } @Test @@ -40,8 +42,8 @@ class Validate { void 박스타입에_불가한_입장으로_생성을_시도하면_예외를_발생시킨다() { ParliamentaryTable table = new ParliamentaryTable(); assertThatThrownBy(() -> new ParliamentaryTimeBox(table, 1, Stance.NEUTRAL, BoxType.OPENING, 10, 1)) - .isInstanceOf(IllegalArgumentException.class) - .hasMessage("타임박스 유형과 일치하지 않는 입장입니다."); + .isInstanceOf(DTClientErrorException.class) + .hasMessage(ClientErrorCode.INVALID_TIME_BOX_STANCE.getMessage()); } } } diff --git a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java index eb065556..8750800a 100644 --- a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java +++ b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java @@ -43,7 +43,7 @@ class getById { Member chan = fixtureGenerator.generateMember("커찬"); ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); - ParliamentaryTable foundChanTable = tableRepository.getById(chanTable.getId()); + ParliamentaryTable foundChanTable = tableRepository.getById(chanTable.getId().longValue()); assertThat(foundChanTable).usingRecursiveComparison().isEqualTo(chanTable); } From de84768c506aff0b9a96a48e740d8faf3503de3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B1=B4=EC=9A=B0?= Date: Sun, 5 Jan 2025 05:16:20 -0800 Subject: [PATCH 25/38] =?UTF-8?q?[TEST]=20generator=20=EC=BB=A8=EB=B2=A4?= =?UTF-8?q?=EC=85=98=EC=97=90=20=EB=A7=9E=EC=B6=94=EC=96=B4=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95=20(#43)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/TimeBoxCreateRequest.java | 13 +-- .../service/member/MemberService.java | 4 +- .../com/debatetimer/BaseControllerTest.java | 12 ++- .../com/debatetimer/BaseRepositoryTest.java | 14 ++- .../java/com/debatetimer/BaseServiceTest.java | 12 ++- .../ParliamentaryControllerTest.java | 59 +++++++----- .../com/debatetimer/fixture/DtoGenerator.java | 38 -------- .../debatetimer/fixture/FixtureGenerator.java | 51 ---------- .../debatetimer/fixture/MemberGenerator.java | 20 ++++ .../fixture/ParliamentaryTableGenerator.java | 21 ++++ .../ParliamentaryTimeBoxGenerator.java | 24 +++++ .../ParliamentaryTableRepositoryTest.java | 18 ++-- .../ParliamentaryTimeBoxRepositoryTest.java | 23 ++--- .../ParliamentaryServiceTest.java | 96 ++++++++++++------- 14 files changed, 213 insertions(+), 192 deletions(-) delete mode 100644 src/test/java/com/debatetimer/fixture/DtoGenerator.java delete mode 100644 src/test/java/com/debatetimer/fixture/FixtureGenerator.java create mode 100644 src/test/java/com/debatetimer/fixture/MemberGenerator.java create mode 100644 src/test/java/com/debatetimer/fixture/ParliamentaryTableGenerator.java create mode 100644 src/test/java/com/debatetimer/fixture/ParliamentaryTimeBoxGenerator.java diff --git a/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java b/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java index 02a78315..48687ce9 100644 --- a/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java +++ b/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java @@ -11,11 +11,11 @@ public record TimeBoxCreateRequest( @Schema(description = "입장", example = "PROS") @NotBlank - String stance, + Stance stance, @Schema(description = "발언 유형", example = "OPENING") @NotBlank - String type, + BoxType type, @Schema(description = "발언 시간(초)", example = "175") @Positive @@ -26,13 +26,6 @@ public record TimeBoxCreateRequest( ) { public ParliamentaryTimeBox toTimeBox(ParliamentaryTable parliamentaryTable, int sequence) { - return new ParliamentaryTimeBox( - parliamentaryTable, - sequence, - Stance.valueOf(stance), - BoxType.valueOf(type), - time, - speakerNumber - ); + return new ParliamentaryTimeBox(parliamentaryTable, sequence, stance, type, time, speakerNumber); } } diff --git a/src/main/java/com/debatetimer/service/member/MemberService.java b/src/main/java/com/debatetimer/service/member/MemberService.java index e752a179..69a0dd46 100644 --- a/src/main/java/com/debatetimer/service/member/MemberService.java +++ b/src/main/java/com/debatetimer/service/member/MemberService.java @@ -20,8 +20,8 @@ public class MemberService { private final ParliamentaryTableRepository parliamentaryTableRepository; @Transactional(readOnly = true) - public TableResponses getTables(long memberId) { - Member member = memberRepository.getById(memberId); + public TableResponses getTables(Long memberId) { + Member member = memberRepository.getById(memberId.longValue()); List parliamentaryTable = parliamentaryTableRepository.findAllByMember(member); return TableResponses.from(parliamentaryTable); } diff --git a/src/test/java/com/debatetimer/BaseControllerTest.java b/src/test/java/com/debatetimer/BaseControllerTest.java index c62a73d2..64a0bdfd 100644 --- a/src/test/java/com/debatetimer/BaseControllerTest.java +++ b/src/test/java/com/debatetimer/BaseControllerTest.java @@ -1,7 +1,8 @@ package com.debatetimer; -import com.debatetimer.fixture.DtoGenerator; -import com.debatetimer.fixture.FixtureGenerator; +import com.debatetimer.fixture.MemberGenerator; +import com.debatetimer.fixture.ParliamentaryTableGenerator; +import com.debatetimer.fixture.ParliamentaryTimeBoxGenerator; import com.debatetimer.repository.member.MemberRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import io.restassured.RestAssured; @@ -22,10 +23,13 @@ public abstract class BaseControllerTest { protected ParliamentaryTableRepository parliamentaryTableRepository; @Autowired - protected FixtureGenerator fixtureGenerator; + protected MemberGenerator memberGenerator; @Autowired - protected DtoGenerator dtoGenerator; + protected ParliamentaryTableGenerator tableGenerator; + + @Autowired + protected ParliamentaryTimeBoxGenerator timeBoxGenerator; @LocalServerPort private int port; diff --git a/src/test/java/com/debatetimer/BaseRepositoryTest.java b/src/test/java/com/debatetimer/BaseRepositoryTest.java index ac27f886..afbecbbb 100644 --- a/src/test/java/com/debatetimer/BaseRepositoryTest.java +++ b/src/test/java/com/debatetimer/BaseRepositoryTest.java @@ -1,14 +1,22 @@ package com.debatetimer; -import com.debatetimer.fixture.FixtureGenerator; +import com.debatetimer.fixture.MemberGenerator; +import com.debatetimer.fixture.ParliamentaryTableGenerator; +import com.debatetimer.fixture.ParliamentaryTimeBoxGenerator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.context.annotation.Import; -@Import({FixtureGenerator.class}) +@Import({MemberGenerator.class, ParliamentaryTableGenerator.class, ParliamentaryTimeBoxGenerator.class}) @DataJpaTest public abstract class BaseRepositoryTest { @Autowired - protected FixtureGenerator fixtureGenerator; + protected MemberGenerator memberGenerator; + + @Autowired + protected ParliamentaryTableGenerator tableGenerator; + + @Autowired + protected ParliamentaryTimeBoxGenerator timeBoxGenerator; } diff --git a/src/test/java/com/debatetimer/BaseServiceTest.java b/src/test/java/com/debatetimer/BaseServiceTest.java index 45f18cb2..6333640b 100644 --- a/src/test/java/com/debatetimer/BaseServiceTest.java +++ b/src/test/java/com/debatetimer/BaseServiceTest.java @@ -1,7 +1,8 @@ package com.debatetimer; -import com.debatetimer.fixture.DtoGenerator; -import com.debatetimer.fixture.FixtureGenerator; +import com.debatetimer.fixture.MemberGenerator; +import com.debatetimer.fixture.ParliamentaryTableGenerator; +import com.debatetimer.fixture.ParliamentaryTimeBoxGenerator; import com.debatetimer.repository.member.MemberRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTimeBoxRepository; @@ -23,8 +24,11 @@ public abstract class BaseServiceTest { protected ParliamentaryTimeBoxRepository timeBoxRepository; @Autowired - protected FixtureGenerator fixtureGenerator; + protected MemberGenerator memberGenerator; @Autowired - protected DtoGenerator dtoGenerator; + protected ParliamentaryTableGenerator tableGenerator; + + @Autowired + protected ParliamentaryTimeBoxGenerator timeBoxGenerator; } diff --git a/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java index 5c02b3e5..9f8c11d6 100644 --- a/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java +++ b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java @@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertAll; import com.debatetimer.BaseControllerTest; +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; @@ -19,19 +21,25 @@ class ParliamentaryControllerTest extends BaseControllerTest { @Nested - class save { + class Save { @Test void 토론_테이블을_생성한다() { - Member bito = fixtureGenerator.generateMember("비토"); - ParliamentaryTableCreateRequest bitoTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest("비토 테이블"); - TableInfoCreateRequest requestTableInfo = bitoTableRequest.info(); - List requestTimeBoxes = bitoTableRequest.table(); + Member bito = memberGenerator.generate("비토"); + TableInfoCreateRequest requestTableInfo = new TableInfoCreateRequest("비토 테이블", "주제"); + List requestTimeBoxes = List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ); + ParliamentaryTableCreateRequest tableCreateRequest = new ParliamentaryTableCreateRequest( + requestTableInfo, + requestTimeBoxes + ); ParliamentaryTableResponse response = RestAssured.given().log().all() .contentType(ContentType.JSON) .queryParam("memberId", bito.getId()) - .body(bitoTableRequest) + .body(tableCreateRequest) .when().post("/api/table/parliamentary") .then().log().all() .statusCode(201) @@ -45,14 +53,14 @@ class save { } @Nested - class getTable { + class GetTable { @Test void 의회식_테이블을_조회한다() { - Member bito = fixtureGenerator.generateMember("비토"); - ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); - fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 1); - fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); + Member bito = memberGenerator.generate("비토"); + ParliamentaryTable bitoTable = tableGenerator.generate(bito); + timeBoxGenerator.generate(bitoTable, 1); + timeBoxGenerator.generate(bitoTable, 2); ParliamentaryTableResponse response = RestAssured.given().log().all() .contentType(ContentType.JSON) @@ -71,16 +79,21 @@ class getTable { } @Nested - class updateTable { + class UpdateTable { @Test void 의회식_토론_테이블을_업데이트한다() { - Member bito = fixtureGenerator.generateMember("커찬"); - ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); - ParliamentaryTableCreateRequest renewTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( - "새로운 테이블"); - TableInfoCreateRequest renewTableInfo = renewTableRequest.info(); - List renewTimeBoxes = renewTableRequest.table(); + Member bito = memberGenerator.generate("비토"); + ParliamentaryTable bitoTable = tableGenerator.generate(bito); + TableInfoCreateRequest renewTableInfo = new TableInfoCreateRequest("비토 테이블", "주제"); + List renewTimeBoxes = List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ); + ParliamentaryTableCreateRequest renewTableRequest = new ParliamentaryTableCreateRequest( + renewTableInfo, + renewTimeBoxes + ); ParliamentaryTableResponse response = RestAssured.given().log().all() .contentType(ContentType.JSON) @@ -101,14 +114,14 @@ class updateTable { } @Nested - class deleteTable { + class DeleteTable { @Test void 의회식_토론_테이블을_삭제한다() { - Member bito = fixtureGenerator.generateMember("비토"); - ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); - fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 1); - fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); + Member bito = memberGenerator.generate("비토"); + ParliamentaryTable bitoTable = tableGenerator.generate(bito); + timeBoxGenerator.generate(bitoTable, 1); + timeBoxGenerator.generate(bitoTable, 2); RestAssured.given().log().all() .contentType(ContentType.JSON) diff --git a/src/test/java/com/debatetimer/fixture/DtoGenerator.java b/src/test/java/com/debatetimer/fixture/DtoGenerator.java deleted file mode 100644 index 6f66a328..00000000 --- a/src/test/java/com/debatetimer/fixture/DtoGenerator.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.debatetimer.fixture; - -import com.debatetimer.domain.BoxType; -import com.debatetimer.domain.Stance; -import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; -import com.debatetimer.dto.parliamentary.request.TableInfoCreateRequest; -import com.debatetimer.dto.parliamentary.request.TimeBoxCreateRequest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import org.springframework.stereotype.Component; - -@Component -public class DtoGenerator { - - public TableInfoCreateRequest generateTableInfoCreateRequest(String tableName) { - return new TableInfoCreateRequest(tableName, "주제"); - } - - public List generateTimeBoxCreateRequests() { - return new ArrayList<>( - Arrays.asList( - generateTimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 180), - generateTimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 180) - ) - ); - } - - public TimeBoxCreateRequest generateTimeBoxCreateRequest(Stance stance, BoxType boxType, int time) { - return new TimeBoxCreateRequest(stance.name(), boxType.name(), time, 1); - } - - public ParliamentaryTableCreateRequest generateParliamentaryTableCreateRequest(String tableName) { - TableInfoCreateRequest tableInfoCreateRequest = generateTableInfoCreateRequest(tableName); - List timeBoxCreateRequests = generateTimeBoxCreateRequests(); - return new ParliamentaryTableCreateRequest(tableInfoCreateRequest, timeBoxCreateRequests); - } -} diff --git a/src/test/java/com/debatetimer/fixture/FixtureGenerator.java b/src/test/java/com/debatetimer/fixture/FixtureGenerator.java deleted file mode 100644 index 8df35183..00000000 --- a/src/test/java/com/debatetimer/fixture/FixtureGenerator.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.debatetimer.fixture; - -import com.debatetimer.domain.BoxType; -import com.debatetimer.domain.Stance; -import com.debatetimer.domain.member.Member; -import com.debatetimer.domain.parliamentary.ParliamentaryTable; -import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; -import com.debatetimer.repository.member.MemberRepository; -import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; -import com.debatetimer.repository.parliamentary.ParliamentaryTimeBoxRepository; -import org.springframework.stereotype.Component; - -@Component -public class FixtureGenerator { - - private final MemberRepository memberRepository; - private final ParliamentaryTableRepository parliamentaryTableRepository; - private final ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository; - - public FixtureGenerator( - MemberRepository memberRepository, - ParliamentaryTableRepository parliamentaryTableRepository, - ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository - ) { - this.memberRepository = memberRepository; - this.parliamentaryTableRepository = parliamentaryTableRepository; - this.parliamentaryTimeBoxRepository = parliamentaryTimeBoxRepository; - } - - public Member generateMember(String nickname) { - return memberRepository.save(new Member(nickname)); - } - - public Member generateMember() { - return generateMember("테스트용 멤버"); - } - - public ParliamentaryTable generateParliamentaryTable(Member member) { - ParliamentaryTable table = new ParliamentaryTable(member, "토론 테이블", "주제", 1800); - return parliamentaryTableRepository.save(table); - } - - public ParliamentaryTable generateParliamentaryTable() { - return generateParliamentaryTable(generateMember()); - } - - public ParliamentaryTimeBox generateParliamentaryTimeBox(ParliamentaryTable testTable, int sequence) { - ParliamentaryTimeBox timeBox = new ParliamentaryTimeBox(testTable, sequence, Stance.PROS, BoxType.OPENING, 180, 1); - return parliamentaryTimeBoxRepository.save(timeBox); - } -} diff --git a/src/test/java/com/debatetimer/fixture/MemberGenerator.java b/src/test/java/com/debatetimer/fixture/MemberGenerator.java new file mode 100644 index 00000000..8af700ff --- /dev/null +++ b/src/test/java/com/debatetimer/fixture/MemberGenerator.java @@ -0,0 +1,20 @@ +package com.debatetimer.fixture; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.repository.member.MemberRepository; +import org.springframework.stereotype.Component; + +@Component +public class MemberGenerator { + + private final MemberRepository memberRepository; + + public MemberGenerator(MemberRepository memberRepository) { + this.memberRepository = memberRepository; + } + + public Member generate(String nickName) { + Member member = new Member(nickName); + return memberRepository.save(member); + } +} diff --git a/src/test/java/com/debatetimer/fixture/ParliamentaryTableGenerator.java b/src/test/java/com/debatetimer/fixture/ParliamentaryTableGenerator.java new file mode 100644 index 00000000..cbb0340f --- /dev/null +++ b/src/test/java/com/debatetimer/fixture/ParliamentaryTableGenerator.java @@ -0,0 +1,21 @@ +package com.debatetimer.fixture; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; +import org.springframework.stereotype.Component; + +@Component +public class ParliamentaryTableGenerator { + + private final ParliamentaryTableRepository parliamentaryTableRepository; + + public ParliamentaryTableGenerator(ParliamentaryTableRepository parliamentaryTableRepository) { + this.parliamentaryTableRepository = parliamentaryTableRepository; + } + + public ParliamentaryTable generate(Member member) { + ParliamentaryTable table = new ParliamentaryTable(member, "토론 테이블", "주제", 1800); + return parliamentaryTableRepository.save(table); + } +} diff --git a/src/test/java/com/debatetimer/fixture/ParliamentaryTimeBoxGenerator.java b/src/test/java/com/debatetimer/fixture/ParliamentaryTimeBoxGenerator.java new file mode 100644 index 00000000..d4fe23d7 --- /dev/null +++ b/src/test/java/com/debatetimer/fixture/ParliamentaryTimeBoxGenerator.java @@ -0,0 +1,24 @@ +package com.debatetimer.fixture; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import com.debatetimer.domain.parliamentary.ParliamentaryTable; +import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import com.debatetimer.repository.parliamentary.ParliamentaryTimeBoxRepository; +import org.springframework.stereotype.Component; + +@Component +public class ParliamentaryTimeBoxGenerator { + + private final ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository; + + public ParliamentaryTimeBoxGenerator(ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository) { + this.parliamentaryTimeBoxRepository = parliamentaryTimeBoxRepository; + } + + public ParliamentaryTimeBox generate(ParliamentaryTable testTable, int sequence) { + ParliamentaryTimeBox timeBox = new ParliamentaryTimeBox(testTable, sequence, Stance.PROS, BoxType.OPENING, 180, + 1); + return parliamentaryTimeBoxRepository.save(timeBox); + } +} diff --git a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java index 8750800a..a8e6d2b2 100644 --- a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java +++ b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java @@ -19,15 +19,15 @@ class ParliamentaryTableRepositoryTest extends BaseRepositoryTest { private ParliamentaryTableRepository tableRepository; @Nested - class findAllByMember { + class FindAllByMember { @Test void 특정_회원의_테이블만_조회한다() { - Member chan = fixtureGenerator.generateMember("커찬"); - Member bito = fixtureGenerator.generateMember("비토"); - ParliamentaryTable chanTable1 = fixtureGenerator.generateParliamentaryTable(chan); - ParliamentaryTable chanTable2 = fixtureGenerator.generateParliamentaryTable(chan); - ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); + Member chan = memberGenerator.generate("커찬"); + Member bito = memberGenerator.generate("비토"); + ParliamentaryTable chanTable1 = tableGenerator.generate(chan); + ParliamentaryTable chanTable2 = tableGenerator.generate(chan); + ParliamentaryTable bitoTable = tableGenerator.generate(bito); List foundKeoChanTables = tableRepository.findAllByMember(chan); @@ -36,12 +36,12 @@ class findAllByMember { } @Nested - class getById { + class GetById { @Test void 특정_아이디의_테이블을_조회한다() { - Member chan = fixtureGenerator.generateMember("커찬"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + Member chan = memberGenerator.generate("커찬"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); ParliamentaryTable foundChanTable = tableRepository.getById(chanTable.getId().longValue()); diff --git a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java index bc7f6e60..bb5a5407 100644 --- a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java +++ b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java @@ -17,20 +17,21 @@ class ParliamentaryTimeBoxRepositoryTest extends BaseRepositoryTest { private ParliamentaryTimeBoxRepository parliamentaryTimeBoxRepository; @Nested - class findAllByParliamentaryTable { + class FindAllByParliamentaryTable { @Test void 특정_테이블의_타임박스를_모두_조회한다() { - Member chan = fixtureGenerator.generateMember("커찬"); - Member bito = fixtureGenerator.generateMember("비토"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); - ParliamentaryTable bitoTable = fixtureGenerator.generateParliamentaryTable(bito); - ParliamentaryTimeBox chanBox1 = fixtureGenerator.generateParliamentaryTimeBox(chanTable, 1); - ParliamentaryTimeBox chanBox2 = fixtureGenerator.generateParliamentaryTimeBox(chanTable, 2); - ParliamentaryTimeBox bitoBox1 = fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); - ParliamentaryTimeBox bitoBox2 = fixtureGenerator.generateParliamentaryTimeBox(bitoTable, 2); - - List foundBoxes = parliamentaryTimeBoxRepository.findAllByParliamentaryTable(chanTable); + Member chan = memberGenerator.generate("커찬"); + Member bito = memberGenerator.generate("비토"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); + ParliamentaryTable bitoTable = tableGenerator.generate(bito); + ParliamentaryTimeBox chanBox1 = timeBoxGenerator.generate(chanTable, 1); + ParliamentaryTimeBox chanBox2 = timeBoxGenerator.generate(chanTable, 2); + ParliamentaryTimeBox bitoBox1 = timeBoxGenerator.generate(bitoTable, 2); + ParliamentaryTimeBox bitoBox2 = timeBoxGenerator.generate(bitoTable, 2); + + List foundBoxes = parliamentaryTimeBoxRepository.findAllByParliamentaryTable( + chanTable); assertThat(foundBoxes).containsExactly(chanBox1, chanBox2); } diff --git a/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java index 553d3ccf..87da8c0c 100644 --- a/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java +++ b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java @@ -5,6 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertAll; import com.debatetimer.BaseServiceTest; +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; @@ -26,15 +28,20 @@ class ParliamentaryServiceTest extends BaseServiceTest { private ParliamentaryService parliamentaryService; @Nested - class save { + class Save { @Test void 의회식_토론_테이블을_생성한다() { - Member chan = fixtureGenerator.generateMember("커찬"); - ParliamentaryTableCreateRequest chanTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( - "커찬의 토론 테이블"); - TableInfoCreateRequest requestTableInfo = chanTableRequest.info(); - List requestTimeBoxes = chanTableRequest.table(); + Member chan = memberGenerator.generate("커찬"); + TableInfoCreateRequest requestTableInfo = new TableInfoCreateRequest("커찬의 테이블", "주제"); + List requestTimeBoxes = List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ); + ParliamentaryTableCreateRequest chanTableRequest = new ParliamentaryTableCreateRequest( + requestTableInfo, + requestTimeBoxes + ); ParliamentaryTableResponse savedTableResponse = parliamentaryService.save(chanTableRequest, chan); Optional foundTable = parliamentaryTableRepository.findById(savedTableResponse.id()); @@ -48,14 +55,14 @@ class save { } @Nested - class findTable { + class FindTable { @Test void 의회식_토론_테이블을_조회한다() { - Member chan = fixtureGenerator.generateMember("커찬"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); - fixtureGenerator.generateParliamentaryTimeBox(chanTable, 1); - fixtureGenerator.generateParliamentaryTimeBox(chanTable, 2); + Member chan = memberGenerator.generate("커찬"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); + timeBoxGenerator.generate(chanTable, 1); + timeBoxGenerator.generate(chanTable, 2); ParliamentaryTableResponse foundResponse = parliamentaryService.findTable(chanTable.getId(), chan); @@ -67,27 +74,33 @@ class findTable { @Test void 회원_소유가_아닌_테이블_조회_시_예외를_발생시킨다() { - Member chan = fixtureGenerator.generateMember("커찬"); - Member coli = fixtureGenerator.generateMember("콜리"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + Member chan = memberGenerator.generate("커찬"); + Member coli = memberGenerator.generate("콜리"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); + long chanTableId = chanTable.getId(); - assertThatThrownBy(() -> parliamentaryService.findTable(chanTable.getId(), coli)) + assertThatThrownBy(() -> parliamentaryService.findTable(chanTableId, coli)) .isInstanceOf(DTClientErrorException.class) .hasMessage(ClientErrorCode.NOT_TABLE_OWNER.getMessage()); } } @Nested - class updateTable { + class UpdateTable { @Test void 의회식_토론_테이블을_수정한다() { - Member chan = fixtureGenerator.generateMember("커찬"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); - ParliamentaryTableCreateRequest renewTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( - "새로운 테이블"); - TableInfoCreateRequest renewTableInfo = renewTableRequest.info(); - List renewTimeBoxes = renewTableRequest.table(); + Member chan = memberGenerator.generate("커찬"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); + TableInfoCreateRequest renewTableInfo = new TableInfoCreateRequest("커찬 테이블", "주제"); + List renewTimeBoxes = List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ); + ParliamentaryTableCreateRequest renewTableRequest = new ParliamentaryTableCreateRequest( + renewTableInfo, + renewTimeBoxes + ); ParliamentaryTableResponse updatedTable = parliamentaryService.updateTable(renewTableRequest, chanTable.getId(), chan); @@ -101,27 +114,35 @@ class updateTable { @Test void 회원_소유가_아닌_테이블_수정_시_예외를_발생시킨다() { - Member chan = fixtureGenerator.generateMember("커찬"); - Member coli = fixtureGenerator.generateMember("콜리"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); - ParliamentaryTableCreateRequest renewTableRequest = dtoGenerator.generateParliamentaryTableCreateRequest( - "새로운 테이블"); + Member chan = memberGenerator.generate("커찬"); + Member coli = memberGenerator.generate("콜리"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); + long chanTableId = chanTable.getId(); + TableInfoCreateRequest renewTableInfo = new TableInfoCreateRequest("새로운 테이블", "주제"); + List renewTimeBoxes = List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ); + ParliamentaryTableCreateRequest renewTableRequest = new ParliamentaryTableCreateRequest( + renewTableInfo, + renewTimeBoxes + ); - assertThatThrownBy(() -> parliamentaryService.updateTable(renewTableRequest, chanTable.getId(), coli)) + assertThatThrownBy(() -> parliamentaryService.updateTable(renewTableRequest, chanTableId, coli)) .isInstanceOf(DTClientErrorException.class) .hasMessage(ClientErrorCode.NOT_TABLE_OWNER.getMessage()); } } @Nested - class deleteTable { + class DeleteTable { @Test void 의회식_토론_테이블을_삭제한다() { - Member chan = fixtureGenerator.generateMember("커찬"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); - fixtureGenerator.generateParliamentaryTimeBox(chanTable, 1); - fixtureGenerator.generateParliamentaryTimeBox(chanTable, 2); + Member chan = memberGenerator.generate("커찬"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); + timeBoxGenerator.generate(chanTable, 1); + timeBoxGenerator.generate(chanTable, 2); parliamentaryService.deleteTable(chanTable.getId(), chan); @@ -136,11 +157,12 @@ class deleteTable { @Test void 회원_소유가_아닌_테이블_삭제_시_예외를_발생시킨다() { - Member chan = fixtureGenerator.generateMember("커찬"); - Member coli = fixtureGenerator.generateMember("콜리"); - ParliamentaryTable chanTable = fixtureGenerator.generateParliamentaryTable(chan); + Member chan = memberGenerator.generate("커찬"); + Member coli = memberGenerator.generate("콜리"); + ParliamentaryTable chanTable = tableGenerator.generate(chan); + Long chanTableId = chanTable.getId(); - assertThatThrownBy(() -> parliamentaryService.deleteTable(chanTable.getId(), coli)) + assertThatThrownBy(() -> parliamentaryService.deleteTable(chanTableId, coli)) .isInstanceOf(DTClientErrorException.class) .hasMessage(ClientErrorCode.NOT_TABLE_OWNER.getMessage()); } From eff690e5993a3be1393b28ff18290e5d7ac4aa41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Mon, 13 Jan 2025 15:26:49 +0900 Subject: [PATCH 26/38] =?UTF-8?q?[CHORE]=20Swagger=20+=20Rest=20Docs=20?= =?UTF-8?q?=EB=A1=9C=20API=20=EB=AC=B8=EC=84=9C=20=EC=83=9D=EC=84=B1=20(#4?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + build.gradle | 35 +- .../controller/auth/AuthMember.java | 1 - .../controller/member/MemberController.java | 4 +- .../member/MemberControllerSwagger.java | 46 --- .../ParliamentaryController.java | 2 +- .../ParliamentaryControllerSwagger.java | 79 ---- .../com/debatetimer/domain/member/Member.java | 6 + .../dto/member/MemberCreateRequest.java | 7 +- .../dto/member/MemberCreateResponse.java | 9 +- .../debatetimer/dto/member/TableResponse.java | 12 +- .../dto/member/TableResponses.java | 7 +- .../ParliamentaryTableCreateRequest.java | 10 +- .../request/TableInfoCreateRequest.java | 3 - .../request/TimeBoxCreateRequest.java | 5 - .../response/ParliamentaryTableResponse.java | 13 +- .../response/TableInfoResponse.java | 9 +- .../response/TimeBoxResponse.java | 21 +- .../debatetimer/exception/ErrorResponse.java | 8 +- .../swagger/annotation/ErrorCode400.java | 24 -- .../swagger/annotation/ErrorCode401.java | 24 -- .../swagger/annotation/ErrorCode404.java | 23 -- .../swagger/annotation/ErrorCode500.java | 25 -- .../swagger/config/SwaggerConfig.java | 27 -- src/main/resources/application.yml | 14 +- src/main/resources/static/docs/.gitkeep | 0 .../{ => controller}/BaseControllerTest.java | 21 +- .../controller/BaseDocumentTest.java | 96 +++++ .../RestDocumentationFilterBuilder.java | 67 ++++ .../controller/RestDocumentationRequest.java | 63 +++ .../controller/RestDocumentationResponse.java | 33 ++ .../java/com/debatetimer/controller/Tag.java | 18 + .../member/MemberControllerTest.java | 15 +- .../controller/member/MemberDocumentTest.java | 141 +++++++ .../ParliamentaryControllerTest.java | 51 ++- .../ParliamentaryDocumentTest.java | 372 ++++++++++++++++++ 36 files changed, 900 insertions(+), 394 deletions(-) delete mode 100644 src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java delete mode 100644 src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java delete mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java delete mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java delete mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java delete mode 100644 src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java delete mode 100644 src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java create mode 100644 src/main/resources/static/docs/.gitkeep rename src/test/java/com/debatetimer/{ => controller}/BaseControllerTest.java (61%) create mode 100644 src/test/java/com/debatetimer/controller/BaseDocumentTest.java create mode 100644 src/test/java/com/debatetimer/controller/RestDocumentationFilterBuilder.java create mode 100644 src/test/java/com/debatetimer/controller/RestDocumentationRequest.java create mode 100644 src/test/java/com/debatetimer/controller/RestDocumentationResponse.java create mode 100644 src/test/java/com/debatetimer/controller/Tag.java create mode 100644 src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java create mode 100644 src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryDocumentTest.java diff --git a/.gitignore b/.gitignore index c2065bc2..4e91a957 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ out/ ### VS Code ### .vscode/ + +### Rest Docs +/src/main/resources/static/docs/openapi3.yaml diff --git a/build.gradle b/build.gradle index ab37c477..62904fed 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,10 @@ plugins { id 'jacoco' id 'org.springframework.boot' version '3.4.0' id 'io.spring.dependency-management' version '1.1.6' + + // Rest Docs & Swagger + id 'com.epages.restdocs-api-spec' version '0.18.2' + id 'org.hidetake.swagger.generator' version '2.18.2' } group = 'com' @@ -35,9 +39,17 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - testImplementation 'io.rest-assured:rest-assured:5.5.0' + // Rest Docs & Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' + testImplementation 'io.rest-assured:rest-assured:5.5.0' + testImplementation 'org.springframework.restdocs:spring-restdocs-restassured' + testImplementation 'com.epages:restdocs-api-spec-mockmvc:0.18.2' + testImplementation 'com.epages:restdocs-api-spec-restassured:0.18.2' +} + +bootJar { + dependsOn("openapi3") } jacoco { @@ -69,3 +81,24 @@ jacocoTestReport { return System.getenv('TEST_REPORT') == 'true' } } + +generateSwaggerUI { + dependsOn("openapi3") + + delete(fileTree("src/main/resources/static/docs/") { + exclude(".gitkeep") + }) + copy { + from("build/resources/main/static/docs/") + into("src/main/resources/static/docs/") + } +} + +openapi3 { + server = "http://localhost:8080" + title = "토론 타이머 API" + description = "토론 타이머 API" + version = "0.0.1" + format = "yaml" + outputDirectory = "build/resources/main/static/docs" +} diff --git a/src/main/java/com/debatetimer/controller/auth/AuthMember.java b/src/main/java/com/debatetimer/controller/auth/AuthMember.java index 3d34af2c..b8a31964 100644 --- a/src/main/java/com/debatetimer/controller/auth/AuthMember.java +++ b/src/main/java/com/debatetimer/controller/auth/AuthMember.java @@ -8,5 +8,4 @@ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface AuthMember { - } diff --git a/src/main/java/com/debatetimer/controller/member/MemberController.java b/src/main/java/com/debatetimer/controller/member/MemberController.java index fc591008..94b9b393 100644 --- a/src/main/java/com/debatetimer/controller/member/MemberController.java +++ b/src/main/java/com/debatetimer/controller/member/MemberController.java @@ -16,17 +16,15 @@ @RestController @RequiredArgsConstructor -public class MemberController implements MemberControllerSwagger { +public class MemberController { private final MemberService memberService; - @Override @GetMapping("/api/table") public TableResponses getTables(@AuthMember Member member) { return memberService.getTables(member.getId()); } - @Override @PostMapping("/api/member") @ResponseStatus(HttpStatus.CREATED) public MemberCreateResponse createMember(@RequestBody MemberCreateRequest request) { diff --git a/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java b/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java deleted file mode 100644 index be4bb0bd..00000000 --- a/src/main/java/com/debatetimer/controller/member/MemberControllerSwagger.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.debatetimer.controller.member; - -import com.debatetimer.domain.member.Member; -import com.debatetimer.dto.member.MemberCreateRequest; -import com.debatetimer.dto.member.MemberCreateResponse; -import com.debatetimer.dto.member.TableResponses; -import com.debatetimer.swagger.annotation.ErrorCode400; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.parameters.RequestBody; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.tags.Tag; - -@Tag(name = "Member API") -public interface MemberControllerSwagger { - - @Operation( - summary = "멤버의 토론 시간표 조회", - responses = { - @ApiResponse( - responseCode = "200", - description = "멤버의 토론 시간표 조회 성공", - content = @Content(schema = @Schema(implementation = TableResponses.class)) - ) - } - ) - @ErrorCode400 - TableResponses getTables(Member member); - - @Operation( - summary = "멤버 생성", - requestBody = @RequestBody( - content = @Content(schema = @Schema(implementation = MemberCreateRequest.class)) - ), - responses = { - @ApiResponse( - responseCode = "201", - description = "멤버 생성 성공", - content = @Content(schema = @Schema(implementation = MemberCreateResponse.class)) - ) - } - ) - @ErrorCode400 - MemberCreateResponse createMember(MemberCreateRequest request); -} diff --git a/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java b/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java index 3dd8f4da..1589899e 100644 --- a/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java +++ b/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryController.java @@ -19,7 +19,7 @@ @RestController @RequiredArgsConstructor -public class ParliamentaryController implements ParliamentaryControllerSwagger { +public class ParliamentaryController { private final ParliamentaryService parliamentaryService; diff --git a/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java b/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java deleted file mode 100644 index fb5c573c..00000000 --- a/src/main/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerSwagger.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.debatetimer.controller.parliamentary; - -import com.debatetimer.domain.member.Member; -import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; -import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; -import com.debatetimer.swagger.annotation.ErrorCode400; -import com.debatetimer.swagger.annotation.ErrorCode404; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.tags.Tag; - -@Tag(name = "ParliamentaryTable API") -public interface ParliamentaryControllerSwagger { - - @Operation( - summary = "새로운 의회식 토론 시간표 생성", - responses = { - @ApiResponse( - responseCode = "201", - description = "의회식 토론 시간표 생성 성공", - content = @Content(schema = @Schema(implementation = ParliamentaryTableResponse.class)) - ) - } - ) - @ErrorCode400 - ParliamentaryTableResponse save( - ParliamentaryTableCreateRequest tableCreateRequest, - @Parameter(hidden = true) Member member - ); - - @Operation( - summary = "의회식 토론 시간표 조회", - responses = { - @ApiResponse( - responseCode = "200", - description = "토론 시간표 조회 성공", - content = @Content(schema = @Schema(implementation = ParliamentaryTableResponse.class)) - ) - } - ) - @ErrorCode400 - @ErrorCode404(description = "회원 테이블이 없는 경우") - ParliamentaryTableResponse getTable( - Long tableId, - @Parameter(hidden = true) Member member - ); - - @Operation( - summary = "의회식 토론 시간표 수정", - responses = { - @ApiResponse( - responseCode = "200", - description = "의회식 토론 시간표 수정 성공", - content = @Content(schema = @Schema(implementation = ParliamentaryTableResponse.class)) - ) - } - ) - @ErrorCode400 - @ErrorCode404(description = "회원 테이블이 없는 경우") - ParliamentaryTableResponse updateTable( - ParliamentaryTableCreateRequest tableCreateRequest, - Long tableId, - @Parameter(hidden = true) Member member - ); - - @Operation( - summary = "의회식 토론 시간표 삭제", - responses = @ApiResponse(responseCode = "204", description = "의회식 토론 시간표 삭제 성공") - ) - @ErrorCode400 - @ErrorCode404(description = "회원 테이블이 없는 경우") - void deleteTable( - Long tableId, - @Parameter(hidden = true) Member member - ); -} diff --git a/src/main/java/com/debatetimer/domain/member/Member.java b/src/main/java/com/debatetimer/domain/member/Member.java index 5b05b538..29b9a3d1 100644 --- a/src/main/java/com/debatetimer/domain/member/Member.java +++ b/src/main/java/com/debatetimer/domain/member/Member.java @@ -26,6 +26,12 @@ public class Member { @NotNull private String nickname; + public Member(long id, String nickname) { + validate(nickname); + this.id = id; + this.nickname = nickname; + } + public Member(String nickname) { validate(nickname); this.nickname = nickname; diff --git a/src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java b/src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java index d8f9e0f2..561246e1 100644 --- a/src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java +++ b/src/main/java/com/debatetimer/dto/member/MemberCreateRequest.java @@ -1,12 +1,9 @@ package com.debatetimer.dto.member; import com.debatetimer.domain.member.Member; -import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; -public record MemberCreateRequest( - @Schema(description = "멤버 닉네임", example = "콜리") - String nickname -) { +public record MemberCreateRequest(@NotBlank String nickname) { public Member toMember() { return new Member(nickname); diff --git a/src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java b/src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java index 3eafd93b..7a4557ef 100644 --- a/src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java +++ b/src/main/java/com/debatetimer/dto/member/MemberCreateResponse.java @@ -1,15 +1,8 @@ package com.debatetimer.dto.member; import com.debatetimer.domain.member.Member; -import io.swagger.v3.oas.annotations.media.Schema; -public record MemberCreateResponse( - @Schema(description = "멤버 아이디", example = "1") - long id, - - @Schema(description = "멤버 닉네임", example = "콜리") - String nickname -) { +public record MemberCreateResponse(long id, String nickname) { public MemberCreateResponse(Member member) { this(member.getId(), member.getNickname()); diff --git a/src/main/java/com/debatetimer/dto/member/TableResponse.java b/src/main/java/com/debatetimer/dto/member/TableResponse.java index 288115d2..855213c6 100644 --- a/src/main/java/com/debatetimer/dto/member/TableResponse.java +++ b/src/main/java/com/debatetimer/dto/member/TableResponse.java @@ -1,18 +1,8 @@ package com.debatetimer.dto.member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; -import io.swagger.v3.oas.annotations.media.Schema; -public record TableResponse( - @Schema(description = "테이블 이름", example = "테이블1") - String name, - - @Schema(description = "토론 타입", example = "PARLIAMENTARY") - TableType type, - - @Schema(description = "소요 시간 (초 단위)", example = "1800") - int duration -) { +public record TableResponse(String name, TableType type, int duration) { public TableResponse(ParliamentaryTable parliamentaryTable) { this(parliamentaryTable.getName(), TableType.PARLIAMENTARY, parliamentaryTable.getDuration()); diff --git a/src/main/java/com/debatetimer/dto/member/TableResponses.java b/src/main/java/com/debatetimer/dto/member/TableResponses.java index a5c3b6b0..398ad724 100644 --- a/src/main/java/com/debatetimer/dto/member/TableResponses.java +++ b/src/main/java/com/debatetimer/dto/member/TableResponses.java @@ -1,14 +1,9 @@ package com.debatetimer.dto.member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; -public record TableResponses( - @ArraySchema(schema = @Schema(description = "테이블들", implementation = TableResponse.class)) - List tables -) { +public record TableResponses(List tables) { public static TableResponses from(List parliamentaryTables) { return new TableResponses(toTableResponses(parliamentaryTables)); diff --git a/src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java b/src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java index a2f6e16a..28bd6722 100644 --- a/src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java +++ b/src/main/java/com/debatetimer/dto/parliamentary/request/ParliamentaryTableCreateRequest.java @@ -3,19 +3,11 @@ import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.domain.parliamentary.ParliamentaryTimeBoxes; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -public record ParliamentaryTableCreateRequest( - @Schema(description = "테이블 기본 정보", implementation = TableInfoCreateRequest.class) - TableInfoCreateRequest info, - - @ArraySchema(schema = @Schema(description = "테이블 타임박스들", implementation = TimeBoxCreateRequest.class)) - List table -) { +public record ParliamentaryTableCreateRequest(TableInfoCreateRequest info, List table) { public ParliamentaryTable toTable(Member member) { return info.toTable(member, sumOfTime()); diff --git a/src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java b/src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java index a31b711d..dceed3df 100644 --- a/src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java +++ b/src/main/java/com/debatetimer/dto/parliamentary/request/TableInfoCreateRequest.java @@ -2,16 +2,13 @@ import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; -import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; public record TableInfoCreateRequest( - @Schema(description = "테이블 이름", example = "테이블1") @NotBlank String name, - @Schema(description = "토론 주제", example = "촉법소년 연령 인하") @NotNull String agenda ) { diff --git a/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java b/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java index 48687ce9..9204113c 100644 --- a/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java +++ b/src/main/java/com/debatetimer/dto/parliamentary/request/TimeBoxCreateRequest.java @@ -4,24 +4,19 @@ import com.debatetimer.domain.Stance; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; -import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Positive; public record TimeBoxCreateRequest( - @Schema(description = "입장", example = "PROS") @NotBlank Stance stance, - @Schema(description = "발언 유형", example = "OPENING") @NotBlank BoxType type, - @Schema(description = "발언 시간(초)", example = "175") @Positive int time, - @Schema(description = "발언자 번호", example = "1", nullable = true) Integer speakerNumber ) { diff --git a/src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java b/src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java index a6c8eb84..c75a0a92 100644 --- a/src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java +++ b/src/main/java/com/debatetimer/dto/parliamentary/response/ParliamentaryTableResponse.java @@ -2,20 +2,9 @@ import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.domain.parliamentary.ParliamentaryTimeBoxes; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; -public record ParliamentaryTableResponse( - @Schema(description = "테이블 아이디", example = "1") - long id, - - @Schema(description = "테이블 기본 정보", implementation = TableInfoResponse.class) - TableInfoResponse info, - - @ArraySchema(schema = @Schema(description = "타임박스들", implementation = TimeBoxResponse.class)) - List table -) { +public record ParliamentaryTableResponse(long id, TableInfoResponse info, List table) { public ParliamentaryTableResponse( ParliamentaryTable parliamentaryTable, diff --git a/src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java b/src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java index c7b37233..e1369eb5 100644 --- a/src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java +++ b/src/main/java/com/debatetimer/dto/parliamentary/response/TableInfoResponse.java @@ -1,15 +1,8 @@ package com.debatetimer.dto.parliamentary.response; import com.debatetimer.domain.parliamentary.ParliamentaryTable; -import io.swagger.v3.oas.annotations.media.Schema; -public record TableInfoResponse( - @Schema(description = "테이블 이름", example = "테이블1") - String name, - - @Schema(description = "토론 주제", example = "촉법소년 연령 인하") - String agenda -) { +public record TableInfoResponse(String name, String agenda) { public TableInfoResponse(ParliamentaryTable parliamentaryTable) { this(parliamentaryTable.getName(), parliamentaryTable.getAgenda()); diff --git a/src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java b/src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java index 0c11789a..2eb8dd29 100644 --- a/src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java +++ b/src/main/java/com/debatetimer/dto/parliamentary/response/TimeBoxResponse.java @@ -1,25 +1,14 @@ package com.debatetimer.dto.parliamentary.response; +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; -import io.swagger.v3.oas.annotations.media.Schema; -public record TimeBoxResponse( - @Schema(description = "입장", example = "PROS") - String stance, - - @Schema(description = "발언 유형", example = "OPENING") - String type, - - @Schema(description = "발언 시간(초)", example = "175") - int time, - - @Schema(description = "발언자 번호", example = "1", nullable = true) - Integer speakerNumber -) { +public record TimeBoxResponse(Stance stance, BoxType type, int time, Integer speakerNumber) { public TimeBoxResponse(ParliamentaryTimeBox parliamentaryTimeBox) { - this(parliamentaryTimeBox.getStance().name(), - parliamentaryTimeBox.getType().name(), + this(parliamentaryTimeBox.getStance(), + parliamentaryTimeBox.getType(), parliamentaryTimeBox.getTime(), parliamentaryTimeBox.getSpeaker() ); diff --git a/src/main/java/com/debatetimer/exception/ErrorResponse.java b/src/main/java/com/debatetimer/exception/ErrorResponse.java index aaafeb6d..16401bcd 100644 --- a/src/main/java/com/debatetimer/exception/ErrorResponse.java +++ b/src/main/java/com/debatetimer/exception/ErrorResponse.java @@ -1,13 +1,7 @@ package com.debatetimer.exception; -import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; -@Schema(description = "예외 객체") -public record ErrorResponse( - @Schema(description = "사용자에게 보여줄 예외 메시지") - @NotBlank - String message -) { +public record ErrorResponse(@NotBlank String message) { } diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java deleted file mode 100644 index d4148c99..00000000 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode400.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.debatetimer.swagger.annotation; - -import com.debatetimer.exception.ErrorResponse; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.springframework.core.annotation.AliasFor; - -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@ApiResponse( - responseCode = "400", - description = "클라이언트 입력 오류", - content = @Content(schema = @Schema(implementation = ErrorResponse.class)) -) -public @interface ErrorCode400 { - - @AliasFor(annotation = ApiResponse.class, attribute = "description") - String description() default "클라이언트 입력 오류"; -} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java deleted file mode 100644 index 941e0a21..00000000 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode401.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.debatetimer.swagger.annotation; - -import com.debatetimer.exception.ErrorResponse; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.springframework.core.annotation.AliasFor; - -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@ApiResponse( - responseCode = "401", - description = "인증되지 않은 사용자", - content = @Content(schema = @Schema(implementation = ErrorResponse.class)) -) -public @interface ErrorCode401 { - - @AliasFor(annotation = ApiResponse.class, attribute = "description") - String description() default "인증되지 않은 사용자"; -} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java deleted file mode 100644 index 61e1d440..00000000 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode404.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.debatetimer.swagger.annotation; - -import com.debatetimer.exception.ErrorResponse; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.springframework.core.annotation.AliasFor; - -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@ApiResponse( - responseCode = "404", - content = @Content(schema = @Schema(implementation = ErrorResponse.class)) -) -public @interface ErrorCode404 { - - @AliasFor(annotation = ApiResponse.class, attribute = "description") - String description(); -} diff --git a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java b/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java deleted file mode 100644 index 21bf7476..00000000 --- a/src/main/java/com/debatetimer/swagger/annotation/ErrorCode500.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.debatetimer.swagger.annotation; - -import com.debatetimer.exception.ErrorResponse; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.springframework.core.annotation.AliasFor; - -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@ApiResponse( - responseCode = "500", - description = "서버 오류", - content = @Content(schema = @Schema(implementation = ErrorResponse.class)) -) -public @interface ErrorCode500 { - - @AliasFor(annotation = ApiResponse.class, attribute = "description") - String description() default ""; - -} diff --git a/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java b/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java deleted file mode 100644 index 0914920e..00000000 --- a/src/main/java/com/debatetimer/swagger/config/SwaggerConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.debatetimer.swagger.config; - -import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.info.Info; -import io.swagger.v3.oas.models.servers.Server; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class SwaggerConfig { - - @Bean - public OpenAPI openAPI() { - return new OpenAPI() - .addServersItem(server()) - .info(getInfo()); - } - - private Server server() { - return new Server().url("/"); - } - - private Info getInfo() { - return new Info().title("디베이트 타이머 API 문서") - .version("1.0.0"); - } -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6fc036c7..eb1d81ff 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,16 +3,10 @@ spring: default: local springdoc: - default-consumes-media-type: application/json;charset=UTF-8 - default-produces-media-type: application/json;charset=UTF-8 - api-docs: - path: /api-docs swagger-ui: + path: /docs/swagger + url: /docs/openapi3.yaml disable-swagger-default-url: true - display-request-duration: true - operations-sorter: alpha - enabled: true - persist-authorization: true filter: true - override-with-generic-response: false - + persist-authorization: true + display-request-duration: true diff --git a/src/main/resources/static/docs/.gitkeep b/src/main/resources/static/docs/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/test/java/com/debatetimer/BaseControllerTest.java b/src/test/java/com/debatetimer/controller/BaseControllerTest.java similarity index 61% rename from src/test/java/com/debatetimer/BaseControllerTest.java rename to src/test/java/com/debatetimer/controller/BaseControllerTest.java index 64a0bdfd..0885791e 100644 --- a/src/test/java/com/debatetimer/BaseControllerTest.java +++ b/src/test/java/com/debatetimer/controller/BaseControllerTest.java @@ -1,16 +1,23 @@ -package com.debatetimer; +package com.debatetimer.controller; +import com.debatetimer.DataBaseCleaner; import com.debatetimer.fixture.MemberGenerator; import com.debatetimer.fixture.ParliamentaryTableGenerator; import com.debatetimer.fixture.ParliamentaryTimeBoxGenerator; import com.debatetimer.repository.member.MemberRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.filter.log.RequestLoggingFilter; +import io.restassured.filter.log.ResponseLoggingFilter; +import io.restassured.specification.RequestSpecification; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.restdocs.RestDocumentationContextProvider; +import org.springframework.restdocs.restassured.RestDocumentationFilter; @ExtendWith(DataBaseCleaner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @@ -34,8 +41,18 @@ public abstract class BaseControllerTest { @LocalServerPort private int port; + private RequestSpecification spec; + @BeforeEach - void setPort() { + void setEnvironment() { RestAssured.port = port; + spec = new RequestSpecBuilder() + .addFilter(new RequestLoggingFilter()) + .addFilter(new ResponseLoggingFilter()) + .build(); + } + + protected RequestSpecification given() { + return RestAssured.given(spec); } } diff --git a/src/test/java/com/debatetimer/controller/BaseDocumentTest.java b/src/test/java/com/debatetimer/controller/BaseDocumentTest.java new file mode 100644 index 00000000..46c879a9 --- /dev/null +++ b/src/test/java/com/debatetimer/controller/BaseDocumentTest.java @@ -0,0 +1,96 @@ +package com.debatetimer.controller; + +import static org.mockito.Mockito.when; +import static org.springframework.restdocs.payload.JsonFieldType.STRING; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; + +import com.debatetimer.domain.member.Member; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import com.debatetimer.repository.member.MemberRepository; +import com.debatetimer.service.member.MemberService; +import com.debatetimer.service.parliamentary.ParliamentaryService; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.filter.log.RequestLoggingFilter; +import io.restassured.filter.log.ResponseLoggingFilter; +import io.restassured.specification.RequestSpecification; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.restdocs.RestDocumentationContextProvider; +import org.springframework.restdocs.RestDocumentationExtension; +import org.springframework.restdocs.restassured.RestAssuredRestDocumentation; +import org.springframework.restdocs.restassured.RestAssuredRestDocumentationConfigurer; +import org.springframework.restdocs.restassured.RestDocumentationFilter; +import org.springframework.test.context.bean.override.mockito.MockitoBean; + +@ExtendWith({RestDocumentationExtension.class, MockitoExtension.class}) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public abstract class BaseDocumentTest { + + protected static long EXIST_MEMBER_ID = 123L; + protected static Member EXIST_MEMBER = new Member(EXIST_MEMBER_ID, "존재하는 멤버"); + + protected static RestDocumentationResponse ERROR_RESPONSE = new RestDocumentationResponse() + .responseBodyField( + fieldWithPath("message").type(STRING).description("에러 메시지") + ); + + @MockitoBean + private MemberRepository memberRepository; + + @MockitoBean + protected MemberService memberService; + + @MockitoBean + protected ParliamentaryService parliamentaryService; + + @LocalServerPort + private int port; + + private RequestSpecification spec; + + @BeforeEach + void setEnvironment(RestDocumentationContextProvider restDocumentation) { + setRestAssured(restDocumentation); + setLoginMember(); + } + + private void setRestAssured(RestDocumentationContextProvider restDocumentation) { + RestAssured.port = port; + RestAssuredRestDocumentationConfigurer webConfigurer = + RestAssuredRestDocumentation.documentationConfiguration(restDocumentation); + spec = new RequestSpecBuilder() + .addFilter(webConfigurer) + .addFilter(new RequestLoggingFilter()) + .addFilter(new ResponseLoggingFilter()) + .build(); + } + + private void setLoginMember() { + when(memberRepository.getById(EXIST_MEMBER_ID)).thenReturn(EXIST_MEMBER); + } + + protected RestDocumentationRequest request() { + return new RestDocumentationRequest(); + } + + protected RestDocumentationResponse response() { + return new RestDocumentationResponse(); + } + + protected RestDocumentationFilterBuilder document(String identifierPrefix, int status) { + return new RestDocumentationFilterBuilder(identifierPrefix, Integer.toString(status)); + } + + protected RestDocumentationFilterBuilder document(String identifierPrefix, ClientErrorCode errorCode) { + return new RestDocumentationFilterBuilder(identifierPrefix, errorCode.name()); + } + + protected RequestSpecification given(RestDocumentationFilter documentationFilter) { + return RestAssured.given(spec) + .filter(documentationFilter); + } +} diff --git a/src/test/java/com/debatetimer/controller/RestDocumentationFilterBuilder.java b/src/test/java/com/debatetimer/controller/RestDocumentationFilterBuilder.java new file mode 100644 index 00000000..91ec2a34 --- /dev/null +++ b/src/test/java/com/debatetimer/controller/RestDocumentationFilterBuilder.java @@ -0,0 +1,67 @@ +package com.debatetimer.controller; + +import static com.epages.restdocs.apispec.RestAssuredRestDocumentationWrapper.document; + +import com.epages.restdocs.apispec.ResourceSnippetParametersBuilder; +import java.util.ArrayList; +import java.util.List; +import org.springframework.http.HttpHeaders; +import org.springframework.restdocs.operation.preprocess.OperationRequestPreprocessor; +import org.springframework.restdocs.operation.preprocess.OperationResponsePreprocessor; +import org.springframework.restdocs.operation.preprocess.Preprocessors; +import org.springframework.restdocs.restassured.RestDocumentationFilter; +import org.springframework.restdocs.snippet.Snippet; + +public class RestDocumentationFilterBuilder { + + private static final String IDENTIFIER_DELIMITER = "/"; + private static final OperationRequestPreprocessor REQUEST_PREPROCESSOR = Preprocessors.preprocessRequest( + Preprocessors.prettyPrint(), + Preprocessors.modifyHeaders() + .remove(HttpHeaders.HOST) + .remove(HttpHeaders.CONTENT_LENGTH) + ); + private static final OperationResponsePreprocessor RESPONSE_PREPROCESSOR = Preprocessors.preprocessResponse( + Preprocessors.prettyPrint(), + Preprocessors.modifyHeaders() + .remove(HttpHeaders.TRANSFER_ENCODING) + .remove(HttpHeaders.DATE) + .remove(HttpHeaders.CONNECTION) + .remove(HttpHeaders.CONTENT_LENGTH) + ); + + private final String identifier; + private final List snippets; + private ResourceSnippetParametersBuilder resourceBuilder; + + private RestDocumentationFilterBuilder(String identifier) { + this.identifier = identifier; + this.resourceBuilder = new ResourceSnippetParametersBuilder(); + this.snippets = new ArrayList<>(); + } + + public RestDocumentationFilterBuilder(String identifierPrefix, String identifier) { + this(identifierPrefix + IDENTIFIER_DELIMITER + identifier); + } + + public RestDocumentationFilterBuilder request(RestDocumentationRequest request) { + resourceBuilder = request.getResourceBuilder(); + snippets.addAll(request.getSnippets()); + return this; + } + + public RestDocumentationFilterBuilder response(RestDocumentationResponse response) { + snippets.addAll(response.getSnippets()); + return this; + } + + public RestDocumentationFilter build() { + return document( + identifier, + resourceBuilder, + REQUEST_PREPROCESSOR, + RESPONSE_PREPROCESSOR, + snippets.toArray(Snippet[]::new) + ); + } +} diff --git a/src/test/java/com/debatetimer/controller/RestDocumentationRequest.java b/src/test/java/com/debatetimer/controller/RestDocumentationRequest.java new file mode 100644 index 00000000..6157034f --- /dev/null +++ b/src/test/java/com/debatetimer/controller/RestDocumentationRequest.java @@ -0,0 +1,63 @@ +package com.debatetimer.controller; + +import static org.springframework.restdocs.headers.HeaderDocumentation.requestHeaders; +import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; +import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; +import static org.springframework.restdocs.request.RequestDocumentation.queryParameters; + +import com.epages.restdocs.apispec.ResourceSnippetParametersBuilder; +import java.util.LinkedList; +import java.util.List; +import org.springframework.restdocs.headers.HeaderDescriptor; +import org.springframework.restdocs.payload.FieldDescriptor; +import org.springframework.restdocs.request.ParameterDescriptor; +import org.springframework.restdocs.snippet.Snippet; + +public class RestDocumentationRequest { + + private final ResourceSnippetParametersBuilder resourceBuilder; + private final List snippets; + + public RestDocumentationRequest() { + this.resourceBuilder = new ResourceSnippetParametersBuilder(); + this.snippets = new LinkedList<>(); + } + + public RestDocumentationRequest tag(Tag tag) { + resourceBuilder.tag(tag.getDisplayName()); + return this; + } + + public RestDocumentationRequest summary(String summary) { + resourceBuilder.summary(summary); + return this; + } + + public RestDocumentationRequest pathParameter(ParameterDescriptor... descriptors) { + snippets.add(pathParameters(descriptors)); + return this; + } + + public RestDocumentationRequest queryParameter(ParameterDescriptor... descriptors) { + snippets.add(queryParameters(descriptors)); + return this; + } + + public RestDocumentationRequest requestHeader(HeaderDescriptor... descriptors) { + snippets.add(requestHeaders(descriptors)); + return this; + } + + public RestDocumentationRequest requestBodyField(FieldDescriptor... descriptors) { + snippets.add(requestFields(descriptors)); + return this; + } + + public ResourceSnippetParametersBuilder getResourceBuilder() { + return resourceBuilder; + } + + public List getSnippets() { + return List.copyOf(snippets); + } +} diff --git a/src/test/java/com/debatetimer/controller/RestDocumentationResponse.java b/src/test/java/com/debatetimer/controller/RestDocumentationResponse.java new file mode 100644 index 00000000..2e25a24c --- /dev/null +++ b/src/test/java/com/debatetimer/controller/RestDocumentationResponse.java @@ -0,0 +1,33 @@ +package com.debatetimer.controller; + +import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders; +import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; + +import java.util.LinkedList; +import java.util.List; +import org.springframework.restdocs.headers.HeaderDescriptor; +import org.springframework.restdocs.payload.FieldDescriptor; +import org.springframework.restdocs.snippet.Snippet; + +public class RestDocumentationResponse { + + private final List snippets; + + public RestDocumentationResponse() { + this.snippets = new LinkedList<>(); + } + + public RestDocumentationResponse responseHeader(HeaderDescriptor... descriptors) { + snippets.add(responseHeaders(descriptors)); + return this; + } + + public RestDocumentationResponse responseBodyField(FieldDescriptor... descriptors) { + snippets.add(responseFields(descriptors)); + return this; + } + + public List getSnippets() { + return List.copyOf(snippets); + } +} diff --git a/src/test/java/com/debatetimer/controller/Tag.java b/src/test/java/com/debatetimer/controller/Tag.java new file mode 100644 index 00000000..4b244dea --- /dev/null +++ b/src/test/java/com/debatetimer/controller/Tag.java @@ -0,0 +1,18 @@ +package com.debatetimer.controller; + +public enum Tag { + + MEMBER_API("Member API"), + PARLIAMENTARY_API("Parliamentary Table API"), + ; + + private final String displayName; + + Tag(String displayName) { + this.displayName = displayName; + } + + public String getDisplayName() { + return displayName; + } +} diff --git a/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java b/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java index 77d8e662..a0251731 100644 --- a/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java +++ b/src/test/java/com/debatetimer/controller/member/MemberControllerTest.java @@ -2,13 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.debatetimer.BaseControllerTest; +import com.debatetimer.controller.BaseControllerTest; import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.dto.member.MemberCreateRequest; import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; -import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -22,12 +21,11 @@ class CreateMember { void 회원을_생성한다() { MemberCreateRequest request = new MemberCreateRequest("커찬"); - MemberCreateResponse response = RestAssured.given().log().all() + MemberCreateResponse response = given() .contentType(ContentType.JSON) .body(request) .when().post("/api/member") - .then().log().all() - .statusCode(201) + .then().statusCode(201) .extract().as(MemberCreateResponse.class); assertThat(response.nickname()).isEqualTo(request.nickname()); @@ -35,7 +33,7 @@ class CreateMember { } @Nested - class getTables { + class GetTables { @Test void 회원의_전체_토론_시간표를_조회한다() { @@ -43,12 +41,11 @@ class getTables { parliamentaryTableRepository.save(new ParliamentaryTable(member, "토론 시간표 A", "주제", 1800)); parliamentaryTableRepository.save(new ParliamentaryTable(member, "토론 시간표 B", "주제", 1900)); - TableResponses response = RestAssured.given().log().all() + TableResponses response = given() .contentType(ContentType.JSON) .queryParam("memberId", member.getId()) .when().get("/api/table") - .then().log().all() - .statusCode(200) + .then().statusCode(200) .extract().as(TableResponses.class); assertThat(response.tables()).hasSize(2); diff --git a/src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java b/src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java new file mode 100644 index 00000000..f534011f --- /dev/null +++ b/src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java @@ -0,0 +1,141 @@ +package com.debatetimer.controller.member; + +import static org.mockito.Mockito.when; +import static org.springframework.restdocs.payload.JsonFieldType.ARRAY; +import static org.springframework.restdocs.payload.JsonFieldType.NUMBER; +import static org.springframework.restdocs.payload.JsonFieldType.STRING; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; + +import com.debatetimer.controller.BaseDocumentTest; +import com.debatetimer.controller.RestDocumentationRequest; +import com.debatetimer.controller.RestDocumentationResponse; +import com.debatetimer.controller.Tag; +import com.debatetimer.dto.member.MemberCreateRequest; +import com.debatetimer.dto.member.MemberCreateResponse; +import com.debatetimer.dto.member.TableResponse; +import com.debatetimer.dto.member.TableResponses; +import com.debatetimer.dto.member.TableType; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import io.restassured.http.ContentType; +import java.util.List; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +public class MemberDocumentTest extends BaseDocumentTest { + + @Nested + class CreateMember { + + private final RestDocumentationRequest requestDocument = request() + .tag(Tag.MEMBER_API) + .summary("멤버 생성") + .requestBodyField( + fieldWithPath("nickname").type(STRING).description("멤버 닉네임") + ); + + private final RestDocumentationResponse responseDocument = response() + .responseBodyField( + fieldWithPath("id").type(NUMBER).description("멤버 ID"), + fieldWithPath("nickname").type(STRING).description("멤버 닉네임") + ); + + @Test + void 회원_생성_성공() { + MemberCreateRequest request = new MemberCreateRequest("커찬"); + MemberCreateResponse response = new MemberCreateResponse(1L, "커찬"); + when(memberService.createMember(request)).thenReturn(response); + + var document = document("member/create", 201) + .request(requestDocument) + .response(responseDocument) + .build(); + + given(document) + .contentType(ContentType.JSON) + .body(request) + .when().post("/api/member") + .then().statusCode(201); + } + + @EnumSource( + value = ClientErrorCode.class, + names = {"INVALID_MEMBER_NICKNAME_LENGTH", "INVALID_MEMBER_NICKNAME_FORM"} + ) + @ParameterizedTest + void 회원_생성_실패(ClientErrorCode errorCode) { + MemberCreateRequest request = new MemberCreateRequest("커찬"); + when(memberService.createMember(request)).thenThrow(new DTClientErrorException(errorCode)); + + var document = document("member/create", errorCode) + .request(requestDocument) + .response(ERROR_RESPONSE) + .build(); + + given(document) + .contentType(ContentType.JSON) + .body(request) + .when().post("/api/member") + .then().statusCode(errorCode.getStatus().value()); + } + } + + @Nested + class GetTables { + + private final RestDocumentationRequest requestDocument = request() + .tag(Tag.MEMBER_API) + .summary("멤버의 토론 시간표 조회") + .queryParameter( + parameterWithName("memberId").description("멤버 ID") + ); + + private final RestDocumentationResponse responseDocument = response() + .responseBodyField( + fieldWithPath("tables").type(ARRAY).description("멤버의 토론 테이블들"), + fieldWithPath("tables[].name").type(STRING).description("토론 테이블 이름"), + fieldWithPath("tables[].type").type(STRING).description("토론 타입"), + fieldWithPath("tables[].duration").type(NUMBER).description("소요 시간 (초)") + ); + + @Test + void 테이블_조회_성공() { + TableResponses response = new TableResponses(List.of( + new TableResponse("토론 테이블 1", TableType.PARLIAMENTARY, 1800), + new TableResponse("토론 테이블 2", TableType.PARLIAMENTARY, 2000) + )); + when(memberService.getTables(EXIST_MEMBER_ID)).thenReturn(response); + + var document = document("member/table", 200) + .request(requestDocument) + .response(responseDocument) + .build(); + + given(document) + .contentType(ContentType.JSON) + .queryParam("memberId", EXIST_MEMBER_ID) + .when().get("/api/table") + .then().statusCode(200); + } + + @EnumSource(value = ClientErrorCode.class, names = {"MEMBER_NOT_FOUND"}) + @ParameterizedTest + void 테이블_조회_실패(ClientErrorCode errorCode) { + when(memberService.getTables(EXIST_MEMBER_ID)).thenThrow(new DTClientErrorException(errorCode)); + + var document = document("member/table", errorCode) + .request(requestDocument) + .response(ERROR_RESPONSE) + .build(); + + given(document) + .contentType(ContentType.JSON) + .queryParam("memberId", EXIST_MEMBER_ID) + .when().get("/api/table") + .then().statusCode(errorCode.getStatus().value()); + } + } +} diff --git a/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java index 9f8c11d6..2a13970a 100644 --- a/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java +++ b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryControllerTest.java @@ -3,7 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; -import com.debatetimer.BaseControllerTest; +import com.debatetimer.controller.BaseControllerTest; import com.debatetimer.domain.BoxType; import com.debatetimer.domain.Stance; import com.debatetimer.domain.member.Member; @@ -12,7 +12,6 @@ import com.debatetimer.dto.parliamentary.request.TableInfoCreateRequest; import com.debatetimer.dto.parliamentary.request.TimeBoxCreateRequest; import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; -import io.restassured.RestAssured; import io.restassured.http.ContentType; import java.util.List; import org.junit.jupiter.api.Nested; @@ -24,30 +23,27 @@ class ParliamentaryControllerTest extends BaseControllerTest { class Save { @Test - void 토론_테이블을_생성한다() { + void 의회식_테이블을_생성한다() { Member bito = memberGenerator.generate("비토"); - TableInfoCreateRequest requestTableInfo = new TableInfoCreateRequest("비토 테이블", "주제"); - List requestTimeBoxes = List.of( - new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), - new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) - ); - ParliamentaryTableCreateRequest tableCreateRequest = new ParliamentaryTableCreateRequest( - requestTableInfo, - requestTimeBoxes + ParliamentaryTableCreateRequest request = new ParliamentaryTableCreateRequest( + new TableInfoCreateRequest("비토 테이블", "주제"), + List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ) ); - ParliamentaryTableResponse response = RestAssured.given().log().all() + ParliamentaryTableResponse response = given() .contentType(ContentType.JSON) .queryParam("memberId", bito.getId()) - .body(tableCreateRequest) + .body(request) .when().post("/api/table/parliamentary") - .then().log().all() - .statusCode(201) + .then().statusCode(201) .extract().as(ParliamentaryTableResponse.class); assertAll( - () -> assertThat(response.info().name()).isEqualTo(requestTableInfo.name()), - () -> assertThat(response.table()).hasSize(requestTimeBoxes.size()) + () -> assertThat(response.info().name()).isEqualTo(request.info().name()), + () -> assertThat(response.table()).hasSize(request.table().size()) ); } } @@ -62,13 +58,12 @@ class GetTable { timeBoxGenerator.generate(bitoTable, 1); timeBoxGenerator.generate(bitoTable, 2); - ParliamentaryTableResponse response = RestAssured.given().log().all() + ParliamentaryTableResponse response = given() .contentType(ContentType.JSON) - .queryParam("memberId", bito.getId()) .pathParam("tableId", bitoTable.getId()) + .queryParam("memberId", bito.getId()) .when().get("/api/table/parliamentary/{tableId}") - .then().log().all() - .statusCode(200) + .then().statusCode(200) .extract().as(ParliamentaryTableResponse.class); assertAll( @@ -95,14 +90,13 @@ class UpdateTable { renewTimeBoxes ); - ParliamentaryTableResponse response = RestAssured.given().log().all() + ParliamentaryTableResponse response = given() .contentType(ContentType.JSON) - .queryParam("memberId", bito.getId()) .pathParam("tableId", bitoTable.getId()) + .queryParam("memberId", bito.getId()) .body(renewTableRequest) .when().put("/api/table/parliamentary/{tableId}") - .then().log().all() - .statusCode(200) + .then().statusCode(200) .extract().as(ParliamentaryTableResponse.class); assertAll( @@ -123,13 +117,12 @@ class DeleteTable { timeBoxGenerator.generate(bitoTable, 1); timeBoxGenerator.generate(bitoTable, 2); - RestAssured.given().log().all() + given() .contentType(ContentType.JSON) - .queryParam("memberId", bito.getId()) .pathParam("tableId", bitoTable.getId()) + .queryParam("memberId", bito.getId()) .when().delete("/api/table/parliamentary/{tableId}") - .then().log().all() - .statusCode(204); + .then().statusCode(204); } } } diff --git a/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryDocumentTest.java b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryDocumentTest.java new file mode 100644 index 00000000..2003e00b --- /dev/null +++ b/src/test/java/com/debatetimer/controller/parliamentary/ParliamentaryDocumentTest.java @@ -0,0 +1,372 @@ +package com.debatetimer.controller.parliamentary; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.when; +import static org.springframework.restdocs.payload.JsonFieldType.ARRAY; +import static org.springframework.restdocs.payload.JsonFieldType.NUMBER; +import static org.springframework.restdocs.payload.JsonFieldType.OBJECT; +import static org.springframework.restdocs.payload.JsonFieldType.STRING; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; + +import com.debatetimer.controller.BaseDocumentTest; +import com.debatetimer.controller.RestDocumentationRequest; +import com.debatetimer.controller.RestDocumentationResponse; +import com.debatetimer.controller.Tag; +import com.debatetimer.domain.BoxType; +import com.debatetimer.domain.Stance; +import com.debatetimer.dto.parliamentary.request.ParliamentaryTableCreateRequest; +import com.debatetimer.dto.parliamentary.request.TableInfoCreateRequest; +import com.debatetimer.dto.parliamentary.request.TimeBoxCreateRequest; +import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; +import com.debatetimer.dto.parliamentary.response.TableInfoResponse; +import com.debatetimer.dto.parliamentary.response.TimeBoxResponse; +import com.debatetimer.exception.custom.DTClientErrorException; +import com.debatetimer.exception.errorcode.ClientErrorCode; +import io.restassured.http.ContentType; +import java.util.List; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +public class ParliamentaryDocumentTest extends BaseDocumentTest { + + @Nested + class Save { + + private final RestDocumentationRequest requestDocument = request() + .tag(Tag.PARLIAMENTARY_API) + .summary("새로운 의회식 토론 시간표 생성") + .queryParameter( + parameterWithName("memberId").description("멤버 ID") + ) + .requestBodyField( + fieldWithPath("info").type(OBJECT).description("토론 테이블 정보"), + fieldWithPath("info.name").type(STRING).description("테이블 이름"), + fieldWithPath("info.agenda").type(STRING).description("토론 주제"), + fieldWithPath("table").type(ARRAY).description("토론 테이블 구성"), + fieldWithPath("table[].stance").type(STRING).description("입장"), + fieldWithPath("table[].type").type(STRING).description("발언 유형"), + fieldWithPath("table[].time").type(NUMBER).description("발언 시간(초)"), + fieldWithPath("table[].speakerNumber").type(NUMBER).description("발언자 번호").optional() + ); + + private final RestDocumentationResponse responseDocument = response() + .responseBodyField( + fieldWithPath("id").type(NUMBER).description("테이블 ID"), + fieldWithPath("info").type(OBJECT).description("토론 테이블 정보"), + fieldWithPath("info.name").type(STRING).description("테이블 이름"), + fieldWithPath("info.agenda").type(STRING).description("토론 주제"), + fieldWithPath("table").type(ARRAY).description("토론 테이블 구성"), + fieldWithPath("table[].stance").type(STRING).description("입장"), + fieldWithPath("table[].type").type(STRING).description("발언 유형"), + fieldWithPath("table[].time").type(NUMBER).description("발언 시간(초)"), + fieldWithPath("table[].speakerNumber").type(NUMBER).description("발언자 번호").optional() + ); + + @Test + void 의회식_테이블_생성_성공() { + ParliamentaryTableCreateRequest request = new ParliamentaryTableCreateRequest( + new TableInfoCreateRequest("비토 테이블 1", "토론 주제"), + List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ) + ); + ParliamentaryTableResponse response = new ParliamentaryTableResponse( + 5L, + new TableInfoResponse("비토 테이블 1", "토론 주제"), + List.of( + new TimeBoxResponse(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxResponse(Stance.CONS, BoxType.OPENING, 3, 1) + ) + ); + when(parliamentaryService.save(eq(request), any())).thenReturn(response); + + var document = document("parliamentary/post", 201) + .request(requestDocument) + .response(responseDocument) + .build(); + + given(document) + .contentType(ContentType.JSON) + .queryParam("memberId", EXIST_MEMBER_ID) + .body(request) + .when().post("/api/table/parliamentary") + .then().statusCode(201); + } + + @EnumSource( + value = ClientErrorCode.class, + names = { + "INVALID_TABLE_NAME_LENGTH", + "INVALID_TABLE_NAME_FORM", + "INVALID_TABLE_TIME", + "INVALID_TIME_BOX_TIME", + "INVALID_TIME_BOX_STANCE" + } + ) + @ParameterizedTest + void 의회식_테이블_생성_실패(ClientErrorCode errorCode) { + ParliamentaryTableCreateRequest request = new ParliamentaryTableCreateRequest( + new TableInfoCreateRequest("비토 테이블 1", "토론 주제"), + List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 3, 1) + ) + ); + when(parliamentaryService.save(eq(request), any())).thenThrow(new DTClientErrorException(errorCode)); + + var document = document("parliamentary/post", errorCode) + .request(requestDocument) + .response(ERROR_RESPONSE) + .build(); + + given(document) + .contentType(ContentType.JSON) + .queryParam("memberId", EXIST_MEMBER_ID) + .body(request) + .when().post("/api/table/parliamentary") + .then().statusCode(errorCode.getStatus().value()); + } + } + + @Nested + class GetTable { + + private final RestDocumentationRequest requestDocument = request() + .summary("의회식 토론 시간표 조회") + .tag(Tag.PARLIAMENTARY_API) + .pathParameter( + parameterWithName("tableId").description("테이블 ID") + ) + .queryParameter( + parameterWithName("memberId").description("멤버 ID") + ); + + private final RestDocumentationResponse responseDocument = response() + .responseBodyField( + fieldWithPath("id").type(NUMBER).description("테이블 ID"), + fieldWithPath("info").type(OBJECT).description("토론 테이블 정보"), + fieldWithPath("info.name").type(STRING).description("테이블 이름"), + fieldWithPath("info.agenda").type(STRING).description("토론 주제"), + fieldWithPath("table").type(ARRAY).description("토론 테이블 구성"), + fieldWithPath("table[].stance").type(STRING).description("입장"), + fieldWithPath("table[].type").type(STRING).description("발언 유형"), + fieldWithPath("table[].time").type(NUMBER).description("발언 시간(초)"), + fieldWithPath("table[].speakerNumber").type(NUMBER).description("발언자 번호").optional() + ); + + @Test + void 의회식_테이블_조회_성공() { + long memberId = 4L; + long tableId = 5L; + ParliamentaryTableResponse response = new ParliamentaryTableResponse( + 5L, + new TableInfoResponse("비토 테이블 1", "토론 주제"), + List.of( + new TimeBoxResponse(Stance.PROS, BoxType.OPENING, 3, 1), + new TimeBoxResponse(Stance.CONS, BoxType.OPENING, 3, 1) + ) + ); + when(parliamentaryService.findTable(eq(tableId), any())).thenReturn(response); + + var document = document("parliamentary/get", 200) + .request(requestDocument) + .response(responseDocument) + .build(); + + given(document) + .contentType(ContentType.JSON) + .pathParam("tableId", tableId) + .queryParam("memberId", memberId) + .when().get("/api/table/parliamentary/{tableId}") + .then().statusCode(200); + } + + @ParameterizedTest + @EnumSource(value = ClientErrorCode.class, names = {"TABLE_NOT_FOUND", "NOT_TABLE_OWNER"}) + void 의회식_테이블_조회_실패(ClientErrorCode errorCode) { + long memberId = 4L; + long tableId = 5L; + when(parliamentaryService.findTable(eq(tableId), any())).thenThrow(new DTClientErrorException(errorCode)); + + var document = document("parliamentary/get", errorCode) + .request(requestDocument) + .response(ERROR_RESPONSE) + .build(); + + given(document) + .contentType(ContentType.JSON) + .pathParam("tableId", tableId) + .queryParam("memberId", memberId) + .when().get("/api/table/parliamentary/{tableId}") + .then().statusCode(errorCode.getStatus().value()); + } + } + + @Nested + class UpdateTable { + + private final RestDocumentationRequest requestDocument = request() + .tag(Tag.PARLIAMENTARY_API) + .summary("의회식 토론 시간표 수정") + .pathParameter( + parameterWithName("tableId").description("테이블 ID") + ) + .queryParameter( + parameterWithName("memberId").description("멤버 ID") + ) + .requestBodyField( + fieldWithPath("info").type(OBJECT).description("토론 테이블 정보"), + fieldWithPath("info.name").type(STRING).description("테이블 이름"), + fieldWithPath("info.agenda").type(STRING).description("토론 주제"), + fieldWithPath("table").type(ARRAY).description("토론 테이블 구성"), + fieldWithPath("table[].stance").type(STRING).description("입장"), + fieldWithPath("table[].type").type(STRING).description("발언 유형"), + fieldWithPath("table[].time").type(NUMBER).description("발언 시간(초)"), + fieldWithPath("table[].speakerNumber").type(NUMBER).description("발언자 번호").optional() + ); + + private final RestDocumentationResponse responseDocument = response() + .responseBodyField( + fieldWithPath("id").type(NUMBER).description("테이블 ID"), + fieldWithPath("info").type(OBJECT).description("토론 테이블 정보"), + fieldWithPath("info.name").type(STRING).description("테이블 이름"), + fieldWithPath("info.agenda").type(STRING).description("토론 주제"), + fieldWithPath("table").type(ARRAY).description("토론 테이블 구성"), + fieldWithPath("table[].stance").type(STRING).description("입장"), + fieldWithPath("table[].type").type(STRING).description("발언 유형"), + fieldWithPath("table[].time").type(NUMBER).description("발언 시간(초)"), + fieldWithPath("table[].speakerNumber").type(NUMBER).description("발언자 번호").optional() + ); + + @Test + void 의회식_토론_테이블_수정() { + long memberId = 4L; + long tableId = 5L; + ParliamentaryTableCreateRequest request = new ParliamentaryTableCreateRequest( + new TableInfoCreateRequest("비토 테이블 2", "토론 주제 2"), + List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 300, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 300, 1) + ) + ); + ParliamentaryTableResponse response = new ParliamentaryTableResponse( + 5L, + new TableInfoResponse("비토 테이블 2", "토론 주제 2"), + List.of( + new TimeBoxResponse(Stance.PROS, BoxType.OPENING, 300, 1), + new TimeBoxResponse(Stance.CONS, BoxType.OPENING, 300, 1) + ) + ); + when(parliamentaryService.updateTable(eq(request), eq(tableId), any())).thenReturn(response); + + var document = document("parliamentary/put", 200) + .request(requestDocument) + .response(responseDocument) + .build(); + + given(document) + .contentType(ContentType.JSON) + .queryParam("memberId", memberId) + .pathParam("tableId", tableId) + .body(request) + .when().put("/api/table/parliamentary/{tableId}") + .then().statusCode(200); + } + + @EnumSource( + value = ClientErrorCode.class, + names = { + "INVALID_TABLE_NAME_LENGTH", + "INVALID_TABLE_NAME_FORM", + "INVALID_TABLE_TIME", + "INVALID_TIME_BOX_TIME", + "INVALID_TIME_BOX_STANCE", + "NOT_TABLE_OWNER" + } + ) + @ParameterizedTest + void 의회식_테이블_생성_실패(ClientErrorCode errorCode) { + long memberId = 4L; + long tableId = 5L; + ParliamentaryTableCreateRequest request = new ParliamentaryTableCreateRequest( + new TableInfoCreateRequest("비토 테이블 2", "토론 주제 2"), + List.of( + new TimeBoxCreateRequest(Stance.PROS, BoxType.OPENING, 300, 1), + new TimeBoxCreateRequest(Stance.CONS, BoxType.OPENING, 300, 1) + ) + ); + when(parliamentaryService.updateTable(eq(request), eq(tableId), any())) + .thenThrow(new DTClientErrorException(errorCode)); + + var document = document("parliamentary/put", errorCode) + .request(requestDocument) + .response(ERROR_RESPONSE) + .build(); + + given(document) + .contentType(ContentType.JSON) + .pathParam("tableId", tableId) + .queryParam("memberId", memberId) + .body(request) + .when().put("/api/table/parliamentary/{tableId}") + .then().statusCode(errorCode.getStatus().value()); + } + } + + @Nested + class DeleteTable { + + private final RestDocumentationRequest requestDocument = request() + .tag(Tag.PARLIAMENTARY_API) + .summary("의회식 토론 시간표 삭제") + .pathParameter( + parameterWithName("tableId").description("테이블 ID") + ) + .queryParameter( + parameterWithName("memberId").description("멤버 ID") + ); + + @Test + void 의회식_테이블_삭제_성공() { + long memberId = 4L; + long tableId = 5L; + doNothing().when(parliamentaryService).deleteTable(eq(tableId), any()); + + var document = document("parliamentary/delete", 204) + .request(requestDocument) + .build(); + + given(document) + .pathParam("tableId", tableId) + .queryParam("memberId", memberId) + .when().delete("/api/table/parliamentary/{tableId}") + .then().statusCode(204); + } + + @EnumSource(value = ClientErrorCode.class, names = {"TABLE_NOT_FOUND", "NOT_TABLE_OWNER"}) + @ParameterizedTest + void 의회식_테이블_삭제_실패(ClientErrorCode errorCode) { + long memberId = 4L; + long tableId = 5L; + doThrow(new DTClientErrorException(errorCode)).when(parliamentaryService).deleteTable(eq(tableId), any()); + + var document = document("parliamentary/delete", errorCode) + .request(requestDocument) + .response(ERROR_RESPONSE) + .build(); + + given(document) + .pathParam("tableId", tableId) + .queryParam("memberId", memberId) + .when().delete("/api/table/parliamentary/{tableId}") + .then().statusCode(errorCode.getStatus().value()); + } + } +} From e4db013b0adb28ac11c19098b2517e51ba7e365e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Mon, 13 Jan 2025 19:29:48 +0900 Subject: [PATCH 27/38] =?UTF-8?q?[TEST]=20BaseTest=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=98=AE=EA=B8=B0=EA=B8=B0=20(#5?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/debatetimer/{ => repository}/BaseRepositoryTest.java | 2 +- .../parliamentary/ParliamentaryTableRepositoryTest.java | 2 +- .../parliamentary/ParliamentaryTimeBoxRepositoryTest.java | 2 +- .../java/com/debatetimer/{ => service}/BaseServiceTest.java | 3 ++- .../java/com/debatetimer/service/member/MemberServiceTest.java | 2 +- .../service/parliamentary/ParliamentaryServiceTest.java | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) rename src/test/java/com/debatetimer/{ => repository}/BaseRepositoryTest.java (95%) rename src/test/java/com/debatetimer/{ => service}/BaseServiceTest.java (94%) diff --git a/src/test/java/com/debatetimer/BaseRepositoryTest.java b/src/test/java/com/debatetimer/repository/BaseRepositoryTest.java similarity index 95% rename from src/test/java/com/debatetimer/BaseRepositoryTest.java rename to src/test/java/com/debatetimer/repository/BaseRepositoryTest.java index afbecbbb..baf01463 100644 --- a/src/test/java/com/debatetimer/BaseRepositoryTest.java +++ b/src/test/java/com/debatetimer/repository/BaseRepositoryTest.java @@ -1,4 +1,4 @@ -package com.debatetimer; +package com.debatetimer.repository; import com.debatetimer.fixture.MemberGenerator; import com.debatetimer.fixture.ParliamentaryTableGenerator; diff --git a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java index a8e6d2b2..0ccdb063 100644 --- a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java +++ b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepositoryTest.java @@ -3,11 +3,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import com.debatetimer.BaseRepositoryTest; import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.exception.custom.DTClientErrorException; import com.debatetimer.exception.errorcode.ClientErrorCode; +import com.debatetimer.repository.BaseRepositoryTest; import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java index bb5a5407..07cac513 100644 --- a/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java +++ b/src/test/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepositoryTest.java @@ -2,10 +2,10 @@ import static org.assertj.core.api.Assertions.assertThat; -import com.debatetimer.BaseRepositoryTest; import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; +import com.debatetimer.repository.BaseRepositoryTest; import java.util.List; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/debatetimer/BaseServiceTest.java b/src/test/java/com/debatetimer/service/BaseServiceTest.java similarity index 94% rename from src/test/java/com/debatetimer/BaseServiceTest.java rename to src/test/java/com/debatetimer/service/BaseServiceTest.java index 6333640b..e68e262a 100644 --- a/src/test/java/com/debatetimer/BaseServiceTest.java +++ b/src/test/java/com/debatetimer/service/BaseServiceTest.java @@ -1,5 +1,6 @@ -package com.debatetimer; +package com.debatetimer.service; +import com.debatetimer.DataBaseCleaner; import com.debatetimer.fixture.MemberGenerator; import com.debatetimer.fixture.ParliamentaryTableGenerator; import com.debatetimer.fixture.ParliamentaryTimeBoxGenerator; diff --git a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java index 44937deb..685661a2 100644 --- a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java +++ b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java @@ -3,12 +3,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; -import com.debatetimer.BaseServiceTest; import com.debatetimer.domain.member.Member; import com.debatetimer.domain.parliamentary.ParliamentaryTable; import com.debatetimer.dto.member.MemberCreateRequest; import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; +import com.debatetimer.service.BaseServiceTest; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java index 87da8c0c..9650711e 100644 --- a/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java +++ b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java @@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; -import com.debatetimer.BaseServiceTest; import com.debatetimer.domain.BoxType; import com.debatetimer.domain.Stance; import com.debatetimer.domain.member.Member; @@ -16,6 +15,7 @@ import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; import com.debatetimer.exception.custom.DTClientErrorException; import com.debatetimer.exception.errorcode.ClientErrorCode; +import com.debatetimer.service.BaseServiceTest; import java.util.List; import java.util.Optional; import org.junit.jupiter.api.Nested; From aa9a2b2a2e7f231c4f8e167b665ae65d27e5f8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Tue, 14 Jan 2025 17:16:01 +0900 Subject: [PATCH 28/38] =?UTF-8?q?[FIX]=20=EB=A9=A4=EB=B2=84=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=A1=B0=ED=9A=8C=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#52)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/debatetimer/dto/member/TableResponse.java | 9 +++++++-- .../controller/member/MemberDocumentTest.java | 5 +++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/debatetimer/dto/member/TableResponse.java b/src/main/java/com/debatetimer/dto/member/TableResponse.java index 855213c6..769d0ace 100644 --- a/src/main/java/com/debatetimer/dto/member/TableResponse.java +++ b/src/main/java/com/debatetimer/dto/member/TableResponse.java @@ -2,9 +2,14 @@ import com.debatetimer.domain.parliamentary.ParliamentaryTable; -public record TableResponse(String name, TableType type, int duration) { +public record TableResponse(long id, String name, TableType type, int duration) { public TableResponse(ParliamentaryTable parliamentaryTable) { - this(parliamentaryTable.getName(), TableType.PARLIAMENTARY, parliamentaryTable.getDuration()); + this( + parliamentaryTable.getId(), + parliamentaryTable.getName(), + TableType.PARLIAMENTARY, + parliamentaryTable.getDuration() + ); } } diff --git a/src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java b/src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java index f534011f..a9edd6d2 100644 --- a/src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java +++ b/src/test/java/com/debatetimer/controller/member/MemberDocumentTest.java @@ -96,6 +96,7 @@ class GetTables { private final RestDocumentationResponse responseDocument = response() .responseBodyField( fieldWithPath("tables").type(ARRAY).description("멤버의 토론 테이블들"), + fieldWithPath("tables[].id").type(NUMBER).description("토론 테이블 ID (토론 타입 별로 ID를 가짐)"), fieldWithPath("tables[].name").type(STRING).description("토론 테이블 이름"), fieldWithPath("tables[].type").type(STRING).description("토론 타입"), fieldWithPath("tables[].duration").type(NUMBER).description("소요 시간 (초)") @@ -104,8 +105,8 @@ class GetTables { @Test void 테이블_조회_성공() { TableResponses response = new TableResponses(List.of( - new TableResponse("토론 테이블 1", TableType.PARLIAMENTARY, 1800), - new TableResponse("토론 테이블 2", TableType.PARLIAMENTARY, 2000) + new TableResponse(1L, "토론 테이블 1", TableType.PARLIAMENTARY, 1800), + new TableResponse(2L, "토론 테이블 2", TableType.PARLIAMENTARY, 2000) )); when(memberService.getTables(EXIST_MEMBER_ID)).thenReturn(response); From 19093245bdcaa3f7c97d8626f0cedcf05746a037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:10:25 +0900 Subject: [PATCH 29/38] =?UTF-8?q?[CHORE]=20Discord=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?embeds=20=EA=B0=9C=EC=84=A0=20(#56)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Comment_Notification.yml | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/PR_Comment_Notification.yml b/.github/workflows/PR_Comment_Notification.yml index f8a2ebf5..4a6eed2b 100644 --- a/.github/workflows/PR_Comment_Notification.yml +++ b/.github/workflows/PR_Comment_Notification.yml @@ -2,7 +2,7 @@ name: Discord Notification on Issue & PR Comment on: issue_comment: - types: [ created, edited ] + types: [ created ] pull_request_review: types: [ submitted ] @@ -15,37 +15,34 @@ jobs: run: | echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV - - name: Set Environment Variables for PR Comments - if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} + - name: Set Environment Variables for Issue + if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} run: | + echo "POST_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV echo "COMMENT_AUTHOR=${{ github.event.comment.user.login }}" >> $GITHUB_ENV - echo "PR_URL=${{ github.event.issue.pull_request.html_url }}" >> $GITHUB_ENV - echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV - echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "COMMENT_AUTHOR_AVATAR=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV + echo "POST_AUTHOR=${{ github.event.issue.user.login }}" >> $GITHUB_ENV + echo "POST_AUTHOR_AVATAR=${{ github.event.issue.user.avatar_url }}" >> $GITHUB_ENV echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV - echo "COMMENT_BODY=Pull Request" >> $GITHUB_ENV - - - name: Set Environment Variables for PR Review Comment - if: ${{ contains(github.event.review.body, '/noti') }} - run: | - echo "COMMENT_AUTHOR=${{ github.event.review.user.login }}" >> $GITHUB_ENV - echo "PR_URL=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV - echo "AUTHOR_URL=${{ github.event.review.user.avatar_url }}" >> $GITHUB_ENV - echo "CONTENT=$(echo '${{ github.event.review.body }}' | base64 -w 0)" >> $GITHUB_ENV - echo "TITLE=${{ github.event.pull_request.title }}" >> $GITHUB_ENV - echo "COMMENT_BODY=Pull Request" >> $GITHUB_ENV + echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "POST_TYPE=Issue" >> $GITHUB_ENV - - name: Set Environment Variables for Issue - if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} + - name: Set Environment Variables for PR Comments + if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} run: | + echo "POST_URL=${{ github.event.issue.pull_request.html_url }}" >> $GITHUB_ENV echo "COMMENT_AUTHOR=${{ github.event.comment.user.login }}" >> $GITHUB_ENV - echo "PR_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV - echo "AUTHOR_URL=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV - echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "COMMENT_AUTHOR_AVATAR=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV - echo "COMMENT_BODY=Issue" >> $GITHUB_ENV + echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "POST_TYPE=Pull Request" >> $GITHUB_ENV + + PR_DATA=$(curl -s -H "Accept: application/vnd.github.v3+json" \ + "${{ github.event.issue.pull_request.url }}") + echo "POST_AUTHOR=$(echo "$PR_DATA" | jq -r '.user.login')" >> $GITHUB_ENV + echo "POST_AUTHOR_AVATAR=$(echo "$PR_DATA" | jq -r '.user.avatar_url')" >> $GITHUB_ENV - - name : Set Discord Content + - name: Set Discord Content if: ${{ env.CONTENT }} env: CONTENT: ${{ env.CONTENT }} @@ -67,47 +64,50 @@ jobs: echo "DISCORD_CONTENT=$(echo $content | base64 -w 0)" >> $GITHUB_ENV - name: Notify Discord - if: ${{ env.COMMENT_AUTHOR && env.PR_URL && env.AUTHOR_URL && env.DISCORD_CONTENT && env.COMMENT_BODY }} + if: ${{ env.WEB_HOOK && env.POST_URL && env.DISCORD_CONTENT }} env: - COMMENT_BODY: ${{ env.COMMENT_BODY }} - WEB_HOOK: ${{ env.WEB_HOOK }} - COMMENT_AUTHOR: ${{ env.COMMENT_AUTHOR }} - PR_URL: ${{ env.PR_URL }} - AUTHOR_URL: ${{ env.AUTHOR_URL }} DISCORD_CONTENT: ${{ env.DISCORD_CONTENT }} + COMMENT_AUTHOR: ${{ env.COMMENT_AUTHOR }} + COMMENT_AUTHOR_AVATAR: ${{ env.COMMENT_AUTHOR_AVATAR }} TITLE: ${{ env.TITLE }} + POST_URL: ${{ env.POST_URL }} + POST_AUTHOR: ${{ env.POST_AUTHOR }} + POST_AUTHOR_AVATAR: ${{ env.POST_AUTHOR_AVATAR }} + POST_TYPE: ${{ env.POST_TYPE }} + WEB_HOOK: ${{ env.WEB_HOOK }} run: | CONTENT_DECODED=$(echo "$DISCORD_CONTENT" | base64 --decode) if [ -n "$WEB_HOOK" ]; then JSON_PAYLOAD=$(jq -n \ --arg content "$CONTENT_DECODED" \ - --arg description "$COMMENT_BODY" \ - --arg title "$TITLE" \ - --arg url "$PR_URL" \ - --arg author_url "$AUTHOR_URL" \ - --arg author_name "$COMMENT_AUTHOR" \ + --arg comment_author "$COMMENT_AUTHOR" \ + --arg comment_author_avatar "$COMMENT_AUTHOR_AVATAR" \ + --arg embeds_title "$TITLE" \ + --arg post_url "$POST_URL" \ + --arg post_author "$POST_AUTHOR" \ + --arg post_author_avatar "$POST_AUTHOR_AVATAR" \ + --arg description "$POST_TYPE" \ --arg color "5814783" \ --arg timestamp "$(date -u +"%Y-%m-%dT%H:%M:%SZ")" \ '{ content: $content, - username: $author_name, - avatar_url: $author_url, - allowed_mentions: { - parse: ["users", "roles"] - }, + username: $comment_author, + avatar_url: $comment_author_avatar, embeds: [{ - title: $title, - url: $url, + title: $embeds_title, + url: $post_url, author: { - name: $author_name, - icon_url: $author_url + name: $post_author, + icon_url: $post_author_avatar }, description: $description, color: ($color | tonumber), timestamp: $timestamp - }] + }], + allowed_mentions: { + parse: ["users", "roles"] + } }') - curl -X POST -H "Content-Type: application/json" -d "$JSON_PAYLOAD" "$WEB_HOOK" else echo "No matching title found. Skipping notification." From ebcd17cb3558051e77abe824044bb789cd1d9b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 17 Jan 2025 21:24:02 +0900 Subject: [PATCH 30/38] =?UTF-8?q?[REFACTOR]=20Repository=20=EC=83=81?= =?UTF-8?q?=EC=86=8D=20=EA=B0=9D=EC=B2=B4=20=EC=A0=84=ED=99=98=20(#53)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../parliamentary/ParliamentaryTimeBoxes.java | 7 ++++-- .../repository/member/MemberRepository.java | 9 ++++++-- .../ParliamentaryTableRepository.java | 13 ++++++++--- .../ParliamentaryTimeBoxRepository.java | 23 ++++++++++++++++--- .../service/member/MemberService.java | 2 +- .../parliamentary/ParliamentaryService.java | 7 ++---- .../service/member/MemberServiceTest.java | 5 ++-- .../ParliamentaryServiceTest.java | 2 +- 8 files changed, 49 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java index b993443a..e0431e3b 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTimeBoxes.java @@ -3,7 +3,9 @@ import java.util.Comparator; import java.util.List; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Getter public class ParliamentaryTimeBoxes { @@ -13,7 +15,8 @@ public class ParliamentaryTimeBoxes { private final List timeBoxes; public ParliamentaryTimeBoxes(List timeBoxes) { - timeBoxes.sort(TIME_BOX_COMPARATOR); - this.timeBoxes = timeBoxes; + this.timeBoxes = timeBoxes.stream() + .sorted(TIME_BOX_COMPARATOR) + .toList(); } } diff --git a/src/main/java/com/debatetimer/repository/member/MemberRepository.java b/src/main/java/com/debatetimer/repository/member/MemberRepository.java index 284f257c..03e43577 100644 --- a/src/main/java/com/debatetimer/repository/member/MemberRepository.java +++ b/src/main/java/com/debatetimer/repository/member/MemberRepository.java @@ -3,9 +3,14 @@ import com.debatetimer.domain.member.Member; import com.debatetimer.exception.custom.DTClientErrorException; import com.debatetimer.exception.errorcode.ClientErrorCode; -import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; +import org.springframework.data.repository.Repository; -public interface MemberRepository extends JpaRepository { +public interface MemberRepository extends Repository { + + Member save(Member member); + + Optional findById(long id); default Member getById(long id) { return findById(id) diff --git a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java index 14f7fabf..f60ca55b 100644 --- a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java +++ b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTableRepository.java @@ -5,14 +5,21 @@ import com.debatetimer.exception.custom.DTClientErrorException; import com.debatetimer.exception.errorcode.ClientErrorCode; import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; +import org.springframework.data.repository.Repository; -public interface ParliamentaryTableRepository extends JpaRepository { +public interface ParliamentaryTableRepository extends Repository { - List findAllByMember(Member member); + ParliamentaryTable save(ParliamentaryTable parliamentaryTable); + + Optional findById(long id); default ParliamentaryTable getById(long tableId) { return findById(tableId) .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.TABLE_NOT_FOUND)); } + + List findAllByMember(Member member); + + void delete(ParliamentaryTable table); } diff --git a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java index 74673d2d..c641c242 100644 --- a/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java +++ b/src/main/java/com/debatetimer/repository/parliamentary/ParliamentaryTimeBoxRepository.java @@ -4,14 +4,31 @@ import com.debatetimer.domain.parliamentary.ParliamentaryTimeBox; import com.debatetimer.domain.parliamentary.ParliamentaryTimeBoxes; import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.Repository; +import org.springframework.transaction.annotation.Transactional; -public interface ParliamentaryTimeBoxRepository extends JpaRepository { +public interface ParliamentaryTimeBoxRepository extends Repository { + + ParliamentaryTimeBox save(ParliamentaryTimeBox timeBox); + + @Transactional + default List saveAll(List timeBoxes) { + return timeBoxes.stream() + .map(this::save) + .toList(); + } + + List findAllByParliamentaryTable(ParliamentaryTable table); default ParliamentaryTimeBoxes findTableTimeBoxes(ParliamentaryTable table) { List timeBoxes = findAllByParliamentaryTable(table); return new ParliamentaryTimeBoxes(timeBoxes); } - List findAllByParliamentaryTable(ParliamentaryTable table); + @Query("DELETE FROM ParliamentaryTimeBox ptb WHERE ptb IN :timeBoxes") + @Modifying(clearAutomatically = true) + @Transactional + void deleteAll(List timeBoxes); } diff --git a/src/main/java/com/debatetimer/service/member/MemberService.java b/src/main/java/com/debatetimer/service/member/MemberService.java index 69a0dd46..67a9ded9 100644 --- a/src/main/java/com/debatetimer/service/member/MemberService.java +++ b/src/main/java/com/debatetimer/service/member/MemberService.java @@ -21,7 +21,7 @@ public class MemberService { @Transactional(readOnly = true) public TableResponses getTables(Long memberId) { - Member member = memberRepository.getById(memberId.longValue()); + Member member = memberRepository.getById(memberId); List parliamentaryTable = parliamentaryTableRepository.findAllByMember(member); return TableResponses.from(parliamentaryTable); } diff --git a/src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java b/src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java index d7a318d9..1aad472a 100644 --- a/src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java +++ b/src/main/java/com/debatetimer/service/parliamentary/ParliamentaryService.java @@ -10,7 +10,6 @@ import com.debatetimer.exception.errorcode.ClientErrorCode; import com.debatetimer.repository.parliamentary.ParliamentaryTableRepository; import com.debatetimer.repository.parliamentary.ParliamentaryTimeBoxRepository; -import jakarta.persistence.EntityManager; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -22,7 +21,6 @@ public class ParliamentaryService { private final ParliamentaryTableRepository tableRepository; private final ParliamentaryTimeBoxRepository timeBoxRepository; - private final EntityManager entityManager; @Transactional public ParliamentaryTableResponse save(ParliamentaryTableCreateRequest tableCreateRequest, Member member) { @@ -51,7 +49,7 @@ public ParliamentaryTableResponse updateTable( existingTable.update(renewedTable); ParliamentaryTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(existingTable); - timeBoxRepository.deleteAllInBatch(timeBoxes.getTimeBoxes()); + timeBoxRepository.deleteAll(timeBoxes.getTimeBoxes()); ParliamentaryTimeBoxes savedTimeBoxes = saveTimeBoxes(tableCreateRequest, existingTable); return new ParliamentaryTableResponse(existingTable, savedTimeBoxes); } @@ -60,8 +58,7 @@ public ParliamentaryTableResponse updateTable( public void deleteTable(Long tableId, Member member) { ParliamentaryTable table = getOwnerTable(tableId, member.getId()); ParliamentaryTimeBoxes timeBoxes = timeBoxRepository.findTableTimeBoxes(table); - timeBoxRepository.deleteAllInBatch(timeBoxes.getTimeBoxes()); - entityManager.clear(); + timeBoxRepository.deleteAll(timeBoxes.getTimeBoxes()); tableRepository.delete(table); } diff --git a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java index 685661a2..22d504bb 100644 --- a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java +++ b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java @@ -9,6 +9,7 @@ import com.debatetimer.dto.member.MemberCreateResponse; import com.debatetimer.dto.member.TableResponses; import com.debatetimer.service.BaseServiceTest; +import java.util.Optional; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,10 +28,10 @@ class CreateMember { MemberCreateResponse actual = memberService.createMember(request); - long memberCount = memberRepository.count(); + Optional foundMember = memberRepository.findById(actual.id()); assertAll( () -> assertThat(actual.nickname()).isEqualTo(request.nickname()), - () -> assertThat(memberCount).isEqualTo(1L) + () -> assertThat(foundMember).isPresent() ); } } diff --git a/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java index 9650711e..89196065 100644 --- a/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java +++ b/src/test/java/com/debatetimer/service/parliamentary/ParliamentaryServiceTest.java @@ -150,7 +150,7 @@ class DeleteTable { List timeBoxes = timeBoxRepository.findAllByParliamentaryTable(chanTable); assertAll( - () -> assertThat(foundTable).isNotPresent(), + () -> assertThat(foundTable).isEmpty(), () -> assertThat(timeBoxes).isEmpty() ); } From 94d77f2f27c6c08f7689fec364f85d7b7dddd431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B1=B4=EC=9A=B0?= Date: Fri, 17 Jan 2025 23:55:28 +0900 Subject: [PATCH 31/38] =?UTF-8?q?[FEAT]=20Excel=20export=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#49)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 + .../exception/errorcode/ServerErrorCode.java | 2 +- .../view/exporter/BoxTypeView.java | 30 +++ .../ParliamentaryTableExcelExporter.java | 189 ++++++++++++++++++ ...rliamentaryTableExportMessageResolver.java | 51 +++++ .../view/exporter/BoxTypeViewTest.java | 22 ++ 6 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/debatetimer/view/exporter/BoxTypeView.java create mode 100644 src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExcelExporter.java create mode 100644 src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExportMessageResolver.java create mode 100644 src/test/java/com/debatetimer/view/exporter/BoxTypeViewTest.java diff --git a/build.gradle b/build.gradle index 62904fed..e8d54d82 100644 --- a/build.gradle +++ b/build.gradle @@ -46,6 +46,10 @@ dependencies { testImplementation 'org.springframework.restdocs:spring-restdocs-restassured' testImplementation 'com.epages:restdocs-api-spec-mockmvc:0.18.2' testImplementation 'com.epages:restdocs-api-spec-restassured:0.18.2' + + // Excel Export + implementation 'org.apache.poi:poi-ooxml:5.2.3' + implementation 'org.apache.poi:poi:5.2.3' } bootJar { diff --git a/src/main/java/com/debatetimer/exception/errorcode/ServerErrorCode.java b/src/main/java/com/debatetimer/exception/errorcode/ServerErrorCode.java index ce05541b..c3ebba80 100644 --- a/src/main/java/com/debatetimer/exception/errorcode/ServerErrorCode.java +++ b/src/main/java/com/debatetimer/exception/errorcode/ServerErrorCode.java @@ -7,7 +7,7 @@ public enum ServerErrorCode implements ErrorCode { INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 오류가 발생했습니다. 관리자에게 문의하세요."), - ; + EXCEL_EXPORT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "엑셀 변환 과정에서 오류가 발생하였습니다"); private final HttpStatus status; private final String message; diff --git a/src/main/java/com/debatetimer/view/exporter/BoxTypeView.java b/src/main/java/com/debatetimer/view/exporter/BoxTypeView.java new file mode 100644 index 00000000..e42bcea8 --- /dev/null +++ b/src/main/java/com/debatetimer/view/exporter/BoxTypeView.java @@ -0,0 +1,30 @@ +package com.debatetimer.view.exporter; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.exception.custom.DTServerErrorException; +import com.debatetimer.exception.errorcode.ServerErrorCode; +import java.util.stream.Stream; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum BoxTypeView { + OPENING_VIEW(BoxType.OPENING, "입론"), + REBUTTAL_VIEW(BoxType.REBUTTAL, "반론"), + CROSS(BoxType.CROSS, "교차 질의"), + CLOSING(BoxType.CLOSING, "최종 발언"), + TIME_OUT(BoxType.TIME_OUT, "작전 시간"), + ; + + private final BoxType boxType; + private final String viewMessage; + + public static String mapView(BoxType target) { + return Stream.of(values()) + .filter(value -> value.boxType == target) + .findAny() + .orElseThrow(() -> new DTServerErrorException(ServerErrorCode.EXCEL_EXPORT_ERROR)) + .viewMessage; + } +} diff --git a/src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExcelExporter.java b/src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExcelExporter.java new file mode 100644 index 00000000..20a27ccc --- /dev/null +++ b/src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExcelExporter.java @@ -0,0 +1,189 @@ +package com.debatetimer.view.exporter; + +import com.debatetimer.domain.Stance; +import com.debatetimer.dto.parliamentary.response.ParliamentaryTableResponse; +import com.debatetimer.dto.parliamentary.response.TableInfoResponse; +import com.debatetimer.dto.parliamentary.response.TimeBoxResponse; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.Font; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ParliamentaryTableExcelExporter { + + private static Font NORMAL; + private static Font BOLD; + private static Font BOLD_AND_WHITE; + + private static CellStyle HEADER_STYLE; + private static CellStyle HEADER_CELL_STYLE; + private static CellStyle PROS_HEADER_STYLE; + private static CellStyle CONS_HEADER_STYLE; + private static CellStyle PROS_STYLE; + private static CellStyle CONS_STYLE; + private static CellStyle NEUTRAL_STYLE; + + private static final String NAME_HEADER = "테이블 이름"; + private static final String TYPE_HEADER = "형식"; + private static final String PARLIAMENTARY_HEADER_BODY = "의회식 토론"; + private static final String AGENDA_HEADER = "토론 주제"; + private static final String PROS_HEADER = "찬성"; + private static final String CONS_HEADER = "반대"; + + private static final int PROS_COLUMN_NUMBER = 0; + private static final int CONS_COLUMN_NUMBER = 1; + private static final int NAME_HEADER_ROW_NUMBER = 1; + private static final int TYPE_HEADER_ROW_NUMBER = 2; + private static final int AGENDA_HEADER_ROW_NUMBER = 3; + private static final int TABLE_HEADER_ROW_NUMBER = 5; + private static final int TIME_BOX_FIRST_ROW_NUMBER = 6; + private static final int END_COLUMN_NUMBER = 3; + private static final int WIDTH_SIZE = 10000; + + private final ParliamentaryTableExportMessageResolver messageResolver; + + private static Font createFont(Workbook workbook, boolean bold, IndexedColors fontColor) { + Font font = workbook.createFont(); + font.setColor(fontColor.getIndex()); + font.setBold(bold); + return font; + } + + private static CellStyle createGroundColor( + Workbook workBook, + IndexedColors color, + Font cellFont, + HorizontalAlignment align + ) { + CellStyle style = workBook.createCellStyle(); + style.setFillForegroundColor(color.getIndex()); + style.setFillPattern(FillPatternType.SOLID_FOREGROUND); + style.setFont(cellFont); + style.setAlignment(align); + style.setVerticalAlignment(VerticalAlignment.CENTER); + return style; + } + + private static void initializeFont(Workbook workbook) { + NORMAL = createFont(workbook, false, IndexedColors.BLACK); + BOLD = createFont(workbook, true, IndexedColors.BLACK); + BOLD_AND_WHITE = createFont(workbook, true, IndexedColors.WHITE); + } + + private static void initializeStyle(Workbook workbook) { + HEADER_STYLE = createGroundColor(workbook, IndexedColors.LIGHT_YELLOW, BOLD, HorizontalAlignment.LEFT); + HEADER_CELL_STYLE = createGroundColor(workbook, IndexedColors.LIGHT_YELLOW, NORMAL, HorizontalAlignment.LEFT); + PROS_HEADER_STYLE = createGroundColor(workbook, IndexedColors.CORNFLOWER_BLUE, BOLD, + HorizontalAlignment.CENTER); + CONS_HEADER_STYLE = createGroundColor(workbook, IndexedColors.CORAL, BOLD, HorizontalAlignment.CENTER); + PROS_STYLE = createGroundColor(workbook, IndexedColors.LIGHT_CORNFLOWER_BLUE, NORMAL, + HorizontalAlignment.CENTER); + CONS_STYLE = createGroundColor(workbook, IndexedColors.ROSE, NORMAL, HorizontalAlignment.CENTER); + NEUTRAL_STYLE = createGroundColor(workbook, IndexedColors.GREY_50_PERCENT, BOLD_AND_WHITE, + HorizontalAlignment.CENTER); + } + + public Workbook export(ParliamentaryTableResponse parliamentaryTableResponse) { + TableInfoResponse tableInfo = parliamentaryTableResponse.info(); + List timeBoxes = parliamentaryTableResponse.table(); + + Workbook workbook = new XSSFWorkbook(); + Sheet sheet = workbook.createSheet(tableInfo.name()); + initializeFont(workbook); + initializeStyle(workbook); + + createHeader(sheet, NAME_HEADER_ROW_NUMBER, NAME_HEADER, tableInfo.name()); + createHeader(sheet, TYPE_HEADER_ROW_NUMBER, TYPE_HEADER, PARLIAMENTARY_HEADER_BODY); + createHeader(sheet, AGENDA_HEADER_ROW_NUMBER, AGENDA_HEADER, tableInfo.agenda()); + + createTableHeader(sheet); + createTimeBoxRows(timeBoxes, sheet); + setColumnWidth(sheet); + return workbook; + } + + private void createHeader( + Sheet sheet, + int rowNumber, + String header, + String headerBody + ) { + Row row = sheet.createRow(rowNumber); + createCell(row, 0, header, HEADER_STYLE); + createCell(row, 1, headerBody, HEADER_CELL_STYLE); + } + + private void createTableHeader(Sheet sheet) { + Row row = sheet.createRow(TABLE_HEADER_ROW_NUMBER); + createCell(row, PROS_COLUMN_NUMBER, PROS_HEADER, PROS_HEADER_STYLE); + createCell(row, CONS_COLUMN_NUMBER, CONS_HEADER, CONS_HEADER_STYLE); + } + + private void createCell(Row row, int index, String value, CellStyle style) { + Cell cell = row.createCell(index); + cell.setCellStyle(style); + cell.setCellValue(value); + } + + private void setColumnWidth(Sheet sheet) { + for (int i = 0; i < END_COLUMN_NUMBER; i++) { + sheet.setColumnWidth(i, WIDTH_SIZE); + } + } + + private void createTimeBoxRows(List timeBoxes, Sheet sheet) { + for (int i = 0; i < timeBoxes.size(); i++) { + createTimeBoxRow(sheet, i + TIME_BOX_FIRST_ROW_NUMBER, timeBoxes.get(i)); + } + } + + private void createTimeBoxRow(Sheet sheet, int rowNumber, TimeBoxResponse timeBox) { + Row row = sheet.createRow(rowNumber); + String timeBoxMessage = messageResolver.resolveBoxMessage(timeBox); + Stance stance = timeBox.stance(); + createRowByStance(sheet, row, stance, rowNumber, timeBoxMessage); + } + + private void createRowByStance(Sheet sheet, Row row, Stance stance, int index, String message) { + switch (stance) { + case NEUTRAL: + Cell neturalCell = row.createCell(0); + neturalCell.setCellStyle(NEUTRAL_STYLE); + neturalCell.setCellValue(message); + sheet.addMergedRegion(new CellRangeAddress(index, index, 0, 1)); // A1:B1 셀 병합 + break; + + case PROS: + setProsAndConsCellstyle(row); + Cell prosCell = row.getCell(PROS_COLUMN_NUMBER); + prosCell.setCellValue(message); + break; + + case CONS: + setProsAndConsCellstyle(row); + Cell consCell = row.getCell(CONS_COLUMN_NUMBER); + consCell.setCellValue(message); + break; + } + } + + private void setProsAndConsCellstyle(Row row) { + Cell prosCell = row.createCell(PROS_COLUMN_NUMBER); + prosCell.setCellStyle(PROS_STYLE); + Cell consCell = row.createCell(CONS_COLUMN_NUMBER); + consCell.setCellStyle(CONS_STYLE); + } +} diff --git a/src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExportMessageResolver.java b/src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExportMessageResolver.java new file mode 100644 index 00000000..b4a069d5 --- /dev/null +++ b/src/main/java/com/debatetimer/view/exporter/ParliamentaryTableExportMessageResolver.java @@ -0,0 +1,51 @@ +package com.debatetimer.view.exporter; + +import com.debatetimer.domain.BoxType; +import com.debatetimer.dto.parliamentary.response.TimeBoxResponse; +import org.springframework.stereotype.Component; + +@Component +public class ParliamentaryTableExportMessageResolver { + + private static final String SPEAKER_SUFFIX = "번 토론자"; + private static final String MINUTES_MESSAGE = "분"; + private static final String SECOND_MESSAGE = "초"; + private static final String TIME_MESSAGE_PREFIX = "("; + private static final String TIME_MESSAGE_SUFFIX = ")"; + private static final String MESSAGE_DELIMITER = "/"; + private static final String SPACE = " "; + + public String resolveBoxMessage(TimeBoxResponse timeBox) { + String defaultMessage = resolveDefaultMessage(timeBox); + BoxType type = timeBox.type(); + if (type == BoxType.TIME_OUT) { + return defaultMessage; + } + return defaultMessage + + MESSAGE_DELIMITER + + resolveSpeakerMessage(timeBox.speakerNumber()); + } + + private String resolveDefaultMessage(TimeBoxResponse timeBox) { + BoxType boxType = timeBox.type(); + return BoxTypeView.mapView(boxType) + + resolveTimeMessage(timeBox.time()); + } + + private String resolveTimeMessage(int totalSecond) { + int minutes = totalSecond / 60; + int second = totalSecond % 60; + String message = minutes + MINUTES_MESSAGE; + + if (second != 0) { + message += SPACE + second + SECOND_MESSAGE; + } + return TIME_MESSAGE_PREFIX + + message + + TIME_MESSAGE_SUFFIX; + } + + private String resolveSpeakerMessage(int speakerNumber) { + return speakerNumber + SPEAKER_SUFFIX; + } +} diff --git a/src/test/java/com/debatetimer/view/exporter/BoxTypeViewTest.java b/src/test/java/com/debatetimer/view/exporter/BoxTypeViewTest.java new file mode 100644 index 00000000..55c552de --- /dev/null +++ b/src/test/java/com/debatetimer/view/exporter/BoxTypeViewTest.java @@ -0,0 +1,22 @@ +package com.debatetimer.view.exporter; + +import static org.assertj.core.api.Assertions.assertThatCode; + +import com.debatetimer.domain.BoxType; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +class BoxTypeViewTest { + + @Nested + class MapView { + + @ParameterizedTest + @EnumSource(value = BoxType.class) + void 타임박스_타입과_일치하는_메시지를_반환한다(BoxType boxType) { + assertThatCode(() -> BoxTypeView.mapView(boxType)) + .doesNotThrowAnyException(); + } + } +} From 2f712aa69bfcce1c9453fe76066220fe2158b626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Wed, 22 Jan 2025 01:06:36 +0900 Subject: [PATCH 32/38] =?UTF-8?q?[CHORE]=20PR=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EC=8B=9C,=20=EC=95=8C=EB=A6=BC=EC=9D=B4?= =?UTF-8?q?=20=EC=95=88=EA=B0=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=20(#63)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Comment_Notification.yml | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/PR_Comment_Notification.yml b/.github/workflows/PR_Comment_Notification.yml index 4a6eed2b..e59abd85 100644 --- a/.github/workflows/PR_Comment_Notification.yml +++ b/.github/workflows/PR_Comment_Notification.yml @@ -16,31 +16,28 @@ jobs: echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV - name: Set Environment Variables for Issue - if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} + if: ${{ github.event.issue && contains(github.event.comment.body, '/noti') }} run: | + echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV echo "POST_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV echo "COMMENT_AUTHOR=${{ github.event.comment.user.login }}" >> $GITHUB_ENV echo "COMMENT_AUTHOR_AVATAR=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV echo "POST_AUTHOR=${{ github.event.issue.user.login }}" >> $GITHUB_ENV echo "POST_AUTHOR_AVATAR=${{ github.event.issue.user.avatar_url }}" >> $GITHUB_ENV echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV - echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV echo "POST_TYPE=Issue" >> $GITHUB_ENV - name: Set Environment Variables for PR Comments - if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} + if: ${{ github.event.pull_request && contains(github.event.review.body, '/noti') }} run: | - echo "POST_URL=${{ github.event.issue.pull_request.html_url }}" >> $GITHUB_ENV - echo "COMMENT_AUTHOR=${{ github.event.comment.user.login }}" >> $GITHUB_ENV - echo "COMMENT_AUTHOR_AVATAR=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV - echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV - echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "CONTENT=$(echo '${{ github.event.review.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "POST_URL=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV + echo "COMMENT_AUTHOR=${{ github.event.review.user.login }}" >> $GITHUB_ENV + echo "COMMENT_AUTHOR_AVATAR=${{ github.event.review.user.avatar_url }}" >> $GITHUB_ENV + echo "POST_AUTHOR=${{ github.event.pull_request.base.user.login }}" >> $GITHUB_ENV + echo "POST_AUTHOR_AVATAR=${{ github.event.pull_request.base.user.avatar_url }}" >> $GITHUB_ENV + echo "TITLE=${{ github.event.pull_request.base.title }}" >> $GITHUB_ENV echo "POST_TYPE=Pull Request" >> $GITHUB_ENV - - PR_DATA=$(curl -s -H "Accept: application/vnd.github.v3+json" \ - "${{ github.event.issue.pull_request.url }}") - echo "POST_AUTHOR=$(echo "$PR_DATA" | jq -r '.user.login')" >> $GITHUB_ENV - echo "POST_AUTHOR_AVATAR=$(echo "$PR_DATA" | jq -r '.user.avatar_url')" >> $GITHUB_ENV - name: Set Discord Content if: ${{ env.CONTENT }} From 3ebd8c2a0b1cf830ebcfa3dc82d472b8d8d1cf28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B1=B4=EC=9A=B0?= Date: Fri, 24 Jan 2025 08:22:23 +0900 Subject: [PATCH 33/38] =?UTF-8?q?[CHORE]=20prod=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC=20(#60)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Prod_CD.yml | 72 +++++++++++++++++++++++++ .github/workflows/Prod_CI.yml | 29 ++++++++++ scripts/prod/replace-new-version.sh | 22 ++++++++ src/main/resources/application-prod.yml | 16 ++++++ src/main/resources/prod-secret.yml | 0 5 files changed, 139 insertions(+) create mode 100644 .github/workflows/Prod_CD.yml create mode 100644 .github/workflows/Prod_CI.yml create mode 100644 scripts/prod/replace-new-version.sh create mode 100644 src/main/resources/application-prod.yml create mode 100644 src/main/resources/prod-secret.yml diff --git a/.github/workflows/Prod_CD.yml b/.github/workflows/Prod_CD.yml new file mode 100644 index 00000000..20e0c517 --- /dev/null +++ b/.github/workflows/Prod_CD.yml @@ -0,0 +1,72 @@ +name: prod-cd + +on: + push: + branches: + - "main" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout Develop Branch + uses: actions/checkout@v4 + with: + ref: "main" + + - name: Setting prod-secret.yml + run: | + echo "${{ secrets.PROD_SECRET_YML }}" > ./src/main/resources/prod-secret.yml + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + + - name: Make gradlew executable + run: chmod +x gradlew + + - name: Clean And Test With Gradle + run: ./gradlew clean test + + - name: bootJar with Gradle + run: ./gradlew bootJar --info + + - name: Change artifact file name + run: mv build/libs/*.jar build/libs/app.jar + + - name: Upload artifact file + uses: actions/upload-artifact@v4 + with: + name: app-artifact + path: ./build/libs/app.jar + if-no-files-found: error + + - name: Upload deploy scripts + uses: actions/upload-artifact@v4 + with: + name: deploy-scripts + path: ./scripts/prod/ + if-no-files-found: error + + deploy: + needs: build + runs-on: prod + + steps: + - name: Download artifact file + uses: actions/download-artifact@v4 + with: + name: app-artifact + path: ~/app + + - name: Download deploy scripts + uses: actions/download-artifact@v4 + with: + name: deploy-scripts + path: ~/app/scripts + + - name: Replace application to latest + run: sudo sh ~/app/scripts/replace-new-version.sh diff --git a/.github/workflows/Prod_CI.yml b/.github/workflows/Prod_CI.yml new file mode 100644 index 00000000..ebcda075 --- /dev/null +++ b/.github/workflows/Prod_CI.yml @@ -0,0 +1,29 @@ +name: prod-ci + +on: + pull_request: + branches: + - main + +jobs: + build-and-push: + runs-on: ubuntu-latest + timeout-minutes: 3 + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Grant Permission + run: chmod +x ./gradlew + + - name: Clean And Test With Gradle + run: ./gradlew clean test diff --git a/scripts/prod/replace-new-version.sh b/scripts/prod/replace-new-version.sh new file mode 100644 index 00000000..d78b646f --- /dev/null +++ b/scripts/prod/replace-new-version.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +PID=$(lsof -t -i:8080) + +# 프로세스 종료 +if [ -z "$PID" ]; then + echo "No process is using port 8080." +else + echo "Killing process with PID: $PID" + kill -15 "$PID" + + # 직전 명령(프로세스 종료 명령)이 정상 동작했는지 확인 + if [ $? -eq 0 ]; then + echo "Process $PID terminated successfully." + else + echo "Failed to terminate process $PID." + fi +fi + +JAR_FILE=$(ls /home/ubuntu/app/*.jar | head -n 1) + +sudo nohup java -Dspring.profiles.active=prod -Duser.timezone=Asia/Seoul -Dserver.port=8080 -jar "$JAR_FILE" & diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 00000000..9ecd8e0b --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,16 @@ +spring: + config: + import: prod-secret.yml + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${secret.datasource.url}:${secret.datasource.port}/${secret.datasource.database}?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&autoReconnect=true&serverTimezone=Asia/Seoul&useLegacyDatetimeCode=false + username: ${secret.datasource.username} + password: ${secret.datasource.password} + jpa: + show-sql: true + properties: + hibernate: + format_sql: true + hibernate: + ddl-auto: validate + defer-datasource-initialization: true diff --git a/src/main/resources/prod-secret.yml b/src/main/resources/prod-secret.yml new file mode 100644 index 00000000..e69de29b From 5950d032e0277affb6003a0be6e884fa5fea42f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EA=B1=B4=EC=9A=B0?= Date: Fri, 24 Jan 2025 08:22:54 +0900 Subject: [PATCH 34/38] =?UTF-8?q?[CHORE]=20DEV=5FCD=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EA=B5=AC=EC=B6=95=20+=20applicat?= =?UTF-8?q?ion-dev.yml=20=EC=9E=91=EC=84=B1=20(#58)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Dev_CD.yml | 72 ++++++++++++++++++++++++++ build.gradle | 2 +- scripts/dev/replace-new-version.sh | 22 ++++++++ src/main/resources/application-dev.yml | 16 ++++++ src/main/resources/dev-secret.yml | 0 5 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/Dev_CD.yml create mode 100644 scripts/dev/replace-new-version.sh create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/dev-secret.yml diff --git a/.github/workflows/Dev_CD.yml b/.github/workflows/Dev_CD.yml new file mode 100644 index 00000000..8718cc23 --- /dev/null +++ b/.github/workflows/Dev_CD.yml @@ -0,0 +1,72 @@ +name: dev-cd + +on: + push: + branches: + - "develop" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout Develop Branch + uses: actions/checkout@v4 + with: + ref: "develop" + + - name: Setting dev-secret.yml + run: | + echo "${{ secrets.DEV_SECRET_YML }}" > ./src/main/resources/dev-secret.yml + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '17' + + - name: Make gradlew executable + run: chmod +x gradlew + + - name: Clean And Test With Gradle + run: ./gradlew clean test + + - name: bootJar with Gradle + run: ./gradlew bootJar --info + + - name: Change artifact file name + run: mv build/libs/*.jar build/libs/app.jar + + - name: Upload artifact file + uses: actions/upload-artifact@v4 + with: + name: app-artifact + path: ./build/libs/app.jar + if-no-files-found: error + + - name: Upload deploy scripts + uses: actions/upload-artifact@v4 + with: + name: deploy-scripts + path: ./scripts/dev/ + if-no-files-found: error + + deploy: + needs: build + runs-on: dev + + steps: + - name: Download artifact file + uses: actions/download-artifact@v4 + with: + name: app-artifact + path: ~/app + + - name: Download deploy scripts + uses: actions/download-artifact@v4 + with: + name: deploy-scripts + path: ~/app/scripts + + - name: Replace application to latest + run: sudo sh ~/app/scripts/replace-new-version.sh diff --git a/build.gradle b/build.gradle index e8d54d82..bdcae96c 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { testImplementation 'org.springframework.restdocs:spring-restdocs-restassured' testImplementation 'com.epages:restdocs-api-spec-mockmvc:0.18.2' testImplementation 'com.epages:restdocs-api-spec-restassured:0.18.2' - + // Excel Export implementation 'org.apache.poi:poi-ooxml:5.2.3' implementation 'org.apache.poi:poi:5.2.3' diff --git a/scripts/dev/replace-new-version.sh b/scripts/dev/replace-new-version.sh new file mode 100644 index 00000000..e86b27e8 --- /dev/null +++ b/scripts/dev/replace-new-version.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +PID=$(lsof -t -i:8080) + +# 프로세스 종료 +if [ -z "$PID" ]; then + echo "No process is using port 8080." +else + echo "Killing process with PID: $PID" + kill -15 "$PID" + + # 직전 명령(프로세스 종료 명령)이 정상 동작했는지 확인 + if [ $? -eq 0 ]; then + echo "Process $PID terminated successfully." + else + echo "Failed to terminate process $PID." + fi +fi + +JAR_FILE=$(ls /home/ubuntu/app/*.jar | head -n 1) + +sudo nohup java -Dspring.profiles.active=dev -Duser.timezone=Asia/Seoul -Dserver.port=8080 -jar "$JAR_FILE" & diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 00000000..07ac26ef --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,16 @@ +spring: + config: + import: dev-secret.yml + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${secret.datasource.url}:${secret.datasource.port}/${secret.datasource.database}?useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true&autoReconnect=true&serverTimezone=Asia/Seoul&useLegacyDatetimeCode=false + username: ${secret.datasource.username} + password: ${secret.datasource.password} + jpa: + show-sql: true + properties: + hibernate: + format_sql: true + hibernate: + ddl-auto: update + defer-datasource-initialization: true diff --git a/src/main/resources/dev-secret.yml b/src/main/resources/dev-secret.yml new file mode 100644 index 00000000..e69de29b From 4321446e8a37cb33b5e7420bd399f84eeb5f823a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 24 Jan 2025 10:00:56 +0900 Subject: [PATCH 35/38] =?UTF-8?q?[CHORE]=20PR=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EC=8B=9C,=20=EC=95=8C=EB=A6=BC=EC=9D=B4?= =?UTF-8?q?=20=EC=95=88=EA=B0=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0=20(#66)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/PR_Comment_Notification.yml | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/PR_Comment_Notification.yml b/.github/workflows/PR_Comment_Notification.yml index e59abd85..e1c8236b 100644 --- a/.github/workflows/PR_Comment_Notification.yml +++ b/.github/workflows/PR_Comment_Notification.yml @@ -16,7 +16,7 @@ jobs: echo "WEB_HOOK=${{ secrets.DISCORD_WEB_HOOK }}" >> $GITHUB_ENV - name: Set Environment Variables for Issue - if: ${{ github.event.issue && contains(github.event.comment.body, '/noti') }} + if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} run: | echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV echo "POST_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV @@ -27,16 +27,28 @@ jobs: echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV echo "POST_TYPE=Issue" >> $GITHUB_ENV - - name: Set Environment Variables for PR Comments - if: ${{ github.event.pull_request && contains(github.event.review.body, '/noti') }} + - name: Set Environment Variables for PR Review Comments + if: ${{ contains(github.event.review.body, '/noti') }} run: | echo "CONTENT=$(echo '${{ github.event.review.body }}' | base64 -w 0)" >> $GITHUB_ENV - echo "POST_URL=${{ github.event.pull_request.html_url }}" >> $GITHUB_ENV + echo "POST_URL=${{ github.event.pull_request._links.html.href }}" >> $GITHUB_ENV echo "COMMENT_AUTHOR=${{ github.event.review.user.login }}" >> $GITHUB_ENV echo "COMMENT_AUTHOR_AVATAR=${{ github.event.review.user.avatar_url }}" >> $GITHUB_ENV echo "POST_AUTHOR=${{ github.event.pull_request.base.user.login }}" >> $GITHUB_ENV echo "POST_AUTHOR_AVATAR=${{ github.event.pull_request.base.user.avatar_url }}" >> $GITHUB_ENV - echo "TITLE=${{ github.event.pull_request.base.title }}" >> $GITHUB_ENV + echo "TITLE=${{ github.event.pull_request.title }}" >> $GITHUB_ENV + echo "POST_TYPE=Pull Request" >> $GITHUB_ENV + + - name: Set Environment Variables for PR Comments + if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '/noti') }} + run: | + echo "CONTENT=$(echo '${{ github.event.comment.body }}' | base64 -w 0)" >> $GITHUB_ENV + echo "POST_URL=${{ github.event.issue.html_url }}" >> $GITHUB_ENV + echo "COMMENT_AUTHOR=${{ github.event.comment.user.login }}" >> $GITHUB_ENV + echo "COMMENT_AUTHOR_AVATAR=${{ github.event.comment.user.avatar_url }}" >> $GITHUB_ENV + echo "POST_AUTHOR=${{ github.event.issue.user.login }}" >> $GITHUB_ENV + echo "POST_AUTHOR_AVATAR=${{ github.event.issue.user.avatar_url }}" >> $GITHUB_ENV + echo "TITLE=${{ github.event.issue.title }}" >> $GITHUB_ENV echo "POST_TYPE=Pull Request" >> $GITHUB_ENV - name: Set Discord Content From 3ee5adae28c79766574a6a1c4d1d98ad99e27a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:12:36 +0900 Subject: [PATCH 36/38] =?UTF-8?q?[FEAT]=20CORS=20=EC=84=A4=EC=A0=95=20(#68?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/debatetimer/config/CorsConfig.java | 33 ++++++++++++++ src/main/resources/application-dev.yml | 3 ++ src/main/resources/application-local.yml | 3 ++ src/main/resources/application-prod.yml | 3 ++ .../controller/GlobalControllerTest.java | 44 +++++++++++++++++++ src/test/resources/application.yml | 26 +++++++++++ 6 files changed, 112 insertions(+) create mode 100644 src/main/java/com/debatetimer/config/CorsConfig.java create mode 100644 src/test/java/com/debatetimer/controller/GlobalControllerTest.java create mode 100644 src/test/resources/application.yml diff --git a/src/main/java/com/debatetimer/config/CorsConfig.java b/src/main/java/com/debatetimer/config/CorsConfig.java new file mode 100644 index 00000000..e767ccc2 --- /dev/null +++ b/src/main/java/com/debatetimer/config/CorsConfig.java @@ -0,0 +1,33 @@ +package com.debatetimer.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class CorsConfig implements WebMvcConfigurer { + + private final String[] corsOrigin; + + public CorsConfig(@Value("${cors.origin}") String[] corsOrigin) { + this.corsOrigin = corsOrigin; + } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOriginPatterns(corsOrigin) + .allowedMethods( + HttpMethod.GET.name(), + HttpMethod.POST.name(), + HttpMethod.PATCH.name(), + HttpMethod.DELETE.name(), + HttpMethod.OPTIONS.name() + ) + .allowCredentials(true) + .allowedHeaders("*"); + } +} + diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 07ac26ef..01065082 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -14,3 +14,6 @@ spring: hibernate: ddl-auto: update defer-datasource-initialization: true + +cors: + origin: ${secret.cors.origin} diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 3fc623ce..751b8a26 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -16,3 +16,6 @@ spring: hibernate: ddl-auto: create-drop defer-datasource-initialization: true + +cors: + origin: * diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 9ecd8e0b..1dce30a9 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -14,3 +14,6 @@ spring: hibernate: ddl-auto: validate defer-datasource-initialization: true + +cors: + origin: ${secret.cors.origin} diff --git a/src/test/java/com/debatetimer/controller/GlobalControllerTest.java b/src/test/java/com/debatetimer/controller/GlobalControllerTest.java new file mode 100644 index 00000000..d4347a38 --- /dev/null +++ b/src/test/java/com/debatetimer/controller/GlobalControllerTest.java @@ -0,0 +1,44 @@ +package com.debatetimer.controller; + +import static org.hamcrest.Matchers.containsString; + +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Value; + +public class GlobalControllerTest extends BaseControllerTest { + + @Value("${cors.origin}") + private String corsOrigin; + + @Nested + class CorsConfigTest { + + @Test + void CORS_preflight에서_허용된_origin의_요청을_정상적으로_처리할_수_있다() { + String allowedMethod = "GET"; + + given() + .header("Origin", corsOrigin) + .header("Access-Control-Request-Method", allowedMethod) + .header("Access-Control-Request-Headers", "Authorization, Content-Type") + .when().options("/") + .then().statusCode(200) + .headers("Access-Control-Allow-Origin", corsOrigin) + .header("Access-Control-Allow-Methods", containsString(allowedMethod)); + } + + @Test + void CORS_preflight에서_허용되지_않은_origin의_요청을_막을_수_있다() { + String notAllowedOrigin = "https://not-allowed-origin.com"; + String allowedMethod = "GET"; + + given() + .header("Origin", notAllowedOrigin) + .header("Access-Control-Request-Method", allowedMethod) + .header("Access-Control-Request-Headers", "Authorization, Content-Type") + .when().options("/") + .then().statusCode(403); + } + } +} diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml new file mode 100644 index 00000000..e105e48e --- /dev/null +++ b/src/test/resources/application.yml @@ -0,0 +1,26 @@ +spring: + profiles: + active: test + +--- + +spring: + config: + activate: + on-profile: test + datasource: + driver-class-name: org.h2.Driver + url: jdbc:h2:mem:database + username: sa + password: + jpa: + show-sql: true + properties: + hibernate: + format_sql: true + hibernate: + ddl-auto: create-drop + defer-datasource-initialization: true + +cors: + origin: http://test.debate-timer.com From 9ba624da3129c69f88676052c71e7c047cc0428f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 24 Jan 2025 16:13:15 +0900 Subject: [PATCH 37/38] =?UTF-8?q?[REFACTOR]=20=ED=85=8C=EC=9D=B4=EB=B8=94?= =?UTF-8?q?=20=EB=AA=85=EC=97=90=20=EC=88=AB=EC=9E=90=EB=A5=BC=20=ED=97=88?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#6?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/parliamentary/ParliamentaryTable.java | 2 +- .../debatetimer/exception/errorcode/ClientErrorCode.java | 2 +- .../domain/parliamentary/ParliamentaryTableTest.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java index 74dec942..5304647e 100644 --- a/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java +++ b/src/main/java/com/debatetimer/domain/parliamentary/ParliamentaryTable.java @@ -21,7 +21,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class ParliamentaryTable { - private static final String NAME_REGEX = "^[a-zA-Z가-힣 ]+$"; + private static final String NAME_REGEX = "^[a-zA-Z가-힣0-9 ]+$"; public static final int NAME_MAX_LENGTH = 20; @Id diff --git a/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java b/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java index 30c8b5e2..bdaf2be2 100644 --- a/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java +++ b/src/main/java/com/debatetimer/exception/errorcode/ClientErrorCode.java @@ -20,7 +20,7 @@ public enum ClientErrorCode implements ErrorCode { ), INVALID_TABLE_NAME_FORM( HttpStatus.BAD_REQUEST, - "테이블 이름은 영문/한글만 가능합니다" + "테이블 이름은 영문/한글/숫자/띄어쓰기만 가능합니다" ), INVALID_TABLE_TIME(HttpStatus.BAD_REQUEST, "시간은 양수만 가능합니다"), diff --git a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java index 94f0b68b..a3521064 100644 --- a/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java +++ b/src/test/java/com/debatetimer/domain/parliamentary/ParliamentaryTableTest.java @@ -16,8 +16,8 @@ class ParliamentaryTableTest { class Validate { @ParameterizedTest - @ValueSource(strings = {"a bc가다", "가나 다ab"}) - void 테이블_이름은_영문과_한글_띄어쓰기만_가능하다(String name) { + @ValueSource(strings = {"a bc가다9", "가0나 다ab"}) + void 테이블_이름은_영문과_한글_숫자_띄어쓰기만_가능하다(String name) { Member member = new Member("member"); assertThatCode(() -> new ParliamentaryTable(member, name, "agenda", 10)) .doesNotThrowAnyException(); @@ -42,7 +42,7 @@ class Validate { } @ParameterizedTest - @ValueSource(strings = {"abc12", "가나다12", "abc\tde"}) + @ValueSource(strings = {"abc@", "가나다*", "abc\tde"}) void 허용된_글자_이외의_문자는_불가능하다(String name) { Member member = new Member("member"); assertThatThrownBy(() -> new ParliamentaryTable(member, name, "agenda", 10)) From 5b0aebc37d4553675dbe81d81a52ab13ed3572a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=BB=A4=EC=B0=AC?= <44027393+leegwichan@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:00:32 +0900 Subject: [PATCH 38/38] =?UTF-8?q?[FIX]=20=EC=9E=84=EC=8B=9C=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20API=20=EC=88=98=EC=A0=95=20(#70)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/member/MemberRepository.java | 2 ++ .../com/debatetimer/service/member/MemberService.java | 4 +++- .../debatetimer/service/member/MemberServiceTest.java | 10 ++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/debatetimer/repository/member/MemberRepository.java b/src/main/java/com/debatetimer/repository/member/MemberRepository.java index 03e43577..de78ccff 100644 --- a/src/main/java/com/debatetimer/repository/member/MemberRepository.java +++ b/src/main/java/com/debatetimer/repository/member/MemberRepository.java @@ -16,4 +16,6 @@ default Member getById(long id) { return findById(id) .orElseThrow(() -> new DTClientErrorException(ClientErrorCode.MEMBER_NOT_FOUND)); } + + Optional findByNickname(String nickname); } diff --git a/src/main/java/com/debatetimer/service/member/MemberService.java b/src/main/java/com/debatetimer/service/member/MemberService.java index 67a9ded9..2273efb2 100644 --- a/src/main/java/com/debatetimer/service/member/MemberService.java +++ b/src/main/java/com/debatetimer/service/member/MemberService.java @@ -28,7 +28,9 @@ public TableResponses getTables(Long memberId) { @Transactional public MemberCreateResponse createMember(MemberCreateRequest request) { - Member member = memberRepository.save(request.toMember()); + // TODO OAuth 로직 들어오면서 수정 예정 + Member member = memberRepository.findByNickname(request.nickname()) + .orElse(memberRepository.save(request.toMember())); return new MemberCreateResponse(member); } } diff --git a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java index 22d504bb..be13f55e 100644 --- a/src/test/java/com/debatetimer/service/member/MemberServiceTest.java +++ b/src/test/java/com/debatetimer/service/member/MemberServiceTest.java @@ -34,6 +34,16 @@ class CreateMember { () -> assertThat(foundMember).isPresent() ); } + + @Test + void 기존_닉네임을_가진_회원이_있다면_해당_회원을_반환한다() { + Member existedMember = memberGenerator.generate("커찬"); + MemberCreateRequest request = new MemberCreateRequest("커찬"); + + MemberCreateResponse actual = memberService.createMember(request); + + assertThat(actual.id()).isEqualTo(existedMember.getId()); + } } @Nested