From c9b1ed58e0da010330655d8bedf41543b1911e99 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 17:07:47 +0900 Subject: [PATCH 01/80] =?UTF-8?q?chore:=20jira=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=8C=8C=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 --- .github/ISSUE_TEMPLATE/issue-form.yml | 40 +++++++++++++ .github/workflows/close-jira-issue.yml | 32 ++++++++++ .github/workflows/create-jira-issue.yml | 77 +++++++++++++++++++++++++ .idea/.gitignore | 8 +++ .idea/famous_restaurant.iml | 9 +++ .idea/misc.xml | 6 ++ .idea/modules.xml | 8 +++ .idea/vcs.xml | 6 ++ 8 files changed, 186 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/issue-form.yml create mode 100644 .github/workflows/close-jira-issue.yml create mode 100644 .github/workflows/create-jira-issue.yml create mode 100644 .idea/.gitignore create mode 100644 .idea/famous_restaurant.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.github/ISSUE_TEMPLATE/issue-form.yml b/.github/ISSUE_TEMPLATE/issue-form.yml new file mode 100644 index 0000000..1d5cc6c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue-form.yml @@ -0,0 +1,40 @@ +name: '새로운 이슈 생성' +description: '새로운 이슈를 생성하고, Jira와 연동하여 관리합니다.' +labels: [feat] +title: '이슈 제목을 입력해주세요.' +body: + - type: input + id: parentKey + attributes: + label: '상위 작업 (Ticket Number)' + description: '상위 작업의 Ticket Number를 입력해주세요. (예: KAN-01)' + placeholder: 'REQ-01' + validations: + required: true + + - type: input + id: childKey + attributes: + label: '하위 작업 (Ticket Number - 선택)' + description: 'Jira에 기존 작업이 있다면 해당 Ticket Number를 입력하세요. 없을 경우 새로운 작업이 생성됩니다.' + placeholder: 'REQ-02' + validations: + required: false + + - type: input + id: branch + attributes: + label: '브랜치 (Branch)' + description: '영어로 브랜치명을 작성해주세요 (예: feature/your-branch)' + placeholder: 'feature/your-branch' + validations: + required: true + + - type: textarea + id: description + attributes: + label: '상세 내용 (Description)' + description: '이슈에 대해서 간략히 설명해주세요' + placeholder: '이슈에 대한 설명을 작성해주세요' + validations: + required: true \ No newline at end of file diff --git a/.github/workflows/close-jira-issue.yml b/.github/workflows/close-jira-issue.yml new file mode 100644 index 0000000..43e7ac3 --- /dev/null +++ b/.github/workflows/close-jira-issue.yml @@ -0,0 +1,32 @@ +name: Close Jira issue +on: + issues: + types: + - closed + +jobs: + close-issue: + name: Close Jira issue + runs-on: ubuntu-latest + + steps: + - name: Login to Jira + uses: atlassian/gajira-login@v3 + env: + JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} + JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} + JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} + + - name: Extract Jira issue key from GitHub issue title + id: extract-key + run: | + ISSUE_TITLE="${{ github.event.issue.title }}" + JIRA_KEY=$(echo "$ISSUE_TITLE" | grep -oE '[A-Z]+-[0-9]+') + echo "JIRA_KEY=$JIRA_KEY" >> $GITHUB_ENV + + - name: Close Jira issue + if: env.JIRA_KEY != '' + uses: atlassian/gajira-transition@v3 + with: + issue: ${{ env.JIRA_KEY }} + transition: 완료 diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml new file mode 100644 index 0000000..e713a20 --- /dev/null +++ b/.github/workflows/create-jira-issue.yml @@ -0,0 +1,77 @@ +name: Create Jira issue +on: + issues: + types: + - opened +jobs: + create-issue: + name: Create Jira issue + runs-on: ubuntu-latest + steps: + - name: Login + uses: atlassian/gajira-login@v3 + env: + JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} + JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} + JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} + + - name: Checkout main code + uses: actions/checkout@v4 + with: + ref: main + + - name: Issue Parser + uses: stefanbuck/github-issue-praser@v3 + id: issue-parser + with: + template-path: .github/ISSUE_TEMPLATE/issue_form.yml + + - name: Log Issue Parser + run: | + echo '${{ steps.issue-parser.outputs.jsonString }}' + + - name: Convert markdown to Jira Syntax + uses: peter-evans/jira2md@v1 + id: md2jira + with: + input-text: | + ### Github Issue Link + - ${{ github.event.issue.html_url }} + + ${{ github.event.issue.body }} + mode: md2jira + + - name: Create Issue + id: create + uses: atlassian/gajira-create@v3 + with: + project: DIAR + issuetype: Subtask + summary: "${{ github.event.issue.title }}" + description: "${{ steps.md2jira.outputs.output-text }}" + fields: | + { + "parent": { + "key": "${{ steps.issue-parser.outputs.issueparser_parentKey }}" + } + } + + - name: Log created issue + run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" + + - name: Checkout develop code + uses: actions/checkout@v4 + with: + ref: develop + + - name: Create branch with Ticket number + run: | + git checkout -b ${{ steps.create.outputs.issue }} + git push origin ${{ steps.create.outputs.issue }} + + - name: Update issue title + uses: actions-cool/issues-helper@v3 + with: + actions: "update-issue" + token: ${{ secrets.GITHUB_TOKEN }} + title: "${{ steps.create.outputs.issue }} ${{ github.event.issue.title }}" \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..c3f502a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 디폴트 무시된 파일 +/shelf/ +/workspace.xml +# 에디터 기반 HTTP 클라이언트 요청 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/famous_restaurant.iml b/.idea/famous_restaurant.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/famous_restaurant.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..589695e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..f470fba --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From bc6bc15e392740ebb59e9875d4897ab031ae2fdb Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 17:45:51 +0900 Subject: [PATCH 02/80] =?UTF-8?q?chore:=20jira=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=8C=8C=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 --- .github/ISSUE_TEMPLATE/{issue-form.yml => issue_form.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{issue-form.yml => issue_form.yml} (100%) diff --git a/.github/ISSUE_TEMPLATE/issue-form.yml b/.github/ISSUE_TEMPLATE/issue_form.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/issue-form.yml rename to .github/ISSUE_TEMPLATE/issue_form.yml From 1a862489da9de15980d0a167cea2bfe56e6e23aa Mon Sep 17 00:00:00 2001 From: jinhosoon <51794440+jinhosoon@users.noreply.github.com> Date: Tue, 14 Jan 2025 17:55:37 +0900 Subject: [PATCH 03/80] init: project setting (#3) --- .gitattributes | 3 + .../ISSUE_TEMPLATE/yummy-issue-template.md | 2 + .gitignore | 37 +++ application/build.gradle | 38 +++ .../src/main/java/yummy/yummyApplication.java | 11 + build.gradle | 25 ++ common/build.gradle | 12 + domain/build.gradle | 28 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 10 + storage/build.gradle | 26 ++ 14 files changed, 545 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 application/build.gradle create mode 100644 application/src/main/java/yummy/yummyApplication.java create mode 100644 build.gradle create mode 100644 common/build.gradle create mode 100644 domain/build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 storage/build.gradle diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.github/ISSUE_TEMPLATE/yummy-issue-template.md b/.github/ISSUE_TEMPLATE/yummy-issue-template.md index 4356d18..0fc6e3a 100644 --- a/.github/ISSUE_TEMPLATE/yummy-issue-template.md +++ b/.github/ISSUE_TEMPLATE/yummy-issue-template.md @@ -8,9 +8,11 @@ assignees: '' --- ## 📋 이슈 내용 + > 추가하려는 기능에 대해 간결하게 설명해주세요 ## ✅ 체크리스트 + - [ ] TODO - [ ] TODO - [ ] TODO diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /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/application/build.gradle b/application/build.gradle new file mode 100644 index 0000000..6eb68c3 --- /dev/null +++ b/application/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.groom' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.junit.jupiter:junit-jupiter' + + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter' + + implementation project(':domain') +} + +test { + useJUnitPlatform() +} + +bootJar { + enabled = true +} + +jar { + enabled = false +} \ No newline at end of file diff --git a/application/src/main/java/yummy/yummyApplication.java b/application/src/main/java/yummy/yummyApplication.java new file mode 100644 index 0000000..34c9c1c --- /dev/null +++ b/application/src/main/java/yummy/yummyApplication.java @@ -0,0 +1,11 @@ +package yummy; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class yummyApplication { + public static void main(String[] args) { + SpringApplication.run(yummyApplication.class, args); + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..6a9117c --- /dev/null +++ b/build.gradle @@ -0,0 +1,25 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +allprojects { + repositories { + mavenCentral() + } +} + +dependencyManagement { + imports { + mavenBom "org.springframework.boot:spring-boot-dependencies:3.4.1" + } +} + +bootJar { + enabled = false +} + +jar { + enabled = false +} diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..df7ccaa --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,12 @@ +plugins { + id 'java' +} + +java { + sourceCompatibility = '17' + targetCompatibility = '17' +} + +dependencies { + +} \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle new file mode 100644 index 0000000..2a8af13 --- /dev/null +++ b/domain/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.goorm' +version = 'unspecified' + + +dependencies { + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.junit.jupiter:junit-jupiter' + + implementation project(':storage') + implementation project(':common') +} + +test { + useJUnitPlatform() +} \ No newline at end of file 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 0000000..e2847c8 --- /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 100755 index 0000000..f5feea6 --- /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 0000000..9d21a21 --- /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 0000000..06650c3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +rootProject.name = 'famous_restaurant' +include 'group' +include 'region' +include 'store' +include 'application' +include 'storage' +include 'user' +include 'common' +include 'domain' + diff --git a/storage/build.gradle b/storage/build.gradle new file mode 100644 index 0000000..e711040 --- /dev/null +++ b/storage/build.gradle @@ -0,0 +1,26 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.goorm' +version = 'unspecified' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +dependencies { + + implementation 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + + runtimeOnly 'com.mysql:mysql-connector-j' + +} + From 78e044a5d989fc8ed24d9c338694c49382f5e4d9 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 21:03:40 +0900 Subject: [PATCH 04/80] =?UTF-8?q?chore:=20jira=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=97=90=20=EA=B8=B0=EC=A1=B4=20=EC=9D=B4?= =?UTF-8?q?=EC=8A=88=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ISSUE_TEMPLATE/yummy-issue-template.md | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/yummy-issue-template.md diff --git a/.github/ISSUE_TEMPLATE/yummy-issue-template.md b/.github/ISSUE_TEMPLATE/yummy-issue-template.md deleted file mode 100644 index 0fc6e3a..0000000 --- a/.github/ISSUE_TEMPLATE/yummy-issue-template.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: yummy issue template -about: Describe this issue template's purpose here. -title: "[feat] 이슈 제목" -labels: '' -assignees: '' - ---- - -## 📋 이슈 내용 - -> 추가하려는 기능에 대해 간결하게 설명해주세요 - -## ✅ 체크리스트 - -- [ ] TODO -- [ ] TODO -- [ ] TODO - -## 📚 레퍼런스 (선택) From 3deb7bf737be9d79ab9410c07382fb5bf0b39b50 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 21:01:19 +0900 Subject: [PATCH 05/80] =?UTF-8?q?chore:=20jira=20=EC=97=B0=EB=8F=99=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EC=97=90=20=EA=B8=B0=EC=A1=B4=20=EC=9D=B4?= =?UTF-8?q?=EC=8A=88=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/issue_form.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue_form.yml b/.github/ISSUE_TEMPLATE/issue_form.yml index 1d5cc6c..a62b5ea 100644 --- a/.github/ISSUE_TEMPLATE/issue_form.yml +++ b/.github/ISSUE_TEMPLATE/issue_form.yml @@ -6,7 +6,7 @@ body: - type: input id: parentKey attributes: - label: '상위 작업 (Ticket Number)' + label: '🌳 상위 작업 (Ticket Number)' description: '상위 작업의 Ticket Number를 입력해주세요. (예: KAN-01)' placeholder: 'REQ-01' validations: @@ -15,7 +15,7 @@ body: - type: input id: childKey attributes: - label: '하위 작업 (Ticket Number - 선택)' + label: '🌱 하위 작업 (Ticket Number - 선택)' description: 'Jira에 기존 작업이 있다면 해당 Ticket Number를 입력하세요. 없을 경우 새로운 작업이 생성됩니다.' placeholder: 'REQ-02' validations: @@ -25,7 +25,7 @@ body: id: branch attributes: label: '브랜치 (Branch)' - description: '영어로 브랜치명을 작성해주세요 (예: feature/your-branch)' + description: '🍃 영어로 브랜치명을 작성해주세요 (예: feature/your-branch)' placeholder: 'feature/your-branch' validations: required: true @@ -33,8 +33,17 @@ body: - type: textarea id: description attributes: - label: '상세 내용 (Description)' + label: '✏️ 상세 내용 (Description)' description: '이슈에 대해서 간략히 설명해주세요' - placeholder: '이슈에 대한 설명을 작성해주세요' + value: | + 📋 이슈 내용 + + ✅ 체크리스트 + - [ ] TODO + - [ ] TODO + - [ ] TODO + + 📚 레퍼런스 (선택) + validations: required: true \ No newline at end of file From 7405b520595279bb0b8b4722e33b9650a8a34827 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 21:07:49 +0900 Subject: [PATCH 06/80] =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/create-jira-issue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index e713a20..a00cea0 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -45,7 +45,7 @@ jobs: id: create uses: atlassian/gajira-create@v3 with: - project: DIAR + project: REQ issuetype: Subtask summary: "${{ github.event.issue.title }}" description: "${{ steps.md2jira.outputs.output-text }}" From bfb5be96282e60c600c8f4d9fd0c23cc9cc25225 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 21:12:26 +0900 Subject: [PATCH 07/80] =?UTF-8?q?chore:=20=EC=9E=87=EC=8A=88=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=EB=B0=8F?= =?UTF-8?q?=20=EB=94=94=EB=B2=84=EA=B9=85=20=EB=A1=9C=EA=B7=B8=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/create-jira-issue.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index a00cea0..4ab66c5 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -59,6 +59,10 @@ jobs: - name: Log created issue run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" + - name: Debug Jira Project Key + run: + echo "Using Jira Project Key: REQ" + - name: Checkout develop code uses: actions/checkout@v4 with: From f1379a4b830e47c2a61f08957224522f7eebb88d Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 21:31:50 +0900 Subject: [PATCH 08/80] =?UTF-8?q?chore:=20=EB=94=94=EB=B2=84=EA=B9=85=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/create-jira-issue.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index 4ab66c5..6e2d0af 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -26,6 +26,12 @@ jobs: with: template-path: .github/ISSUE_TEMPLATE/issue_form.yml + #템플릿 경로 추적 로그 + - name: Debug Template Path + run: + echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" + + - name: Log Issue Parser run: | echo '${{ steps.issue-parser.outputs.jsonString }}' @@ -56,13 +62,14 @@ jobs: } } + # 프로젝트 키 디버깅 메시지 + - name: Debug Project Key + run: + echo "Project Key: REQ" + - name: Log created issue run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" - - name: Debug Jira Project Key - run: - echo "Using Jira Project Key: REQ" - - name: Checkout develop code uses: actions/checkout@v4 with: From 69fcc8e454c76178dd5df9684eaeb8935a530921 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 21:56:25 +0900 Subject: [PATCH 09/80] chore: Fix YAML syntax issues --- .github/workflows/create-jira-issue.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index 6e2d0af..865ca78 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -26,11 +26,8 @@ jobs: with: template-path: .github/ISSUE_TEMPLATE/issue_form.yml - #템플릿 경로 추적 로그 - name: Debug Template Path - run: - echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" - + run: echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" - name: Log Issue Parser run: | @@ -62,10 +59,8 @@ jobs: } } - # 프로젝트 키 디버깅 메시지 - name: Debug Project Key - run: - echo "Project Key: REQ" + run: echo "Project Key: REQ" - name: Log created issue run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" @@ -85,4 +80,4 @@ jobs: with: actions: "update-issue" token: ${{ secrets.GITHUB_TOKEN }} - title: "${{ steps.create.outputs.issue }} ${{ github.event.issue.title }}" \ No newline at end of file + title: "${{ steps.create.outputs.issue }} ${{ github.event.issue.title }}" From 63a880ab4037979e1443518c4ea0313b2aa346a3 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 21:57:55 +0900 Subject: [PATCH 10/80] chore: Fix YAML syntax issues --- .github/workflows/create-jira-issue.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index 865ca78..7e71f09 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -27,7 +27,8 @@ jobs: template-path: .github/ISSUE_TEMPLATE/issue_form.yml - name: Debug Template Path - run: echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" + run: + echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" - name: Log Issue Parser run: | @@ -60,7 +61,8 @@ jobs: } - name: Debug Project Key - run: echo "Project Key: REQ" + run: + echo "Project Key: REQ" - name: Log created issue run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" From 8bbec6744da9caebf11736f7b52b6dea46c5fb19 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 22:15:01 +0900 Subject: [PATCH 11/80] chore: Fix YAML syntax issues --- .github/workflows/create-jira-issue.yml | 62 ++++++++++++++++++------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index 7e71f09..e1bc8f6 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -24,14 +24,13 @@ jobs: uses: stefanbuck/github-issue-praser@v3 id: issue-parser with: - template-path: .github/ISSUE_TEMPLATE/issue_form.yml - - - name: Debug Template Path - run: - echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" + template-path: .github/ISSUE_TEMPLATE/issue-form.yml - name: Log Issue Parser run: | + echo '${{ steps.issue-parser.outputs.issueparser_parentKey }}' + echo '${{ steps.issue-parser.outputs.issueparser_childKey }}' + echo '${{ steps.issue-parser.outputs.__ticket_number }}' echo '${{ steps.issue-parser.outputs.jsonString }}' - name: Convert markdown to Jira Syntax @@ -45,14 +44,23 @@ jobs: ${{ github.event.issue.body }} mode: md2jira + - name: Transition issue + if: ${{ steps.issue-parser.outputs.issueparser_childKey != '' && steps.issue-parser.outputs.issueparser_childKey != null }} + id: transition + uses: atlassian/gajira-transition@v3 + with: + issue: "${{ steps.issue-parser.outputs.issueparser_childKey }}" + transition: "진행 중" + - name: Create Issue + if: ${{ steps.issue-parser.outputs.issueparser_childKey == '' && steps.issue-parser.outputs.issueparser_childKey == null }} id: create uses: atlassian/gajira-create@v3 with: project: REQ - issuetype: Subtask - summary: "${{ github.event.issue.title }}" - description: "${{ steps.md2jira.outputs.output-text }}" + issuetype: Task + summary: '${{ github.event.issue.title }}' + description: '${{ steps.md2jira.outputs.output-text }}' fields: | { "parent": { @@ -60,26 +68,46 @@ jobs: } } - - name: Debug Project Key - run: - echo "Project Key: REQ" - - name: Log created issue run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" - name: Checkout develop code uses: actions/checkout@v4 with: - ref: develop + ref: dev - name: Create branch with Ticket number run: | - git checkout -b ${{ steps.create.outputs.issue }} - git push origin ${{ steps.create.outputs.issue }} + if [[ "${{ steps.create.outcome }}" == "success" ]]; then + ISSUE_NUMBER="${{ steps.create.outputs.issue }}" + else + ISSUE_NUMBER="${{ steps.issue-parser.outputs.issueparser_childKey }}" + fi + ISSUE_TITLE="${{ steps.issue-parser.outputs.issueparser_branch}}" + BRANCH_NAME="${ISSUE_NUMBER}-$(echo ${ISSUE_TITLE} | sed 's/ /-/g')" + git checkout -b "${BRANCH_NAME}" + git push origin "${BRANCH_NAME}" - name: Update issue title uses: actions-cool/issues-helper@v3 with: - actions: "update-issue" + actions: 'update-issue' + token: ${{ secrets.GITHUB_TOKEN }} + title: '[${{ steps.create.outputs.issue }}] ${{ github.event.issue.title }}' + + - name : 기존 이슈 제목 업데이트 + if: ${{ steps.issue-parser.outputs.issueparser_childKey != '' && steps.issue-parser.outputs.issueparser_childKey != null }} + uses: actions-cool/issues-helper@v3 + with: + actions: 'update-issue' + token: ${{ secrets.GITHUB_TOKEN}} + title: '[${{ steps.issue-parser.outputs.issueparser_childKey }}] ${{ github.event.issue.title }}' + + - name: Add comment with Jira issue link + uses: actions-cool/issues-helper@v3 + with: + actions: 'create-comment' token: ${{ secrets.GITHUB_TOKEN }} - title: "${{ steps.create.outputs.issue }} ${{ github.event.issue.title }}" + issue-number: ${{ github.event.issue.number }} + body: 'Jira Issue Created: [${{ steps.create.outputs.issue }}](${{ secrets.JIRA_BASE_URL }}/browse/${{ steps.create.outputs.issue }})' + From 9660d00ba6a18ecde07d38ba9f1e950885d58ad7 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 22:32:19 +0900 Subject: [PATCH 12/80] chore: Fix YAML syntax issues --- .github/ISSUE_TEMPLATE/issue_form.yml | 4 ++-- .github/workflows/create-jira-issue.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue_form.yml b/.github/ISSUE_TEMPLATE/issue_form.yml index a62b5ea..bff757b 100644 --- a/.github/ISSUE_TEMPLATE/issue_form.yml +++ b/.github/ISSUE_TEMPLATE/issue_form.yml @@ -24,8 +24,8 @@ body: - type: input id: branch attributes: - label: '브랜치 (Branch)' - description: '🍃 영어로 브랜치명을 작성해주세요 (예: feature/your-branch)' + label: '🍃 브랜치 (Branch)' + description: '영어로 브랜치명을 작성해주세요 (예: feature/your-branch)' placeholder: 'feature/your-branch' validations: required: true diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index e1bc8f6..0933cae 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -24,7 +24,7 @@ jobs: uses: stefanbuck/github-issue-praser@v3 id: issue-parser with: - template-path: .github/ISSUE_TEMPLATE/issue-form.yml + template-path: .github/ISSUE_TEMPLATE/issue_form.yml - name: Log Issue Parser run: | From c25f38d01abe2397890bcc8b7815e1a9c2ee7bfc Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 23:05:19 +0900 Subject: [PATCH 13/80] chore: Fix YAML syntax issues --- .github/ISSUE_TEMPLATE/bug_report.md | 32 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 21 +++++++++++++++ .github/ISSUE_TEMPLATE/issue_form.yml | 6 ++--- 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..bcd402e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug Report +about: Create a report to help us improve +title: "[BUG] " +labels: bug +assignees: '' + +--- + +## Describe the bug +A clear and concise description of what the bug is. + +## Steps to reproduce +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '...' +4. See error + +## Expected behavior +A clear and concise description of what you expected to happen. + +## Screenshots +If applicable, add screenshots to help explain your problem. + +## Environment +- OS: [e.g., macOS 13.1] +- Browser: [e.g., Chrome 108] + +## Additional context +Add any other context about the problem here. + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..31ddbf4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,21 @@ +--- +name: Feature Request +about: Suggest an idea for this project +title: "[FEATURE] " +labels: enhancement +assignees: '' + +--- + +## Is your feature request related to a problem? Please describe. +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +## Describe the solution you'd like +A clear and concise description of what you want to happen. + +## Describe alternatives you've considered +A clear and concise description of any alternative solutions or features you've considered. + +## Additional context +Add any other context or screenshots about the feature request here. + diff --git a/.github/ISSUE_TEMPLATE/issue_form.yml b/.github/ISSUE_TEMPLATE/issue_form.yml index bff757b..cce508c 100644 --- a/.github/ISSUE_TEMPLATE/issue_form.yml +++ b/.github/ISSUE_TEMPLATE/issue_form.yml @@ -6,7 +6,7 @@ body: - type: input id: parentKey attributes: - label: '🌳 상위 작업 (Ticket Number)' + label: '상위 작업 (Ticket Number)' description: '상위 작업의 Ticket Number를 입력해주세요. (예: KAN-01)' placeholder: 'REQ-01' validations: @@ -15,7 +15,7 @@ body: - type: input id: childKey attributes: - label: '🌱 하위 작업 (Ticket Number - 선택)' + label: '하위 작업 (Ticket Number - 선택)' description: 'Jira에 기존 작업이 있다면 해당 Ticket Number를 입력하세요. 없을 경우 새로운 작업이 생성됩니다.' placeholder: 'REQ-02' validations: @@ -24,7 +24,7 @@ body: - type: input id: branch attributes: - label: '🍃 브랜치 (Branch)' + label: '브랜치 (Branch)' description: '영어로 브랜치명을 작성해주세요 (예: feature/your-branch)' placeholder: 'feature/your-branch' validations: From 0ad0e37d2bda44fc3b9f4d49741d61fc9a80d995 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 23:15:13 +0900 Subject: [PATCH 14/80] chore: Fix YAML syntax issues --- .github/ISSUE_TEMPLATE/bug_report.md | 32 ----------------------- .github/ISSUE_TEMPLATE/feature_request.md | 21 --------------- .github/ISSUE_TEMPLATE/issue_form.yml | 6 ++--- 3 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index bcd402e..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug Report -about: Create a report to help us improve -title: "[BUG] " -labels: bug -assignees: '' - ---- - -## Describe the bug -A clear and concise description of what the bug is. - -## Steps to reproduce -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '...' -3. Scroll down to '...' -4. See error - -## Expected behavior -A clear and concise description of what you expected to happen. - -## Screenshots -If applicable, add screenshots to help explain your problem. - -## Environment -- OS: [e.g., macOS 13.1] -- Browser: [e.g., Chrome 108] - -## Additional context -Add any other context about the problem here. - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 31ddbf4..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: Feature Request -about: Suggest an idea for this project -title: "[FEATURE] " -labels: enhancement -assignees: '' - ---- - -## Is your feature request related to a problem? Please describe. -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -## Describe the solution you'd like -A clear and concise description of what you want to happen. - -## Describe alternatives you've considered -A clear and concise description of any alternative solutions or features you've considered. - -## Additional context -Add any other context or screenshots about the feature request here. - diff --git a/.github/ISSUE_TEMPLATE/issue_form.yml b/.github/ISSUE_TEMPLATE/issue_form.yml index cce508c..930d5b1 100644 --- a/.github/ISSUE_TEMPLATE/issue_form.yml +++ b/.github/ISSUE_TEMPLATE/issue_form.yml @@ -36,14 +36,14 @@ body: label: '✏️ 상세 내용 (Description)' description: '이슈에 대해서 간략히 설명해주세요' value: | - 📋 이슈 내용 + [ 이슈 내용 ] - ✅ 체크리스트 + [ 체크리스트 ] - [ ] TODO - [ ] TODO - [ ] TODO - 📚 레퍼런스 (선택) + [ 레퍼런스 (선택) ] validations: required: true \ No newline at end of file From 3988abb3b947e0cddca46c3f15b11437664b4815 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Tue, 14 Jan 2025 23:17:30 +0900 Subject: [PATCH 15/80] chore: Fix YAML syntax issues --- .github/ISSUE_TEMPLATE/issue_form.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/issue_form.yml b/.github/ISSUE_TEMPLATE/issue_form.yml index 930d5b1..7d27444 100644 --- a/.github/ISSUE_TEMPLATE/issue_form.yml +++ b/.github/ISSUE_TEMPLATE/issue_form.yml @@ -33,7 +33,7 @@ body: - type: textarea id: description attributes: - label: '✏️ 상세 내용 (Description)' + label: '상세 내용 (Description)' description: '이슈에 대해서 간략히 설명해주세요' value: | [ 이슈 내용 ] From 31b921258ec3ee5d2533bbbe44e270ece4aeb8de Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Wed, 15 Jan 2025 00:58:20 +0900 Subject: [PATCH 16/80] chore: Fix YAML syntax issues --- .github/workflows/create-jira-issue.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml index 0933cae..970663f 100644 --- a/.github/workflows/create-jira-issue.yml +++ b/.github/workflows/create-jira-issue.yml @@ -26,6 +26,11 @@ jobs: with: template-path: .github/ISSUE_TEMPLATE/issue_form.yml + - name: Debug Template Path + run: | + ls .github/ISSUE_TEMPLATE/ + echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" + - name: Log Issue Parser run: | echo '${{ steps.issue-parser.outputs.issueparser_parentKey }}' From 142ccae538d3de4befb2950f1408c87c8ce5c6f2 Mon Sep 17 00:00:00 2001 From: makernaru-test00 Date: Wed, 15 Jan 2025 01:08:24 +0900 Subject: [PATCH 17/80] chore: Fix YAML syntax issues --- .github/workflows/close-jira-issue.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/close-jira-issue.yml b/.github/workflows/close-jira-issue.yml index 43e7ac3..9b07c3c 100644 --- a/.github/workflows/close-jira-issue.yml +++ b/.github/workflows/close-jira-issue.yml @@ -20,8 +20,20 @@ jobs: - name: Extract Jira issue key from GitHub issue title id: extract-key run: | + # Extract ISSUE_TITLE from the GitHub event ISSUE_TITLE="${{ github.event.issue.title }}" + echo "ISSUE_TITLE=$ISSUE_TITLE" + + # Use grep to extract Jira key JIRA_KEY=$(echo "$ISSUE_TITLE" | grep -oE '[A-Z]+-[0-9]+') + + # Handle cases where JIRA_KEY is empty + if [ -z "$JIRA_KEY" ]; then + echo "Error: Jira key not found in ISSUE_TITLE: $ISSUE_TITLE" + exit 1 + fi + + # Output JIRA_KEY to GitHub environment echo "JIRA_KEY=$JIRA_KEY" >> $GITHUB_ENV - name: Close Jira issue From 3481558e383313c638441ea6c5b5863b838d721f Mon Sep 17 00:00:00 2001 From: jinhosoon Date: Wed, 15 Jan 2025 09:28:36 +0900 Subject: [PATCH 18/80] init : DB --- application/src/main/resources/application-dev.yml | 0 .../src/main/resources/application-local.yml | 14 ++++++++++++++ .../src/main/resources/application-test.yml | 0 application/src/main/resources/application.yml | 8 ++++++++ 4 files changed, 22 insertions(+) create mode 100644 application/src/main/resources/application-dev.yml create mode 100644 application/src/main/resources/application-local.yml create mode 100644 application/src/main/resources/application-test.yml create mode 100644 application/src/main/resources/application.yml diff --git a/application/src/main/resources/application-dev.yml b/application/src/main/resources/application-dev.yml new file mode 100644 index 0000000..e69de29 diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml new file mode 100644 index 0000000..f6aac0d --- /dev/null +++ b/application/src/main/resources/application-local.yml @@ -0,0 +1,14 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/require + username: root + password: root + driver-class-name: com.mysql.jdbc.Driver + + jpa: + hibernate: + ddl-auto: update + show-sql: true + properties: + hibernate: + format_sql: true \ No newline at end of file diff --git a/application/src/main/resources/application-test.yml b/application/src/main/resources/application-test.yml new file mode 100644 index 0000000..e69de29 diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml new file mode 100644 index 0000000..a0639df --- /dev/null +++ b/application/src/main/resources/application.yml @@ -0,0 +1,8 @@ +spring: + application: + name: yummy-application + profiles: + active: local + +server: + port: 8080 \ No newline at end of file From 04cc81132e2a1623202ef9714c22d5b1e195083d Mon Sep 17 00:00:00 2001 From: jinhosoon Date: Wed, 15 Jan 2025 09:48:00 +0900 Subject: [PATCH 19/80] fix: update 'com.mysql.cj.jdbc.Driver' , db --- application/src/main/resources/application-local.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index f6aac0d..0e79427 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -1,9 +1,9 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/require - username: root - password: root - driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://localhost:3306/yummy_db + username: yummy@% + password: yummy1234! + driver-class-name: com.mysql.cj.jdbc.Driver jpa: hibernate: From 56d9d173feddbae47c1a721cfadd78024cff8c0f Mon Sep 17 00:00:00 2001 From: jinhosoon Date: Wed, 15 Jan 2025 09:51:19 +0900 Subject: [PATCH 20/80] fix: update username 'yummy' --- application/src/main/resources/application-local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index 0e79427..18af873 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -1,7 +1,7 @@ spring: datasource: url: jdbc:mysql://localhost:3306/yummy_db - username: yummy@% + username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver From ea4a372c7ae76aed7000c0c21e1c61b78e21117f Mon Sep 17 00:00:00 2001 From: fbehddn Date: Wed, 15 Jan 2025 10:09:12 +0900 Subject: [PATCH 21/80] =?UTF-8?q?chore:=20=EC=9D=B4=EC=8A=88=20=EB=B0=8F?= =?UTF-8?q?=20PR=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/-bug-fix-template.md | 17 ++++++++++++++++ .github/ISSUE_TEMPLATE/feature-template.md | 20 +++++++++++++++++++ .../ISSUE_TEMPLATE/refactor-issue-template.md | 19 ++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++--- 4 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/-bug-fix-template.md create mode 100644 .github/ISSUE_TEMPLATE/feature-template.md create mode 100644 .github/ISSUE_TEMPLATE/refactor-issue-template.md diff --git a/.github/ISSUE_TEMPLATE/-bug-fix-template.md b/.github/ISSUE_TEMPLATE/-bug-fix-template.md new file mode 100644 index 0000000..822e90c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/-bug-fix-template.md @@ -0,0 +1,17 @@ +--- +name: "\bBug Fix Template" +about: 버그 이슈 템플릿 +title: "[BUG] " +labels: bug +assignees: '' + +--- + +## 🐞 어떤 상황에서 발생한 버그인가요? +> 어떤 상황에서 발생한 버그인지 설명해주세요 + +## 🎁 수정한 내용 +> 어떤 작업으로 버그를 잡았는지 설명해주세요 + + +## 🔍 참고할만한 자료(선택) \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature-template.md b/.github/ISSUE_TEMPLATE/feature-template.md new file mode 100644 index 0000000..3ff4034 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-template.md @@ -0,0 +1,20 @@ +--- +name: Feature Template +about: 기능 추가 이슈 템플릿 +title: "[FEAT] " +labels: feature +assignees: '' + +--- + +## 📌 어떤 기능인가요? +> 추가하려는 기능에 대해 간결하게 설명해주세요 + + +## 📜 작업 상세 내용 +- [ ] TODO +- [ ] TODO +- [ ] TODO + + +## 🔍 참고할만한 자료(선택) \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/refactor-issue-template.md b/.github/ISSUE_TEMPLATE/refactor-issue-template.md new file mode 100644 index 0000000..7d3d8ee --- /dev/null +++ b/.github/ISSUE_TEMPLATE/refactor-issue-template.md @@ -0,0 +1,19 @@ +--- +name: Refactor issue template +about: 리팩터링 이슈 템플릿 +title: "[REFACTOR] " +labels: refactor +assignees: '' + +--- + +## 📌 어떤 기능을 리팩터링 하나요? +> 리팩터링 할 기능에 대해 간결하게 설명해주세요 + +## AS-IS +> 현재 인식한 상황에 대해 설명해주세요 + +## TO-BE +> 현재의 상황에서 개선시킬 이상적인 지향점을 설명해주세요 + +## 🔍 참고할만한 자료(선택) \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 76feb13..8bc836b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,10 @@ -## 📋 이슈 번호 +## ⚡️ 관련 이슈 +close #이슈번호 -## 🛠 구현 사항 +## 📍주요 변경 사항 +> 주요 변경 사항에 대해 작성해주세요. + + +## 🎸기타 +> 고려해야 하는 내용을 작성해 주세요. -## 📚 기타 From 1f5c0fd0ba43be0f0f5d76169be8216a65a7f4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=8F=99=EC=9A=B0?= <108855080+fbehddn@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:10:14 +0900 Subject: [PATCH 22/80] Rename -bug-fix-template.md to bug-fix-template.md --- .../{-bug-fix-template.md => bug-fix-template.md} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/ISSUE_TEMPLATE/{-bug-fix-template.md => bug-fix-template.md} (89%) diff --git a/.github/ISSUE_TEMPLATE/-bug-fix-template.md b/.github/ISSUE_TEMPLATE/bug-fix-template.md similarity index 89% rename from .github/ISSUE_TEMPLATE/-bug-fix-template.md rename to .github/ISSUE_TEMPLATE/bug-fix-template.md index 822e90c..3e5f17f 100644 --- a/.github/ISSUE_TEMPLATE/-bug-fix-template.md +++ b/.github/ISSUE_TEMPLATE/bug-fix-template.md @@ -14,4 +14,4 @@ assignees: '' > 어떤 작업으로 버그를 잡았는지 설명해주세요 -## 🔍 참고할만한 자료(선택) \ No newline at end of file +## 🔍 참고할만한 자료(선택) From 348366ef1951a68d41c64f828bca599f1cf47de3 Mon Sep 17 00:00:00 2001 From: leeminjung1 Date: Wed, 15 Jan 2025 10:09:29 +0900 Subject: [PATCH 23/80] chore: Set Java toolchain to Java 17 for all modules --- .idea/famous_restaurant.iml | 9 --------- .idea/misc.xml | 3 ++- .idea/modules.xml | 8 -------- application/build.gradle | 6 ------ build.gradle | 5 +++++ common/build.gradle | 5 ----- storage/build.gradle | 6 ------ 7 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 .idea/famous_restaurant.iml delete mode 100644 .idea/modules.xml diff --git a/.idea/famous_restaurant.iml b/.idea/famous_restaurant.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/famous_restaurant.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 589695e..7bc1d85 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ - + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f470fba..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/application/build.gradle b/application/build.gradle index 6eb68c3..ea4adf8 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -7,12 +7,6 @@ plugins { group = 'com.groom' version = '0.0.1-SNAPSHOT' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/build.gradle b/build.gradle index 6a9117c..f1e70a0 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,11 @@ allprojects { repositories { mavenCentral() } + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } } dependencyManagement { diff --git a/common/build.gradle b/common/build.gradle index df7ccaa..ac2939b 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -2,11 +2,6 @@ plugins { id 'java' } -java { - sourceCompatibility = '17' - targetCompatibility = '17' -} - dependencies { } \ No newline at end of file diff --git a/storage/build.gradle b/storage/build.gradle index e711040..52208ac 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -7,12 +7,6 @@ plugins { group = 'com.goorm' version = 'unspecified' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } -} - dependencies { implementation 'org.projectlombok:lombok' From c209ddab5e23e6f5ca596d991a0ec3729632fb3b Mon Sep 17 00:00:00 2001 From: leeminjung1 Date: Wed, 15 Jan 2025 10:18:13 +0900 Subject: [PATCH 24/80] fix: specify mainClass for Spring Boot application --- domain/build.gradle | 3 +++ storage/build.gradle | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/domain/build.gradle b/domain/build.gradle index 2a8af13..495f0d6 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -7,6 +7,9 @@ plugins { group = 'com.goorm' version = 'unspecified' +springBoot { + mainClass = 'yummy.yummyApplication' +} dependencies { diff --git a/storage/build.gradle b/storage/build.gradle index 52208ac..cbf2452 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -7,6 +7,10 @@ plugins { group = 'com.goorm' version = 'unspecified' +springBoot { + mainClass = 'yummy.yummyApplication' +} + dependencies { implementation 'org.projectlombok:lombok' From 851279792829694eaf722f1b19642874acaeb430 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Wed, 15 Jan 2025 10:41:53 +0900 Subject: [PATCH 25/80] =?UTF-8?q?feat:=20Sw=C3=A3swagger-config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 5 ++- application/build.gradle | 4 ++ .../com/groom/yummy/config/SwaggerConfig.java | 39 +++++++++++++++++++ .../groom}/yummy/yummyApplication.java | 2 +- 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/config/SwaggerConfig.java rename application/src/main/java/{ => com/groom}/yummy/yummyApplication.java (92%) diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bc1d85..fe0b0da 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,10 @@ - + + + + \ No newline at end of file diff --git a/application/build.gradle b/application/build.gradle index ea4adf8..c33adb2 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -17,6 +17,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter' implementation project(':domain') + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + } test { diff --git a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java new file mode 100644 index 0000000..80ff26f --- /dev/null +++ b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java @@ -0,0 +1,39 @@ +package com.groom.yummy.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.servers.Server; +import io.swagger.v3.oas.models.info.Info; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; + +@Configuration +public class SwaggerConfig { + +// @Value("${dev-host}") +// private String serverHost; + + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .components(new Components()) + .info(apiInfo()) + .servers(servers()); + } + + private Info apiInfo() { + return new Info() + .title("INTIP API명세서") + .description("api 명세서") + .version("1.0.0"); + } + + private List servers() { + List servers = new ArrayList<>(); + servers.add(new Server().url("http://localhost:8080").description("Local URL")); + return servers; + } +} diff --git a/application/src/main/java/yummy/yummyApplication.java b/application/src/main/java/com/groom/yummy/yummyApplication.java similarity index 92% rename from application/src/main/java/yummy/yummyApplication.java rename to application/src/main/java/com/groom/yummy/yummyApplication.java index 34c9c1c..6a912ba 100644 --- a/application/src/main/java/yummy/yummyApplication.java +++ b/application/src/main/java/com/groom/yummy/yummyApplication.java @@ -1,4 +1,4 @@ -package yummy; +package com.groom.yummy; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; From 9ca2a05a52db7bdbb92d26e960b66941777dc2a2 Mon Sep 17 00:00:00 2001 From: leeminjung1 Date: Wed, 15 Jan 2025 11:04:29 +0900 Subject: [PATCH 26/80] fix: Remove .idea from tracking and update .gitignore --- .gitignore | 2 +- .idea/.gitignore | 8 -------- .idea/misc.xml | 10 ---------- .idea/vcs.xml | 6 ------ 4 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index c2065bc..7a0f4d7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ bin/ !**/src/test/**/bin/ ### IntelliJ IDEA ### -.idea +.idea/ *.iws *.iml *.ipr diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index c3f502a..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# 디폴트 무시된 파일 -/shelf/ -/workspace.xml -# 에디터 기반 HTTP 클라이언트 요청 -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index fe0b0da..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 68415e9779b8a8dda7e0de98ec4594847af86556 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Wed, 15 Jan 2025 17:59:27 +0900 Subject: [PATCH 27/80] feat: storage entity --- .../com/groom/yummy/config/SwaggerConfig.java | 3 +- .../exception/GlobalExceptionHandler.java | 4 ++ .../main/java/exception/CustomException.java | 4 ++ common/src/main/java/exception/ErrorCode.java | 4 ++ domain/build.gradle | 1 - .../com/groom/yummy/config/MySqlConfig.java | 53 +++++++++++++++ .../com/groom/yummy/domain/BaseEntity.java | 29 +++++++++ .../groom/yummy/domain/group/GroupEntity.java | 59 +++++++++++++++++ .../domain/group/GroupEntityRepository.java | 10 +++ .../domain/group/GroupJpaRepository.java | 6 ++ .../yummy/domain/group/MeetingStatus.java | 35 ++++++++++ .../yummy/domain/region/RegionEntity.java | 33 ++++++++++ .../domain/region/RegionJpaRepository.java | 6 ++ .../groom/yummy/domain/reply/ReplyEntity.java | 39 +++++++++++ .../domain/reply/ReplyJpaRepository.java | 6 ++ .../groom/yummy/domain/store/Category.java | 41 ++++++++++++ .../groom/yummy/domain/store/StoreEntity.java | 64 +++++++++++++++++++ .../domain/store/StoreJpaRepository.java | 7 ++ .../groom/yummy/domain/user/UserEntity.java | 54 ++++++++++++++++ .../domain/user/UserEntityRepository.java | 10 +++ .../yummy/domain/user/UserJpaRepository.java | 6 ++ .../domain/usertogroup/AttendanceStatus.java | 17 +++++ .../domain/usertogroup/UserToGroupEntity.java | 40 ++++++++++++ 23 files changed, 529 insertions(+), 2 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java create mode 100644 common/src/main/java/exception/CustomException.java create mode 100644 common/src/main/java/exception/ErrorCode.java create mode 100644 storage/src/main/java/com/groom/yummy/config/MySqlConfig.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/BaseEntity.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/group/GroupJpaRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/group/MeetingStatus.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/region/RegionJpaRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/store/Category.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/usertogroup/AttendanceStatus.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java diff --git a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java index 80ff26f..86a0dad 100644 --- a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.info.Info; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,7 +27,7 @@ public OpenAPI openAPI() { private Info apiInfo() { return new Info() - .title("INTIP API명세서") + .title("yummy 명세서") .description("api 명세서") .version("1.0.0"); } diff --git a/application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java b/application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..50d70ab --- /dev/null +++ b/application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java @@ -0,0 +1,4 @@ +package com.groom.yummy.exception; + +public class GlobalExceptionHandler { +} diff --git a/common/src/main/java/exception/CustomException.java b/common/src/main/java/exception/CustomException.java new file mode 100644 index 0000000..78eb164 --- /dev/null +++ b/common/src/main/java/exception/CustomException.java @@ -0,0 +1,4 @@ +package exception; + +public class CustomException { +} diff --git a/common/src/main/java/exception/ErrorCode.java b/common/src/main/java/exception/ErrorCode.java new file mode 100644 index 0000000..115eb48 --- /dev/null +++ b/common/src/main/java/exception/ErrorCode.java @@ -0,0 +1,4 @@ +package exception; + +public enum ErrorCode { +} diff --git a/domain/build.gradle b/domain/build.gradle index 495f0d6..bcbe74c 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -23,7 +23,6 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter' implementation project(':storage') - implementation project(':common') } test { diff --git a/storage/src/main/java/com/groom/yummy/config/MySqlConfig.java b/storage/src/main/java/com/groom/yummy/config/MySqlConfig.java new file mode 100644 index 0000000..b146c76 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/config/MySqlConfig.java @@ -0,0 +1,53 @@ +//package com.groom.yummy.config; +// +// +//import com.zaxxer.hikari.HikariDataSource; +//import jakarta.persistence.EntityManagerFactory; +//import org.springframework.beans.factory.annotation.Qualifier; +//import org.springframework.boot.context.properties.ConfigurationProperties; +//import org.springframework.boot.jdbc.DataSourceBuilder; +//import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.context.annotation.Primary; +//import org.springframework.context.annotation.Profile; +//import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +//import org.springframework.orm.jpa.JpaTransactionManager; +//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +//import org.springframework.transaction.PlatformTransactionManager; +//import org.springframework.transaction.annotation.EnableTransactionManagement; +// +// +//import javax.sql.DataSource; +//import java.util.HashMap; +//import java.util.Map; +// +//@Configuration +//@Profile("!test") +//@EnableTransactionManagement +//@EnableJpaRepositories(basePackages = {"com.groom.yummy.domain"}) +//public class MySqlConfig { +// @Bean(name = "dataSource") +// @Primary +// @ConfigurationProperties(prefix = "spring.datasource") +// public DataSource dataSource(){ +// return DataSourceBuilder.create().type(HikariDataSource.class).build(); +// } +// @Primary +// @Bean(name = "entityManagerFactory") +// public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, @Qualifier("dataSource") DataSource dataSource) { +// +// Map properties = new HashMap(); +// properties.put("hibernate.hbm2ddl.auto", "update"); +// properties.put("hibernate.dialect", "org.hibernate.dialect.MySQL8Dialect"); +// +// return builder.dataSource(dataSource).packages("com.groom.yummy.domain").persistenceUnit("primary").properties(properties).build(); +// } +// +// @Primary +// @Bean(name = "transactionManager") +// PlatformTransactionManager transactionManager(@Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) { +// return new JpaTransactionManager(entityManagerFactory); +// } +//} +// diff --git a/storage/src/main/java/com/groom/yummy/domain/BaseEntity.java b/storage/src/main/java/com/groom/yummy/domain/BaseEntity.java new file mode 100644 index 0000000..d7adb82 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/BaseEntity.java @@ -0,0 +1,29 @@ +package com.groom.yummy.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@SuperBuilder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@EntityListeners(AuditingEntityListener.class) +public class BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @CreationTimestamp + private LocalDateTime createdAt; + + @UpdateTimestamp + private LocalDateTime updatedAt; + +} diff --git a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java new file mode 100644 index 0000000..0f86add --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java @@ -0,0 +1,59 @@ +package com.groom.yummy.domain.group; + +import com.groom.yummy.domain.BaseEntity; +import com.groom.yummy.domain.store.StoreEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.time.LocalDateTime; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Table(name = "teams") +@SuperBuilder +public class GroupEntity extends BaseEntity { + + @Column(nullable = false) + private String title; + + @Column(nullable = false) + private String content; + + @Column(nullable = false) + private Integer maxParticipants; + + @Column(nullable = false) + private Integer minParticipants; + + @Column(nullable = false) + private Integer currentParticipants; + + @Column(nullable = false) + private LocalDateTime meetingDate; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private MeetingStatus meetingStatus; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) + private StoreEntity store; + + @Builder + public GroupEntity(String title, String content, Integer maxParticipants, Integer minParticipants, + Integer currentParticipants, LocalDateTime meetingDate, MeetingStatus meetingStatus, StoreEntity store) { + this.title = title; + this.content = content; + this.maxParticipants = maxParticipants; + this.minParticipants = minParticipants; + this.currentParticipants = currentParticipants; + this.meetingDate = meetingDate; + this.meetingStatus = meetingStatus; + this.store = store; + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java new file mode 100644 index 0000000..042cd42 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java @@ -0,0 +1,10 @@ +package com.groom.yummy.domain.group; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class GroupEntityRepository { + private final GroupJpaRepository groupJpaRepository; +} diff --git a/storage/src/main/java/com/groom/yummy/domain/group/GroupJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/group/GroupJpaRepository.java new file mode 100644 index 0000000..f19cf3e --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/group/GroupJpaRepository.java @@ -0,0 +1,6 @@ +package com.groom.yummy.domain.group; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface GroupJpaRepository extends JpaRepository { +} diff --git a/storage/src/main/java/com/groom/yummy/domain/group/MeetingStatus.java b/storage/src/main/java/com/groom/yummy/domain/group/MeetingStatus.java new file mode 100644 index 0000000..6da5b97 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/group/MeetingStatus.java @@ -0,0 +1,35 @@ +package com.groom.yummy.domain.group; + +import lombok.Getter; + +@Getter +public enum MeetingStatus { + OPEN("OPEN", "모집 중: 참가 요청을 받고 있는 상태"), + CLOSED("CLOSED", "모집 마감: 더 이상 참가 요청을 받지 않는 상태."), + FINALIZED("FINALIZED", "팀 결성 완료: 모집이 끝나고 팀이 확정된 상태"), + CANCELLED("CANCELLED", "모집 취소: 소모임 자체가 취소된 상태"), + IN_PROGRESS("IN_PROGRESS", "모임 진행 중: 팀 결성 후 모임이 진행 중인 상태"), + COMPLETED("COMPLETED", "모임 완료: 모임이 종료된 상태"); + + private final String code; + private final String description; + + MeetingStatus(String code, String description) { + this.code = code; + this.description = description; + } + + @Override + public String toString() { + return String.format("%s (%s)", code, description); + } + + public static MeetingStatus fromCode(String code) { + for (MeetingStatus status : MeetingStatus.values()) { + if (status.getCode().equalsIgnoreCase(code)) { + return status; + } + } + throw new IllegalArgumentException("Unknown MeetingStatus code: " + code); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java new file mode 100644 index 0000000..425c0a4 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java @@ -0,0 +1,33 @@ +package com.groom.yummy.domain.region; + +import com.groom.yummy.domain.BaseEntity; +import com.groom.yummy.domain.store.StoreEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Table(name = "region") +@SuperBuilder +public class RegionEntity extends BaseEntity { + + @Column(nullable = false, unique = true) + private String regionName; + + @Column(nullable = false, unique = true) + private String regionCode; + + @Builder + public RegionEntity(String regionName, String regionCode) { + this.regionName = regionName; + this.regionCode = regionCode; + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/region/RegionJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/region/RegionJpaRepository.java new file mode 100644 index 0000000..aa0a374 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/region/RegionJpaRepository.java @@ -0,0 +1,6 @@ +package com.groom.yummy.domain.region; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface RegionJpaRepository extends JpaRepository { +} diff --git a/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java new file mode 100644 index 0000000..7c11cf5 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java @@ -0,0 +1,39 @@ +package com.groom.yummy.domain.reply; + +import com.groom.yummy.domain.BaseEntity; +import com.groom.yummy.domain.group.GroupEntity; +import com.groom.yummy.domain.user.UserEntity; +import jakarta.persistence.*; +import lombok.*; +import lombok.experimental.SuperBuilder; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Table(name="reply") +@SuperBuilder +public class ReplyEntity extends BaseEntity { + + @Column(nullable = false) + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "parent_id") + private ReplyEntity parentReply; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private UserEntity user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "group_id", nullable = false) + private GroupEntity group; + + @Builder + public ReplyEntity(String content, ReplyEntity parentReply, UserEntity user, GroupEntity group) { + this.content = content; + this.parentReply = parentReply; + this.user = user; + this.group = group; + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java new file mode 100644 index 0000000..78f9d0c --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java @@ -0,0 +1,6 @@ +package com.groom.yummy.domain.reply; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReplyJpaRepository extends JpaRepository { +} diff --git a/storage/src/main/java/com/groom/yummy/domain/store/Category.java b/storage/src/main/java/com/groom/yummy/domain/store/Category.java new file mode 100644 index 0000000..a466731 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/store/Category.java @@ -0,0 +1,41 @@ +package com.groom.yummy.domain.store; + +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +@Getter +public enum Category { + // TODO : apiCode 수정 + KOREAN("001","한식"), + WESTERN("002","양식"), + Chinese("003","중식"), + Japanese("004","일식"), + Dessert("005","디저트"); + + private final String apiCode; + private final String description; + + private static final Map API_CODE_TO_CATEGORY = new HashMap<>(); + + static { + for(Category category: values()){ + API_CODE_TO_CATEGORY.put(category.getApiCode(), category); + } + } + + Category(String apiCode, String description) { + this.apiCode = apiCode; + this.description = description; + } + + public static Category fromApiCode(String apiCode) { + return API_CODE_TO_CATEGORY.get(apiCode); + } + + @Override + public String toString() { + return String.format("%s (%s) ", apiCode, description); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java new file mode 100644 index 0000000..68af7a0 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java @@ -0,0 +1,64 @@ +package com.groom.yummy.domain.store; + +import com.groom.yummy.domain.BaseEntity; +import com.groom.yummy.domain.group.GroupEntity; +import com.groom.yummy.domain.region.RegionEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Table(name = "store") +@SuperBuilder +public class StoreEntity extends BaseEntity { + + @Column(nullable = false) + private String name; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Category category; + + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id", nullable = false) + private RegionEntity region; + + private StoreEntity(String name, Category category, RegionEntity region) { + this.name = name; + this.category = category; + this.region = region; + } + + private StoreEntity(String name, Category category, RegionEntity region, List groups) { + this.name = name; + this.category = category; + this.region = region; + } + + // 필수 필드만 생성 + public static StoreEntity create(String name, Category category, RegionEntity region) { + if (name == null || name.isBlank()) { + throw new IllegalArgumentException("Store name must not be null or blank"); + } + if (category == null) { + throw new IllegalArgumentException("Category must not be null"); + } + if (region == null) { + throw new IllegalArgumentException("Region must not be null"); + } + return new StoreEntity(name, category, region); + } + + // 그룹 포함 생성 + private static StoreEntity createWithGroups(String name, Category category, RegionEntity region, List groups) { + StoreEntity store = create(name, category, region); + return store; + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java new file mode 100644 index 0000000..e6631a1 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java @@ -0,0 +1,7 @@ +package com.groom.yummy.domain.store; + +import jakarta.persistence.Id; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreJpaRepository extends JpaRepository { +} diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java new file mode 100644 index 0000000..71ac78d --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java @@ -0,0 +1,54 @@ +package com.groom.yummy.domain.user; + +import com.groom.yummy.domain.BaseEntity; +import com.groom.yummy.domain.usertogroup.UserToGroupEntity; +import jakarta.persistence.*; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Table(name = "users") +@SuperBuilder +public class UserEntity extends BaseEntity { + + @Column(nullable = false, unique = true) + private String email; + + @Column(nullable = false, unique = true) + private String nickname; + + @Column(nullable = false) + private Long groupJoinCount; + + @Column(nullable = false) + private Long groupAttendanceCount; + + @Column(nullable = false) + private boolean isDeleted; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + private List userGroups; + + private UserEntity(String email, String nickname){ + this.email = email; + this.nickname = nickname; + this.groupJoinCount = 0L; + this.groupAttendanceCount = 0L; + this.isDeleted = false; + } + + public static UserEntity createNewUser(String email, String nickname) { + if (email == null || email.isBlank()) { + throw new IllegalStateException("Email must not be null or empty"); + } + + if (nickname == null || nickname.isBlank()) { + throw new IllegalStateException("nickname must not be null or empty"); + } + return new UserEntity(email, nickname); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java new file mode 100644 index 0000000..f72a0bc --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java @@ -0,0 +1,10 @@ +package com.groom.yummy.domain.user; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class UserEntityRepository { + private final UserJpaRepository userJpaRepository; +} diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java new file mode 100644 index 0000000..f12ebaa --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java @@ -0,0 +1,6 @@ +package com.groom.yummy.domain.user; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserJpaRepository extends JpaRepository { +} diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/AttendanceStatus.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/AttendanceStatus.java new file mode 100644 index 0000000..3f8d16f --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/AttendanceStatus.java @@ -0,0 +1,17 @@ +package com.groom.yummy.domain.usertogroup; + +public enum AttendanceStatus { + ATTENDED("참석"), + NO_SHOW("불참"), + APPROVED("승인됨"); + + private final String description; + + AttendanceStatus(String description) { + this.description = description; + } + + public String getDescription() { + return description; + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java new file mode 100644 index 0000000..17ff302 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java @@ -0,0 +1,40 @@ +package com.groom.yummy.domain.usertogroup; + +import com.groom.yummy.domain.BaseEntity; +import com.groom.yummy.domain.group.GroupEntity; +import com.groom.yummy.domain.user.UserEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "user_groups") +@SuperBuilder +public class UserToGroupEntity extends BaseEntity { + + @Column(nullable = false) + private boolean isLeader; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private AttendanceStatus attendanceStatus; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", nullable = false) + private UserEntity user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "group_id", nullable = false) + private GroupEntity group; + + @Builder + public UserToGroupEntity(AttendanceStatus attendanceStatus, boolean isLeader, UserEntity user, GroupEntity group) { + this.attendanceStatus = attendanceStatus; + this.isLeader = isLeader; + this.user = user; + this.group = group; + } +} From 605333f0ab72b72ce9742f33fae3230a277e03da Mon Sep 17 00:00:00 2001 From: fbehddn Date: Wed, 15 Jan 2025 19:26:30 +0900 Subject: [PATCH 28/80] =?UTF-8?q?chore:=20=EA=B8=B0=EB=B3=B8=20CI=20?= =?UTF-8?q?=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/CI.yml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml new file mode 100644 index 0000000..8eb0341 --- /dev/null +++ b/.github/workflows/CI.yml @@ -0,0 +1,26 @@ +name: BE CI + +on: + pull_request: + branches: + - dev + - main +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: 체크아웃 + uses: actions/checkout@v4 + + - name: gradle 캐싱 + uses: gradle/actions/setup-gradle@v4 + + - name: JDK 17 설정 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + + - name: 테스트 코드 실행 + run: ./gradlew test \ No newline at end of file From 47b5e0c71fdea5c3ff4fd23f4987df113f8b5129 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Wed, 15 Jan 2025 22:31:38 +0900 Subject: [PATCH 29/80] =?UTF-8?q?build:=20Spring=20Boot=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=8C=8C=EC=9D=BC=20=EB=B0=8F=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EC=A0=9D=ED=8A=B8=20=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - bootJar에 mainClass와 archiveFileName 추가 - Spring Boot 빌드 결과 파일명 'yummy_server.jar'로 변경 - 프로젝트 구조를 정리하고 settings.gradle에 모듈 재정의 - MainApplication 대문자 수정 --- application/build.gradle | 2 ++ .../yummy/{yummyApplication.java => YummyApplication.java} | 4 ++-- settings.gradle | 5 +---- 3 files changed, 5 insertions(+), 6 deletions(-) rename application/src/main/java/com/groom/yummy/{yummyApplication.java => YummyApplication.java} (70%) diff --git a/application/build.gradle b/application/build.gradle index c33adb2..f8656f8 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -28,6 +28,8 @@ test { } bootJar { + mainClass = 'com.groom.yummy.YummyApplication' + archiveFileName = "yummy_server.jar" enabled = true } diff --git a/application/src/main/java/com/groom/yummy/yummyApplication.java b/application/src/main/java/com/groom/yummy/YummyApplication.java similarity index 70% rename from application/src/main/java/com/groom/yummy/yummyApplication.java rename to application/src/main/java/com/groom/yummy/YummyApplication.java index 6a912ba..b4fdc63 100644 --- a/application/src/main/java/com/groom/yummy/yummyApplication.java +++ b/application/src/main/java/com/groom/yummy/YummyApplication.java @@ -4,8 +4,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class yummyApplication { +public class YummyApplication { public static void main(String[] args) { - SpringApplication.run(yummyApplication.class, args); + SpringApplication.run(YummyApplication.class, args); } } diff --git a/settings.gradle b/settings.gradle index 06650c3..367ef9b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,7 @@ rootProject.name = 'famous_restaurant' -include 'group' -include 'region' -include 'store' + include 'application' include 'storage' -include 'user' include 'common' include 'domain' From ce8eeb9dd681db542dacc0463ae3d355d7257ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=8F=99=EC=9A=B0?= <108855080+fbehddn@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:45:58 +0900 Subject: [PATCH 30/80] Feat/setup cd pipeline (#22) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: push 작업에도 CI/CD 구축 * feat: 배포 자동화를 위한 deploy.yml 및 Dockerfile 생성 * chore: application.yml 파일 생성하여 배포 * fix: dockerfile 수정하여 아키텍처 호환성 추가 * chore: DB 설정값 추가 * chore: CD 작업 브랜치 추가 * build: 빌드시 application.yml 파일 생성 * fix * fix: applcation_properties secrets 타이틀 변경 * fix: db url 변경 --- .github/workflows/CI.yml | 4 + .github/workflows/deploy.yml | 77 +++++++++++++++++++ Dockerfile | 4 + .../src/main/resources/application-local.yml | 4 +- .../src/main/resources/application.yml | 4 +- 5 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/deploy.yml create mode 100644 Dockerfile diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8eb0341..6634bcd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,6 +1,10 @@ name: BE CI on: + push: + branches: + - feat/* + - feature/* pull_request: branches: - dev diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..91d6c75 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,77 @@ +name: Build and Deploy to EC2 + +on: + push: + branches: + - dev + - feat/* + - feature/* + workflow_dispatch: + +jobs: + build-and-push-docker: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Build with Gradle + run: ./gradlew clean build + + - name: DockerHub Login + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Build and Tag Docker Image + run: | + docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:${{ github.sha }} . + docker tag ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:latest + + - name: Push Docker Image to DockerHub + run: | + docker push ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:${{ github.sha }} + docker push ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:latest + + deploy-to-ec2: + runs-on: ubuntu-latest + needs: build-and-push-docker + + steps: + - name: SSH and Deploy to EC2 + uses: appleboy/ssh-action@v1.1.0 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_PRIVATE_KEY }} + port: ${{ secrets.EC2_PORT }} + script: | + # `application-local.yml` 파일 생성 + echo "${{ secrets.APPLICATION_LOCAL_PROPERTIES }}" > /home/ubuntu/app/yummy-server/application-local.yml + + # 기존 컨테이너 중단 및 삭제 + docker-compose -f /home/ubuntu/app/yummy-server/docker-compose.yml down + + # 최신 Docker 이미지 Pull + docker-compose -f /home/ubuntu/app/yummy-server/docker-compose.yml pull + + # 컨테이너 다시 실행 + docker-compose -f /home/ubuntu/app/yummy-server/docker-compose.yml up -d diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..37f5dd1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM --platform=linux/amd64 openjdk:17-jdk-slim +ARG JAR_FILE=application/build/libs/yummy_server.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java", "-jar", "/app.jar"] diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index 18af873..09f421d 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/yummy_db + url: jdbc:mysql://mysql:3306/yummy_db # docker-compose에서 mysql 서비스 연결 username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver @@ -11,4 +11,4 @@ spring: show-sql: true properties: hibernate: - format_sql: true \ No newline at end of file + format_sql: true diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index a0639df..1fa0286 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -1,8 +1,6 @@ spring: - application: - name: yummy-application profiles: - active: local + active: dev server: port: 8080 \ No newline at end of file From c440fb2691968aaf4c1686721e2e493ffdce3b96 Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Thu, 16 Jan 2025 15:57:40 +0900 Subject: [PATCH 31/80] feat: feature-oauth2-user - #17 (#21) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat: OAuth2, User 도메인 추가 - 미완성 --- application/build.gradle | 17 ++++- .../groom/yummy/config/SecurityConfig.java | 71 +++++++++++++++++++ .../exception/CustomAccessDeniedHandler.java | 24 +++++++ .../CustomAuthenticationEntryPoint.java | 24 +++++++ .../com/groom/yummy/filter/JwtAuthFilter.java | 24 +++++++ .../groom/yummy/oauth2/auth/LoginUser.java | 51 +++++++++++++ .../groom/yummy/oauth2/dto/KakaoResponse.java | 33 +++++++++ .../yummy/oauth2/dto/OAuth2Response.java | 8 +++ .../oauth2/handler/CustomSuccessHandler.java | 27 +++++++ .../service/CustomOAuth2UserService.java | 38 ++++++++++ .../strategy/KakaoOAuth2ResStrategy.java | 21 ++++++ .../oauth2/strategy/OAuth2ResFactory.java | 26 +++++++ .../oauth2/strategy/OAuth2ResStrategy.java | 10 +++ .../java/com/groom/yummy/util/CookieUtil.java | 33 +++++++++ .../java/com/groom/yummy/util/JwtUtil.java | 71 +++++++++++++++++++ .../src/main/resources/application-local.yml | 24 +++++++ build.gradle | 7 ++ domain/build.gradle | 10 --- .../main/java/com/groom/yummy/user/User.java | 20 ++++++ .../com/groom/yummy/user/UserAuthService.java | 16 +++++ .../com/groom/yummy/user/UserRepository.java | 8 +++ settings.gradle | 4 +- storage/build.gradle | 8 +-- .../com/groom/yummy/domain/BaseEntity.java | 2 + .../yummy/domain/region/RegionEntity.java | 4 -- .../groom/yummy/domain/user/UserEntity.java | 44 ++++++------ .../domain/user/UserEntityRepository.java | 16 ++++- .../yummy/domain/user/UserJpaRepository.java | 3 + 28 files changed, 595 insertions(+), 49 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/config/SecurityConfig.java create mode 100644 application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java create mode 100644 application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java create mode 100644 application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/dto/KakaoResponse.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/dto/OAuth2Response.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/strategy/KakaoOAuth2ResStrategy.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResFactory.java create mode 100644 application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResStrategy.java create mode 100644 application/src/main/java/com/groom/yummy/util/CookieUtil.java create mode 100644 application/src/main/java/com/groom/yummy/util/JwtUtil.java create mode 100644 domain/src/main/java/com/groom/yummy/user/User.java create mode 100644 domain/src/main/java/com/groom/yummy/user/UserAuthService.java create mode 100644 domain/src/main/java/com/groom/yummy/user/UserRepository.java diff --git a/application/build.gradle b/application/build.gradle index f8656f8..ccfb99d 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -4,23 +4,34 @@ plugins { id 'io.spring.dependency-management' version '1.1.7' } -group = 'com.groom' version = '0.0.1-SNAPSHOT' dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' + runtimeOnly project(':storage') + compileOnly project(':domain') + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-security' testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation 'org.junit.jupiter:junit-jupiter' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' - implementation project(':domain') // Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + // OAuth2 + implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + + // jwt + implementation 'io.jsonwebtoken:jjwt-api:0.12.3' + implementation 'io.jsonwebtoken:jjwt-impl:0.12.3' + implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' + } test { diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java new file mode 100644 index 0000000..eb40e24 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -0,0 +1,71 @@ +package com.groom.yummy.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.exception.CustomAccessDeniedHandler; +import com.groom.yummy.exception.CustomAuthenticationEntryPoint; +import com.groom.yummy.filter.JwtAuthFilter; +import com.groom.yummy.util.JwtUtil; +import com.groom.yummy.oauth2.handler.CustomSuccessHandler; +import com.groom.yummy.oauth2.service.CustomOAuth2UserService; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final CustomOAuth2UserService customOAuth2UserService; + private final CustomSuccessHandler customSuccessHandler; + private final JwtUtil jwtUtil; + private final ObjectMapper objectMapper; + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ + // cors 설정 + // http.cors((cors -> cors.configurationSource(configurationSource()))); + + // csfr disable + http.csrf((auth) -> auth.disable()); + + // HTTP Basic 인증 방식 disable + http.httpBasic((auth) -> auth.disable()); + + //경로별 인가 작업 + http.authorizeHttpRequests((auth) -> auth + .requestMatchers( "/login/**", "/oauth2/**", "/oauth2/authorization/**").permitAll() // OAuth2 관련 경로 허용 + .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**").permitAll() // Swagger 관련 경로 허용 + .requestMatchers("/image").permitAll() + .requestMatchers("/api/v1/fcm").permitAll() + .requestMatchers("/chat/**","/ws-stomp/**","/chatroom","/create","/chatting/**").permitAll() + .requestMatchers("/crawling/*").permitAll() + .requestMatchers("/gemini").permitAll() + .anyRequest().authenticated()); + + //세션 설정 : STATELESS + http.sessionManagement((session) -> session + .sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + + //oauth2 + http.oauth2Login((oauth2) -> + oauth2.userInfoEndpoint((userInfoEndpointConfig) -> userInfoEndpointConfig + .userService(customOAuth2UserService)).successHandler(customSuccessHandler)); + + // JWTFilter 추가 + http.addFilterBefore(new JwtAuthFilter(jwtUtil), UsernamePasswordAuthenticationFilter.class); + + // Exception handler 추가 + http.exceptionHandling(exceptionHandling -> + exceptionHandling + .accessDeniedHandler(new CustomAccessDeniedHandler(objectMapper)) + .authenticationEntryPoint(new CustomAuthenticationEntryPoint(objectMapper))); + + return http.build(); + } +} diff --git a/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java b/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java new file mode 100644 index 0000000..5bccb22 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java @@ -0,0 +1,24 @@ +package com.groom.yummy.exception; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.web.access.AccessDeniedHandler; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class CustomAccessDeniedHandler implements AccessDeniedHandler { + + private final ObjectMapper objectMapper; + + @Override + public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { + + } +} diff --git a/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java b/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java new file mode 100644 index 0000000..7dbaf94 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java @@ -0,0 +1,24 @@ +package com.groom.yummy.exception; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { + + private final ObjectMapper objectMapper; + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { + + } +} diff --git a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java new file mode 100644 index 0000000..375a233 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java @@ -0,0 +1,24 @@ +package com.groom.yummy.filter; + +import com.groom.yummy.util.JwtUtil; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@RequiredArgsConstructor +@Component +public class JwtAuthFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + + } +} diff --git a/application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java b/application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java new file mode 100644 index 0000000..09ef51a --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java @@ -0,0 +1,51 @@ +package com.groom.yummy.oauth2.auth; + +import lombok.Getter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.oauth2.core.user.OAuth2User; +import com.groom.yummy.user.User; + +import java.util.Collection; +import java.util.Map; + +@Getter +public class LoginUser implements UserDetails, OAuth2User{ + private final User user; + private Map attributes; + + public LoginUser(User user, Map attributes) { + this.user = user; + this.attributes = attributes; + } + + @Override + public Map getAttributes() { + return attributes; + } + + @Override + public Collection getAuthorities() { + return null; + } + + + @Override + public String getUsername() { + return user.getEmail(); + } + + @Override + public String getName() { + return user.getNickname(); + } + + public String getRole(){ + return user.getRole(); + } + + @Override + public String getPassword() { + return null; + } +} diff --git a/application/src/main/java/com/groom/yummy/oauth2/dto/KakaoResponse.java b/application/src/main/java/com/groom/yummy/oauth2/dto/KakaoResponse.java new file mode 100644 index 0000000..1ef3b63 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/dto/KakaoResponse.java @@ -0,0 +1,33 @@ +package com.groom.yummy.oauth2.dto; + + +import java.util.Map; + +public class KakaoResponse implements OAuth2Response { + + private final Map attributes; + + public KakaoResponse(Map attributes) { + this.attributes = attributes; + } + + @Override + public String getProvider() { + return "kakao"; + } + + @Override + public String getProviderId() { + return attributes.get("id").toString(); + } + + @Override + public String getEmail() { + return ((Map)attributes.get("kakao_account")).get("email").toString(); + } + + @Override + public String getName() { + return ((Map)attributes.get("properties")).get("nickname").toString(); + } +} diff --git a/application/src/main/java/com/groom/yummy/oauth2/dto/OAuth2Response.java b/application/src/main/java/com/groom/yummy/oauth2/dto/OAuth2Response.java new file mode 100644 index 0000000..8bf578c --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/dto/OAuth2Response.java @@ -0,0 +1,8 @@ +package com.groom.yummy.oauth2.dto; + +public interface OAuth2Response { + String getProvider(); + String getProviderId(); + String getEmail(); + String getName(); +} diff --git a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java new file mode 100644 index 0000000..f124094 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java @@ -0,0 +1,27 @@ +package com.groom.yummy.oauth2.handler; + +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserAuthService; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.authentication.AuthenticationSuccessHandler; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class CustomSuccessHandler implements AuthenticationSuccessHandler { + + private final UserAuthService userAuthService; + @Override + public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { + UserDetails userDetails = (UserDetails) authentication.getPrincipal(); + User user = userAuthService.findAuthUserByEmail(userDetails.getUsername()).orElseThrow(); + + } +} diff --git a/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java new file mode 100644 index 0000000..ecd4203 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java @@ -0,0 +1,38 @@ +package com.groom.yummy.oauth2.service; + +import com.groom.yummy.oauth2.dto.OAuth2Response; +import com.groom.yummy.oauth2.strategy.OAuth2ResFactory; +import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; +import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; +import org.springframework.security.oauth2.core.OAuth2AuthenticationException; +import org.springframework.security.oauth2.core.user.OAuth2User; +import org.springframework.stereotype.Service; +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserAuthService; + +import java.util.Optional; + +@Service +public class CustomOAuth2UserService extends DefaultOAuth2UserService { + + private final OAuth2ResFactory oAuth2ResFactory; + private final UserAuthService userAuthService; + + public CustomOAuth2UserService(OAuth2ResFactory oAuth2ResFactory, UserAuthService userAuthService) { + this.oAuth2ResFactory = oAuth2ResFactory; + this.userAuthService = userAuthService; + } + + @Override + public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException{ + OAuth2User oAuth2User = super.loadUser(userRequest); + + String registrationId = userRequest.getClientRegistration().getRegistrationId(); + OAuth2Response oAuth2Response = oAuth2ResFactory.createOAuth2Response(registrationId, oAuth2User.getAttributes()); + String email = oAuth2Response.getEmail(); + + Optional user = userAuthService.findAuthUserByEmail(email); + + return null; + } +} diff --git a/application/src/main/java/com/groom/yummy/oauth2/strategy/KakaoOAuth2ResStrategy.java b/application/src/main/java/com/groom/yummy/oauth2/strategy/KakaoOAuth2ResStrategy.java new file mode 100644 index 0000000..f2f8a9d --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/strategy/KakaoOAuth2ResStrategy.java @@ -0,0 +1,21 @@ +package com.groom.yummy.oauth2.strategy; + +import com.groom.yummy.oauth2.dto.KakaoResponse; +import com.groom.yummy.oauth2.dto.OAuth2Response; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component +public class KakaoOAuth2ResStrategy implements OAuth2ResStrategy{ + + @Override + public String getProviderName() { + return "kakao"; + } + + @Override + public OAuth2Response createOAuth2Response(Map attributes) { + return new KakaoResponse(attributes); + } +} diff --git a/application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResFactory.java b/application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResFactory.java new file mode 100644 index 0000000..8473f9e --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResFactory.java @@ -0,0 +1,26 @@ +package com.groom.yummy.oauth2.strategy; + +import com.groom.yummy.oauth2.dto.OAuth2Response; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; + +@Component +public class OAuth2ResFactory { + private final Map strategies; + + public OAuth2ResFactory(List strategiyList) { + this.strategies = strategiyList.stream() + .collect(Collectors.toMap(OAuth2ResStrategy::getProviderName, Function.identity())); + } + + public OAuth2Response createOAuth2Response(String registrationId, Map attributes){ + OAuth2ResStrategy strategy = strategies.get(registrationId); + System.out.println(strategy); + if(Objects.equals(strategy,null)) throw new IllegalStateException("지원하지 않는 provider 입니다."); + return strategy.createOAuth2Response(attributes); + }} diff --git a/application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResStrategy.java b/application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResStrategy.java new file mode 100644 index 0000000..b10d05a --- /dev/null +++ b/application/src/main/java/com/groom/yummy/oauth2/strategy/OAuth2ResStrategy.java @@ -0,0 +1,10 @@ +package com.groom.yummy.oauth2.strategy; + +import com.groom.yummy.oauth2.dto.OAuth2Response; + +import java.util.Map; + +public interface OAuth2ResStrategy { + String getProviderName(); + OAuth2Response createOAuth2Response(Map attributes); +} diff --git a/application/src/main/java/com/groom/yummy/util/CookieUtil.java b/application/src/main/java/com/groom/yummy/util/CookieUtil.java new file mode 100644 index 0000000..0ad5b94 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/util/CookieUtil.java @@ -0,0 +1,33 @@ +package com.groom.yummy.util; + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.ResponseCookie; + +public class CookieUtil { + public static ResponseCookie createCookie(final String nameOfCookie, final String token, + final Long cookieValidTime) { + return ResponseCookie.from(nameOfCookie, token) + .path("/") + .sameSite("Strict") + .secure(true) + .maxAge(Math.toIntExact(cookieValidTime)) + .httpOnly(true) + .build(); + } + + public static Cookie getCookie(HttpServletRequest request, String nameOfCookie) { + Cookie[] cookies = request.getCookies(); + + if (cookies == null || cookies.length == 0) { + return null; + } + + for (Cookie cookie : cookies) { + if (cookie.getName().equals(nameOfCookie)) { + return cookie; + } + } + return null; + } +} diff --git a/application/src/main/java/com/groom/yummy/util/JwtUtil.java b/application/src/main/java/com/groom/yummy/util/JwtUtil.java new file mode 100644 index 0000000..8ed94dc --- /dev/null +++ b/application/src/main/java/com/groom/yummy/util/JwtUtil.java @@ -0,0 +1,71 @@ +package com.groom.yummy.util; + +import com.groom.yummy.user.User; +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.Keys; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.util.Date; + +@Component +public class JwtUtil { + + private final Key secretKey; + private final long validTime; + public static final String AUTHORIZATION_HEADER = "Authorization"; + public static final String BEARER_PREFIX = "Bearer "; + + + public JwtUtil(@Value("${spring.jwt.secret}") String secretKey, + @Value("${spring.jwt.valid-time}")long validTime){ + this.secretKey = Keys.hmacShaKeyFor(secretKey.getBytes(StandardCharsets.UTF_8)); + this.validTime = validTime; + } + + public String createAccessToken(User user){ + Date timeNow = new Date(System.currentTimeMillis()); + Date expirationTime = new Date(timeNow.getTime() + validTime); + + return Jwts.builder() + .setSubject(String.valueOf(user.getId())) + .claim("role",user.getRole()) + .claim("email",user.getEmail()) + .setIssuedAt(timeNow) + .setExpiration(expirationTime) + .signWith(secretKey, SignatureAlgorithm.HS256) + .compact(); + } + + public String getUsername(String token){ + String info = Jwts.parser().setSigningKey(secretKey).build().parseClaimsJws(token).getBody().getSubject(); + return info; + } + + public boolean validateToken(String token){ + //log.info("토큰 유효성 검증 시작"); + return valid(secretKey, token); + } + + private boolean valid(Key key, String token){ + try{ + Jws claims = Jwts.parser().setSigningKey(secretKey).build().parseClaimsJws(token); + return !claims.getBody().getExpiration().before(new Date()); + }catch (SignatureException ex){ + throw new RuntimeException(); + }catch (MalformedJwtException ex){ + throw new RuntimeException(); + }catch (ExpiredJwtException ex){ + throw new RuntimeException(); + }catch (IllegalArgumentException ex){ + throw new RuntimeException(); + } + } + +} + + diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index 09f421d..db9f683 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -12,3 +12,27 @@ spring: properties: hibernate: format_sql: true + + security: + oauth2: + client: + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + registration: + kakao: + client-name: kakao + client-id: ${client-id} + client-secret: ${client-secret} + redirect-uri: ${redirect-uri} + client-authentication-method: client_secret_post + authorization-grant-type: authorization_code + scope: profile_nickname, account_email + + jwt: + secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32ni + valid-time: 7200000 + diff --git a/build.gradle b/build.gradle index f1e70a0..464827e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ plugins { } allprojects { + group = 'com.groom.yummy' repositories { mavenCentral() } @@ -15,6 +16,12 @@ allprojects { } } +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + dependencyManagement { imports { mavenBom "org.springframework.boot:spring-boot-dependencies:3.4.1" diff --git a/domain/build.gradle b/domain/build.gradle index bcbe74c..72a8242 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -4,25 +4,15 @@ plugins { id 'io.spring.dependency-management' version '1.1.7' } -group = 'com.goorm' version = 'unspecified' -springBoot { - mainClass = 'yummy.yummyApplication' -} - dependencies { - - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation 'org.junit.jupiter:junit-jupiter' - - implementation project(':storage') } test { diff --git a/domain/src/main/java/com/groom/yummy/user/User.java b/domain/src/main/java/com/groom/yummy/user/User.java new file mode 100644 index 0000000..d2b38b3 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/user/User.java @@ -0,0 +1,20 @@ +package com.groom.yummy.user; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class User { + private Long id; + private String nickname; + private String role; + private String email; + private Long groupJoinCount; + private Long groupAttendanceCount; + private boolean isDeleted; +} diff --git a/domain/src/main/java/com/groom/yummy/user/UserAuthService.java b/domain/src/main/java/com/groom/yummy/user/UserAuthService.java new file mode 100644 index 0000000..7e5f677 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/user/UserAuthService.java @@ -0,0 +1,16 @@ +package com.groom.yummy.user; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class UserAuthService { + private final UserRepository userRepository; + + public Optional findAuthUserByEmail(String email){ + return userRepository.findByEmail(email); + } +} diff --git a/domain/src/main/java/com/groom/yummy/user/UserRepository.java b/domain/src/main/java/com/groom/yummy/user/UserRepository.java new file mode 100644 index 0000000..b699bc5 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/user/UserRepository.java @@ -0,0 +1,8 @@ +package com.groom.yummy.user; + +import java.util.Optional; + +public interface UserRepository { + Optional findByEmail(String email); + Long save(User user); +} diff --git a/settings.gradle b/settings.gradle index 367ef9b..4fd861a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,5 @@ rootProject.name = 'famous_restaurant' - include 'application' include 'storage' include 'common' -include 'domain' - +include 'domain' \ No newline at end of file diff --git a/storage/build.gradle b/storage/build.gradle index cbf2452..e5e35cf 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -4,21 +4,15 @@ plugins { id 'io.spring.dependency-management' version '1.1.7' } -group = 'com.goorm' version = 'unspecified' -springBoot { - mainClass = 'yummy.yummyApplication' -} - dependencies { - + implementation project(':domain') implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' runtimeOnly 'com.mysql:mysql-connector-j' - } diff --git a/storage/src/main/java/com/groom/yummy/domain/BaseEntity.java b/storage/src/main/java/com/groom/yummy/domain/BaseEntity.java index d7adb82..d7dd69e 100644 --- a/storage/src/main/java/com/groom/yummy/domain/BaseEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/BaseEntity.java @@ -2,6 +2,7 @@ import jakarta.persistence.*; import lombok.AccessLevel; +import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.hibernate.annotations.CreationTimestamp; @@ -14,6 +15,7 @@ @SuperBuilder @NoArgsConstructor(access = AccessLevel.PROTECTED) @EntityListeners(AuditingEntityListener.class) +@Getter public class BaseEntity { @Id diff --git a/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java index 425c0a4..2e359ce 100644 --- a/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java @@ -1,7 +1,6 @@ package com.groom.yummy.domain.region; import com.groom.yummy.domain.BaseEntity; -import com.groom.yummy.domain.store.StoreEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -9,9 +8,6 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.util.ArrayList; -import java.util.List; - @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java index 71ac78d..e0aabcc 100644 --- a/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java @@ -1,12 +1,10 @@ package com.groom.yummy.domain.user; import com.groom.yummy.domain.BaseEntity; -import com.groom.yummy.domain.usertogroup.UserToGroupEntity; import jakarta.persistence.*; import lombok.*; import lombok.experimental.SuperBuilder; - -import java.util.List; +import com.groom.yummy.user.User; @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @@ -30,25 +28,29 @@ public class UserEntity extends BaseEntity { @Column(nullable = false) private boolean isDeleted; - @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) - private List userGroups; - - private UserEntity(String email, String nickname){ - this.email = email; - this.nickname = nickname; - this.groupJoinCount = 0L; - this.groupAttendanceCount = 0L; - this.isDeleted = false; + @Column(nullable = false) + private String role; + + public static User toModel(UserEntity userEntity){ + return User.builder() + .id(userEntity.getId()) + .nickname(userEntity.nickname) + .email(userEntity.getEmail()) + .role(userEntity.role) + .groupAttendanceCount(userEntity.groupAttendanceCount) + .groupAttendanceCount(userEntity.groupJoinCount) + .isDeleted(userEntity.isDeleted) + .build(); } - public static UserEntity createNewUser(String email, String nickname) { - if (email == null || email.isBlank()) { - throw new IllegalStateException("Email must not be null or empty"); - } - - if (nickname == null || nickname.isBlank()) { - throw new IllegalStateException("nickname must not be null or empty"); - } - return new UserEntity(email, nickname); + public static UserEntity toEntity(User user){ + return UserEntity.builder() + .nickname(user.getNickname()) + .email(user.getEmail()) + .role(user.getRole()) + .groupAttendanceCount(user.getGroupAttendanceCount()) + .groupJoinCount(user.getGroupJoinCount()) + .isDeleted(user.isDeleted()) + .build(); } } diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java index f72a0bc..176ad0a 100644 --- a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java @@ -2,9 +2,23 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserRepository; + +import java.util.Optional; @Repository @RequiredArgsConstructor -public class UserEntityRepository { +public class UserEntityRepository implements UserRepository { private final UserJpaRepository userJpaRepository; + + @Override + public Optional findByEmail(String email) { + return userJpaRepository.findByEmail(email).map(UserEntity::toModel); + } + + @Override + public Long save(User user) { + return userJpaRepository.save(UserEntity.toEntity(user)).getId(); + } } diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java index f12ebaa..9468d0d 100644 --- a/storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserJpaRepository.java @@ -2,5 +2,8 @@ import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface UserJpaRepository extends JpaRepository { + Optional findByEmail(String email); } From 0c2bf75d3cec49f6a864a263233962718bf17645 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Thu, 16 Jan 2025 16:14:20 +0900 Subject: [PATCH 32/80] =?UTF-8?q?fix:=20feat:=20Spring=20Boot=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EC=A0=9D=ED=8A=B8=20Gradle=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application-local.yml | 2 +- application/src/main/resources/application.yml | 2 +- domain/build.gradle | 4 ++++ storage/build.gradle | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index db9f683..8e91a0c 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://mysql:3306/yummy_db # docker-compose에서 mysql 서비스 연결 + url: jdbc:mysql://localhost:3306/yummy_db username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 1fa0286..ebd23ee 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: local server: port: 8080 \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle index 72a8242..7aa5045 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -17,4 +17,8 @@ dependencies { test { useJUnitPlatform() +} + +tasks.named('bootJar') { + enabled = false } \ No newline at end of file diff --git a/storage/build.gradle b/storage/build.gradle index e5e35cf..4b76569 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -16,3 +16,6 @@ dependencies { runtimeOnly 'com.mysql:mysql-connector-j' } +tasks.named('bootJar') { + enabled = false +} \ No newline at end of file From d90b2dc470a7c39b41bc5aa2dc756ec72c783b64 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Thu, 16 Jan 2025 16:19:50 +0900 Subject: [PATCH 33/80] =?UTF-8?q?fix:=20ec2=20=EC=84=9C=EB=B2=84=EB=8A=94?= =?UTF-8?q?=20profile=20dev=20=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application-local.yml | 2 +- application/src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index 8e91a0c..207a7b3 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/yummy_db + url: jdbc:mysql://mysql:3306/yummy_db username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index ebd23ee..1fa0286 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: dev server: port: 8080 \ No newline at end of file From 0516aff981443d50f9d6814afb5fbc8339b838fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=8F=99=EC=9A=B0?= <108855080+fbehddn@users.noreply.github.com> Date: Fri, 17 Jan 2025 13:14:16 +0900 Subject: [PATCH 34/80] =?UTF-8?q?fix:=20ecr=EC=9D=84=20=ED=86=B5=ED=95=9C?= =?UTF-8?q?=20=EB=B0=B0=ED=8F=AC=20(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 63 +++++++++++++++ .github/workflows/{CI.yml => ci.yml} | 14 +--- .github/workflows/deploy.yml | 77 ------------------- Dockerfile | 7 +- .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-local.yml | 2 +- .../src/main/resources/application-test.yml | 0 .../src/main/resources/application.yml | 2 +- 8 files changed, 71 insertions(+), 94 deletions(-) create mode 100644 .github/workflows/cd.yml rename .github/workflows/{CI.yml => ci.yml} (69%) delete mode 100644 .github/workflows/deploy.yml delete mode 100644 application/src/main/resources/application-dev.yml delete mode 100644 application/src/main/resources/application-test.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000..26293c9 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,63 @@ +name: Build and Deploy to EC2 + +on: + push: + branches: + - main + - dev + +jobs: + build-and-push-docker: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: gradle/actions/setup-gradle@v4 + + - name: Build with Gradle + run: ./gradlew clean build + + - name: application.yml 파일 생성 + run: echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./src/main/resources/application.yml + + - name: AWS Resource에 접근할 수 있게 AWS credentials 설정 + uses: aws-actions/configure-aws-credentials@v4 + with: + aws-region: ap-northeast-2 + aws-access-key-id: ${{ secrests.AWS_ACCESS_KEY_ID}} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY}} + + - name: ECR login + id: login-ecr + uses: aws-actions/amazon-ecr-login@v2 + + - name: Docker 이미지 생성 + run: docker build -t my-yummy . + + - name: Docker 이미지에 태그 붙이기 + run: docker tag my-yummy ${{ secrets.ECR_REGISTRY }}/my-yummy:latest + + - name: ECR에 Docker 이미지 Push + run: docker push ${{ secrets.ECR_REGISTRY }}/my-yummy:latest + + - name: SSH로 EC2에 접속하기 + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ secrets.EC2_HOST}} + username: ${{ secrets.EC2_USERNAME}} + key: ${{ secrets.EC2_PRIVATE_KEY}} + script_stop: true + script: | + cd ~/my-yummy + docker compose down || true + docker pull ${{ secrets.ECR_REGISTRY }}/my-yummy:latest + docker compose up -d --build \ No newline at end of file diff --git a/.github/workflows/CI.yml b/.github/workflows/ci.yml similarity index 69% rename from .github/workflows/CI.yml rename to .github/workflows/ci.yml index 6634bcd..edcdf6a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/ci.yml @@ -1,30 +1,22 @@ name: BE CI on: - push: - branches: - - feat/* - - feature/* pull_request: branches: - - dev - main + - dev jobs: build: runs-on: ubuntu-latest - steps: - - name: 체크아웃 + - name: Github Repository 파일 불러오기 uses: actions/checkout@v4 - - name: gradle 캐싱 - uses: gradle/actions/setup-gradle@v4 - - name: JDK 17 설정 uses: actions/setup-java@v4 with: - java-version: 17 distribution: temurin + java-version: 17 - name: 테스트 코드 실행 run: ./gradlew test \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 91d6c75..0000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,77 +0,0 @@ -name: Build and Deploy to EC2 - -on: - push: - branches: - - dev - - feat/* - - feature/* - workflow_dispatch: - -jobs: - build-and-push-docker: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - - - name: Cache Gradle packages - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Build with Gradle - run: ./gradlew clean build - - - name: DockerHub Login - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} - - - name: Build and Tag Docker Image - run: | - docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:${{ github.sha }} . - docker tag ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:${{ github.sha }} ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:latest - - - name: Push Docker Image to DockerHub - run: | - docker push ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:${{ github.sha }} - docker push ${{ secrets.DOCKERHUB_USERNAME }}/yummy_server:latest - - deploy-to-ec2: - runs-on: ubuntu-latest - needs: build-and-push-docker - - steps: - - name: SSH and Deploy to EC2 - uses: appleboy/ssh-action@v1.1.0 - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USERNAME }} - key: ${{ secrets.EC2_PRIVATE_KEY }} - port: ${{ secrets.EC2_PORT }} - script: | - # `application-local.yml` 파일 생성 - echo "${{ secrets.APPLICATION_LOCAL_PROPERTIES }}" > /home/ubuntu/app/yummy-server/application-local.yml - - # 기존 컨테이너 중단 및 삭제 - docker-compose -f /home/ubuntu/app/yummy-server/docker-compose.yml down - - # 최신 Docker 이미지 Pull - docker-compose -f /home/ubuntu/app/yummy-server/docker-compose.yml pull - - # 컨테이너 다시 실행 - docker-compose -f /home/ubuntu/app/yummy-server/docker-compose.yml up -d diff --git a/Dockerfile b/Dockerfile index 37f5dd1..ff092ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ -FROM --platform=linux/amd64 openjdk:17-jdk-slim -ARG JAR_FILE=application/build/libs/yummy_server.jar -COPY ${JAR_FILE} app.jar -ENTRYPOINT ["java", "-jar", "/app.jar"] +FROM openjdk:17-jdk +COPY application/build/libs/yummy_server.jar yummy_server.jar +ENTRYPOINT ["java", "-jar", "yummy_server.jar"] diff --git a/application/src/main/resources/application-dev.yml b/application/src/main/resources/application-dev.yml deleted file mode 100644 index e69de29..0000000 diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index 207a7b3..82bc0ab 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://mysql:3306/yummy_db + url: jdbc:mysql://localhost:3306/yummy_db username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/application/src/main/resources/application-test.yml b/application/src/main/resources/application-test.yml deleted file mode 100644 index e69de29..0000000 diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 1fa0286..ebd23ee 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev + active: local server: port: 8080 \ No newline at end of file From e66a178d30dabbfcfaf730b9dda0a6ff61390da3 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 13:18:50 +0900 Subject: [PATCH 35/80] =?UTF-8?q?fix:=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=98=A4=ED=83=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/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 26293c9..6076ceb 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -33,7 +33,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v4 with: aws-region: ap-northeast-2 - aws-access-key-id: ${{ secrests.AWS_ACCESS_KEY_ID}} + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID}} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY}} - name: ECR login From 3641866734e2de0a5f85d4d7e91b694192779eef Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 13:26:36 +0900 Subject: [PATCH 36/80] =?UTF-8?q?fix:=20=EB=AA=A8=EB=93=88=EB=B3=84=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 6076ceb..e6b9936 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -27,7 +27,7 @@ jobs: run: ./gradlew clean build - name: application.yml 파일 생성 - run: echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./src/main/resources/application.yml + run: echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./application/src/main/resources/application.yml - name: AWS Resource에 접근할 수 있게 AWS credentials 설정 uses: aws-actions/configure-aws-credentials@v4 From 7ea28d4fc81009fd8927ad72ed2beba82fc302bc Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Fri, 17 Jan 2025 16:52:22 +0900 Subject: [PATCH 37/80] =?UTF-8?q?feat:=20OAuth2=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=99=84=EC=84=B1,=20User=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#26)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: feature-oauth2-user - #17 * feat: oauth2 기능 완성, User 도메인 추가 - #23 --- application/build.gradle | 2 + .../com/groom/yummy/config/CorsMvcConfig.java | 16 ++++ .../groom/yummy/config/SecurityConfig.java | 39 ++++++--- .../com/groom/yummy/config/SwaggerConfig.java | 3 +- .../yummy/controller/UserController.java | 56 +++++++++++++ .../exception/CustomAccessDeniedHandler.java | 10 ++- .../CustomAuthenticationEntryPoint.java | 10 ++- .../com/groom/yummy/filter/JwtAuthFilter.java | 77 ++++++++++++++++- .../java/com/groom/yummy/jwt/JwtProvider.java | 83 +++++++++++++++++++ .../groom/yummy/oauth2/auth/LoginUser.java | 7 +- .../oauth2/handler/CustomSuccessHandler.java | 24 ++++-- .../service/CustomOAuth2UserService.java | 22 +++-- .../yummy/resolver/AuthUserResolver.java | 33 ++++++++ .../java/com/groom/yummy/util/CookieUtil.java | 20 ++--- .../java/com/groom/yummy/util/JwtUtil.java | 71 ---------------- .../src/main/resources/application-local.yml | 12 +-- common/build.gradle | 5 +- .../java/com/groom/yummy/dto/ResponseDto.java | 20 +++++ .../yummy/exception/CustomException.java | 4 + .../com/groom/yummy/exception/ErrorCode.java | 4 + .../main/java/exception/CustomException.java | 4 - common/src/main/java/exception/ErrorCode.java | 4 - domain/build.gradle | 2 + .../dto/request/UpdateNicknameReqDto.java | 8 ++ .../yummy/dto/response/UserInfoResDto.java | 23 +++++ .../com/groom/yummy/facade/UserFacade.java | 49 +++++++++++ .../groom/yummy/publisher/EventPublisher.java | 5 ++ .../yummy/publisher/SpringEventPublisher.java | 16 ++++ .../main/java/com/groom/yummy/user/User.java | 11 +++ .../com/groom/yummy/user/UserAuthService.java | 22 +++++ .../com/groom/yummy/user/UserDeleteEvent.java | 6 ++ .../yummy/user/UserNicknameChangedEvent.java | 6 ++ .../com/groom/yummy/user/UserRepository.java | 1 + .../com/groom/yummy/user/UserService.java | 35 ++++++++ .../groom/yummy/domain/user/UserEntity.java | 23 +++-- .../domain/user/UserEntityRepository.java | 9 +- .../groom/yummy/handler/UserEventHandler.java | 33 ++++++++ 37 files changed, 627 insertions(+), 148 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java create mode 100644 application/src/main/java/com/groom/yummy/controller/UserController.java create mode 100644 application/src/main/java/com/groom/yummy/jwt/JwtProvider.java create mode 100644 application/src/main/java/com/groom/yummy/resolver/AuthUserResolver.java delete mode 100644 application/src/main/java/com/groom/yummy/util/JwtUtil.java create mode 100644 common/src/main/java/com/groom/yummy/dto/ResponseDto.java create mode 100644 common/src/main/java/com/groom/yummy/exception/CustomException.java create mode 100644 common/src/main/java/com/groom/yummy/exception/ErrorCode.java delete mode 100644 common/src/main/java/exception/CustomException.java delete mode 100644 common/src/main/java/exception/ErrorCode.java create mode 100644 domain/src/main/java/com/groom/yummy/dto/request/UpdateNicknameReqDto.java create mode 100644 domain/src/main/java/com/groom/yummy/dto/response/UserInfoResDto.java create mode 100644 domain/src/main/java/com/groom/yummy/facade/UserFacade.java create mode 100644 domain/src/main/java/com/groom/yummy/publisher/EventPublisher.java create mode 100644 domain/src/main/java/com/groom/yummy/publisher/SpringEventPublisher.java create mode 100644 domain/src/main/java/com/groom/yummy/user/UserDeleteEvent.java create mode 100644 domain/src/main/java/com/groom/yummy/user/UserNicknameChangedEvent.java create mode 100644 domain/src/main/java/com/groom/yummy/user/UserService.java create mode 100644 storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java diff --git a/application/build.gradle b/application/build.gradle index ccfb99d..6bc5a3d 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -9,6 +9,7 @@ version = '0.0.1-SNAPSHOT' dependencies { runtimeOnly project(':storage') compileOnly project(':domain') + implementation project(':common') implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' @@ -17,6 +18,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java b/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java new file mode 100644 index 0000000..2eb3429 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java @@ -0,0 +1,16 @@ +package com.groom.yummy.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class CorsMvcConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry corsRegistry){ + corsRegistry.addMapping("/**") + .exposedHeaders("Set-Cookie") + .allowedOrigins("http://localhost:8080"); + } +} diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index eb40e24..c4c3b4d 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -4,9 +4,9 @@ import com.groom.yummy.exception.CustomAccessDeniedHandler; import com.groom.yummy.exception.CustomAuthenticationEntryPoint; import com.groom.yummy.filter.JwtAuthFilter; -import com.groom.yummy.util.JwtUtil; import com.groom.yummy.oauth2.handler.CustomSuccessHandler; import com.groom.yummy.oauth2.service.CustomOAuth2UserService; +import com.groom.yummy.jwt.JwtProvider; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -15,6 +15,11 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; @Configuration @EnableWebSecurity @@ -23,29 +28,28 @@ public class SecurityConfig { private final CustomOAuth2UserService customOAuth2UserService; private final CustomSuccessHandler customSuccessHandler; - private final JwtUtil jwtUtil; + private final JwtProvider jwtUtil; private final ObjectMapper objectMapper; + @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ - // cors 설정 - // http.cors((cors -> cors.configurationSource(configurationSource()))); + //cors 설정 + http.cors((cors -> cors.configurationSource(configurationSource()))); // csfr disable http.csrf((auth) -> auth.disable()); + // form 로그인 disable + http.formLogin((auth) -> auth.disable()); + // HTTP Basic 인증 방식 disable http.httpBasic((auth) -> auth.disable()); //경로별 인가 작업 http.authorizeHttpRequests((auth) -> auth - .requestMatchers( "/login/**", "/oauth2/**", "/oauth2/authorization/**").permitAll() // OAuth2 관련 경로 허용 + .requestMatchers( "/login/**", "/oauth2/**", "/oauth2/authorization/**").permitAll() .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**").permitAll() // Swagger 관련 경로 허용 - .requestMatchers("/image").permitAll() - .requestMatchers("/api/v1/fcm").permitAll() - .requestMatchers("/chat/**","/ws-stomp/**","/chatroom","/create","/chatting/**").permitAll() - .requestMatchers("/crawling/*").permitAll() - .requestMatchers("/gemini").permitAll() .anyRequest().authenticated()); //세션 설정 : STATELESS @@ -65,7 +69,18 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ exceptionHandling .accessDeniedHandler(new CustomAccessDeniedHandler(objectMapper)) .authenticationEntryPoint(new CustomAuthenticationEntryPoint(objectMapper))); - return http.build(); } -} + + public CorsConfigurationSource configurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + configuration.addAllowedHeader("*"); + configuration.addAllowedMethod("*"); + configuration.addAllowedOrigin("http://localhost:8080"); // 특정 도메인 허용 + configuration.setAllowCredentials(true); + configuration.addExposedHeader("ACCESS_TOKEN"); + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); // 모든 주소요청에 위 설정을 넣어주겠다. + return source; + } +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java index 86a0dad..336fafc 100644 --- a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java @@ -2,9 +2,8 @@ import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; -import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.info.Info; -import org.springframework.beans.factory.annotation.Value; +import io.swagger.v3.oas.models.servers.Server; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/application/src/main/java/com/groom/yummy/controller/UserController.java b/application/src/main/java/com/groom/yummy/controller/UserController.java new file mode 100644 index 0000000..815c533 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/controller/UserController.java @@ -0,0 +1,56 @@ +package com.groom.yummy.controller; + +import com.groom.yummy.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.dto.response.UserInfoResDto; +import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.oauth2.auth.LoginUser; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "[User] User API") +@Controller +@RequiredArgsConstructor +@Slf4j +@RequestMapping("/api/v1/users") +public class UserController { + private final UserFacade userFacade; + + @Operation(summary = "자신의 정보 조회", description = "토큰 정보 기반 유저 정보를 조회합니다") + @GetMapping() + public ResponseEntity> getUserInfoByToken(@AuthenticationPrincipal LoginUser loginUser){ + Long userId = loginUser.getUserId(); + UserInfoResDto userInfoResDto = userFacade.getUserInfo(userId); + return ResponseEntity.ok(ResponseDto.of(userInfoResDto,"자신의 정보 조회 성공")); + } + + @Operation(summary = "유저 정보 조회", description = "토큰 정보 기반 유저 정보를 조회합니다") + @GetMapping("/{userId}") + public ResponseEntity> getUserInfo(@PathVariable("userId") Long userId){ + UserInfoResDto userInfoResDto = userFacade.getUserInfo(userId); + return ResponseEntity.ok(ResponseDto.of(userInfoResDto,"유저 정보 조회 성공")); + } + + @Operation(summary = "유저 닉네임 변경", description = "토큰 정보 기반 유저 닉네임을 변경합니다.") + @PatchMapping("/profile") + public ResponseEntity> updateUserNickname(@RequestBody UpdateNicknameReqDto updateNicknameReqDto, + @AuthenticationPrincipal LoginUser loginUser){ + Long userId = loginUser.getUserId(); + UserInfoResDto userInfoResDto = userFacade.updateUserNickname(userId,updateNicknameReqDto); + return ResponseEntity.ok(ResponseDto.of(userInfoResDto,"유저 닉네임 변경 성공")); + } + + @Operation(summary = "유저 계정 삭제", description = "토큰 정보 기반 유저를 삭제합니다.") + @DeleteMapping() + public ResponseEntity> deleteUserByToken(@AuthenticationPrincipal LoginUser loginUser){ + Long userId = loginUser.getUserId(); + Long deleteUserId = userFacade.deleteUser(userId); + return ResponseEntity.ok(ResponseDto.of(deleteUserId,"회원정보 삭제 성공")); + } +} diff --git a/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java b/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java index 5bccb22..6a87ca8 100644 --- a/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java +++ b/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java @@ -1,6 +1,7 @@ package com.groom.yummy.exception; import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.dto.ResponseDto; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -14,11 +15,12 @@ @Component @RequiredArgsConstructor public class CustomAccessDeniedHandler implements AccessDeniedHandler { - private final ObjectMapper objectMapper; - @Override public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { - + response.setContentType("application/json;charset=UTF-8"); + String result = objectMapper.writeValueAsString(ResponseDto.of(403,"접근 권한이 없는 사용자입니다.")); + response.setStatus(403); + response.getWriter().write(result); } -} +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java b/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java index 7dbaf94..0a58cbc 100644 --- a/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java +++ b/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java @@ -1,13 +1,13 @@ package com.groom.yummy.exception; import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.dto.ResponseDto; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; import java.io.IOException; @@ -15,10 +15,12 @@ @Component @RequiredArgsConstructor public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { - private final ObjectMapper objectMapper; @Override public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { - + response.setContentType("application/json;charset=UTF-8"); + String result = objectMapper.writeValueAsString(ResponseDto.of(401,"인증이 실패하였습니다.")); + response.setStatus(401); + response.getWriter().write(result); } -} +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java index 375a233..2d6a20a 100644 --- a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java +++ b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java @@ -1,24 +1,93 @@ package com.groom.yummy.filter; -import com.groom.yummy.util.JwtUtil; +import com.groom.yummy.oauth2.auth.LoginUser; +import com.groom.yummy.user.User; +import com.groom.yummy.jwt.JwtProvider; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; -@RequiredArgsConstructor +@Log4j2 @Component +@RequiredArgsConstructor public class JwtAuthFilter extends OncePerRequestFilter { - private final JwtUtil jwtUtil; + private final JwtProvider jwtProvider; @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + // 요청한 URL이 swagger-ui 경로인 경우 바로 필터 통과 + if (request.getRequestURI().equals("/swagger-ui/index.html")) { + filterChain.doFilter(request, response); + return; + } + + String token = findToken(request); + log.info("token before verify: {}", token); + if (verifyToken(request, response, filterChain, token)) return; + log.info("token after verify: {}", token); + User user = getUser(token); + + setSecuritySession(user); + filterChain.doFilter(request, response); + } + + private static void setSecuritySession(User user){ + LoginUser loginUser = new LoginUser(user); + log.info("SessionLoginUser : {}", loginUser.getUsername()); + Authentication authToken = new UsernamePasswordAuthenticationToken(loginUser,null, loginUser.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(authToken); + } + + private User getUser(String token){ + Long userId = jwtProvider.getUserId(token); + String username = jwtProvider.getUsername(token); + String name = jwtProvider.getName(token); + String role = jwtProvider.getRole(token); + + log.info("getUser username: ", username); + return User.builder() + .id(userId) + .email(username) + .nickname(name) + .role(role) + .build(); + } + + private boolean verifyToken(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain, String token) throws IOException, ServletException { + if (token == null) { + log.debug("token null"); + filterChain.doFilter(request, response); + return true; + } + if (jwtProvider.validateToken(token)) { + log.debug("token expired"); + filterChain.doFilter(request, response); + return true; + } + return false; + } + + private static String findToken(HttpServletRequest request){ + String token = null; + Cookie[] cookies = request.getCookies(); + for(Cookie cookie : cookies){ + if(cookie.getName().equals("Authorization")){ + token = cookie.getValue(); + } + } + return token; } -} +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/jwt/JwtProvider.java b/application/src/main/java/com/groom/yummy/jwt/JwtProvider.java new file mode 100644 index 0000000..906dc1c --- /dev/null +++ b/application/src/main/java/com/groom/yummy/jwt/JwtProvider.java @@ -0,0 +1,83 @@ +package com.groom.yummy.jwt; + +import io.jsonwebtoken.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.StandardCharsets; +import java.util.Date; + +@Component +@Slf4j +public class JwtProvider { + private SecretKey secretKey; + + @Value("${spring.jwt.valid-time}") + public Long VALID_TIME; + + @Value("${spring.jwt.cookie-name}") + public String COOKIE_NAME; + + private JwtProvider(@Value("${spring.jwt.secret}") String secret){ + secretKey = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), Jwts.SIG.HS256.key().build().getAlgorithm()); + } + + public String createAccessToken(Long userId, String email, String nickname, String role){ + Date timeNow = new Date(System.currentTimeMillis()); + log.info("timeNow : {}", timeNow); + Date expirationTime = new Date(timeNow.getTime() + VALID_TIME); + log.info("expirationTime: {}", expirationTime); + return Jwts.builder() + .claim("userId", userId) + .claim("email",email) + .claim("nickname", nickname) + .claim("role",role) + .setIssuedAt(timeNow) + .setExpiration(expirationTime) + .signWith(secretKey, SignatureAlgorithm.HS256) + .compact(); + } + + public Long getUserId(String token) { + return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("userId", Long.class); + } + public String getUsername(String token) { + + return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("email", String.class); + } + + public String getName(String token){ + return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("nickname", String.class); + } + + public String getRole(String token) { + + return Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token).getPayload().get("role", String.class); + } + + public boolean validateToken(String token){ + //log.info("토큰 유효성 검증 시작"); + return valid(secretKey, token); + } + + private boolean valid(SecretKey secretKey, String token){ + try{ + Jws claims = Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token); + return claims.getBody().getExpiration().before(new Date()); + }catch (SignatureException ex){ + throw new RuntimeException(); + }catch (MalformedJwtException ex){ + throw new RuntimeException(); + }catch (ExpiredJwtException ex){ + throw new RuntimeException(); + }catch (IllegalArgumentException ex){ + throw new RuntimeException(); + } + } + +} + + diff --git a/application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java b/application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java index 09ef51a..b443319 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java +++ b/application/src/main/java/com/groom/yummy/oauth2/auth/LoginUser.java @@ -14,6 +14,9 @@ public class LoginUser implements UserDetails, OAuth2User{ private final User user; private Map attributes; + public LoginUser(User user){ + this.user = user; + } public LoginUser(User user, Map attributes) { this.user = user; this.attributes = attributes; @@ -44,8 +47,10 @@ public String getRole(){ return user.getRole(); } + public Long getUserId(){return user.getId();} + @Override public String getPassword() { return null; } -} +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java index f124094..105e3ee 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java +++ b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java @@ -1,13 +1,14 @@ package com.groom.yummy.oauth2.handler; -import com.groom.yummy.user.User; -import com.groom.yummy.user.UserAuthService; +import com.groom.yummy.oauth2.auth.LoginUser; +import com.groom.yummy.util.CookieUtil; +import com.groom.yummy.jwt.JwtProvider; import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.security.core.Authentication; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; @@ -17,11 +18,18 @@ @RequiredArgsConstructor public class CustomSuccessHandler implements AuthenticationSuccessHandler { - private final UserAuthService userAuthService; + private final JwtProvider jwtUtil; @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { - UserDetails userDetails = (UserDetails) authentication.getPrincipal(); - User user = userAuthService.findAuthUserByEmail(userDetails.getUsername()).orElseThrow(); - + LoginUser loginUser = (LoginUser) authentication.getPrincipal(); + String email = loginUser.getUsername(); + String nickname = loginUser.getName(); + Long userId = loginUser.getUserId(); + String role = loginUser.getRole(); + + String accessToken = jwtUtil.createAccessToken(userId,email,nickname,role); + + response.addCookie(CookieUtil.createCookie(jwtUtil.COOKIE_NAME,accessToken,jwtUtil.VALID_TIME)); + response.sendRedirect("http://localhost:8080/swagger-ui/index.html"); } -} +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java index ecd4203..00504a6 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java +++ b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java @@ -1,26 +1,29 @@ package com.groom.yummy.oauth2.service; +import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.oauth2.auth.LoginUser; import com.groom.yummy.oauth2.dto.OAuth2Response; import com.groom.yummy.oauth2.strategy.OAuth2ResFactory; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.stereotype.Service; import com.groom.yummy.user.User; -import com.groom.yummy.user.UserAuthService; import java.util.Optional; @Service +@Slf4j public class CustomOAuth2UserService extends DefaultOAuth2UserService { private final OAuth2ResFactory oAuth2ResFactory; - private final UserAuthService userAuthService; + private final UserFacade userFacade; - public CustomOAuth2UserService(OAuth2ResFactory oAuth2ResFactory, UserAuthService userAuthService) { + public CustomOAuth2UserService(OAuth2ResFactory oAuth2ResFactory, UserFacade userFacade) { this.oAuth2ResFactory = oAuth2ResFactory; - this.userAuthService = userAuthService; + this.userFacade = userFacade; } @Override @@ -30,9 +33,10 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic String registrationId = userRequest.getClientRegistration().getRegistrationId(); OAuth2Response oAuth2Response = oAuth2ResFactory.createOAuth2Response(registrationId, oAuth2User.getAttributes()); String email = oAuth2Response.getEmail(); - - Optional user = userAuthService.findAuthUserByEmail(email); - - return null; + String nickname = oAuth2Response.getName(); + Optional optionalUser = userFacade.findAuthUserByEmail(email); + User user = userFacade.findOrCreateUser(optionalUser, nickname, email); + log.info("loadUser : {}", user.getEmail()); + return new LoginUser(user, oAuth2User.getAttributes()); } -} +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/resolver/AuthUserResolver.java b/application/src/main/java/com/groom/yummy/resolver/AuthUserResolver.java new file mode 100644 index 0000000..a8bd0e3 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/resolver/AuthUserResolver.java @@ -0,0 +1,33 @@ +//package com.groom.yummy.resolver; +// +//import com.groom.yummy.domain.user.User; +//import com.groom.yummy.domain.user.UserAuthService; +//import lombok.RequiredArgsConstructor; +//import org.springframework.core.MethodParameter; +//import org.springframework.security.core.Authentication; +//import org.springframework.security.core.context.SecurityContextHolder; +//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; +// +//@RequiredArgsConstructor +//public class AuthUserResolver implements HandlerMethodArgumentResolver { +// +// private final UserAuthService userAuthService; +// +// @Override +// public boolean supportsParameter(MethodParameter parameter) { +// return User.class.isAssignableFrom(parameter.getParameterType()); +// } +// +// @Override +// public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, +// NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { +// Authentication auth = SecurityContextHolder.getContext().getAuthentication(); +// if(auth == null){ +// throw new RuntimeException(); +// } +// return userAuthService.findAuthUserByEmail(auth.getName()).orElseThrow(RuntimeException::new); +// } +//} diff --git a/application/src/main/java/com/groom/yummy/util/CookieUtil.java b/application/src/main/java/com/groom/yummy/util/CookieUtil.java index 0ad5b94..0f24395 100644 --- a/application/src/main/java/com/groom/yummy/util/CookieUtil.java +++ b/application/src/main/java/com/groom/yummy/util/CookieUtil.java @@ -2,18 +2,16 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; -import org.springframework.http.ResponseCookie; public class CookieUtil { - public static ResponseCookie createCookie(final String nameOfCookie, final String token, - final Long cookieValidTime) { - return ResponseCookie.from(nameOfCookie, token) - .path("/") - .sameSite("Strict") - .secure(true) - .maxAge(Math.toIntExact(cookieValidTime)) - .httpOnly(true) - .build(); + public static Cookie createCookie(final String nameOfCookie, final String token, + final Long cookieValidTime) { + Cookie cookie = new Cookie(nameOfCookie,token); + cookie.setPath("/"); + cookie.setHttpOnly(true); + cookie.setMaxAge(Math.toIntExact(cookieValidTime)); + cookie.setSecure(true); + return cookie; } public static Cookie getCookie(HttpServletRequest request, String nameOfCookie) { @@ -30,4 +28,4 @@ public static Cookie getCookie(HttpServletRequest request, String nameOfCookie) } return null; } -} +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/util/JwtUtil.java b/application/src/main/java/com/groom/yummy/util/JwtUtil.java deleted file mode 100644 index 8ed94dc..0000000 --- a/application/src/main/java/com/groom/yummy/util/JwtUtil.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.groom.yummy.util; - -import com.groom.yummy.user.User; -import io.jsonwebtoken.*; -import io.jsonwebtoken.security.Keys; -import jakarta.servlet.http.HttpServletRequest; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import java.nio.charset.StandardCharsets; -import java.security.Key; -import java.util.Date; - -@Component -public class JwtUtil { - - private final Key secretKey; - private final long validTime; - public static final String AUTHORIZATION_HEADER = "Authorization"; - public static final String BEARER_PREFIX = "Bearer "; - - - public JwtUtil(@Value("${spring.jwt.secret}") String secretKey, - @Value("${spring.jwt.valid-time}")long validTime){ - this.secretKey = Keys.hmacShaKeyFor(secretKey.getBytes(StandardCharsets.UTF_8)); - this.validTime = validTime; - } - - public String createAccessToken(User user){ - Date timeNow = new Date(System.currentTimeMillis()); - Date expirationTime = new Date(timeNow.getTime() + validTime); - - return Jwts.builder() - .setSubject(String.valueOf(user.getId())) - .claim("role",user.getRole()) - .claim("email",user.getEmail()) - .setIssuedAt(timeNow) - .setExpiration(expirationTime) - .signWith(secretKey, SignatureAlgorithm.HS256) - .compact(); - } - - public String getUsername(String token){ - String info = Jwts.parser().setSigningKey(secretKey).build().parseClaimsJws(token).getBody().getSubject(); - return info; - } - - public boolean validateToken(String token){ - //log.info("토큰 유효성 검증 시작"); - return valid(secretKey, token); - } - - private boolean valid(Key key, String token){ - try{ - Jws claims = Jwts.parser().setSigningKey(secretKey).build().parseClaimsJws(token); - return !claims.getBody().getExpiration().before(new Date()); - }catch (SignatureException ex){ - throw new RuntimeException(); - }catch (MalformedJwtException ex){ - throw new RuntimeException(); - }catch (ExpiredJwtException ex){ - throw new RuntimeException(); - }catch (IllegalArgumentException ex){ - throw new RuntimeException(); - } - } - -} - - diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index 82bc0ab..8c88a9b 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/yummy_db + url: jdbc:mysql://localhost:3306/yummy_db # docker-compose에서 mysql 서비스 연결 username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver @@ -25,14 +25,14 @@ spring: registration: kakao: client-name: kakao - client-id: ${client-id} - client-secret: ${client-secret} - redirect-uri: ${redirect-uri} + client-id: 82ba3e9571981e2890eff7c1c5743f36 + client-secret: NR66uQh0wrUwkmcaA59qgtra4XAFqk0k + redirect-uri: http://localhost:8080/login/oauth2/code/kakao client-authentication-method: client_secret_post authorization-grant-type: authorization_code scope: profile_nickname, account_email jwt: - secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32ni + secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 valid-time: 7200000 - + cookie-name: Authorization \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index ac2939b..4351384 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,7 +1,10 @@ plugins { id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' } dependencies { - + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/common/src/main/java/com/groom/yummy/dto/ResponseDto.java b/common/src/main/java/com/groom/yummy/dto/ResponseDto.java new file mode 100644 index 0000000..5e9cdaf --- /dev/null +++ b/common/src/main/java/com/groom/yummy/dto/ResponseDto.java @@ -0,0 +1,20 @@ +package com.groom.yummy.dto; + + +import lombok.Builder; +import lombok.Getter; + +@Getter +public class ResponseDto { + private final T data; + private final String msg; + + @Builder + public ResponseDto(T data, String msg){ + this.data = data; + this.msg = msg; + } + public static ResponseDto of(T data, String msg){ + return ResponseDto.builder().data(data).msg(msg).build(); + } +} diff --git a/common/src/main/java/com/groom/yummy/exception/CustomException.java b/common/src/main/java/com/groom/yummy/exception/CustomException.java new file mode 100644 index 0000000..8a50b31 --- /dev/null +++ b/common/src/main/java/com/groom/yummy/exception/CustomException.java @@ -0,0 +1,4 @@ +package com.groom.yummy.exception; + +public class CustomException { +} diff --git a/common/src/main/java/com/groom/yummy/exception/ErrorCode.java b/common/src/main/java/com/groom/yummy/exception/ErrorCode.java new file mode 100644 index 0000000..7a28a22 --- /dev/null +++ b/common/src/main/java/com/groom/yummy/exception/ErrorCode.java @@ -0,0 +1,4 @@ +package com.groom.yummy.exception; + +public enum ErrorCode { +} diff --git a/common/src/main/java/exception/CustomException.java b/common/src/main/java/exception/CustomException.java deleted file mode 100644 index 78eb164..0000000 --- a/common/src/main/java/exception/CustomException.java +++ /dev/null @@ -1,4 +0,0 @@ -package exception; - -public class CustomException { -} diff --git a/common/src/main/java/exception/ErrorCode.java b/common/src/main/java/exception/ErrorCode.java deleted file mode 100644 index 115eb48..0000000 --- a/common/src/main/java/exception/ErrorCode.java +++ /dev/null @@ -1,4 +0,0 @@ -package exception; - -public enum ErrorCode { -} diff --git a/domain/build.gradle b/domain/build.gradle index 7aa5045..0c2414a 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -7,6 +7,8 @@ plugins { version = 'unspecified' dependencies { + compileOnly 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/domain/src/main/java/com/groom/yummy/dto/request/UpdateNicknameReqDto.java b/domain/src/main/java/com/groom/yummy/dto/request/UpdateNicknameReqDto.java new file mode 100644 index 0000000..46c04bc --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/dto/request/UpdateNicknameReqDto.java @@ -0,0 +1,8 @@ +package com.groom.yummy.dto.request; + +import lombok.Builder; + +@Builder +public record UpdateNicknameReqDto( + String nickname +){} \ No newline at end of file diff --git a/domain/src/main/java/com/groom/yummy/dto/response/UserInfoResDto.java b/domain/src/main/java/com/groom/yummy/dto/response/UserInfoResDto.java new file mode 100644 index 0000000..0937516 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/dto/response/UserInfoResDto.java @@ -0,0 +1,23 @@ +package com.groom.yummy.dto.response; + +import com.groom.yummy.user.User; +import lombok.Builder; + +@Builder +public record UserInfoResDto( + Long id, + String email, + String nickname, + Long joinCount, + Long participationCount +) { + public static UserInfoResDto from(User user){ + return UserInfoResDto.builder() + .id(user.getId()) + .email(user.getEmail()) + .nickname(user.getNickname()) + .joinCount(user.getGroupJoinCount()) + .participationCount(user.getGroupAttendanceCount()) + .build(); + } +} diff --git a/domain/src/main/java/com/groom/yummy/facade/UserFacade.java b/domain/src/main/java/com/groom/yummy/facade/UserFacade.java new file mode 100644 index 0000000..e040fcd --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/facade/UserFacade.java @@ -0,0 +1,49 @@ +package com.groom.yummy.facade; + +import com.groom.yummy.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.dto.response.UserInfoResDto; +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserAuthService; +import com.groom.yummy.user.UserService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Slf4j +@Transactional(readOnly = true) // 서비스 계층과 충돌이 나지 않게 트랜잭션 선언 +public class UserFacade { + + private final UserAuthService userAuthService; + private final UserService userService; + + public UserInfoResDto getUserInfo(Long userId) { + User user = userService.getUserInfo(userId); + return UserInfoResDto.from(user); + } + public Optional findAuthUserByEmail(String email){ + return userAuthService.findAuthUserByEmail(email); + } + + @Transactional + public User findOrCreateUser(Optional optionalUser, String name, String email) { + return userAuthService.findOrCreateUser(optionalUser, name, email); + } + + @Transactional + public UserInfoResDto updateUserNickname(Long id, UpdateNicknameReqDto updateNicknameReqDto){ + String nickname = updateNicknameReqDto.nickname(); + User user = userService.updateNickname(id, nickname); + return UserInfoResDto.from(user); + } + + @Transactional + public Long deleteUser(Long userId) { + Long deleteUserId = userService.deleteUser(userId); + return deleteUserId; + } +} diff --git a/domain/src/main/java/com/groom/yummy/publisher/EventPublisher.java b/domain/src/main/java/com/groom/yummy/publisher/EventPublisher.java new file mode 100644 index 0000000..7731c79 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/publisher/EventPublisher.java @@ -0,0 +1,5 @@ +package com.groom.yummy.publisher; + +public interface EventPublisher { + void publish(Object event); +} diff --git a/domain/src/main/java/com/groom/yummy/publisher/SpringEventPublisher.java b/domain/src/main/java/com/groom/yummy/publisher/SpringEventPublisher.java new file mode 100644 index 0000000..eb76ffa --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/publisher/SpringEventPublisher.java @@ -0,0 +1,16 @@ +package com.groom.yummy.publisher; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class SpringEventPublisher implements EventPublisher{ + + private final ApplicationEventPublisher applicationEventPublisher; + @Override + public void publish(Object event) { + applicationEventPublisher.publishEvent(event); + } +} diff --git a/domain/src/main/java/com/groom/yummy/user/User.java b/domain/src/main/java/com/groom/yummy/user/User.java index d2b38b3..1f04a19 100644 --- a/domain/src/main/java/com/groom/yummy/user/User.java +++ b/domain/src/main/java/com/groom/yummy/user/User.java @@ -17,4 +17,15 @@ public class User { private Long groupJoinCount; private Long groupAttendanceCount; private boolean isDeleted; + + protected void changeNickname(String nickname){ + if (nickname == null || nickname.trim().isEmpty()) { + throw new RuntimeException("닉네임은 null이거나 빈 값일 수 없습니다."); + } + this.nickname = nickname; + } + + protected void deleteUser(){ + this.isDeleted = true; + } } diff --git a/domain/src/main/java/com/groom/yummy/user/UserAuthService.java b/domain/src/main/java/com/groom/yummy/user/UserAuthService.java index 7e5f677..fb83c91 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserAuthService.java +++ b/domain/src/main/java/com/groom/yummy/user/UserAuthService.java @@ -2,15 +2,37 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import java.util.Optional; @Service @RequiredArgsConstructor +@Transactional(readOnly = true) public class UserAuthService { private final UserRepository userRepository; public Optional findAuthUserByEmail(String email){ return userRepository.findByEmail(email); } + + @Transactional + public User findOrCreateUser(Optional optionalUser, String nickname, String email){ + User user; + if(optionalUser.isEmpty()){ + user = User.builder() + .nickname(nickname) + .email(email) + .role("ROLE_USER") + .groupJoinCount(0L) + .groupAttendanceCount(0L) + .isDeleted(false) + .build(); + userRepository.save(user); + }else{ + user = optionalUser.get(); + } + return user; + } } diff --git a/domain/src/main/java/com/groom/yummy/user/UserDeleteEvent.java b/domain/src/main/java/com/groom/yummy/user/UserDeleteEvent.java new file mode 100644 index 0000000..89307b8 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/user/UserDeleteEvent.java @@ -0,0 +1,6 @@ +package com.groom.yummy.user; + +public record UserDeleteEvent( + Long userId, + boolean isDeleted +) {} diff --git a/domain/src/main/java/com/groom/yummy/user/UserNicknameChangedEvent.java b/domain/src/main/java/com/groom/yummy/user/UserNicknameChangedEvent.java new file mode 100644 index 0000000..f5b0e64 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/user/UserNicknameChangedEvent.java @@ -0,0 +1,6 @@ +package com.groom.yummy.user; + +public record UserNicknameChangedEvent( + Long userId, + String newNickname +){} diff --git a/domain/src/main/java/com/groom/yummy/user/UserRepository.java b/domain/src/main/java/com/groom/yummy/user/UserRepository.java index b699bc5..b76cca5 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserRepository.java +++ b/domain/src/main/java/com/groom/yummy/user/UserRepository.java @@ -3,6 +3,7 @@ import java.util.Optional; public interface UserRepository { + Optional findById(Long userId); Optional findByEmail(String email); Long save(User user); } diff --git a/domain/src/main/java/com/groom/yummy/user/UserService.java b/domain/src/main/java/com/groom/yummy/user/UserService.java new file mode 100644 index 0000000..20dde82 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/user/UserService.java @@ -0,0 +1,35 @@ +package com.groom.yummy.user; + +import com.groom.yummy.publisher.EventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class UserService { + private final UserRepository userRepository; + private final EventPublisher eventPublisher; + public User getUserInfo(Long userId) { + return userRepository.findById(userId).orElseThrow(); + } + + @Transactional + public User updateNickname(Long userId,String nickname){ + User user = userRepository.findById(userId).orElseThrow(); + user.changeNickname(nickname); + eventPublisher.publish(new UserNicknameChangedEvent(user.getId(),user.getNickname())); + return user; + } + + @Transactional + public Long deleteUser(Long userId) { + User user = userRepository.findById(userId).orElseThrow(); + user.deleteUser(); + eventPublisher.publish(new UserDeleteEvent(user.getId(),user.isDeleted())); + return user.getId(); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java index e0aabcc..e12948b 100644 --- a/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntity.java @@ -1,10 +1,15 @@ package com.groom.yummy.domain.user; import com.groom.yummy.domain.BaseEntity; -import jakarta.persistence.*; -import lombok.*; -import lombok.experimental.SuperBuilder; import com.groom.yummy.user.User; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @@ -16,7 +21,7 @@ public class UserEntity extends BaseEntity { @Column(nullable = false, unique = true) private String email; - @Column(nullable = false, unique = true) + @Column(nullable = false) private String nickname; @Column(nullable = false) @@ -31,6 +36,14 @@ public class UserEntity extends BaseEntity { @Column(nullable = false) private String role; + public void updateNickname(String nickname){ + this.nickname = nickname; + } + + public void deleteUser(boolean isDeleted){ + this.isDeleted = isDeleted; + } + public static User toModel(UserEntity userEntity){ return User.builder() .id(userEntity.getId()) @@ -38,7 +51,7 @@ public static User toModel(UserEntity userEntity){ .email(userEntity.getEmail()) .role(userEntity.role) .groupAttendanceCount(userEntity.groupAttendanceCount) - .groupAttendanceCount(userEntity.groupJoinCount) + .groupJoinCount(userEntity.groupJoinCount) .isDeleted(userEntity.isDeleted) .build(); } diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java index 176ad0a..7ee3519 100644 --- a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java @@ -1,9 +1,9 @@ package com.groom.yummy.domain.user; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; import java.util.Optional; @@ -12,6 +12,11 @@ public class UserEntityRepository implements UserRepository { private final UserJpaRepository userJpaRepository; + @Override + public Optional findById(Long userId) { + return userJpaRepository.findById(userId).map(UserEntity::toModel); + } + @Override public Optional findByEmail(String email) { return userJpaRepository.findByEmail(email).map(UserEntity::toModel); diff --git a/storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java b/storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java new file mode 100644 index 0000000..d584932 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java @@ -0,0 +1,33 @@ +package com.groom.yummy.handler; + +import com.groom.yummy.domain.user.UserEntity; +import com.groom.yummy.domain.user.UserJpaRepository; +import com.groom.yummy.user.UserDeleteEvent; +import com.groom.yummy.user.UserNicknameChangedEvent; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Component +@Transactional +@RequiredArgsConstructor +@Slf4j +public class UserEventHandler { + private final UserJpaRepository userJpaRepository; + + @EventListener + public void handlerNicknameChange(UserNicknameChangedEvent event){ + UserEntity userEntity = userJpaRepository.findById(event.userId()).orElseThrow(); + userEntity.updateNickname(event.newNickname()); + log.info("userEntity nickname : {}", userEntity.getNickname()); + } + + @EventListener + public void handleUserDelete(UserDeleteEvent event) { + UserEntity userEntity = userJpaRepository.findById(event.userId()).orElseThrow(); + userEntity.deleteUser(event.isDeleted()); + log.info("userEntity isDelete : {}", userEntity.isDeleted()); + } +} From e8b48c95b4b8c946c95371734effd0be519a19b9 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Fri, 17 Jan 2025 17:18:40 +0900 Subject: [PATCH 38/80] =?UTF-8?q?hotfix:=20yml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application-local.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml index 8c88a9b..1e16bfc 100644 --- a/application/src/main/resources/application-local.yml +++ b/application/src/main/resources/application-local.yml @@ -25,9 +25,9 @@ spring: registration: kakao: client-name: kakao - client-id: 82ba3e9571981e2890eff7c1c5743f36 - client-secret: NR66uQh0wrUwkmcaA59qgtra4XAFqk0k - redirect-uri: http://localhost:8080/login/oauth2/code/kakao + client-id: ${client-id} + client-secret: ${client-secret} + redirect-uri: ${redirect-uri} client-authentication-method: client_secret_post authorization-grant-type: authorization_code scope: profile_nickname, account_email From 68d2b982dd4436e2c9264d50d69c74b724cf92d8 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 17:27:39 +0900 Subject: [PATCH 39/80] =?UTF-8?q?fix:=20properties,=20cat=20=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=AA=85=EB=A0=B9=EC=96=B4=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 5 +++-- application/src/main/resources/application.properties | 0 application/src/main/resources/application.yml | 6 ------ 3 files changed, 3 insertions(+), 8 deletions(-) create mode 100644 application/src/main/resources/application.properties delete mode 100644 application/src/main/resources/application.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index e6b9936..d157363 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -26,8 +26,9 @@ jobs: - name: Build with Gradle run: ./gradlew clean build - - name: application.yml 파일 생성 + - name: application.properties 파일 생성 run: echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./application/src/main/resources/application.yml + cat ./application/src/main/resources/application.properties - name: AWS Resource에 접근할 수 있게 AWS credentials 설정 uses: aws-actions/configure-aws-credentials@v4 @@ -41,7 +42,7 @@ jobs: uses: aws-actions/amazon-ecr-login@v2 - name: Docker 이미지 생성 - run: docker build -t my-yummy . + run: docker build -t --platform linux/amd64 -t my-yummy . - name: Docker 이미지에 태그 붙이기 run: docker tag my-yummy ${{ secrets.ECR_REGISTRY }}/my-yummy:latest diff --git a/application/src/main/resources/application.properties b/application/src/main/resources/application.properties new file mode 100644 index 0000000..e69de29 diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml deleted file mode 100644 index ebd23ee..0000000 --- a/application/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring: - profiles: - active: local - -server: - port: 8080 \ No newline at end of file From 1eaca67329d5900e1537066dd524d1e018bda530 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 17:58:15 +0900 Subject: [PATCH 40/80] =?UTF-8?q?fix:=20common=20=EB=AA=A8=EB=93=88=20boot?= =?UTF-8?q?Jar=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=20=EB=B0=8F=20JAR=20?= =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/build.gradle | 10 ++++++++++ settings.gradle | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 4351384..7812ef6 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,4 +7,14 @@ plugins { dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' +} + +// 'bootJar' 태스크 비활성화 +tasks.withType(org.springframework.boot.gradle.tasks.bundling.BootJar) { + enabled = false +} + +// JAR 태스크 활성화 +tasks.named('jar') { + enabled = true } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4fd861a..7f89c0b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,2 @@ rootProject.name = 'famous_restaurant' -include 'application' -include 'storage' -include 'common' -include 'domain' \ No newline at end of file +include 'application', 'storage', 'common', 'domain' From a28264550dd7db601830478da8ff1406843c2db8 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 17:59:57 +0900 Subject: [PATCH 41/80] =?UTF-8?q?fix:=20=EB=8F=84=EC=BB=A4=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=ED=83=9C=EA=B7=B8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d157363..c19fd8f 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -42,7 +42,7 @@ jobs: uses: aws-actions/amazon-ecr-login@v2 - name: Docker 이미지 생성 - run: docker build -t --platform linux/amd64 -t my-yummy . + run: docker build -t my-yummy . - name: Docker 이미지에 태그 붙이기 run: docker tag my-yummy ${{ secrets.ECR_REGISTRY }}/my-yummy:latest From d7b5efa608c6f60a1105be3aa7fb60c141d14acf Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 21:42:36 +0900 Subject: [PATCH 42/80] =?UTF-8?q?fix:=20properties=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B0=8F=20-local.yml=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-local.yml | 38 ------------------- .../src/main/resources/application.properties | 0 2 files changed, 38 deletions(-) delete mode 100644 application/src/main/resources/application-local.yml delete mode 100644 application/src/main/resources/application.properties diff --git a/application/src/main/resources/application-local.yml b/application/src/main/resources/application-local.yml deleted file mode 100644 index 1e16bfc..0000000 --- a/application/src/main/resources/application-local.yml +++ /dev/null @@ -1,38 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://localhost:3306/yummy_db # docker-compose에서 mysql 서비스 연결 - username: yummy - password: yummy1234! - driver-class-name: com.mysql.cj.jdbc.Driver - - jpa: - hibernate: - ddl-auto: update - show-sql: true - properties: - hibernate: - format_sql: true - - security: - oauth2: - client: - provider: - kakao: - authorization-uri: https://kauth.kakao.com/oauth/authorize - token-uri: https://kauth.kakao.com/oauth/token - user-info-uri: https://kapi.kakao.com/v2/user/me - user-name-attribute: id - registration: - kakao: - client-name: kakao - client-id: ${client-id} - client-secret: ${client-secret} - redirect-uri: ${redirect-uri} - client-authentication-method: client_secret_post - authorization-grant-type: authorization_code - scope: profile_nickname, account_email - - jwt: - secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 - valid-time: 7200000 - cookie-name: Authorization \ No newline at end of file diff --git a/application/src/main/resources/application.properties b/application/src/main/resources/application.properties deleted file mode 100644 index e69de29..0000000 From 0e1fb74d6cd2966a87c6a6b3a84151cb80c379ba Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 21:42:57 +0900 Subject: [PATCH 43/80] =?UTF-8?q?chore:=20module(application)=20h2=20db=20?= =?UTF-8?q?=EC=9D=98=EC=A1=B4=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 --- application/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/application/build.gradle b/application/build.gradle index 6bc5a3d..8bb5fe0 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'io.jsonwebtoken:jjwt-api:0.12.3' implementation 'io.jsonwebtoken:jjwt-impl:0.12.3' implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' + runtimeOnly 'com.h2database:h2' } From 7c9365e1226d691ba890901aa60c3baade47df4e Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 21:43:24 +0900 Subject: [PATCH 44/80] =?UTF-8?q?chore:=20cd=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c19fd8f..ee509c8 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -26,9 +26,9 @@ jobs: - name: Build with Gradle run: ./gradlew clean build - - name: application.properties 파일 생성 - run: echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./application/src/main/resources/application.yml - cat ./application/src/main/resources/application.properties +# - name: application.properties 파일 생성 +# run: echo "${{ secrets.APPLICATION_PROPERTIES }}" > ./application/src/main/resources/application.properties +# cat ./application/src/main/resources/application.properties - name: AWS Resource에 접근할 수 있게 AWS credentials 설정 uses: aws-actions/configure-aws-credentials@v4 From 3871d4616b9737927bd3af4920f3ddabf1b279d0 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 21:56:39 +0900 Subject: [PATCH 45/80] =?UTF-8?q?chore:=20=EC=A0=84=EC=B2=B4=20=EB=94=94?= =?UTF-8?q?=EB=A0=89=ED=86=A0=EB=A6=AC=EC=9D=98=20env=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20git=EC=97=90=EC=84=9C=20=EC=B6=94=EC=A0=81=20=EC=95=88?= =?UTF-8?q?=ED=95=98=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7a0f4d7..062f1db 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ +**/.env ### STS ### .apt_generated From 1c847e46b0473e6e9caf5977870e221db1831b4f Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 21:56:59 +0900 Subject: [PATCH 46/80] =?UTF-8?q?chore:=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=95=9C=20=ED=8C=8C=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 135 ++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 application/src/main/resources/application.yml diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml new file mode 100644 index 0000000..fece820 --- /dev/null +++ b/application/src/main/resources/application.yml @@ -0,0 +1,135 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/yummy_db # docker-compose ? mysql ??? ?? ?? + username: yummy + password: yummy1234! + driver-class-name: com.mysql.cj.jdbc.Driver + + jpa: + hibernate: + ddl-auto: update + show-sql: true + open-in-view: false + properties: + hibernate: + format_sql: true + + security: + oauth2: + client: + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + registration: + kakao: + client-name: kakao + client-id: ${client-id} + client-secret: ${client-secret} + redirect-uri: ${redirect-uri} + client-authentication-method: client_secret_post + authorization-grant-type: authorization_code + scope: profile_nickname, account_email + + jwt: + secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 + valid-time: 7200000 + cookie-name: Authorization + +server: + port: 8081 +--- +spring: + config: + activate: + on-profile: prod + + datasource: + url: jdbc:mysql://my-db:3306/yummy_db # docker-compose ? mysql ??? ?? ?? + username: yummy + password: yummy1234! + driver-class-name: com.mysql.cj.jdbc.Driver + + jpa: + hibernate: + ddl-auto: update + show-sql: true + open-in-view: false + properties: + hibernate: + format_sql: true + + security: + oauth2: + client: + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + registration: + kakao: + client-name: kakao + client-id: ${client-id} + client-secret: ${client-secret} + redirect-uri: ${redirect-uri} + client-authentication-method: client_secret_post + authorization-grant-type: authorization_code + scope: profile_nickname, account_email + + jwt: + secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 + valid-time: 7200000 + cookie-name: Authorization + +--- +spring: + config: + activate: + on-profile: test + + datasource: + url: jdbc:h2:mem:testdb + driver-class-name: org.h2.Driver + username: sa + password: + h2: + console: + enabled: true + + jpa: + hibernate: + ddl-auto: create + properties: + hibernate: + dialect: org.hibernate.dialect.H2Dialect + show_sql: true + format_sql: true + default_batch_fetch_size: 50 + + security: + oauth2: + client: + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + registration: + kakao: + client-name: kakao + client-id: ${client-id} + client-secret: ${client-secret} + redirect-uri: ${redirect-uri} + client-authentication-method: client_secret_post + authorization-grant-type: authorization_code + scope: profile_nickname, account_email + + jwt: + secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 + valid-time: 7200000 + cookie-name: Authorization From 7e9155c332a5eb6774013273d2239de3c82cb615 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Fri, 17 Jan 2025 22:31:44 +0900 Subject: [PATCH 47/80] =?UTF-8?q?chore:=20prod=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=ED=8F=AC=ED=8A=B8=EB=84=98=EB=B2=84=20=EB=AA=85?= =?UTF-8?q?=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index fece820..689b77b 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -85,6 +85,9 @@ spring: valid-time: 7200000 cookie-name: Authorization +server: + port: 8080 + --- spring: config: From 35ab4b795d1beeb523fadc08db59856c4bea5afe Mon Sep 17 00:00:00 2001 From: fbehddn Date: Sat, 18 Jan 2025 00:46:35 +0900 Subject: [PATCH 48/80] =?UTF-8?q?chore:=20swagger=20cors=20ip=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/groom/yummy/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index c4c3b4d..dc86ab8 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -76,7 +76,8 @@ public CorsConfigurationSource configurationSource() { CorsConfiguration configuration = new CorsConfiguration(); configuration.addAllowedHeader("*"); configuration.addAllowedMethod("*"); - configuration.addAllowedOrigin("http://localhost:8080"); // 특정 도메인 허용 + configuration.addAllowedOrigin("http://localhost:8081"); // 특정 도메인 허용 + configuration.addAllowedOrigin("http://13.124.191.4:8080"); // 특정 도메인 허용 configuration.setAllowCredentials(true); configuration.addExposedHeader("ACCESS_TOKEN"); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); From 9d9b34383e0660ca6f4fb01e83c38104c3815ba0 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Sun, 19 Jan 2025 20:27:43 +0900 Subject: [PATCH 49/80] =?UTF-8?q?fix:=20808=208081=20=ED=8F=AC=ED=8A=B8=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/groom/yummy/config/CorsMvcConfig.java | 2 +- .../src/main/java/com/groom/yummy/config/SwaggerConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java b/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java index 2eb3429..a6e4773 100644 --- a/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java +++ b/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java @@ -11,6 +11,6 @@ public class CorsMvcConfig implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry corsRegistry){ corsRegistry.addMapping("/**") .exposedHeaders("Set-Cookie") - .allowedOrigins("http://localhost:8080"); + .allowedOrigins("http://localhost:8081"); } } diff --git a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java index 336fafc..da1ad9e 100644 --- a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java @@ -33,7 +33,7 @@ private Info apiInfo() { private List servers() { List servers = new ArrayList<>(); - servers.add(new Server().url("http://localhost:8080").description("Local URL")); + servers.add(new Server().url("http://localhost:8081").description("Local URL")); return servers; } } From edd0fb473a838b8710ae2024fbd0558d532dd14c Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Mon, 20 Jan 2025 13:14:48 +0900 Subject: [PATCH 50/80] =?UTF-8?q?test:=20OAuth2=20,=20User=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EB=A5=BC=20=EC=9E=91=EC=84=B1=20(#28)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: oauth, user 테스트 코드 작성 완료 - #27 * feat: UserEventHandlerTest 추가 --- application/build.gradle | 3 + .../com/groom/yummy/YummyApplication.java | 2 +- .../yummy/controller/UserController.java | 5 +- .../com/groom/yummy/filter/JwtAuthFilter.java | 40 ++-- .../oauth2/handler/CustomSuccessHandler.java | 9 +- .../service/CustomOAuth2UserService.java | 6 +- .../src/main/resources/application.yml | 6 +- .../yummy/controller/UserControllerTest.java | 179 ++++++++++++++++++ .../handler/CustomSuccessHandlerTest.java | 78 ++++++++ .../service/CustomOAuth2UserServiceTest.java | 142 ++++++++++++++ .../java/module/ControllerTestSupport.java | 23 +++ domain/build.gradle | 1 + .../com/groom/yummy/user/UserAuthService.java | 2 +- .../com/groom/yummy/user/UserRepository.java | 2 +- .../com/groom/yummy/user/UserService.java | 2 +- .../groom/yummy/facade/UserFacadeTest.java | 119 ++++++++++++ .../groom/yummy/user/UserAuthServiceTest.java | 89 +++++++++ storage/build.gradle | 10 + .../java/com/groom/yummy/config/H2Config.java | 58 ++++++ .../domain/user/UserEntityRepository.java | 8 +- .../java/com/groom/yummy/TestApplication.java | 18 ++ .../domain/user/UserEntityRepositoryTest.java | 92 +++++++++ .../yummy/handler/UserEventHandlerTest.java | 73 +++++++ 23 files changed, 934 insertions(+), 33 deletions(-) create mode 100644 application/src/test/java/com/groom/yummy/controller/UserControllerTest.java create mode 100644 application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java create mode 100644 application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java create mode 100644 application/src/test/java/module/ControllerTestSupport.java create mode 100644 domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java create mode 100644 domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java create mode 100644 storage/src/main/java/com/groom/yummy/config/H2Config.java create mode 100644 storage/src/test/java/com/groom/yummy/TestApplication.java create mode 100644 storage/src/test/java/com/groom/yummy/domain/user/UserEntityRepositoryTest.java create mode 100644 storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java diff --git a/application/build.gradle b/application/build.gradle index 8bb5fe0..46cbaa4 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -9,16 +9,19 @@ version = '0.0.1-SNAPSHOT' dependencies { runtimeOnly project(':storage') compileOnly project(':domain') + testImplementation project(':domain') implementation project(':common') implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' + testImplementation 'org.springframework.security:spring-security-test' testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation 'org.junit.jupiter:junit-jupiter' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/application/src/main/java/com/groom/yummy/YummyApplication.java b/application/src/main/java/com/groom/yummy/YummyApplication.java index b4fdc63..7468414 100644 --- a/application/src/main/java/com/groom/yummy/YummyApplication.java +++ b/application/src/main/java/com/groom/yummy/YummyApplication.java @@ -4,7 +4,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class YummyApplication { + public class YummyApplication { public static void main(String[] args) { SpringApplication.run(YummyApplication.class, args); } diff --git a/application/src/main/java/com/groom/yummy/controller/UserController.java b/application/src/main/java/com/groom/yummy/controller/UserController.java index 815c533..8f6233f 100644 --- a/application/src/main/java/com/groom/yummy/controller/UserController.java +++ b/application/src/main/java/com/groom/yummy/controller/UserController.java @@ -1,9 +1,9 @@ package com.groom.yummy.controller; +import com.groom.yummy.dto.ResponseDto; import com.groom.yummy.dto.request.UpdateNicknameReqDto; import com.groom.yummy.dto.response.UserInfoResDto; import com.groom.yummy.facade.UserFacade; -import com.groom.yummy.dto.ResponseDto; import com.groom.yummy.oauth2.auth.LoginUser; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -11,11 +11,10 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @Tag(name = "[User] User API") -@Controller +@RestController @RequiredArgsConstructor @Slf4j @RequestMapping("/api/v1/users") diff --git a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java index 2d6a20a..704fcff 100644 --- a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java +++ b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java @@ -27,26 +27,27 @@ public class JwtAuthFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + String token = findToken(request); - // 요청한 URL이 swagger-ui 경로인 경우 바로 필터 통과 - if (request.getRequestURI().equals("/swagger-ui/index.html")) { + if (!verifyToken(request, token)) { filterChain.doFilter(request, response); return; } - String token = findToken(request); - log.info("token before verify: {}", token); - if (verifyToken(request, response, filterChain, token)) return; - log.info("token after verify: {}", token); User user = getUser(token); - setSecuritySession(user); filterChain.doFilter(request, response); } + protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException { + String path = request.getRequestURI(); + return path.startsWith("/swagger-ui/") || path.startsWith("/v3/api-docs") || path.startsWith("/swagger-resources/"); + } + private static void setSecuritySession(User user){ LoginUser loginUser = new LoginUser(user); log.info("SessionLoginUser : {}", loginUser.getUsername()); + log.info("SessionLoginUser getAuthorities: {}", loginUser.getAuthorities()); Authentication authToken = new UsernamePasswordAuthenticationToken(loginUser,null, loginUser.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authToken); } @@ -66,18 +67,23 @@ private User getUser(String token){ .build(); } - private boolean verifyToken(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain, String token) throws IOException, ServletException { - if (token == null) { + private boolean verifyToken(HttpServletRequest request,String token) throws IOException, ServletException { + Boolean isValid = (Boolean) request.getAttribute("isTokenValid"); + if(isValid != null) return isValid; + + if (token == null || jwtProvider.validateToken(token)) { log.debug("token null"); - filterChain.doFilter(request, response); - return true; - } - if (jwtProvider.validateToken(token)) { - log.debug("token expired"); - filterChain.doFilter(request, response); - return true; + request.setAttribute("isTokenValid",false); + //filterChain.doFilter(request, response); + return false; } - return false; +// if (jwtProvider.validateToken(token)) { +// log.debug("token expired"); +// //filterChain.doFilter(request, response); +// return true; +// } + request.setAttribute("isTokenValid", true); + return true; } private static String findToken(HttpServletRequest request){ diff --git a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java index 105e3ee..5f2dd14 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java +++ b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java @@ -8,6 +8,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; @@ -16,20 +17,22 @@ @Component @RequiredArgsConstructor +@Slf4j public class CustomSuccessHandler implements AuthenticationSuccessHandler { - private final JwtProvider jwtUtil; + private final JwtProvider jwtProvider; @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { LoginUser loginUser = (LoginUser) authentication.getPrincipal(); + log.info("onAuthenticationSuccess Authenticated User: " + loginUser.getName()); String email = loginUser.getUsername(); String nickname = loginUser.getName(); Long userId = loginUser.getUserId(); String role = loginUser.getRole(); - String accessToken = jwtUtil.createAccessToken(userId,email,nickname,role); + String accessToken = jwtProvider.createAccessToken(userId,email,nickname,role); - response.addCookie(CookieUtil.createCookie(jwtUtil.COOKIE_NAME,accessToken,jwtUtil.VALID_TIME)); + response.addCookie(CookieUtil.createCookie(jwtProvider.COOKIE_NAME,accessToken,jwtProvider.VALID_TIME)); response.sendRedirect("http://localhost:8080/swagger-ui/index.html"); } } \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java index 00504a6..a03bfd2 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java +++ b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java @@ -29,11 +29,15 @@ public CustomOAuth2UserService(OAuth2ResFactory oAuth2ResFactory, UserFacade use @Override public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException{ OAuth2User oAuth2User = super.loadUser(userRequest); - + log.info("oAuth2User key-set : {}", oAuth2User.getAttributes().keySet()); + System.out.println("ID: " + oAuth2User.getAttributes().get("id")); + System.out.println("Connected At: " + oAuth2User.getAttributes().get("connected_at")); String registrationId = userRequest.getClientRegistration().getRegistrationId(); + OAuth2Response oAuth2Response = oAuth2ResFactory.createOAuth2Response(registrationId, oAuth2User.getAttributes()); String email = oAuth2Response.getEmail(); String nickname = oAuth2Response.getName(); + Optional optionalUser = userFacade.findAuthUserByEmail(email); User user = userFacade.findOrCreateUser(optionalUser, nickname, email); log.info("loadUser : {}", user.getEmail()); diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 689b77b..c66bc5a 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/yummy_db # docker-compose ? mysql ??? ?? ?? + url: jdbc:mysql://localhost:3306/yummy_db # docker-compose?? mysql ??? ?? username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver @@ -40,14 +40,16 @@ spring: server: port: 8081 + --- + spring: config: activate: on-profile: prod datasource: - url: jdbc:mysql://my-db:3306/yummy_db # docker-compose ? mysql ??? ?? ?? + url: jdbc:mysql://localhost:3306/yummy_db # docker-compose?? mysql ??? ?? username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java new file mode 100644 index 0000000..e7a869c --- /dev/null +++ b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java @@ -0,0 +1,179 @@ +package com.groom.yummy.controller; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.config.SecurityConfig; +import com.groom.yummy.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.dto.response.UserInfoResDto; +import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.jwt.JwtProvider; +import com.groom.yummy.oauth2.handler.CustomSuccessHandler; +import com.groom.yummy.oauth2.service.CustomOAuth2UserService; +import com.groom.yummy.user.User; +import jakarta.servlet.http.Cookie; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.http.MediaType; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; + +import static org.mockito.Mockito.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + + +@ActiveProfiles("test") +@Import({SecurityConfig.class}) +@WebMvcTest(controllers = {UserController.class}) +@ExtendWith(MockitoExtension.class) // Mockito 확장 사용 +class UserControllerTest { + + @Autowired + protected MockMvc mockMvc; + @Autowired + protected ObjectMapper objectMapper; + @MockitoBean + protected JwtProvider jwtProvider; + @MockitoBean + protected UserFacade userFacade; + @MockitoBean + private CustomOAuth2UserService customOAuth2UserService; + @MockitoBean + private CustomSuccessHandler customSuccessHandler; + + @BeforeEach + void setUp(){ + String mockJwtToken = "mockJwtToken"; + // JwtProvider Mock 설정 + when(jwtProvider.validateToken(mockJwtToken)).thenReturn(false); + when(jwtProvider.getUserId(mockJwtToken)).thenReturn(1L); + when(jwtProvider.getUsername(mockJwtToken)).thenReturn("email@gmail.com"); + when(jwtProvider.getName(mockJwtToken)).thenReturn("강형준"); + when(jwtProvider.getRole(mockJwtToken)).thenReturn("ROLE_USER"); + } + + @Test + @DisplayName("토큰 기반 정보로 유저 조회 테스트") + void getUserInfoByTokenTest() throws Exception { + // given + Long userId = 1L; + String jwtToken = "mockJwtToken"; + String email = "email@gmail.com"; + String nickname = "강형준"; + UserInfoResDto mockResponse = UserInfoResDto.builder().id(userId).email(email).nickname(nickname).build(); + when(userFacade.getUserInfo(userId)).thenReturn(mockResponse); + + // When & Then + ResultActions actions = mockMvc.perform(get("/api/v1/users") + .cookie(new Cookie("Authorization", jwtToken)) // 쿠키 추가 + .contentType(MediaType.APPLICATION_JSON)) + .andExpectAll( + status().isOk(), + jsonPath("$.data.id").value(userId), + jsonPath("$.data.email").value(email), + jsonPath("$.data.nickname").value(nickname), + jsonPath("$.msg").value("자신의 정보 조회 성공") + ); + + verify(userFacade, times(1)) + .getUserInfo(any(Long.class)); + verify(jwtProvider, times(1)) + .validateToken(any(String.class)); + } + + @Test + @DisplayName("userId로 유저를 조회 테스트") + void getUserInfoTest() throws Exception{ + // given + Long userId = 1L; + String jwtToken = "mockJwtToken"; + String email = "email@gmail.com"; + String nickname = "홍길동"; + UserInfoResDto mockResponse = UserInfoResDto.builder().id(userId).email(email).nickname(nickname).build(); + when(userFacade.getUserInfo(userId)).thenReturn(mockResponse); + + // When & Then + ResultActions actions = mockMvc.perform(get("/api/v1/users/" + userId) + .cookie(new Cookie("Authorization", jwtToken)) // 쿠키 추가 + .contentType(MediaType.APPLICATION_JSON)) + .andExpectAll( + status().isOk(), + jsonPath("$.data.id").value(userId), + jsonPath("$.data.email").value(email), + jsonPath("$.data.nickname").value(nickname), + jsonPath("$.msg").value("유저 정보 조회 성공") + ); + + verify(userFacade, times(1)) + .getUserInfo(any(Long.class)); + verify(jwtProvider, times(1)) + .validateToken(any(String.class)); + } + + @Test + @DisplayName("유저 nickname 변경 테스트.") + void updateUserNicknameTest() throws Exception{ + // given + Long userId = 1L; + String jwtToken = "mockJwtToken"; + String email = "email@gmail.com"; + String updateNick = "이후강형준"; + + UpdateNicknameReqDto updateNicknameReqDto = UpdateNicknameReqDto.builder().nickname(updateNick).build(); + String body = objectMapper.writeValueAsString(updateNicknameReqDto); + + UserInfoResDto mockResponse = UserInfoResDto.builder().id(userId).email(email).nickname(updateNick).build(); + when(userFacade.updateUserNickname(userId, updateNicknameReqDto)).thenReturn(mockResponse); + + // When & Then + ResultActions actions = mockMvc.perform(patch("/api/v1/users/profile") + .cookie(new Cookie("Authorization", jwtToken)) // 쿠키 추가 + .content(body) + .contentType(MediaType.APPLICATION_JSON)) + .andExpectAll( + status().isOk(), + jsonPath("$.data.id").value(userId), + jsonPath("$.data.email").value(email), + jsonPath("$.data.nickname").value(updateNick), + jsonPath("$.msg").value("유저 닉네임 변경 성공") + ); + + verify(userFacade, times(1)) + .updateUserNickname(any(Long.class), any(UpdateNicknameReqDto.class)); + verify(jwtProvider, times(1)) + .validateToken(any(String.class)); + } + + @Test + @DisplayName("유저 삭제(논리) 테스트") + void deleteUserByTokenTest() throws Exception{ + // given + Long userId = 1L; + String jwtToken = "mockJwtToken"; + + when(userFacade.deleteUser(userId)).thenReturn(userId); + + // When & Then + ResultActions actions = mockMvc.perform(delete("/api/v1/users") + .cookie(new Cookie("Authorization", jwtToken)) // 쿠키 추가 + .contentType(MediaType.APPLICATION_JSON)) + .andExpectAll( + status().isOk(), + jsonPath("$.data").value(userId), + jsonPath("$.msg").value("회원정보 삭제 성공") + ); + + verify(userFacade, times(1)) + .deleteUser(any(Long.class)); + verify(jwtProvider, times(1)) + .validateToken(any(String.class)); + } +} \ No newline at end of file diff --git a/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java b/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java new file mode 100644 index 0000000..74da50d --- /dev/null +++ b/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java @@ -0,0 +1,78 @@ +package com.groom.yummy.oauth2.handler; + +import com.groom.yummy.jwt.JwtProvider; +import com.groom.yummy.oauth2.auth.LoginUser; +import com.groom.yummy.user.User; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; + +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +class CustomSuccessHandlerTest { + + @InjectMocks + private CustomSuccessHandler customSuccessHandler; + @Mock + private JwtProvider jwtProvider; + + private MockHttpServletRequest request; + private MockHttpServletResponse response; + + @BeforeEach + void setUp(){ + request = new MockHttpServletRequest(); + response = new MockHttpServletResponse(); + jwtProvider.COOKIE_NAME = "Authorization"; + jwtProvider.VALID_TIME = 1000L; + } + + @Test + @DisplayName("OAuth2 성공 핸들러 테스트") + void onAuthenticationSuccessTest() throws ServletException, IOException { + // given + Long userId = 1L; + String email = "email@gmail.com"; + String nickname = "강형준"; + String role = "ROLE_USER"; + String expectedToken = "mockAccessToken"; + String cookieName = "Authorization"; + Long validTime = 1000L; + + User user = User.builder().id(userId).email(email).nickname(nickname).role(role).build(); + LoginUser loginUser = new LoginUser(user); + + Authentication authentication = new UsernamePasswordAuthenticationToken(loginUser, null); + + when(jwtProvider.createAccessToken(userId, email, nickname, role)).thenReturn(expectedToken); + + // when + customSuccessHandler.onAuthenticationSuccess(request, response, authentication); + + // then + Cookie cookie = response.getCookie(cookieName); + assertNotNull(cookie); + assertEquals(expectedToken, cookie.getValue()); + assertEquals(validTime, cookie.getMaxAge()); + + assertEquals("http://localhost:8080/swagger-ui/index.html", response.getRedirectedUrl()); + + verify(jwtProvider, times(1)) + .createAccessToken(userId, email, nickname,role); + } +} \ No newline at end of file diff --git a/application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java b/application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java new file mode 100644 index 0000000..549017e --- /dev/null +++ b/application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java @@ -0,0 +1,142 @@ +package com.groom.yummy.oauth2.service; + +import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.oauth2.auth.LoginUser; +import com.groom.yummy.oauth2.dto.KakaoResponse; +import com.groom.yummy.oauth2.dto.OAuth2Response; +import com.groom.yummy.oauth2.strategy.OAuth2ResFactory; +import com.groom.yummy.user.User; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.security.oauth2.client.registration.ClientRegistration; +import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; +import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; +import org.springframework.security.oauth2.core.AuthorizationGrantType; +import org.springframework.security.oauth2.core.OAuth2AccessToken; +import org.springframework.security.oauth2.core.user.OAuth2User; + +import java.time.Instant; +import java.util.Map; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class CustomOAuth2UserServiceTest { + @InjectMocks + private CustomOAuth2UserService customOAuth2UserService; + + @Mock + private OAuth2ResFactory oAuth2ResFactory; + + @Mock + private UserFacade userFacade; + + @Mock + private DefaultOAuth2UserService defaultOAuth2UserService; + + Map attributes; + + @BeforeEach + void setUp(){ + String registrationId = "kakao"; + String email = "email@gmail.com"; + String nickname = "강형준"; + + attributes = Map.of( + "id", registrationId, + "kakao_account", Map.of("email", email), + "properties", Map.of("nickname", nickname) + ); + } + + @Test + void kakaoOAuth2loadUserTest() throws Exception { + // given + String registrationId = "kakao"; + String email = "email@gmail.com"; + String nickname = "강형준"; + String oauth2AccessToken = "testAccessToken"; + + // 가짜 웹 서버를 통해 실제 카카오 서버와의 통신을 mocking 합니다. + MockWebServer mockWebServer = new MockWebServer(); + mockWebServer.start(); + + // 받은 엑세스 토큰을 통해, 클라이언트가 UserInfo Endpoint 요청 보내 사용자 정보를 받는 동작 Mocking + String userInfoResponse = "{ \"id\": \"" + registrationId + + "\", \"kakao_account\": { \"email\": \"" + email + "\" }," + + " \"properties\": { \"nickname\": \"" + nickname + "\" } }"; + mockWebServer.enqueue(new MockResponse() + .setResponseCode(200) + .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) + .setBody(userInfoResponse) + ); + + // Mock OAuth2AccessToken: 엑세스 토큰 Mocking + OAuth2AccessToken accessToken = new OAuth2AccessToken( + OAuth2AccessToken.TokenType.BEARER, + oauth2AccessToken, + Instant.now(), + Instant.now().plusSeconds(3600) + ); + + // OAuth2 인증 및 사용자 정보 요청 과정에서 필요한 클라이언트와 요청 정보를 Mocking + ClientRegistration clientRegistration = ClientRegistration.withRegistrationId("kakao") + .clientId("test-client-id") + .clientSecret("test-client-secret") + .authorizationUri("https://kauth.kakao.com/oauth/authorize") + .tokenUri("https://kauth.kakao.com/oauth/token") + .userInfoUri(mockWebServer.url("/mock/url").toString()) + .userNameAttributeName("id") + .authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE) + .redirectUri("{baseUrl}/login/oauth2/code/{registrationId}") + .build(); + OAuth2UserRequest userRequest = new OAuth2UserRequest(clientRegistration, accessToken); + + // 인증 이후 받은 사용자 정보 Mocking + OAuth2User oAuth2User = Mockito.mock(OAuth2User.class); + Mockito.when(oAuth2User.getAttributes()).thenReturn(Map.of( + "id", registrationId, + "kakao_account", Map.of("email", email), + "properties", Map.of("nickname", nickname) + )); + + // 받은 사용자 정보를 변환하는 OAuth2Response 클래스 Mocking + OAuth2Response oAuth2Response = Mockito.mock(OAuth2Response.class); + Mockito.when(oAuth2Response.getEmail()).thenReturn(email); + Mockito.when(oAuth2Response.getName()).thenReturn(nickname); + Mockito.when(oAuth2ResFactory.createOAuth2Response(registrationId, oAuth2User.getAttributes())) + .thenReturn(oAuth2Response); + + // userFacade 클래스 목킹 + User mockUser = User.builder().email(email).nickname(nickname).build(); + Mockito.when(userFacade.findAuthUserByEmail(email)).thenReturn(Optional.empty()); + Mockito.when(userFacade.findOrCreateUser(Optional.empty(), nickname, email)).thenReturn(mockUser); + + // when + OAuth2User result = customOAuth2UserService.loadUser(userRequest); + + // then + assertNotNull(result); + assertTrue(result instanceof LoginUser); // 리턴 값이 LoginUser 객체인지 확ㅇㄴ + + // OAuth2User 구현체인 LoginUser 로 캐스팅 + LoginUser loginUser = (LoginUser) result; + + assertEquals(email, loginUser.getUser().getEmail()); + assertEquals(nickname, loginUser.getUser().getNickname()); + + // MockWebServer 종료 + mockWebServer.shutdown(); + } +} \ No newline at end of file diff --git a/application/src/test/java/module/ControllerTestSupport.java b/application/src/test/java/module/ControllerTestSupport.java new file mode 100644 index 0000000..4289ade --- /dev/null +++ b/application/src/test/java/module/ControllerTestSupport.java @@ -0,0 +1,23 @@ +package module; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.controller.UserController; +import com.groom.yummy.jwt.JwtProvider; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.test.web.servlet.MockMvc; + +//@WebMvcTest(controllers = {UserController.class}) +//@ExtendWith(MockitoExtension.class) // Mockito 확장 사용 +//public class ControllerTestSupport { +// +// @Autowired +// protected MockMvc mockMvc; +// @Autowired +// protected ObjectMapper objectMapper; +// @Mock +// protected JwtProvider jwtProvider; +//} diff --git a/domain/build.gradle b/domain/build.gradle index 0c2414a..2c3fc8e 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -15,6 +15,7 @@ dependencies { testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'org.mockito:mockito-junit-jupiter:5.5.0' } test { diff --git a/domain/src/main/java/com/groom/yummy/user/UserAuthService.java b/domain/src/main/java/com/groom/yummy/user/UserAuthService.java index fb83c91..02d366b 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserAuthService.java +++ b/domain/src/main/java/com/groom/yummy/user/UserAuthService.java @@ -29,7 +29,7 @@ public User findOrCreateUser(Optional optionalUser, String nickname, Strin .groupAttendanceCount(0L) .isDeleted(false) .build(); - userRepository.save(user); + user = userRepository.save(user); }else{ user = optionalUser.get(); } diff --git a/domain/src/main/java/com/groom/yummy/user/UserRepository.java b/domain/src/main/java/com/groom/yummy/user/UserRepository.java index b76cca5..ad84ac2 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserRepository.java +++ b/domain/src/main/java/com/groom/yummy/user/UserRepository.java @@ -5,5 +5,5 @@ public interface UserRepository { Optional findById(Long userId); Optional findByEmail(String email); - Long save(User user); + User save(User user); } diff --git a/domain/src/main/java/com/groom/yummy/user/UserService.java b/domain/src/main/java/com/groom/yummy/user/UserService.java index 20dde82..60524c6 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserService.java +++ b/domain/src/main/java/com/groom/yummy/user/UserService.java @@ -18,7 +18,7 @@ public User getUserInfo(Long userId) { } @Transactional - public User updateNickname(Long userId,String nickname){ + public User updateNickname(Long userId, String nickname){ User user = userRepository.findById(userId).orElseThrow(); user.changeNickname(nickname); eventPublisher.publish(new UserNicknameChangedEvent(user.getId(),user.getNickname())); diff --git a/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java b/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java new file mode 100644 index 0000000..9139ed0 --- /dev/null +++ b/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java @@ -0,0 +1,119 @@ +package com.groom.yummy.facade; + +import com.groom.yummy.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.dto.response.UserInfoResDto; +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserAuthService; +import com.groom.yummy.user.UserService; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; + +@ExtendWith(MockitoExtension.class) +class UserFacadeTest { + + @Mock + private UserAuthService userAuthService; + + @Mock + private UserService userService; + + @InjectMocks + private UserFacade userFacade; + + @Test + void getUserInfoTest() { + // given + Long userId = 1L; + String nickname = "강형준"; + String email = "email@gmail.com"; + + User mockUser = User.builder().id(userId).nickname(nickname).email(email).build(); + Mockito.when(userService.getUserInfo(userId)).thenReturn(mockUser); + + // when + UserInfoResDto result = userFacade.getUserInfo(userId); + + // then + assertNotNull(result); + assertEquals(mockUser.getEmail(), result.email()); + assertEquals(mockUser.getNickname(), result.nickname()); + } + + @Test + void findAuthUserByEmailTest() { + // given + Long userId = 1L; + String nickname = "강형준"; + String email = "email@gmail.com"; + + User mockUser = User.builder().id(userId).nickname(nickname).email(email).build(); + Mockito.when(userAuthService.findAuthUserByEmail(email)).thenReturn(Optional.of(mockUser)); + + // when + Optional result = userFacade.findAuthUserByEmail(email); + + // then + assertTrue(result.isPresent()); + assertEquals(email, result.get().getEmail()); + } + + @Test + void findOrCreateUserTest() { + // given + Long userId = 1L; + String nickname = "강형준"; + String email = "email@gmail.com"; + Optional optionalUser = Optional.empty(); + User mockUser = User.builder().id(userId).nickname(nickname).email(email).build(); + Mockito.when(userAuthService.findOrCreateUser(optionalUser, nickname, email)).thenReturn(mockUser); + + // when + User result = userFacade.findOrCreateUser(optionalUser, nickname, email); + + // then + assertNotNull(result); + assertEquals(email, result.getEmail()); + assertEquals(nickname, result.getNickname()); + } + + @Test + void updateUserNicknameTest() { + // Arrange + Long userId = 1L; + String oldNickname = "강형준"; + String email = "email@gmail.com"; + String newNickname = "업데이트강형준"; + UpdateNicknameReqDto updateNicknameReqDto = new UpdateNicknameReqDto(newNickname); + User updateMockUser = User.builder().id(userId).nickname(newNickname).email(email).build(); + Mockito.when(userService.updateNickname(userId, newNickname)).thenReturn(updateMockUser); + + // when + UserInfoResDto result = userFacade.updateUserNickname(userId, updateNicknameReqDto); + + // then + assertNotNull(result); + assertEquals(newNickname, result.nickname()); + } + + @Test + void deleteUser_shouldReturnDeletedUserId() { + // given + Long userId = 1L; + Mockito.when(userService.deleteUser(userId)).thenReturn(userId); + + // when + Long result = userFacade.deleteUser(userId); + + // then + assertNotNull(result); + assertEquals(userId, result); + } +} \ No newline at end of file diff --git a/domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java b/domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java new file mode 100644 index 0000000..7f13875 --- /dev/null +++ b/domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java @@ -0,0 +1,89 @@ +package com.groom.yummy.user; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class UserAuthServiceTest { + @InjectMocks + private UserAuthService userAuthService; + @Mock + private UserRepository userRepository; + + @Test + void findAuthUserByEmailTest() { + // given + String nickname = "강형준"; + String email = "email@gmail.com"; + String role = "ROLE_USER"; + User mockUser = User.builder() + .email(email) + .nickname(nickname) + .role(role) + .build(); + when(userRepository.findByEmail(email)).thenReturn(Optional.of(mockUser)); + + // when + Optional result = userAuthService.findAuthUserByEmail(email); + + // then + assertTrue(result.isPresent()); + assertEquals(email, result.get().getEmail()); + assertEquals(nickname, result.get().getNickname()); + } + + @Test + void findOrCreateUser_Create_Test() { + // given + Long userId = 1L; + String nickname = "강형준"; + String email = "email@gmail.com"; + String role = "ROLE_USER"; + Optional optionalUser = Optional.empty(); + + User createUser = User.builder().id(userId).email(email).nickname(nickname).role(role).build(); + when(userRepository.save(any(User.class))).thenReturn(createUser); + + // when + User result = userAuthService.findOrCreateUser(optionalUser, nickname, email); + + // then + assertNotNull(result); + assertEquals(userId, result.getId()); + assertEquals(email, result.getEmail()); + assertEquals(nickname, result.getNickname()); + assertEquals(role, result.getRole()); + } + + @Test + void findOrCreateUser_Find_Test() { + // given + String nickname = "강형준"; + String email = "email@gmail.com"; + String role = "ROLE_USER"; + + User existingUser = User.builder() + .email(email) + .nickname(nickname) + .role(role) + .build(); + + Optional optionalUser = Optional.of(existingUser); + + // when + User result = userAuthService.findOrCreateUser(optionalUser, nickname, email); + + // then + assertNotNull(result); + assertEquals(existingUser, result); + } +} \ No newline at end of file diff --git a/storage/build.gradle b/storage/build.gradle index 4b76569..c53193a 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -8,14 +8,24 @@ version = 'unspecified' dependencies { implementation project(':domain') + implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' runtimeOnly 'com.mysql:mysql-connector-j' + runtimeOnly 'com.h2database:h2' + + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.springframework.boot:spring-boot-starter-test' + } tasks.named('bootJar') { enabled = false +} + +tasks.test { + useJUnitPlatform() } \ No newline at end of file diff --git a/storage/src/main/java/com/groom/yummy/config/H2Config.java b/storage/src/main/java/com/groom/yummy/config/H2Config.java new file mode 100644 index 0000000..882f766 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/config/H2Config.java @@ -0,0 +1,58 @@ +//package com.groom.yummy.config; +// +//import jakarta.persistence.EntityManagerFactory; +//import org.springframework.beans.factory.annotation.Qualifier; +//import org.springframework.boot.jdbc.DataSourceBuilder; +//import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.context.annotation.Primary; +//import org.springframework.context.annotation.Profile; +//import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +//import org.springframework.orm.jpa.JpaTransactionManager; +//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +//import org.springframework.transaction.PlatformTransactionManager; +//import org.springframework.transaction.annotation.EnableTransactionManagement; +// +//import javax.sql.DataSource; +//import java.util.HashMap; +//import java.util.Map; +// +//@Configuration +//@Profile("test") +//@EnableTransactionManagement +//@EnableJpaRepositories(basePackages = {"com.groom.yummy.domain"}) +//public class H2Config { +// @Bean(name = "dataSource") +// @Primary +// public DataSource h2DataSource() { +// return DataSourceBuilder.create() +// .driverClassName("org.h2.Driver") +// .url("jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE") +// .username("sa") +// .password("") +// .build(); +// } +// +// @Primary +// @Bean(name = "entityManagerFactory") +// public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, +// @Qualifier("dataSource") DataSource dataSource) { +// Map properties = new HashMap<>(); +// properties.put("hibernate.hbm2ddl.auto", "create"); +// properties.put("hibernate.dialect", "org.hibernate.dialect.H2Dialect"); +// +// return builder +// .dataSource(dataSource) +// .packages("com.groom.yummy.domain") +// .persistenceUnit("test") +// .properties(properties) +// .build(); +// } +// +// @Primary +// @Bean(name = "transactionManager") +// public PlatformTransactionManager transactionManager(@Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) { +// return new JpaTransactionManager(entityManagerFactory); +// } +//} diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java index 7ee3519..2305cf6 100644 --- a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java @@ -3,13 +3,14 @@ import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; import lombok.RequiredArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.Optional; @Repository @RequiredArgsConstructor -public class UserEntityRepository implements UserRepository { +public class UserEntityRepository implements UserRepository { private final UserJpaRepository userJpaRepository; @Override @@ -23,7 +24,8 @@ public Optional findByEmail(String email) { } @Override - public Long save(User user) { - return userJpaRepository.save(UserEntity.toEntity(user)).getId(); + public User save(User user) { + UserEntity userEntity = userJpaRepository.save(UserEntity.toEntity(user)); + return UserEntity.toModel(userEntity); } } diff --git a/storage/src/test/java/com/groom/yummy/TestApplication.java b/storage/src/test/java/com/groom/yummy/TestApplication.java new file mode 100644 index 0000000..e7029c8 --- /dev/null +++ b/storage/src/test/java/com/groom/yummy/TestApplication.java @@ -0,0 +1,18 @@ +package com.groom.yummy; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +// 테스트 환경에서 mock 테스트가 아닌 실제 db(H2 db)에 접근하여 테스트 하기 위해 추가. +@SpringBootApplication +public class TestApplication { + public static void main(String[] args) { + SpringApplication.run(TestApplication.class, args); + } +} + +/* 컴포넌트 스캔의 범위 + 예를 들어, TestApplication 클래스가 src/test/java/com.groom.yummy 패키지에 위치하면: + 스캔 범위: com.groom.yummy와 그 하위 패키지. + 따라서 main 폴더 아래의 com.groom.yummy에 위치한 클래스들도 빈으로 등록됩니다. + */ diff --git a/storage/src/test/java/com/groom/yummy/domain/user/UserEntityRepositoryTest.java b/storage/src/test/java/com/groom/yummy/domain/user/UserEntityRepositoryTest.java new file mode 100644 index 0000000..f319db3 --- /dev/null +++ b/storage/src/test/java/com/groom/yummy/domain/user/UserEntityRepositoryTest.java @@ -0,0 +1,92 @@ +package com.groom.yummy.domain.user; + +import com.groom.yummy.user.User; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +@SpringBootTest +@ActiveProfiles("test") +@Transactional +class UserEntityRepositoryTest { + + @Autowired + private UserEntityRepository userEntityRepository; + + @Autowired + private UserJpaRepository userJpaRepository; + + private UserEntity testUserEntity; + + @BeforeEach + void setUp(){ + testUserEntity = UserEntity.builder() + .email("email@gmail.com") + .nickname("강형준") + .role("ROLE_USER") + .groupAttendanceCount(0L) + .groupJoinCount(0L) + .isDeleted(false) + .build(); + + userJpaRepository.save(testUserEntity); + } + + @Test + void findByIdTest() { + // given + Long userId = testUserEntity.getId(); + // when + Optional result = userEntityRepository.findById(userId); + // then + assertTrue(result.isPresent()); + assertEquals(testUserEntity.getId(), result.get().getId()); + assertEquals(testUserEntity.getEmail(), result.get().getEmail()); + assertEquals(testUserEntity.getNickname(), result.get().getNickname()); + assertEquals(testUserEntity.getRole(), result.get().getRole()); + assertEquals(testUserEntity.isDeleted(), result.get().isDeleted()); + } + + @Test + void findByEmailTest() { + // given + String email = "email@gmail.com"; + + // when + Optional result = userEntityRepository.findByEmail(email); + + // then + assertTrue(result.isPresent()); + assertEquals(testUserEntity.getId(),result.get().getId()); + assertEquals(testUserEntity.getEmail(), result.get().getEmail()); + assertEquals(testUserEntity.getNickname(), result.get().getNickname()); + assertEquals(testUserEntity.getRole(), result.get().getRole()); + } + + @Test + void saveTest() { + // given + String email = "email@naver.com"; + String nickname = "홍길동"; + String role = "ROLE_USER"; + boolean isDeleted = false; + User user = User.builder().email(email).nickname(nickname).role(role).groupJoinCount(0L).groupAttendanceCount(0L).isDeleted(isDeleted).build(); + + // when + User result = userEntityRepository.save(user); + + // then + assertEquals(result.getEmail(), email); + assertEquals(result.getNickname(), nickname); + assertEquals(result.getRole(), role); + assertEquals(result.isDeleted(), isDeleted); + } +} \ No newline at end of file diff --git a/storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java b/storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java new file mode 100644 index 0000000..48a2fda --- /dev/null +++ b/storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java @@ -0,0 +1,73 @@ +package com.groom.yummy.handler; + +import com.groom.yummy.domain.user.UserEntity; +import com.groom.yummy.domain.user.UserJpaRepository; +import com.groom.yummy.user.UserDeleteEvent; +import com.groom.yummy.user.UserNicknameChangedEvent; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest +@Transactional +class UserEventHandlerTest { + + @Autowired + private ApplicationEventPublisher eventPublisher; + + @Autowired + private UserJpaRepository userJpaRepository; + + private UserEntity testUserEntity; + + @BeforeEach + void setUp(){ + testUserEntity = UserEntity.builder() + .email("email@gmail.com") + .nickname("강형준") + .role("ROLE_USER") + .groupAttendanceCount(0L) + .groupJoinCount(0L) + .isDeleted(false) + .build(); + userJpaRepository.save(testUserEntity); + } + + @Test + void handlerNicknameChaneTest(){ + // given + Long userId = testUserEntity.getId(); + String newNickname = "새로운강형준"; + + // when + eventPublisher.publishEvent(new UserNicknameChangedEvent(userId, newNickname)); + + // then + Optional updatedUser = userJpaRepository.findById(userId); + assertTrue(updatedUser.isPresent()); + assertEquals(newNickname, updatedUser.get().getNickname()); + } + + @Test + void handleUserDeleteTest(){ + // given + Long userId = testUserEntity.getId(); + boolean isDeleted = true; + + // when + eventPublisher.publishEvent(new UserDeleteEvent(userId, isDeleted)); + + // then + Optional deletedUser = userJpaRepository.findById(userId); + assertTrue(deletedUser.isPresent()); + assertTrue(deletedUser.get().isDeleted()); + } + +} \ No newline at end of file From 41585a8692d66e6880f91043e3a48e188627cd18 Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Mon, 20 Jan 2025 13:24:24 +0900 Subject: [PATCH 51/80] Hyungjun#27 test oauth user (#29) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: oauth, user 테스트 코드 작성 완료 - #27 * feat: UserEventHandlerTest 추가 * fix: port 수정 --------- Co-authored-by: LeeJeongHoon <142333228+DawnIsProblem@users.noreply.github.com> --- .../com/groom/yummy/oauth2/handler/CustomSuccessHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java index 5f2dd14..9b94234 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java +++ b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java @@ -33,6 +33,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo String accessToken = jwtProvider.createAccessToken(userId,email,nickname,role); response.addCookie(CookieUtil.createCookie(jwtProvider.COOKIE_NAME,accessToken,jwtProvider.VALID_TIME)); - response.sendRedirect("http://localhost:8080/swagger-ui/index.html"); + response.sendRedirect("http://localhost:8081/swagger-ui/index.html"); } } \ No newline at end of file From 47450f3ef5b4a8bdd06b68ea91387f59e6d4d18e Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Mon, 20 Jan 2025 13:37:23 +0900 Subject: [PATCH 52/80] =?UTF-8?q?fix:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95=20(#30)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: oauth, user 테스트 코드 작성 완료 - #27 * feat: UserEventHandlerTest 추가 * fix: port 수정 * fix: 테스트코드 포트 에러 수정 * fix: 컨플릭트 해결 --------- Co-authored-by: LeeJeongHoon <142333228+DawnIsProblem@users.noreply.github.com> --- .../groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java b/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java index 74da50d..eed6ae3 100644 --- a/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java +++ b/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java @@ -70,7 +70,7 @@ void onAuthenticationSuccessTest() throws ServletException, IOException { assertEquals(expectedToken, cookie.getValue()); assertEquals(validTime, cookie.getMaxAge()); - assertEquals("http://localhost:8080/swagger-ui/index.html", response.getRedirectedUrl()); + assertEquals("http://localhost:8081/swagger-ui/index.html", response.getRedirectedUrl()); verify(jwtProvider, times(1)) .createAccessToken(userId, email, nickname,role); From 8241e9ab1d05c7c4566323beee863d44f8a39ffe Mon Sep 17 00:00:00 2001 From: fbehddn Date: Mon, 20 Jan 2025 14:53:01 +0900 Subject: [PATCH 53/80] =?UTF-8?q?chore:=20=EB=B0=B0=ED=8F=AC=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20db=20url=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index c66bc5a..bf2423b 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -49,7 +49,7 @@ spring: on-profile: prod datasource: - url: jdbc:mysql://localhost:3306/yummy_db # docker-compose?? mysql ??? ?? + url: jdbc:mysql://my-db:3306/yummy_db # docker - compose 에서 정의한 db 컨테이너 이름 명시 username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver From aee51c8744de26650b89e61eb70ef36f41807641 Mon Sep 17 00:00:00 2001 From: LeeJeongHoon <142333228+DawnIsProblem@users.noreply.github.com> Date: Mon, 20 Jan 2025 15:02:01 +0900 Subject: [PATCH 54/80] Feat/group feature (#31) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 의존성 문제로 모듈 이동 * chore: GroupEntity 수정 * chore: RegionEntity 수정 * chore: StoreEntity 수정 * chore: id 타입 수정 * feat: 소모임 관련 기능 구현 * feat: 소모임 관련 Dto 추가 * feat: 지역 관련 기능 구현 * feat: 웹 클라이언트 설정 추가 * test: 기능 테스트 코드 추가 * test: 소모임 컨트롤러 추가 * test: 소모임 비즈니스 로직 추가 * feat: 소모임 관련 기능 구현 * feat: Store관련 기능 구현 --- application/build.gradle | 46 ++-- .../groom/yummy/config/WebClientConfig.java | 14 ++ .../yummy/controller/GroupController.java | 87 ++++++++ .../groom/yummy/webclient/SomeApiService.java | 61 +++++ .../yummy/controller/GroupControllerTest.java | 203 +++++++++++++++++ .../oauth2/service/SomeApiServiceTest.java | 106 +++++++++ domain/build.gradle | 10 + .../java/com/groom/yummy/group/Group.java | 25 +++ .../groom/yummy/group/GroupRepository.java | 12 + .../com/groom/yummy/group/GroupService.java | 51 +++++ .../com/groom/yummy}/group/MeetingStatus.java | 2 +- .../dto/request/CreateGroupRequestDto.java | 33 +++ .../dto/request/JoinGroupRequestDto.java | 13 ++ .../dto/response/GroupDetailResponseDto.java | 45 ++++ .../group/dto/response/GroupResponseDto.java | 40 ++++ .../dto/response/ParticipantResponseDto.java | 15 ++ .../dto/response/StoreDetailResponseDto.java | 16 ++ .../java/com/groom/yummy/region/Region.java | 17 ++ .../groom/yummy/region/RegionRepository.java | 10 + .../com/groom/yummy/region/RegionService.java | 34 +++ .../java/com/groom/yummy}/store/Category.java | 6 +- .../java/com/groom/yummy/store/Store.java | 19 ++ .../groom/yummy/store/StoreRepository.java | 10 + .../com/groom/yummy/store/StoreService.java | 43 ++++ .../groom/yummy/group/GroupServiceTest.java | 211 ++++++++++++++++++ .../groom/yummy/region/RegionServiceTest.java | 65 ++++++ .../groom/yummy/store/StoreServiceTest.java | 77 +++++++ .../groom/yummy/domain/group/GroupEntity.java | 29 +++ .../domain/group/GroupEntityRepository.java | 52 ++++- .../yummy/domain/region/RegionEntity.java | 16 ++ .../domain/region/RegionEntityRepository.java | 35 +++ .../groom/yummy/domain/store/StoreEntity.java | 31 +-- .../domain/store/StoreEntityRepository.java | 41 ++++ .../domain/store/StoreJpaRepository.java | 3 +- 34 files changed, 1443 insertions(+), 35 deletions(-) create mode 100755 application/src/main/java/com/groom/yummy/config/WebClientConfig.java create mode 100755 application/src/main/java/com/groom/yummy/controller/GroupController.java create mode 100755 application/src/main/java/com/groom/yummy/webclient/SomeApiService.java create mode 100755 application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java create mode 100755 application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java create mode 100755 domain/src/main/java/com/groom/yummy/group/Group.java create mode 100755 domain/src/main/java/com/groom/yummy/group/GroupRepository.java create mode 100755 domain/src/main/java/com/groom/yummy/group/GroupService.java rename {storage/src/main/java/com/groom/yummy/domain => domain/src/main/java/com/groom/yummy}/group/MeetingStatus.java (96%) mode change 100644 => 100755 create mode 100755 domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java create mode 100755 domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java create mode 100755 domain/src/main/java/com/groom/yummy/group/dto/response/GroupDetailResponseDto.java create mode 100755 domain/src/main/java/com/groom/yummy/group/dto/response/GroupResponseDto.java create mode 100755 domain/src/main/java/com/groom/yummy/group/dto/response/ParticipantResponseDto.java create mode 100755 domain/src/main/java/com/groom/yummy/group/dto/response/StoreDetailResponseDto.java create mode 100755 domain/src/main/java/com/groom/yummy/region/Region.java create mode 100755 domain/src/main/java/com/groom/yummy/region/RegionRepository.java create mode 100755 domain/src/main/java/com/groom/yummy/region/RegionService.java rename {storage/src/main/java/com/groom/yummy/domain => domain/src/main/java/com/groom/yummy}/store/Category.java (85%) mode change 100644 => 100755 create mode 100755 domain/src/main/java/com/groom/yummy/store/Store.java create mode 100755 domain/src/main/java/com/groom/yummy/store/StoreRepository.java create mode 100755 domain/src/main/java/com/groom/yummy/store/StoreService.java create mode 100755 domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java create mode 100755 domain/src/test/java/com/groom/yummy/region/RegionServiceTest.java create mode 100755 domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java create mode 100755 storage/src/main/java/com/groom/yummy/domain/region/RegionEntityRepository.java create mode 100755 storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java diff --git a/application/build.gradle b/application/build.gradle index 46cbaa4..4f8b897 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -7,39 +7,55 @@ plugins { version = '0.0.1-SNAPSHOT' dependencies { + // Project Dependencies runtimeOnly project(':storage') compileOnly project(':domain') testImplementation project(':domain') implementation project(':common') + // Spring Boot Starters + implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' - testImplementation 'org.springframework.security:spring-security-test' - testImplementation platform('org.junit:junit-bom:5.10.0') - testImplementation 'org.junit.jupiter:junit-jupiter' - - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0' - compileOnly 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - - - // Swagger - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-webflux' // OAuth2 implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - // jwt + // JWT implementation 'io.jsonwebtoken:jjwt-api:0.12.3' implementation 'io.jsonwebtoken:jjwt-impl:0.12.3' implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + + // Database runtimeOnly 'com.h2database:h2' + // Lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + // Testing Dependencies + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testImplementation 'javax.servlet:javax.servlet-api:4.0.1' + + // Mocking and JSON Processing + testImplementation 'com.squareup.okhttp3:mockwebserver:4.11.0' + testImplementation 'org.mockito:mockito-core:5.6.0' + testImplementation 'org.mockito:mockito-junit-jupiter:5.7.0' + testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' + + // Netty + implementation "io.netty:netty-resolver-dns-native-macos:4.1.110.Final:osx-x86_64" } + test { useJUnitPlatform() } diff --git a/application/src/main/java/com/groom/yummy/config/WebClientConfig.java b/application/src/main/java/com/groom/yummy/config/WebClientConfig.java new file mode 100755 index 0000000..7583d77 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/config/WebClientConfig.java @@ -0,0 +1,14 @@ +package com.groom.yummy.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.client.WebClient; + +@Configuration +public class WebClientConfig { + @Bean + public WebClient webClient() { + return WebClient.builder().baseUrl("http://localhost:8080").build(); // 실제 환경에서는 동적으로 설정 + } +} + diff --git a/application/src/main/java/com/groom/yummy/controller/GroupController.java b/application/src/main/java/com/groom/yummy/controller/GroupController.java new file mode 100755 index 0000000..a55a2fe --- /dev/null +++ b/application/src/main/java/com/groom/yummy/controller/GroupController.java @@ -0,0 +1,87 @@ +package com.groom.yummy.controller; + +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.group.GroupService; +import com.groom.yummy.group.dto.request.CreateGroupRequestDto; +import com.groom.yummy.group.dto.request.JoinGroupRequestDto; +import com.groom.yummy.group.dto.response.GroupDetailResponseDto; +import com.groom.yummy.group.dto.response.GroupResponseDto; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/api/v1/groups") +@RequiredArgsConstructor +public class GroupController { + + private final GroupService groupService; + + @Operation(summary = "소모임 생성", description = "소모임을 생성합니다.") + @PostMapping + public ResponseEntity> createGroup( + @Valid @RequestBody CreateGroupRequestDto requestDto + ) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + String userEmail = authentication.getName(); + + Long groupId = groupService.createGroup(requestDto.toGroupDomain(), userEmail); + GroupResponseDto response = groupService.findGroupById(groupId) + .map(GroupResponseDto::fromGroupDomain) + .orElseThrow(() -> new IllegalArgumentException("소모임 생성 실패")); + + return ResponseEntity.status(HttpStatus.CREATED) + .body(new ResponseDto<>(response, "소모임 생성 성공")); + } + + @Operation(summary = "소모임 리스트 조회", description = "생성되어있는 소모임 리스트를 출력합니다.") + @GetMapping + public ResponseEntity>> getAllGroups( + @RequestParam(required = false) String category, + @RequestParam(required = false) String regionCode, + @RequestParam(required = false) String storeName, + @RequestParam(defaultValue = "1") int page + ) { + List groups = groupService.getAllGroups(category, regionCode, storeName, page) + .stream() + .map(GroupResponseDto::fromGroupDomain) + .collect(Collectors.toList()); + + return ResponseEntity.ok(new ResponseDto<>(groups, "소모임 목록 조회 성공")); + } + + @Operation(summary = "소모임 상세 정보 조회", description = "소모임 ID 기반으로 소모임의 상세 정보를 출력합니다.") + @GetMapping("/{groupId}") + public ResponseEntity> getGroupById( + @PathVariable Long groupId + ) { + GroupDetailResponseDto response = groupService.findGroupById(groupId) + .map(GroupDetailResponseDto::fromGroupDomain) + .orElseThrow(() -> new IllegalArgumentException("소모임을 찾을 수 없습니다.")); + + return ResponseEntity.ok(new ResponseDto<>(response, "소모임 상세 정보 조회 성공")); + } + + @Operation(summary = "소모임 참가", description = "선택한 소모임에 참가합니다.") + @PostMapping("/{groupId}/join") + public ResponseEntity> joinGroup( + @PathVariable Long groupId, + @Valid @RequestBody JoinGroupRequestDto request + ) { + + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + String userEmail = authentication.getName(); + + groupService.joinGroup(groupId, request.getUserId(), userEmail); + return ResponseEntity.ok(new ResponseDto<>(null, "소모임 참여 성공")); + } +} + diff --git a/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java b/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java new file mode 100755 index 0000000..6cdf681 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java @@ -0,0 +1,61 @@ +package com.groom.yummy.webclient; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.store.Category; +import com.groom.yummy.store.Store; +import com.groom.yummy.store.StoreService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class SomeApiService { + private final WebClient.Builder webClientBuilder; + private final StoreService storeService; + + public String getSomeData(String regionCode) { + WebClient webClient = webClientBuilder.build(); + try { + String response = webClient.get() + .uri(uriBuilder -> uriBuilder + .path("/api/v1/regions") + .queryParam("regionCode", regionCode) + .build()) + .retrieve() + .bodyToMono(String.class) + .block(); + + List stores = parseStoresFromResponse(response); + stores.forEach(storeService::createStore); + + return response; + } catch (Exception e) { + throw new RuntimeException("WebClient 요청 중 오류 발생", e); + } + } + + private List parseStoresFromResponse(String response) { + ObjectMapper objectMapper = new ObjectMapper(); + try { + JsonNode rootNode = objectMapper.readTree(response); + JsonNode storesNode = rootNode.path("data").path("stores"); + return objectMapper.convertValue(storesNode, new TypeReference>() {}) + .stream() + .map(store -> Store.builder() + .storeId(store.getStoreId()) + .name(store.getName()) + .category(Category.fromApiCode(String.valueOf(store.getCategory()))) + .regionId(store.getRegionId()) + .build()) + .toList(); + } catch (Exception e) { + throw new RuntimeException("JSON 파싱 중 오류 발생", e); + } + } + +} diff --git a/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java b/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java new file mode 100755 index 0000000..100f2c7 --- /dev/null +++ b/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java @@ -0,0 +1,203 @@ +package com.groom.yummy.controller; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.group.Group; +import com.groom.yummy.group.GroupService; +import com.groom.yummy.group.MeetingStatus; +import com.groom.yummy.group.dto.request.CreateGroupRequestDto; +import com.groom.yummy.group.dto.request.JoinGroupRequestDto; +import com.groom.yummy.group.dto.response.GroupDetailResponseDto; +import com.groom.yummy.group.dto.response.GroupResponseDto; +import com.groom.yummy.jwt.JwtProvider; +import jakarta.servlet.http.Cookie; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.web.servlet.MockMvc; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(GroupController.class) +public class GroupControllerTest { + + @Autowired + private MockMvc mockMvc; + + @Autowired + private ObjectMapper objectMapper; + + @MockitoBean + private GroupService groupService; + + @MockitoBean + private JwtProvider jwtProvider; + + @DisplayName("사용자는 소모임을 생성할 수 있다.") + @Test + @Order(1) + @WithMockUser(username = "testUser@gmail.com", roles = "USER") + void 그룹_생성_테스트() throws Exception { + // Given + CreateGroupRequestDto createGroupRequestDto = CreateGroupRequestDto.builder() + .title("Go to Goorm Store!") + .content("yummy yummy yummy yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .meetingDate(LocalDateTime.now()) + .storeId(10L) + .build(); + + GroupResponseDto groupResponseDto = GroupResponseDto.builder() + .id(1L) + .title("Go to Goorm Store!") + .content("yummy yummy yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(1) + .meetingDate(LocalDateTime.now()) + .meetingStatus("OPEN") + .storeId(10L) + .createdAt(LocalDateTime.now()) + .build(); + + // Mock JwtProvider 동작 정의 + when(jwtProvider.validateToken("valid.jwt.token")).thenReturn(true); + when(jwtProvider.getUsername("valid.jwt.token")).thenReturn("testUser@gmail.com"); + + when(groupService.createGroup(any(Group.class), any(String.class))).thenReturn(1L); + when(groupService.findGroupById(1L)).thenReturn(Optional.of(Group.builder() + .id(1L) + .title("Go to Goorm Store!") + .content("yummy yummy yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .storeId(10L) + .meetingStatus(MeetingStatus.OPEN) + .build())); + + // When & Then + mockMvc.perform(post("/api/v1/groups") + .cookie(new Cookie("Authorization", "valid.jwt.token")) + .with(csrf()) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(createGroupRequestDto))) + .andExpect(status().isCreated()) + .andExpect(jsonPath("$.msg").value("소모임 생성 성공")) + .andExpect(jsonPath("$.data.id").value(1L)) + .andExpect(jsonPath("$.data.title").value("Go to Goorm Store!")); + } + + @DisplayName("사용자는 소모임 목록을 조회할 수 있다.") + @Test + @Order(2) + @WithMockUser(username = "TestUser@gmail.com", roles = "USER") + void 소모임_목록_리스트_조회_테스트() throws Exception { + // Given + Group group = Group.builder() + .id(1L) + .title("Go to Goorm Store!") + .content("yummy yummy yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(1) + .meetingDate(LocalDateTime.now()) + .meetingStatus(MeetingStatus.OPEN) + .storeId(10L) + .build(); + + when(groupService.getAllGroups(any(String.class), any(String.class), any(String.class), any(int.class))) + .thenReturn(List.of(group)); + + // When & Then + mockMvc.perform(get("/api/v1/groups") + .param("category", "KOREAN") + .param("regionCode", "110110110") + .param("storeName", "구룸식당") + .param("page", "1") + .cookie(new Cookie("Authorization", "valid.jwt.token"))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.msg").value("소모임 목록 조회 성공")) + .andExpect(jsonPath("$.data[0].id").value(1L)) + .andExpect(jsonPath("$.data[0].title").value("Go to Goorm Store!")); + } + + + @DisplayName("사용자는 소모임 상세 정보를 조회할 수 있다.") + @Test + @Order(3) + @WithMockUser(username = "testUser@gmail.com", roles = "USER") + void 소모임_상세_조회_테스트() throws Exception { + // Given + GroupDetailResponseDto groupDetailResponseDto = GroupDetailResponseDto.builder() + .id(1L) + .title("Go to Goorm Store!") + .content("yummy yummy yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(1) + .meetingDate(LocalDateTime.now()) + .meetingStatus("OPEN") + .storeId(10L) + .createdAt(LocalDateTime.now()) + .build(); + + when(groupService.findGroupById(1L)).thenReturn(Optional.of(Group.builder() + .id(1L) + .title("Go to Goorm Store!") + .content("yummy yummy yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(1) + .meetingDate(LocalDateTime.now()) + .meetingStatus(MeetingStatus.OPEN) + .storeId(10L) + .build())); + + // When & Then + mockMvc.perform(get("/api/v1/groups/{groupId}", 1L) + .cookie(new Cookie("Authorization", "valid.jwt.token"))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.msg").value("소모임 상세 정보 조회 성공")) + .andExpect(jsonPath("$.data.id").value(1L)) + .andExpect(jsonPath("$.data.title").value("Go to Goorm Store!")); + } + + @DisplayName("사용자는 소모임에 참여할 수 있다.") + @Test + @Order(4) + @WithMockUser(username = "testUser@gmail.com", roles = "USER") + void 소모임_참가_테스트() throws Exception { + // Given + JoinGroupRequestDto joinGroupRequestDto = JoinGroupRequestDto.builder() + .userId(1L) + .build(); + + // Mocking JwtProvider 동작 정의 + when(jwtProvider.validateToken("valid.jwt.token")).thenReturn(true); + when(jwtProvider.getUsername("valid.jwt.token")).thenReturn("testUser@gmail.com"); + + // When & Then + mockMvc.perform(post("/api/v1/groups/{groupId}/join", 1L) + .cookie(new Cookie("Authorization", "valid.jwt.token")) + .with(csrf()) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(joinGroupRequestDto))) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.msg").value("소모임 참여 성공")); + } +} diff --git a/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java b/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java new file mode 100755 index 0000000..7f331e1 --- /dev/null +++ b/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java @@ -0,0 +1,106 @@ +package com.groom.yummy.oauth2.service; + +import com.groom.yummy.store.StoreService; +import com.groom.yummy.webclient.SomeApiService; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.web.reactive.function.client.WebClient; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +@SpringBootTest( + webEnvironment = SpringBootTest.WebEnvironment.MOCK +) +@ActiveProfiles("test") +@Import(SomeApiServiceTest.TestConfig.class) +class SomeApiServiceTest { + + @Autowired + private SomeApiService someApiService; + + @MockitoBean + private StoreService storeService; + + private static MockWebServer mockWebServer; + + @BeforeAll + static void setUpServer() throws Exception { + mockWebServer = new MockWebServer(); + mockWebServer.start(); + } + + @AfterAll + static void tearDownServer() throws Exception { + mockWebServer.shutdown(); + } + + @Test + @DisplayName("특정 지역 요청 시 반환된 식당 정보 저장 테스트") + void 특정지역_식당정보_저장테스트() throws Exception { + // GIVEN + String mockResponseBody = """ + { + "data": { + "stores": [ + { + "storeId": 1, + "name": "맛집가게", + "regionId": 2, + "category": "001" + }, + { + "storeId": 2, + "name": "맛집가게2", + "regionId": 2, + "category": "002" + } + ] + }, + "message": "가게 목록이 성공적으로 조회되었습니다." + } + """; + + mockWebServer.enqueue(new MockResponse() + .setBody(mockResponseBody) + .addHeader("Content-Type", "application/json")); + + // WHEN + String regionCode = "1111000000"; + someApiService.getSomeData(regionCode); + + // THEN + verify(storeService, times(2)).createStore(any()); + + // Mock 서버 요청 검증 + RecordedRequest recordedRequest = mockWebServer.takeRequest(); + assertEquals("/api/v1/regions?regionCode=1111000000", recordedRequest.getPath()); + assertEquals("GET", recordedRequest.getMethod()); + } + + @Configuration + static class TestConfig { + @Bean + public SomeApiService someApiService() { + String baseUrl = mockWebServer.url("/").toString(); + return new SomeApiService(WebClient.builder().baseUrl(baseUrl), storeService()); + } + + @Bean + public StoreService storeService() { + return mock(StoreService.class); + } + } +} diff --git a/domain/build.gradle b/domain/build.gradle index 2c3fc8e..df852d1 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -9,13 +9,23 @@ version = 'unspecified' dependencies { compileOnly 'org.springframework.boot:spring-boot-starter-data-jpa' + // Spring boot implementation 'org.springframework.boot:spring-boot-starter-web' + + // lombok implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' + // JUnit testImplementation platform('org.junit:junit-bom:5.10.0') testImplementation 'org.junit.jupiter:junit-jupiter' + + // Mockito testImplementation 'org.mockito:mockito-junit-jupiter:5.5.0' + + // AssertJ + testImplementation 'org.assertj:assertj-core:3.24.2' + } test { diff --git a/domain/src/main/java/com/groom/yummy/group/Group.java b/domain/src/main/java/com/groom/yummy/group/Group.java new file mode 100755 index 0000000..a9a1293 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/Group.java @@ -0,0 +1,25 @@ +package com.groom.yummy.group; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class Group { + + private Long id; + private String title; + private String content; + private Integer maxParticipants; + private Integer minParticipants; + private Integer currentParticipants; + private LocalDateTime meetingDate; + private MeetingStatus meetingStatus; + private Long storeId; +} diff --git a/domain/src/main/java/com/groom/yummy/group/GroupRepository.java b/domain/src/main/java/com/groom/yummy/group/GroupRepository.java new file mode 100755 index 0000000..fbbeefe --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/GroupRepository.java @@ -0,0 +1,12 @@ +package com.groom.yummy.group; + +import java.util.List; +import java.util.Optional; + + +public interface GroupRepository { + Optional findGroupById(Long id); + Long saveGroup(Group group, Long storeId); + List findAllGroups(String category, String regionCode, String storeName, int page); + void updateGroupParticipants(Long groupId, int newParticipantCount); +} diff --git a/domain/src/main/java/com/groom/yummy/group/GroupService.java b/domain/src/main/java/com/groom/yummy/group/GroupService.java new file mode 100755 index 0000000..4652bac --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/GroupService.java @@ -0,0 +1,51 @@ +package com.groom.yummy.group; + +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class GroupService { + + private final GroupRepository groupRepository; + private final UserRepository userRepository; + + public Long createGroup(Group group, String userEmail) { + User user = userRepository.findByEmail(userEmail) + .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다.")); + + Long storeId = group.getStoreId(); + if (storeId == null) { + throw new IllegalArgumentException("Store ID는 null일 수 없습니다."); + } + return groupRepository.saveGroup(group, storeId); + } + + public Optional findGroupById(Long id) { + return groupRepository.findGroupById(id); + } + + public List getAllGroups(String category, String regionCode, String storeName, int page) { + return groupRepository.findAllGroups(category, regionCode, storeName, page); + } + + public void joinGroup(Long groupId, Long userId, String userEmail) { + User user = userRepository.findByEmail(userEmail) + .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다.")); + + Group group = groupRepository.findGroupById(groupId) + .orElseThrow(() -> new IllegalArgumentException("소모임을 찾을 수 없습니다.")); + + if (group.getCurrentParticipants() >= group.getMaxParticipants()) { + throw new IllegalStateException("참가 인원이 가득 찼습니다."); + } + groupRepository.updateGroupParticipants(groupId, group.getCurrentParticipants() + 1); + } + +} + diff --git a/storage/src/main/java/com/groom/yummy/domain/group/MeetingStatus.java b/domain/src/main/java/com/groom/yummy/group/MeetingStatus.java old mode 100644 new mode 100755 similarity index 96% rename from storage/src/main/java/com/groom/yummy/domain/group/MeetingStatus.java rename to domain/src/main/java/com/groom/yummy/group/MeetingStatus.java index 6da5b97..4908403 --- a/storage/src/main/java/com/groom/yummy/domain/group/MeetingStatus.java +++ b/domain/src/main/java/com/groom/yummy/group/MeetingStatus.java @@ -1,4 +1,4 @@ -package com.groom.yummy.domain.group; +package com.groom.yummy.group; import lombok.Getter; diff --git a/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java b/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java new file mode 100755 index 0000000..60f49bf --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java @@ -0,0 +1,33 @@ +package com.groom.yummy.group.dto.request; + +import com.groom.yummy.group.Group; +import lombok.*; + +import java.time.LocalDateTime; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class CreateGroupRequestDto { + private String title; + private String content; + private Integer maxParticipants; + private Integer minParticipants; + private LocalDateTime meetingDate; + private Long storeId; + + public Group toGroupDomain() { + return Group.builder() + .title(this.title) + .content(this.content) + .maxParticipants(this.maxParticipants) + .minParticipants(this.minParticipants) + .currentParticipants(1) + .meetingDate(this.meetingDate) + .storeId(this.storeId) + .build(); + } +} + diff --git a/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java b/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java new file mode 100755 index 0000000..950991e --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java @@ -0,0 +1,13 @@ +package com.groom.yummy.group.dto.request; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class JoinGroupRequestDto { + private Long userId; +} + diff --git a/domain/src/main/java/com/groom/yummy/group/dto/response/GroupDetailResponseDto.java b/domain/src/main/java/com/groom/yummy/group/dto/response/GroupDetailResponseDto.java new file mode 100755 index 0000000..4b746f1 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/dto/response/GroupDetailResponseDto.java @@ -0,0 +1,45 @@ +package com.groom.yummy.group.dto.response; + +import com.groom.yummy.group.Group; +import lombok.*; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class GroupDetailResponseDto{ + + private Long id; + private String title; + private String content; + private Integer maxParticipants; + private Integer minParticipants; + private Integer currentParticipants; + private LocalDateTime meetingDate; + private String meetingStatus; + private Long storeId; + private LocalDateTime createdAt; + + private StoreDetailResponseDto storeDetailResponse; + private List participantResponseList; + + public static GroupDetailResponseDto fromGroupDomain(Group group) { + return GroupDetailResponseDto.builder() + .id(group.getId()) + .title(group.getTitle()) + .content(group.getContent()) + .maxParticipants(group.getMaxParticipants()) + .minParticipants(group.getMinParticipants()) + .currentParticipants(group.getCurrentParticipants()) + .meetingDate(group.getMeetingDate()) + .meetingStatus(group.getMeetingStatus().toString()) + .storeId(group.getStoreId()) + .createdAt(LocalDateTime.now()) + .build(); + } +} + diff --git a/domain/src/main/java/com/groom/yummy/group/dto/response/GroupResponseDto.java b/domain/src/main/java/com/groom/yummy/group/dto/response/GroupResponseDto.java new file mode 100755 index 0000000..95e34a3 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/dto/response/GroupResponseDto.java @@ -0,0 +1,40 @@ +package com.groom.yummy.group.dto.response; + +import com.groom.yummy.group.Group; +import lombok.*; + +import java.time.LocalDateTime; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class GroupResponseDto { + private Long id; + private String title; + private String content; + private Integer maxParticipants; + private Integer minParticipants; + private Integer currentParticipants; + private LocalDateTime meetingDate; + private String meetingStatus; + private Long storeId; + private LocalDateTime createdAt; + + public static GroupResponseDto fromGroupDomain(Group group) { + return GroupResponseDto.builder() + .id(group.getId()) + .title(group.getTitle()) + .content(group.getContent()) + .maxParticipants(group.getMaxParticipants()) + .minParticipants(group.getMinParticipants()) + .currentParticipants(group.getCurrentParticipants()) + .meetingDate(group.getMeetingDate()) + .meetingStatus(group.getMeetingStatus().toString()) + .storeId(group.getStoreId()) + .createdAt(LocalDateTime.now()) + .build(); + } +} + diff --git a/domain/src/main/java/com/groom/yummy/group/dto/response/ParticipantResponseDto.java b/domain/src/main/java/com/groom/yummy/group/dto/response/ParticipantResponseDto.java new file mode 100755 index 0000000..02d57e0 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/dto/response/ParticipantResponseDto.java @@ -0,0 +1,15 @@ +package com.groom.yummy.group.dto.response; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ParticipantResponseDto { + private Long userId; + private String nickname; + private String attendanceStatus; + private Boolean isLeader; +} diff --git a/domain/src/main/java/com/groom/yummy/group/dto/response/StoreDetailResponseDto.java b/domain/src/main/java/com/groom/yummy/group/dto/response/StoreDetailResponseDto.java new file mode 100755 index 0000000..f65e126 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/group/dto/response/StoreDetailResponseDto.java @@ -0,0 +1,16 @@ +package com.groom.yummy.group.dto.response; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class StoreDetailResponseDto { + private Long id; + private String name; + private String category; + private Long regionId; +} + diff --git a/domain/src/main/java/com/groom/yummy/region/Region.java b/domain/src/main/java/com/groom/yummy/region/Region.java new file mode 100755 index 0000000..dab681e --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/region/Region.java @@ -0,0 +1,17 @@ +package com.groom.yummy.region; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Getter +public class Region { + + private Long id; + private String regionName; + private String regionCode; +} diff --git a/domain/src/main/java/com/groom/yummy/region/RegionRepository.java b/domain/src/main/java/com/groom/yummy/region/RegionRepository.java new file mode 100755 index 0000000..f5de7ca --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/region/RegionRepository.java @@ -0,0 +1,10 @@ +package com.groom.yummy.region; + +import java.util.List; +import java.util.Optional; + +public interface RegionRepository { + Optional findRegionById(Long id); + Long saveRegion(Region region); + List findAllRegions(); +} diff --git a/domain/src/main/java/com/groom/yummy/region/RegionService.java b/domain/src/main/java/com/groom/yummy/region/RegionService.java new file mode 100755 index 0000000..341113b --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/region/RegionService.java @@ -0,0 +1,34 @@ +package com.groom.yummy.region; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class RegionService { + + private final RegionRepository regionRepository; + + public Optional findRegionById(Long id) { + return regionRepository.findRegionById(id); + } + + public Long createRegion(Region region) { + regionRepository.findAllRegions().stream() + .filter(r -> r.getRegionName().equals(region.getRegionName()) || r.getRegionCode().equals(region.getRegionCode())) + .findAny() + .ifPresent(r -> { + throw new IllegalArgumentException("이미 등록되어있는 지역입니다."); + }); + + return regionRepository.saveRegion(region); + } + + public List getAllRegions() { + return regionRepository.findAllRegions(); + } +} + diff --git a/storage/src/main/java/com/groom/yummy/domain/store/Category.java b/domain/src/main/java/com/groom/yummy/store/Category.java old mode 100644 new mode 100755 similarity index 85% rename from storage/src/main/java/com/groom/yummy/domain/store/Category.java rename to domain/src/main/java/com/groom/yummy/store/Category.java index a466731..ade4530 --- a/storage/src/main/java/com/groom/yummy/domain/store/Category.java +++ b/domain/src/main/java/com/groom/yummy/store/Category.java @@ -1,4 +1,4 @@ -package com.groom.yummy.domain.store; +package com.groom.yummy.store; import lombok.Getter; @@ -38,4 +38,8 @@ public static Category fromApiCode(String apiCode) { public String toString() { return String.format("%s (%s) ", apiCode, description); } + + public static boolean isValidCategory(Category category) { + return API_CODE_TO_CATEGORY.containsValue(category); + } } diff --git a/domain/src/main/java/com/groom/yummy/store/Store.java b/domain/src/main/java/com/groom/yummy/store/Store.java new file mode 100755 index 0000000..91b204b --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/store/Store.java @@ -0,0 +1,19 @@ +package com.groom.yummy.store; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class Store { + + private Long storeId; + private String name; + private Category category; + private Long regionId; + +} diff --git a/domain/src/main/java/com/groom/yummy/store/StoreRepository.java b/domain/src/main/java/com/groom/yummy/store/StoreRepository.java new file mode 100755 index 0000000..24c1e49 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/store/StoreRepository.java @@ -0,0 +1,10 @@ +package com.groom.yummy.store; + +import java.util.List; +import java.util.Optional; + +public interface StoreRepository { + Optional findStoreById(Long id); + Long saveStore(Store store, Long regionId); + List findAllStores(); +} diff --git a/domain/src/main/java/com/groom/yummy/store/StoreService.java b/domain/src/main/java/com/groom/yummy/store/StoreService.java new file mode 100755 index 0000000..10ba35b --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/store/StoreService.java @@ -0,0 +1,43 @@ +package com.groom.yummy.store; + +import com.groom.yummy.region.RegionService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class StoreService { + + private final StoreRepository storeRepository; + private final RegionService regionService; + + public Long createStore(Store store) { + regionService.findRegionById(store.getRegionId()) + .orElseThrow(() -> new IllegalArgumentException("지역을 찾을 수 없습니다.")); + + storeRepository.findAllStores().stream() + .filter(s -> s.getName().equals(store.getName()) && s.getRegionId().equals(store.getRegionId())) + .findAny() + .ifPresent(s -> { + throw new IllegalArgumentException("이미 등록되어있는 가게 정보 입니다."); + }); + + if (store.getCategory() == null || !Category.isValidCategory(store.getCategory())) { + throw new IllegalArgumentException("등록되지 않은 카테고리 입니다."); + } + + return storeRepository.saveStore(store, store.getRegionId()); + } + + public Optional findStoreById(Long storeId) { + return storeRepository.findStoreById(storeId); + } + + public List getAllStores() { + return storeRepository.findAllStores(); + } +} + diff --git a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java new file mode 100755 index 0000000..8c6bc54 --- /dev/null +++ b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java @@ -0,0 +1,211 @@ +package com.groom.yummy.group; + +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserRepository; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +public class GroupServiceTest { + + @InjectMocks + private GroupService groupService; + + @Mock + private GroupRepository groupRepository; + + @Mock + private UserRepository userRepository; + + @DisplayName("사용자는 소모임을 생성할 수 있다.") + @Order(1) + @Test + void 소모임_생성_테스트() { + //Given + User user = User.builder() + .id(1L) + .email("Goorm@gmail.com") + .nickname("Goorm") + .role("USER") + .groupJoinCount(10L) + .groupAttendanceCount(8L) + .isDeleted(false) + .build(); + + Group group = Group.builder() + .title("Go to Goorm store") + .content("yummy yummy yummy yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .storeId(10L) + .build(); + + when(userRepository.findByEmail(Mockito.eq("Goorm@gmail.com"))) + .thenReturn(Optional.of(user)); + + when(groupRepository.saveGroup(any(Group.class), anyLong())) + .thenReturn(1L); + + // When + Long groupId = groupService.createGroup(group, user.getEmail()); + + // Then + assertEquals(1L, groupId); + verify(groupRepository, times(1)) + .saveGroup(any(Group.class), anyLong()); + } + + @DisplayName("사용자는 소모임 상세 정보를 조회할 수 있다.") + @Order(2) + @Test + void 소모임_상세_조회_테스트() { + // Given + Long groupId = 1L; + Group group = Group.builder() + .id(groupId) + .title("Go to Goorm store") + .content("yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(2) + .storeId(10L) + .build(); + + when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); + + // When + Optional foundGroup = groupService.findGroupById(groupId); + + // Then + assertTrue(foundGroup.isPresent()); + assertEquals(groupId, foundGroup.get().getId()); + verify(groupRepository, times(1)).findGroupById(groupId); + } + + @DisplayName("사용자는 소모임에 참여할 수 있다.") + @Order(3) + @Test + void 소모임_참여_테스트() { + // Given + Long groupId = 1L; + Long userId = 1L; + String userEmail = "Goorm@gmail.com"; + + Group group = Group.builder() + .id(groupId) + .title("Go to Goorm store") + .content("yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(2) + .storeId(10L) + .build(); + + User user = User.builder() + .id(userId) + .email(userEmail) + .nickname("Goorm") + .role("USER") + .groupJoinCount(10L) + .groupAttendanceCount(8L) + .isDeleted(false) + .build(); + + when(userRepository.findByEmail(userEmail)).thenReturn(Optional.of(user)); + when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); + + // When + groupService.joinGroup(groupId, userId, userEmail); + + // Then + verify(groupRepository, times(1)).updateGroupParticipants(eq(groupId), eq(3)); + verify(userRepository, times(1)).findByEmail(userEmail); + } + + @DisplayName("소모임 참여 시 참가 인원이 초과되면 예외가 발생한다.") + @Order(4) + @Test + void 소모임_참여_참가인원_초과_테스트() { + // Given + Long groupId = 1L; + Long userId = 1L; + String userEmail = "Goorm@gmail.com"; + + Group group = Group.builder() + .id(groupId) + .title("Go to Goorm store") + .content("yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(4) + .storeId(10L) + .build(); + + User user = User.builder() + .id(userId) + .email(userEmail) + .nickname("Goorm") + .role("USER") + .groupJoinCount(10L) + .groupAttendanceCount(8L) + .isDeleted(false) + .build(); + + when(userRepository.findByEmail(userEmail)).thenReturn(Optional.of(user)); + when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); + + // When + IllegalStateException exception = assertThrows(IllegalStateException.class, + () -> groupService.joinGroup(groupId, userId, userEmail)); + + // Then + assertEquals("참가 인원이 가득 찼습니다.", exception.getMessage()); + verify(groupRepository, never()).updateGroupParticipants(anyLong(), anyInt()); + } + + @DisplayName("소모임 리스트 조회 테스트") + @Order(5) + @Test + void 소모임_리스트_조회_테스트() { + // Given + String category = "KOREAN"; + String regionCode = "SEOUL"; + String storeName = "Goorm Store"; + int page = 1; + + List groups = List.of( + Group.builder() + .id(1L) + .title("Go to Goorm store") + .content("yummy yummy") + .maxParticipants(4) + .minParticipants(3) + .currentParticipants(2) + .storeId(10L) + .build() + ); + + when(groupRepository.findAllGroups(category, regionCode, storeName, page)).thenReturn(groups); + + // When + List result = groupService.getAllGroups(category, regionCode, storeName, page); + + // Then + assertEquals(1, result.size()); + assertEquals("Go to Goorm store", result.get(0).getTitle()); + verify(groupRepository, times(1)).findAllGroups(category, regionCode, storeName, page); + } +} diff --git a/domain/src/test/java/com/groom/yummy/region/RegionServiceTest.java b/domain/src/test/java/com/groom/yummy/region/RegionServiceTest.java new file mode 100755 index 0000000..8924b6a --- /dev/null +++ b/domain/src/test/java/com/groom/yummy/region/RegionServiceTest.java @@ -0,0 +1,65 @@ +package com.groom.yummy.region; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.List; + +import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +public class RegionServiceTest { + + @Mock + private RegionRepository regionRepository; + + @InjectMocks + private RegionService regionService; + + + @Test + @Order(1) + @DisplayName("지역 저장 성공 테스트") + void 지역_저장_성공_테스트() { + //Given + Region region = Region.builder() + .regionName("구름동") + .regionCode("99999999") + .build(); + + when(regionRepository.findAllRegions()).thenReturn(List.of()); + when(regionRepository.saveRegion(any(Region.class))).thenReturn(1L); + + // When + Long regionId = regionService.createRegion(region); + + // Then + assertThat(regionId).isEqualTo(1L); + verify(regionRepository).saveRegion(any(Region.class)); + } + + @Test + @Order(2) + @DisplayName("중복된 지역 정보로 저장 시 실패") + void 중복_자역_저장_실패_테스트() { + // Given + Region region = Region.builder() + .regionName("서울특별시 강남구") + .regionCode("1111010100") + .build(); + + when(regionRepository.findAllRegions()).thenReturn(List.of(region)); + + // When & Then + assertThrows(IllegalArgumentException.class, () -> regionService.createRegion(region)); + verify(regionRepository, never()).saveRegion(any(Region.class)); + } +} diff --git a/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java b/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java new file mode 100755 index 0000000..0a1a61a --- /dev/null +++ b/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java @@ -0,0 +1,77 @@ +package com.groom.yummy.store; + +import com.groom.yummy.region.Region; +import com.groom.yummy.region.RegionService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +public class StoreServiceTest { + + @Mock + private StoreRepository storeRepository; + + @Mock + private RegionService regionService; + + @InjectMocks + private StoreService storeService; + + + @Test + @Order(1) + @DisplayName("요청 API 가게 정보 등록 성공 테스트") + void 가게_등록_성공_테스트() { + // Given + Store store = Store.builder() + .name("GoormStore") + .category(Category.Dessert) + .regionId(1L) + .build(); + + Region region = Region.builder() + .id(1L) + .regionName("구름동") + .regionCode("99999999") + .build(); + + when(regionService.findRegionById(1L)).thenReturn(Optional.of(region)); + when(storeRepository.saveStore(any(Store.class), any(Long.class))).thenReturn(1L); + + // When + Long storeId = storeService.createStore(store); + + // Then + assertThat(storeId).isEqualTo(1L); + verify(regionService).findRegionById(1L); + verify(storeRepository).saveStore(any(Store.class), eq(1L)); + } + + @Test + @Order(2) + @DisplayName("요청 API 가게 정보 등록 실패 테스트") + void 가게_등록_실패_테스트() { + // GIVEN + Store store = Store.builder() + .name("GoormStore") + .category(Category.Dessert) + .regionId(1L) + .build(); + + // When & Then + assertThrows(IllegalArgumentException.class, () -> storeService.createStore(store)); + verify(storeRepository, never()).saveStore(any(Store.class), anyLong()); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java index 0f86add..d3f5038 100644 --- a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java @@ -2,6 +2,8 @@ import com.groom.yummy.domain.BaseEntity; import com.groom.yummy.domain.store.StoreEntity; +import com.groom.yummy.group.Group; +import com.groom.yummy.group.MeetingStatus; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -56,4 +58,31 @@ public GroupEntity(String title, String content, Integer maxParticipants, Intege this.meetingStatus = meetingStatus; this.store = store; } + + public static Group toGroupDomain(GroupEntity groupEntity) { + return Group.builder() + .id(groupEntity.getId()) + .title(groupEntity.getTitle()) + .content(groupEntity.getContent()) + .maxParticipants(groupEntity.getMaxParticipants()) + .minParticipants(groupEntity.getMinParticipants()) + .currentParticipants(groupEntity.getCurrentParticipants()) + .meetingDate(groupEntity.getMeetingDate()) + .meetingStatus(groupEntity.getMeetingStatus()) + .storeId(groupEntity.getStore().getId()) + .build(); + } + + public static GroupEntity fromGroupDomain(Group group, StoreEntity store) { + return GroupEntity.builder() + .title(group.getTitle()) + .content(group.getContent()) + .maxParticipants(group.getMaxParticipants()) + .minParticipants(group.getMinParticipants()) + .currentParticipants(group.getCurrentParticipants()) + .meetingDate(group.getMeetingDate()) + .meetingStatus(group.getMeetingStatus()) + .store(store) + .build(); + } } diff --git a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java index 042cd42..4726ccc 100644 --- a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java @@ -1,10 +1,58 @@ package com.groom.yummy.domain.group; +import com.groom.yummy.domain.store.StoreEntity; +import com.groom.yummy.domain.store.StoreJpaRepository; +import com.groom.yummy.group.Group; +import com.groom.yummy.group.GroupRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + + @Repository @RequiredArgsConstructor -public class GroupEntityRepository { +public class GroupEntityRepository implements GroupRepository { + private final GroupJpaRepository groupJpaRepository; -} + private final StoreJpaRepository storeJpaRepository; + + @Override + public Long saveGroup(Group group, Long storeId) { + StoreEntity storeEntity = storeJpaRepository.findById(storeId) + .orElseThrow(() -> new IllegalArgumentException("Store not found for id: " + storeId)); + GroupEntity groupEntity = GroupEntity.fromGroupDomain(group, storeEntity); + return groupJpaRepository.save(groupEntity).getId(); + } + + @Override + public Optional findGroupById(Long id) { + return groupJpaRepository.findById(id).map(GroupEntity::toGroupDomain); + } + + @Override + public List findAllGroups(String category, String regionCode, String storeName, int page) { + return groupJpaRepository.findAll().stream() + .map(GroupEntity::toGroupDomain) + .collect(Collectors.toList()); + } + + @Override + public void updateGroupParticipants(Long groupId, int participants) { + GroupEntity groupEntity = groupJpaRepository.findById(groupId) + .orElseThrow(() -> new IllegalArgumentException("Group not found for id: " + groupId)); + groupEntity = GroupEntity.builder() + .title(groupEntity.getTitle()) + .content(groupEntity.getContent()) + .maxParticipants(groupEntity.getMaxParticipants()) + .minParticipants(groupEntity.getMinParticipants()) + .currentParticipants(participants) + .meetingDate(groupEntity.getMeetingDate()) + .meetingStatus(groupEntity.getMeetingStatus()) + .store(groupEntity.getStore()) + .build(); + groupJpaRepository.save(groupEntity); + } +} \ No newline at end of file diff --git a/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java index 2e359ce..f19cb27 100644 --- a/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntity.java @@ -1,6 +1,7 @@ package com.groom.yummy.domain.region; import com.groom.yummy.domain.BaseEntity; +import com.groom.yummy.region.Region; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -26,4 +27,19 @@ public RegionEntity(String regionName, String regionCode) { this.regionName = regionName; this.regionCode = regionCode; } + + public Region toRegionDomain() { + return Region.builder() + .id(this.getId()) + .regionName(this.regionName) + .regionCode(this.regionCode) + .build(); + } + + public static RegionEntity fromRegionDomain(Region region) { + if (region == null) { + throw new IllegalArgumentException("지역 설정은 필수입니다."); + } + return new RegionEntity(region.getRegionName(), region.getRegionCode()); + } } diff --git a/storage/src/main/java/com/groom/yummy/domain/region/RegionEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntityRepository.java new file mode 100755 index 0000000..3b27723 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/region/RegionEntityRepository.java @@ -0,0 +1,35 @@ +package com.groom.yummy.domain.region; + +import com.groom.yummy.region.Region; +import com.groom.yummy.region.RegionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +public class RegionEntityRepository implements RegionRepository { + + private final RegionJpaRepository regionJpaRepository; + + @Override + public Optional findRegionById(Long id) { + return regionJpaRepository.findById(id).map(RegionEntity::toRegionDomain); + } + + @Override + public Long saveRegion(Region region) { + RegionEntity regionEntity = RegionEntity.fromRegionDomain(region); + return regionJpaRepository.save(regionEntity).getId(); + } + + @Override + public List findAllRegions() { + return regionJpaRepository.findAll().stream() + .map(RegionEntity::toRegionDomain) + .collect(Collectors.toList()); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java index 68af7a0..73318f0 100644 --- a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java @@ -1,16 +1,15 @@ package com.groom.yummy.domain.store; import com.groom.yummy.domain.BaseEntity; -import com.groom.yummy.domain.group.GroupEntity; import com.groom.yummy.domain.region.RegionEntity; +import com.groom.yummy.store.Category; +import com.groom.yummy.store.Store; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.util.List; - @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter @@ -25,7 +24,6 @@ public class StoreEntity extends BaseEntity { @Column(nullable = false) private Category category; - @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "region_id", nullable = false) private RegionEntity region; @@ -36,13 +34,23 @@ private StoreEntity(String name, Category category, RegionEntity region) { this.region = region; } - private StoreEntity(String name, Category category, RegionEntity region, List groups) { - this.name = name; - this.category = category; - this.region = region; + public static Store toStoreDomain(StoreEntity storeEntity) { + return Store.builder() + .storeId(storeEntity.getId()) + .name(storeEntity.getName()) + .regionId(storeEntity.getRegion().getId()) + .category(storeEntity.getCategory()) + .build(); + } + + public static StoreEntity fromStoreDomain(Store store, RegionEntity region) { + return StoreEntity.builder() + .name(store.getName()) + .category(store.getCategory()) + .region(region) + .build(); } - // 필수 필드만 생성 public static StoreEntity create(String name, Category category, RegionEntity region) { if (name == null || name.isBlank()) { throw new IllegalArgumentException("Store name must not be null or blank"); @@ -56,9 +64,4 @@ public static StoreEntity create(String name, Category category, RegionEntity re return new StoreEntity(name, category, region); } - // 그룹 포함 생성 - private static StoreEntity createWithGroups(String name, Category category, RegionEntity region, List groups) { - StoreEntity store = create(name, category, region); - return store; - } } diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java new file mode 100755 index 0000000..24336be --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java @@ -0,0 +1,41 @@ +package com.groom.yummy.domain.store; + +import com.groom.yummy.domain.region.RegionEntity; +import com.groom.yummy.domain.region.RegionJpaRepository; +import com.groom.yummy.store.Store; +import com.groom.yummy.store.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +@Repository +@RequiredArgsConstructor +public class StoreEntityRepository implements StoreRepository { + + private final StoreJpaRepository storeJpaRepository; + private final RegionJpaRepository regionJpaRepository; + + @Override + public Optional findStoreById(Long id) { + return storeJpaRepository.findById(id).map(StoreEntity::toStoreDomain); + } + + @Override + public Long saveStore(Store store, Long regionId) { + RegionEntity regionEntity = regionJpaRepository.findById(regionId) + .orElseThrow(() -> new IllegalArgumentException("지역을 찾을 수 없습니다.")); + + StoreEntity storeEntity = StoreEntity.fromStoreDomain(store, regionEntity); + return storeJpaRepository.save(storeEntity).getId(); + } + + @Override + public List findAllStores() { + return storeJpaRepository.findAll().stream() + .map(StoreEntity::toStoreDomain) + .collect(Collectors.toList()); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java index e6631a1..af3b8a0 100644 --- a/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java @@ -1,7 +1,6 @@ package com.groom.yummy.domain.store; -import jakarta.persistence.Id; import org.springframework.data.jpa.repository.JpaRepository; -public interface StoreJpaRepository extends JpaRepository { +public interface StoreJpaRepository extends JpaRepository { } From 5d2267c251ff1ce5e1ff75fdf8efbd78bf6a8b5f Mon Sep 17 00:00:00 2001 From: fbehddn Date: Mon, 20 Jan 2025 16:45:20 +0900 Subject: [PATCH 55/80] =?UTF-8?q?chore:=20=ED=94=84=EB=A1=9C=EB=8D=95?= =?UTF-8?q?=EC=85=98=20=ED=99=98=EA=B2=BD=20=EC=84=A4=EC=A0=95=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EB=AA=A8=EB=91=90=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index bf2423b..b89ce59 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -49,9 +49,9 @@ spring: on-profile: prod datasource: - url: jdbc:mysql://my-db:3306/yummy_db # docker - compose 에서 정의한 db 컨테이너 이름 명시 - username: yummy - password: yummy1234! + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver jpa: @@ -75,15 +75,15 @@ spring: registration: kakao: client-name: kakao - client-id: ${client-id} - client-secret: ${client-secret} - redirect-uri: ${redirect-uri} + client-id: ${CLIENT_ID} + client-secret: ${CLIENT_SECRET} + redirect-uri: ${REDIRECT_URI} client-authentication-method: client_secret_post authorization-grant-type: authorization_code scope: profile_nickname, account_email jwt: - secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 + secret: ${JWT_SECRET} valid-time: 7200000 cookie-name: Authorization From 39010d62379b4c56527f568987d8c18c8b509929 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Mon, 20 Jan 2025 16:54:54 +0900 Subject: [PATCH 56/80] =?UTF-8?q?chore:=20Hibernate=20Dialect=EB=A5=BC=20?= =?UTF-8?q?=EB=AA=85=EC=8B=9C=EC=A0=81=EC=9C=BC=EB=A1=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index b89ce59..603a134 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -62,6 +62,7 @@ spring: properties: hibernate: format_sql: true + dialect: org.hibernate.dialect.MySQLDialect security: oauth2: From 68899d624ca24f90b6d38967c93dbb5a2678422e Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Mon, 20 Jan 2025 17:24:52 +0900 Subject: [PATCH 57/80] =?UTF-8?q?refactor:=20=EB=B0=B0=ED=8F=AC=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/groom/yummy/config/CorsMvcConfig.java | 6 +++++- .../main/java/com/groom/yummy/config/SecurityConfig.java | 5 ++++- .../main/java/com/groom/yummy/config/SwaggerConfig.java | 7 ++++--- .../main/java/com/groom/yummy/filter/JwtAuthFilter.java | 7 +------ .../groom/yummy/oauth2/handler/CustomSuccessHandler.java | 7 ++++++- application/src/main/resources/application.yml | 3 ++- .../yummy/oauth2/handler/CustomSuccessHandlerTest.java | 3 --- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java b/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java index a6e4773..f4240ea 100644 --- a/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java +++ b/application/src/main/java/com/groom/yummy/config/CorsMvcConfig.java @@ -1,5 +1,6 @@ package com.groom.yummy.config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -7,10 +8,13 @@ @Configuration public class CorsMvcConfig implements WebMvcConfigurer { + @Value("${server.url}") + private String SERVER_URL; + @Override public void addCorsMappings(CorsRegistry corsRegistry){ corsRegistry.addMapping("/**") .exposedHeaders("Set-Cookie") - .allowedOrigins("http://localhost:8081"); + .allowedOrigins(SERVER_URL); } } diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index dc86ab8..17ba68a 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -8,6 +8,7 @@ import com.groom.yummy.oauth2.service.CustomOAuth2UserService; import com.groom.yummy.jwt.JwtProvider; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -31,6 +32,8 @@ public class SecurityConfig { private final JwtProvider jwtUtil; private final ObjectMapper objectMapper; + @Value("${server.url}") + private String SERVER_URL; @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ @@ -76,7 +79,7 @@ public CorsConfigurationSource configurationSource() { CorsConfiguration configuration = new CorsConfiguration(); configuration.addAllowedHeader("*"); configuration.addAllowedMethod("*"); - configuration.addAllowedOrigin("http://localhost:8081"); // 특정 도메인 허용 + configuration.addAllowedOrigin(SERVER_URL); // 특정 도메인 허용 configuration.addAllowedOrigin("http://13.124.191.4:8080"); // 특정 도메인 허용 configuration.setAllowCredentials(true); configuration.addExposedHeader("ACCESS_TOKEN"); diff --git a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java index da1ad9e..36dfeb8 100644 --- a/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SwaggerConfig.java @@ -4,6 +4,7 @@ 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.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -13,8 +14,8 @@ @Configuration public class SwaggerConfig { -// @Value("${dev-host}") -// private String serverHost; + @Value("${server.url}") + private String SERVER_URL; @Bean public OpenAPI openAPI() { @@ -33,7 +34,7 @@ private Info apiInfo() { private List servers() { List servers = new ArrayList<>(); - servers.add(new Server().url("http://localhost:8081").description("Local URL")); + servers.add(new Server().url(SERVER_URL).description("YUMMY 명세서")); return servers; } } diff --git a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java index 704fcff..fbe2ea9 100644 --- a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java +++ b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java @@ -74,14 +74,9 @@ private boolean verifyToken(HttpServletRequest request,String token) throws IOEx if (token == null || jwtProvider.validateToken(token)) { log.debug("token null"); request.setAttribute("isTokenValid",false); - //filterChain.doFilter(request, response); return false; } -// if (jwtProvider.validateToken(token)) { -// log.debug("token expired"); -// //filterChain.doFilter(request, response); -// return true; -// } + request.setAttribute("isTokenValid", true); return true; } diff --git a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java index 9b94234..5e0ec3f 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java +++ b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java @@ -9,6 +9,7 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; @@ -21,6 +22,10 @@ public class CustomSuccessHandler implements AuthenticationSuccessHandler { private final JwtProvider jwtProvider; + + @Value("${server.url}") + private String SERVER_URL; + @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { LoginUser loginUser = (LoginUser) authentication.getPrincipal(); @@ -33,6 +38,6 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo String accessToken = jwtProvider.createAccessToken(userId,email,nickname,role); response.addCookie(CookieUtil.createCookie(jwtProvider.COOKIE_NAME,accessToken,jwtProvider.VALID_TIME)); - response.sendRedirect("http://localhost:8081/swagger-ui/index.html"); + response.sendRedirect(SERVER_URL+"/swagger-ui/index.html"); } } \ No newline at end of file diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index c66bc5a..80bc1a4 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -40,7 +40,7 @@ spring: server: port: 8081 - + url: http://localhost:8081 --- spring: @@ -89,6 +89,7 @@ spring: server: port: 8080 + url: https://52.78.217.57.nip.io --- spring: diff --git a/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java b/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java index eed6ae3..cc407fa 100644 --- a/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java +++ b/application/src/test/java/com/groom/yummy/oauth2/handler/CustomSuccessHandlerTest.java @@ -30,7 +30,6 @@ class CustomSuccessHandlerTest { private CustomSuccessHandler customSuccessHandler; @Mock private JwtProvider jwtProvider; - private MockHttpServletRequest request; private MockHttpServletResponse response; @@ -70,8 +69,6 @@ void onAuthenticationSuccessTest() throws ServletException, IOException { assertEquals(expectedToken, cookie.getValue()); assertEquals(validTime, cookie.getMaxAge()); - assertEquals("http://localhost:8081/swagger-ui/index.html", response.getRedirectedUrl()); - verify(jwtProvider, times(1)) .createAccessToken(userId, email, nickname,role); } From ac5126229e1ab66eb6595b50b1f79ec65b6e112c Mon Sep 17 00:00:00 2001 From: leeminjung1 <52394879+leeminjung1@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:44:13 +0900 Subject: [PATCH 58/80] Feat/reply (#32) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: regiter reply * feat: reply cru * feat: add delete service * chore: ci.yml 수정 * feat: update reply, add test --- application/build.gradle | 2 +- .../groom/yummy/config/SecurityConfig.java | 2 +- .../yummy/controller/GroupController.java | 2 + .../yummy/controller/ReplyController.java | 175 ++++++++++++++++ .../yummy/reply/dto/ReplyRequestDto.java | 30 +++ .../yummy/reply/dto/ReplyResponseDto.java | 31 +++ .../reply/dto/ReplyUpdateRequestDto.java | 13 ++ .../src/main/resources/application.yml | 52 +---- .../yummy/controller/ReplyControllerTest.java | 193 ++++++++++++++++++ domain/build.gradle | 2 +- .../java/com/groom/yummy/reply/Reply.java | 35 ++++ .../groom/yummy/reply/ReplyRepository.java | 14 ++ .../com/groom/yummy/reply/ReplyService.java | 79 +++++++ .../yummy/reply/event/ReplyUpdatedEvent.java | 6 + .../groom/yummy/reply/ReplyServiceTest.java | 171 ++++++++++++++++ .../groom/yummy/domain/reply/ReplyEntity.java | 27 +++ .../domain/reply/ReplyEntityRepository.java | 81 ++++++++ .../domain/reply/ReplyJpaRepository.java | 9 + .../domain/user/UserEntityRepository.java | 1 - .../yummy/handler/ReplyEventListener.java | 28 +++ 20 files changed, 898 insertions(+), 55 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/controller/ReplyController.java create mode 100644 application/src/main/java/com/groom/yummy/reply/dto/ReplyRequestDto.java create mode 100644 application/src/main/java/com/groom/yummy/reply/dto/ReplyResponseDto.java create mode 100644 application/src/main/java/com/groom/yummy/reply/dto/ReplyUpdateRequestDto.java create mode 100644 application/src/test/java/com/groom/yummy/controller/ReplyControllerTest.java create mode 100644 domain/src/main/java/com/groom/yummy/reply/Reply.java create mode 100644 domain/src/main/java/com/groom/yummy/reply/ReplyRepository.java create mode 100644 domain/src/main/java/com/groom/yummy/reply/ReplyService.java create mode 100644 domain/src/main/java/com/groom/yummy/reply/event/ReplyUpdatedEvent.java create mode 100644 domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntityRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/handler/ReplyEventListener.java diff --git a/application/build.gradle b/application/build.gradle index 4f8b897..b871eae 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -16,6 +16,7 @@ dependencies { // Spring Boot Starters implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-webflux' @@ -55,7 +56,6 @@ dependencies { implementation "io.netty:netty-resolver-dns-native-macos:4.1.110.Final:osx-x86_64" } - test { useJUnitPlatform() } diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index 17ba68a..3b27eab 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -87,4 +87,4 @@ public CorsConfigurationSource configurationSource() { source.registerCorsConfiguration("/**", configuration); // 모든 주소요청에 위 설정을 넣어주겠다. return source; } -} \ No newline at end of file +} diff --git a/application/src/main/java/com/groom/yummy/controller/GroupController.java b/application/src/main/java/com/groom/yummy/controller/GroupController.java index a55a2fe..2d94697 100755 --- a/application/src/main/java/com/groom/yummy/controller/GroupController.java +++ b/application/src/main/java/com/groom/yummy/controller/GroupController.java @@ -7,6 +7,7 @@ import com.groom.yummy.group.dto.response.GroupDetailResponseDto; import com.groom.yummy.group.dto.response.GroupResponseDto; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -18,6 +19,7 @@ import java.util.List; import java.util.stream.Collectors; +@Tag(name = "[Group] Group API") @RestController @RequestMapping("/api/v1/groups") @RequiredArgsConstructor diff --git a/application/src/main/java/com/groom/yummy/controller/ReplyController.java b/application/src/main/java/com/groom/yummy/controller/ReplyController.java new file mode 100644 index 0000000..69923e5 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/controller/ReplyController.java @@ -0,0 +1,175 @@ +package com.groom.yummy.controller; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.reply.Reply; +import com.groom.yummy.reply.ReplyService; +import com.groom.yummy.reply.dto.ReplyRequestDto; +import com.groom.yummy.reply.dto.ReplyResponseDto; +import com.groom.yummy.reply.dto.ReplyUpdateRequestDto; + +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; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; + +@Tag(name = "[Reply] Reply API") +@RestController +@RequestMapping("/api/v1/reply") +@RequiredArgsConstructor +public class ReplyController { + + private final ReplyService replyService; + + @Operation( + summary = "댓글 등록", + description = "댓글을 등록합니다.", + responses = { + @ApiResponse( + responseCode = "200", + description = "댓글 작성 성공", + content = @Content(schema = @Schema(implementation = ReplyResponseDto.class)) + ), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청 데이터" + ) + } + ) + @PostMapping + public ResponseEntity registerReply(@Valid @RequestBody ReplyRequestDto request) { + try { + Reply savedReply = replyService.createReply(request.toDomain()); + ReplyResponseDto responseDto = ReplyResponseDto.fromDomain(savedReply); + return ResponseEntity.ok(new ResponseDto<>(responseDto, "댓글을 성공적으로 작성하였습니다.")); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ResponseDto<>(-1, "댓글 작성 실패: " + e.getMessage())); + } + } + + @Operation( + summary = "댓글 목록 조회", + description = "특정 그룹 ID에 속한 모든 댓글을 페이지 단위로 조회합니다.", + parameters = { + @Parameter(name = "groupId", description = "그룹 ID", required = true), + @Parameter(name = "page", description = "조회할 페이지 번호 (0부터 시작)", example = "0"), + @Parameter(name = "size", description = "페이지 크기", example = "10") + }, + responses = { + @ApiResponse( + responseCode = "200", + description = "댓글 조회 성공", + content = @Content(schema = @Schema(implementation = ReplyResponseDto.class)) + ), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청 데이터" + ) + } + ) + @GetMapping(path = "/all") + public ResponseEntity getAllReplies( + @RequestParam Long groupId, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size) { + try { + PageRequest pageRequest = PageRequest.of(page, size); + Page replies = replyService.getAllReplies(groupId, pageRequest); + Page responseDtos = replies.map(ReplyResponseDto::fromDomain); + return ResponseEntity.ok(new ResponseDto<>(responseDtos, "댓글 조회 성공")); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ResponseDto<>(-1, "댓글 조회 실패: " + e.getMessage())); + } + } + + @Operation( + summary = "댓글 수정", + description = "댓글의 내용을 수정합니다.", + parameters = { + @Parameter(name = "id", description = "수정할 댓글 ID", required = true) + }, + responses = { + @ApiResponse( + responseCode = "200", + description = "댓글 수정 성공", + content = @Content(schema = @Schema(implementation = ReplyResponseDto.class)) + ), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청 데이터 또는 댓글이 존재하지 않음" + ), + @ApiResponse( + responseCode = "500", + description = "서버 오류" + ) + } + ) + @PatchMapping("/{id}") + public ResponseEntity updateReply(@PathVariable Long id, @Valid @RequestBody ReplyUpdateRequestDto request) { + try { + Reply updatedReply = replyService.updateReply(id, request.content()); + ReplyResponseDto responseDto = ReplyResponseDto.fromDomain(updatedReply); + return ResponseEntity.ok(new ResponseDto<>(responseDto, "댓글이 성공적으로 수정되었습니다.")); + } catch (IllegalArgumentException e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ResponseDto<>(-1, "댓글 수정 실패: " + e.getMessage())); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ResponseDto<>(-1, "서버 오류: " + e.getMessage())); + } + } + + @Operation( + summary = "댓글 삭제", + description = "댓글을 삭제합니다.", + parameters = { + @Parameter(name = "id", description = "삭제할 댓글 ID", required = true) + }, + responses = { + @ApiResponse( + responseCode = "200", + description = "댓글 삭제 성공" + ), + @ApiResponse( + responseCode = "400", + description = "잘못된 요청 데이터 또는 댓글 삭제 실패" + ), + @ApiResponse( + responseCode = "500", + description = "서버 오류" + ) + } + ) + @DeleteMapping("/{id}") + public ResponseEntity deleteReply(@PathVariable Long id) { + try { + replyService.deleteReply(id); + return ResponseEntity.ok(new ResponseDto<>(null, "댓글이 성공적으로 삭제되었습니다.")); + } catch (IllegalStateException e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ResponseDto<>(-1, "댓글 삭제 실패: " + e.getMessage())); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ResponseDto<>(-1, "서버 오류: " + e.getMessage())); + } + } +} diff --git a/application/src/main/java/com/groom/yummy/reply/dto/ReplyRequestDto.java b/application/src/main/java/com/groom/yummy/reply/dto/ReplyRequestDto.java new file mode 100644 index 0000000..180f52d --- /dev/null +++ b/application/src/main/java/com/groom/yummy/reply/dto/ReplyRequestDto.java @@ -0,0 +1,30 @@ +package com.groom.yummy.reply.dto; + +import com.groom.yummy.reply.Reply; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record ReplyRequestDto( + @NotNull(message = "댓글 내용은 필수입니다.") + @Size(max = 500, message = "댓글 내용은 500자를 넘을 수 없습니다.") + String content, + + Long parentId, + + @NotNull(message = "작성자 ID는 필수입니다.") + Long userId, + + @NotNull(message = "그룹 ID는 필수입니다.") + Long groupId +) { + + public Reply toDomain() { + return Reply.builder() + .content(content) + .parentReplyId(parentId) + .userId(userId) + .groupId(groupId) + .build(); + } +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/reply/dto/ReplyResponseDto.java b/application/src/main/java/com/groom/yummy/reply/dto/ReplyResponseDto.java new file mode 100644 index 0000000..e6f55d7 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/reply/dto/ReplyResponseDto.java @@ -0,0 +1,31 @@ +package com.groom.yummy.reply.dto; + +import java.time.LocalDateTime; + +import com.groom.yummy.reply.Reply; + +import lombok.Builder; + +@Builder +public record ReplyResponseDto( + Long id, + String content, + Long parentId, + Long userId, + Long groupId, + LocalDateTime createdAt, + LocalDateTime updatedAt +) { + + public static ReplyResponseDto fromDomain(Reply reply) { + return ReplyResponseDto.builder() + .id(reply.getId()) + .content(reply.getContent()) + .parentId(reply.getParentReplyId()) + .userId(reply.getUserId()) + .groupId(reply.getGroupId()) + .createdAt(reply.getCreatedAt()) + .updatedAt(reply.getUpdatedAt()) + .build(); + } +} \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/reply/dto/ReplyUpdateRequestDto.java b/application/src/main/java/com/groom/yummy/reply/dto/ReplyUpdateRequestDto.java new file mode 100644 index 0000000..88d8b00 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/reply/dto/ReplyUpdateRequestDto.java @@ -0,0 +1,13 @@ +package com.groom.yummy.reply.dto; + +import com.groom.yummy.reply.Reply; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record ReplyUpdateRequestDto( + @NotNull(message = "댓글 내용은 필수입니다.") + @Size(max = 500, message = "댓글 내용은 500자를 넘을 수 없습니다.") + String content +) { +} \ No newline at end of file diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index c6484c3..1d50ee0 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -89,54 +89,4 @@ spring: cookie-name: Authorization server: - port: 8080 - url: https://52.78.217.57.nip.io - ---- -spring: - config: - activate: - on-profile: test - - datasource: - url: jdbc:h2:mem:testdb - driver-class-name: org.h2.Driver - username: sa - password: - h2: - console: - enabled: true - - jpa: - hibernate: - ddl-auto: create - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect - show_sql: true - format_sql: true - default_batch_fetch_size: 50 - - security: - oauth2: - client: - provider: - kakao: - authorization-uri: https://kauth.kakao.com/oauth/authorize - token-uri: https://kauth.kakao.com/oauth/token - user-info-uri: https://kapi.kakao.com/v2/user/me - user-name-attribute: id - registration: - kakao: - client-name: kakao - client-id: ${client-id} - client-secret: ${client-secret} - redirect-uri: ${redirect-uri} - client-authentication-method: client_secret_post - authorization-grant-type: authorization_code - scope: profile_nickname, account_email - - jwt: - secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 - valid-time: 7200000 - cookie-name: Authorization + port: 8080 \ No newline at end of file diff --git a/application/src/test/java/com/groom/yummy/controller/ReplyControllerTest.java b/application/src/test/java/com/groom/yummy/controller/ReplyControllerTest.java new file mode 100644 index 0000000..7ed7954 --- /dev/null +++ b/application/src/test/java/com/groom/yummy/controller/ReplyControllerTest.java @@ -0,0 +1,193 @@ +package com.groom.yummy.controller; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.http.MediaType; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.reply.Reply; +import com.groom.yummy.reply.ReplyService; +import com.groom.yummy.jwt.JwtProvider; +import com.groom.yummy.reply.dto.ReplyRequestDto; +import com.groom.yummy.reply.dto.ReplyUpdateRequestDto; + +import static org.mockito.Mockito.*; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.util.List; + +import jakarta.servlet.http.Cookie; + +@WebMvcTest(ReplyController.class) +class ReplyControllerTest { + + @Autowired + private MockMvc mockMvc; + + @Autowired + private ObjectMapper objectMapper; + + @MockitoBean + private ReplyService replyService; + + @MockitoBean + private JwtProvider jwtProvider; + + private Cookie authCookie; + + @BeforeEach + void setUp() { + // Mock 사용자 설정 + UserDetails principal = org.springframework.security.core.userdetails.User + .withUsername("testUser@gmail.com") + .password("password") // 비밀번호는 테스트용이므로 중요하지 않음 + .roles("USER") // 역할 설정 + .build(); + + // 인증 객체 생성 + Authentication authentication = new UsernamePasswordAuthenticationToken( + principal, principal.getPassword(), principal.getAuthorities() + ); + + // SecurityContext에 인증 정보 설정 + SecurityContextHolder.getContext().setAuthentication(authentication); + + when(jwtProvider.validateToken("valid.jwt.token")).thenReturn(true); + when(jwtProvider.getUsername("valid.jwt.token")).thenReturn("testUser@gmail.com"); + + // 쿠키 객체 생성 + authCookie = new Cookie("Authorization", "valid.jwt.token"); + } + + + @Test + @DisplayName("사용자는 댓글을 등록할 수 있다.") + void registerReplyTest() throws Exception { + // given + Long groupId = 1L; + String content = "댓글 내용"; + ReplyRequestDto requestDto = new ReplyRequestDto(content, null, 1L, groupId); + Reply savedReply = Reply.builder().id(1L).content(content).groupId(groupId).build(); + + // Mocking 서비스 호출 + when(replyService.createReply(any(Reply.class))).thenReturn(savedReply); + + String body = objectMapper.writeValueAsString(requestDto); + + // when + ResultActions actions = mockMvc.perform(post("/api/v1/reply") + .cookie(authCookie) // Authorization 쿠키 설정 + .with(csrf()) // CSRF 토큰 설정 + .contentType(MediaType.APPLICATION_JSON) + .content(body)); + + // then + actions.andExpectAll( + status().isOk(), + jsonPath("$.data.id").value(savedReply.getId()), + jsonPath("$.data.content").value(savedReply.getContent()), + jsonPath("$.msg").value("댓글을 성공적으로 작성하였습니다.") + ); + + // verify 호출 횟수 검증 + verify(replyService, times(1)).createReply(any(Reply.class)); + } + + @Test + @DisplayName("사용자는 특정 소모임의 댓글을 조회할 수 있다.") + void getAllRepliesTest() throws Exception { + // given + Long groupId = 1L; + Reply reply1 = Reply.builder().id(1L).content("댓글1").groupId(groupId).build(); + Reply reply2 = Reply.builder().id(2L).content("댓글2").groupId(groupId).build(); + Page replyPage = new PageImpl<>(List.of(reply1, reply2)); + + when(replyService.getAllReplies(eq(groupId), any())).thenReturn(replyPage); + + // when + ResultActions actions = mockMvc.perform(get("/api/v1/reply/all") + .param("groupId", groupId.toString()) + .param("page", "0") + .param("size", "10") + .cookie(authCookie) + .contentType(MediaType.APPLICATION_JSON)); + + // then + actions.andExpectAll( + status().isOk(), + jsonPath("$.data.content").isArray(), + jsonPath("$.msg").value("댓글 조회 성공") + ); + + verify(replyService, times(1)).getAllReplies(eq(groupId), any()); + } + + @Test + @DisplayName("사용자는 댓글을 수정할 수 있다.") + void updateReplyTest() throws Exception { + // given + Long replyId = 1L; + String updatedContent = "수정된 댓글 내용"; + ReplyUpdateRequestDto updateRequestDto = new ReplyUpdateRequestDto(updatedContent); + Reply updatedReply = Reply.builder().id(replyId).content(updatedContent).build(); + + when(replyService.updateReply(eq(replyId), eq(updatedContent))).thenReturn(updatedReply); + + String body = objectMapper.writeValueAsString(updateRequestDto); + + // when + ResultActions actions = mockMvc.perform(patch("/api/v1/reply/" + replyId) + .cookie(authCookie) + .with(csrf()) + .contentType(MediaType.APPLICATION_JSON) + .content(body)); + + // then + actions.andExpectAll( + status().isOk(), + jsonPath("$.data.id").value(replyId), + jsonPath("$.data.content").value(updatedContent), + jsonPath("$.msg").value("댓글이 성공적으로 수정되었습니다.") + ); + + verify(replyService, times(1)).updateReply(eq(replyId), eq(updatedContent)); + } + + @Test + @DisplayName("사용자는 댓글을 삭제할 수 있다.") + void deleteReplyTest() throws Exception { + // given + Long replyId = 1L; + + doNothing().when(replyService).deleteReply(replyId); + + // when + ResultActions actions = mockMvc.perform(delete("/api/v1/reply/" + replyId) + .cookie(authCookie) + .with(csrf()) + .contentType(MediaType.APPLICATION_JSON)); + + // then + actions.andExpectAll( + status().isOk(), + jsonPath("$.msg").value("댓글이 성공적으로 삭제되었습니다.") + ); + + verify(replyService, times(1)).deleteReply(replyId); + } +} diff --git a/domain/build.gradle b/domain/build.gradle index df852d1..0f84cd5 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -7,7 +7,7 @@ plugins { version = 'unspecified' dependencies { - compileOnly 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // Spring boot implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/domain/src/main/java/com/groom/yummy/reply/Reply.java b/domain/src/main/java/com/groom/yummy/reply/Reply.java new file mode 100644 index 0000000..92b0eb1 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/reply/Reply.java @@ -0,0 +1,35 @@ +package com.groom.yummy.reply; + +import java.time.LocalDateTime; + +import lombok.Builder; +import lombok.Getter; + +@Getter +public class Reply { + private Long id; + private String content; + private Long parentReplyId; + private Long userId; + private Long groupId; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; + + @Builder + public Reply(Long id, String content, Long parentReplyId, Long userId, Long groupId, LocalDateTime createdAt, + LocalDateTime updatedAt) { + this.id = id; + this.content = content; + this.parentReplyId = parentReplyId; + this.userId = userId; + this.groupId = groupId; + this.createdAt = createdAt; + this.updatedAt = updatedAt; + } + + protected void updateReply(String content) { + this.content = content; + this.updatedAt = LocalDateTime.now(); + } + +} \ No newline at end of file diff --git a/domain/src/main/java/com/groom/yummy/reply/ReplyRepository.java b/domain/src/main/java/com/groom/yummy/reply/ReplyRepository.java new file mode 100644 index 0000000..efb1e3a --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/reply/ReplyRepository.java @@ -0,0 +1,14 @@ +package com.groom.yummy.reply; + +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface ReplyRepository { + Optional findById(Long id); + Optional save(Reply reply); + Page findAllByParentId(Long parentId, Pageable pageable); + Page findByGroupId(Long groupId, Pageable pageable); + void deleteById(Long id); +} \ No newline at end of file diff --git a/domain/src/main/java/com/groom/yummy/reply/ReplyService.java b/domain/src/main/java/com/groom/yummy/reply/ReplyService.java new file mode 100644 index 0000000..2d62d66 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/reply/ReplyService.java @@ -0,0 +1,79 @@ +package com.groom.yummy.reply; + +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.groom.yummy.group.GroupRepository; +import com.groom.yummy.publisher.EventPublisher; +import com.groom.yummy.reply.event.ReplyUpdatedEvent; +import com.groom.yummy.user.UserRepository; + +import lombok.RequiredArgsConstructor; + +@Service +@RequiredArgsConstructor +public class ReplyService { + + private final ReplyRepository replyRepository; + private final UserRepository userRepository; + private final GroupRepository groupRepository; + private final EventPublisher eventPublisher; + + @Transactional + public Reply createReply(Reply reply) { + validateUser(reply.getUserId()); + validateGroup(reply.getGroupId()); + + Reply savedReply = replyRepository.save(reply) + .orElseThrow(() -> new IllegalArgumentException("댓글 저장 실패: " + reply)); + + return savedReply; + } + + @Transactional + public Reply updateReply(Long id, String content) { + Reply reply = validateReply(id); + + // TODO: 댓글 수정 권한 + + reply.updateReply(content); + + eventPublisher.publish(new ReplyUpdatedEvent(reply.getId(), reply.getContent())); + + return reply; + } + + @Transactional(readOnly = true) + public Page getAllReplies(Long groupId, Pageable pageable) { + validateGroup(groupId); + return replyRepository.findByGroupId(groupId, pageable); + } + + @Transactional + public void deleteReply(Long id) { + validateReply(id); + replyRepository.deleteById(id); + } + + // 댓글 검증 + private Reply validateReply(Long id) { + return replyRepository.findById(id) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 댓글입니다. ID: " + id)); + } + + // 사용자 검증 + private void validateUser(Long userId) { + userRepository.findById(userId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자입니다. ID: " + userId)); + } + + // 그룹 검증 + private void validateGroup(Long groupId) { + groupRepository.findGroupById(groupId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 소모임입니다. ID: " + groupId)); + } +} diff --git a/domain/src/main/java/com/groom/yummy/reply/event/ReplyUpdatedEvent.java b/domain/src/main/java/com/groom/yummy/reply/event/ReplyUpdatedEvent.java new file mode 100644 index 0000000..668c6be --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/reply/event/ReplyUpdatedEvent.java @@ -0,0 +1,6 @@ +package com.groom.yummy.reply.event; + +public record ReplyUpdatedEvent ( + Long replyId, + String content +) {} diff --git a/domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java b/domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java new file mode 100644 index 0000000..d38ea99 --- /dev/null +++ b/domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java @@ -0,0 +1,171 @@ +package com.groom.yummy.reply; + +import com.groom.yummy.publisher.EventPublisher; +import com.groom.yummy.reply.event.ReplyUpdatedEvent; +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserRepository; +import com.groom.yummy.group.Group; +import com.groom.yummy.group.GroupRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +class ReplyServiceTest { + + @InjectMocks + private ReplyService replyService; + + @Mock + private ReplyRepository replyRepository; + + @Mock + private UserRepository userRepository; + + @Mock + private GroupRepository groupRepository; + + @Mock + private EventPublisher eventPublisher; + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); + } + + @Test + @DisplayName("사용자는 소모임에 댓그을 등록할 수 있다.") + void createReply_Success() { + // Given + Reply reply = Reply.builder().content("댓글 내용").userId(1L).groupId(1L).build(); + Reply savedReply = Reply.builder().id(1L).content("댓글 내용").userId(1L).groupId(1L).build(); + + when(userRepository.findById(1L)).thenReturn(Optional.of(mock(User.class))); + when(groupRepository.findGroupById(1L)).thenReturn(Optional.of(mock(Group.class))); + when(replyRepository.save(reply)).thenReturn(Optional.of(savedReply)); + + // When + Reply result = replyService.createReply(reply); + + // Then + assertNotNull(result); + assertEquals(savedReply.getId(), result.getId()); + verify(replyRepository, times(1)).save(reply); + } + + @Test + @DisplayName("존재하지 않는 사용자는 댓글을 등록할 수 없다.") + void createReply_UserNotFound() { + // Given + Reply reply = Reply.builder().content("댓글 내용").userId(1L).groupId(1L).build(); + + when(userRepository.findById(1L)).thenReturn(Optional.empty()); + + // When & Then + IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { + replyService.createReply(reply); + }); + + assertEquals("존재하지 않는 사용자입니다. ID: 1", exception.getMessage()); + verify(replyRepository, never()).save(any()); + } + + @Test + @DisplayName("댓글을 수정할 수 있다.") + void updateReply_Success() { + // Given + Reply reply = Reply.builder().id(1L).content("기존 댓글 내용").build(); + String updatedContent = "수정된 댓글 내용"; + + when(replyRepository.findById(1L)).thenReturn(Optional.of(reply)); + + // When + Reply result = replyService.updateReply(1L, updatedContent); + + // Then + assertNotNull(result); + assertEquals(updatedContent, result.getContent()); + verify(replyRepository, times(1)).findById(1L); + verify(eventPublisher, times(1)).publish(any(ReplyUpdatedEvent.class)); + } + + @Test + @DisplayName("존재하지 않는 댓글은 수정할 수 없다.") + void updateReply_ReplyNotFound() { + // Given + when(replyRepository.findById(1L)).thenReturn(Optional.empty()); + + // When & Then + IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { + replyService.updateReply(1L, "수정된 댓글 내용"); + }); + + assertEquals("존재하지 않는 댓글입니다. ID: 1", exception.getMessage()); + verify(eventPublisher, never()).publish(any()); + } + + @Test + @DisplayName("소모임에 달리 모든 댓글을 조회할 수 있다.") + void getAllReplies_Success() { + // Given + Long groupId = 1L; + Pageable pageable = PageRequest.of(0, 10); + Reply reply1 = Reply.builder().id(1L).content("댓글 1").groupId(groupId).build(); + Reply reply2 = Reply.builder().id(2L).content("댓글 2").groupId(groupId).build(); + Page replyPage = new PageImpl<>(List.of(reply1, reply2)); + + when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(mock(Group.class))); + when(replyRepository.findByGroupId(eq(groupId), eq(pageable))).thenReturn(replyPage); + + // When + Page result = replyService.getAllReplies(groupId, pageable); + + // Then + assertNotNull(result); + assertEquals(2, result.getTotalElements()); + verify(replyRepository, times(1)).findByGroupId(eq(groupId), eq(pageable)); + } + + @Test + @DisplayName("댓글을 삭제할 수 있다.") + void deleteReply_Success() { + // Given + Long replyId = 1L; + Reply reply = Reply.builder().id(replyId).content("댓글 내용").build(); + + when(replyRepository.findById(replyId)).thenReturn(Optional.of(reply)); + + // When + replyService.deleteReply(replyId); + + // Then + verify(replyRepository, times(1)).deleteById(replyId); + } + + @Test + @DisplayName("존재하지 않는 댓글은 삭제할 수 없다.") + void deleteReply_ReplyNotFound() { + // Given + when(replyRepository.findById(1L)).thenReturn(Optional.empty()); + + // When & Then + IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { + replyService.deleteReply(1L); + }); + + assertEquals("존재하지 않는 댓글입니다. ID: 1", exception.getMessage()); + verify(replyRepository, never()).deleteById(any()); + } +} \ No newline at end of file diff --git a/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java index 7c11cf5..e76456f 100644 --- a/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntity.java @@ -3,6 +3,8 @@ import com.groom.yummy.domain.BaseEntity; import com.groom.yummy.domain.group.GroupEntity; import com.groom.yummy.domain.user.UserEntity; +import com.groom.yummy.reply.Reply; + import jakarta.persistence.*; import lombok.*; import lombok.experimental.SuperBuilder; @@ -36,4 +38,29 @@ public ReplyEntity(String content, ReplyEntity parentReply, UserEntity user, Gro this.user = user; this.group = group; } + + public static Reply toModel(ReplyEntity entity) { + return Reply.builder() + .id(entity.getId()) + .content(entity.getContent()) + .parentReplyId(entity.getParentReply() != null ? entity.getParentReply().getId() : null) + .userId(entity.getUser().getId()) + .groupId(entity.getGroup().getId()) + .createdAt(entity.getCreatedAt()) + .updatedAt(entity.getUpdatedAt()) + .build(); + } + + public static ReplyEntity toEntity(Reply reply, ReplyEntity parent, UserEntity user, GroupEntity group) { + return ReplyEntity.builder() + .content(reply.getContent()) + .parentReply(parent) + .user(user) + .group(group) + .build(); + } + + public void updateReply(String content) { + this.content = content; + } } diff --git a/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntityRepository.java new file mode 100644 index 0000000..636009b --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyEntityRepository.java @@ -0,0 +1,81 @@ +package com.groom.yummy.domain.reply; + +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; + +import com.groom.yummy.domain.group.GroupEntity; +import com.groom.yummy.domain.group.GroupJpaRepository; +import com.groom.yummy.domain.user.UserEntity; +import com.groom.yummy.domain.user.UserJpaRepository; +import com.groom.yummy.reply.Reply; +import com.groom.yummy.reply.ReplyRepository; + +import lombok.RequiredArgsConstructor; + +@Repository +@RequiredArgsConstructor +public class ReplyEntityRepository implements ReplyRepository { + + private final ReplyJpaRepository replyRepository; + private final UserJpaRepository userRepository; + private final GroupJpaRepository groupJpaRepository; + + @Override + public Optional findById(Long id) { + return replyRepository.findById(id).map(ReplyEntity::toModel); + } + + @Override + public Page findAllByParentId(Long parentId, Pageable pageable) { + return replyRepository.findByParentReplyId(parentId, pageable).map(ReplyEntity::toModel); + } + + @Override + public Optional save(Reply reply) { + ReplyEntity parentReply = findParentReply(reply.getParentReplyId()); + UserEntity user = findUser(reply.getUserId()); + GroupEntity group = findGroup(reply.getGroupId()); + + ReplyEntity replyEntity = ReplyEntity.toEntity(reply, parentReply, user, group); + return Optional.ofNullable(ReplyEntity.toModel(replyRepository.save(replyEntity))); + } + + @Override + public Page findByGroupId(Long groupId, Pageable pageable) { + return replyRepository.findByGroupId(groupId, pageable).map(ReplyEntity::toModel); + } + + @Override + public void deleteById(Long id) { + // 자식 댓글 존재 여부 확인 + if (replyRepository.existsByParentReplyId(id)) { + throw new IllegalStateException("자식 댓글이 존재하여 삭제할 수 없습니다. ID: " + id); + } + + replyRepository.deleteById(id); + } + + // 부모 댓글 조회 + private ReplyEntity findParentReply(Long parentReplyId) { + if (parentReplyId == null) { + return null; // 부모 댓글이 없으면 null 반환 + } + return replyRepository.findById(parentReplyId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 부모 댓글")); + } + + // 사용자 조회 + private UserEntity findUser(Long userId) { + return userRepository.findById(userId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 회원")); + } + + // 그룹 조회 + private GroupEntity findGroup(Long groupId) { + return groupJpaRepository.findById(groupId) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 그룹")); + } +} diff --git a/storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java index 78f9d0c..5108055 100644 --- a/storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/reply/ReplyJpaRepository.java @@ -1,6 +1,15 @@ package com.groom.yummy.domain.reply; +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; public interface ReplyJpaRepository extends JpaRepository { + Page findByGroupId(Long groupId, Pageable pageable); + + Page findByParentReplyId(Long parentId, Pageable pageable); + + boolean existsByParentReplyId(Long id); } diff --git a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java index 2305cf6..81ffa3b 100644 --- a/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/user/UserEntityRepository.java @@ -3,7 +3,6 @@ import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; import lombok.RequiredArgsConstructor; -import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import java.util.Optional; diff --git a/storage/src/main/java/com/groom/yummy/handler/ReplyEventListener.java b/storage/src/main/java/com/groom/yummy/handler/ReplyEventListener.java new file mode 100644 index 0000000..0afd178 --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/handler/ReplyEventListener.java @@ -0,0 +1,28 @@ +package com.groom.yummy.handler; + +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +import com.groom.yummy.domain.reply.ReplyEntity; +import com.groom.yummy.domain.reply.ReplyJpaRepository; +import com.groom.yummy.reply.event.ReplyUpdatedEvent; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Component +@RequiredArgsConstructor +@Slf4j +public class ReplyEventListener { + + private final ReplyJpaRepository replyJpaRepository; + + @EventListener + public void handleReplyUpdatedEvent(ReplyUpdatedEvent event) { + ReplyEntity replyEntity = replyJpaRepository.findById(event.replyId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 댓글의 아이디")); + + replyEntity.updateReply(event.content()); + log.info("댓글이 수정되었습니다. ID: {}, 내용: {}", event.replyId(), event.content()); + } +} \ No newline at end of file From 3116d2a283f1265fec8f0b6b5e116fd20839b023 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Tue, 21 Jan 2025 15:39:00 +0900 Subject: [PATCH 59/80] =?UTF-8?q?fix:=20=EC=84=A4=EC=A0=95=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?-=20test=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20-=20prod=20=ED=94=84=EB=A1=9C=ED=95=84=20s?= =?UTF-8?q?erver.uri=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 49 ++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 1d50ee0..cc22e68 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/yummy_db # docker-compose?? mysql ??? ?? + url: jdbc:mysql://localhost:3306/yummy_db username: yummy password: yummy1234! driver-class-name: com.mysql.cj.jdbc.Driver @@ -89,4 +89,49 @@ spring: cookie-name: Authorization server: - port: 8080 \ No newline at end of file + port: 8080 + url: https://52.78.217.57.nip.io +--- + spring: + config: + activate: + on-profile: test + datasource: + url: jdbc:h2:mem:testdb + driver-class-name: org.h2.Driver + username: sa + password: + h2: + console: + enabled: true + jpa: + hibernate: + ddl-auto: create + properties: + hibernate: + dialect: org.hibernate.dialect.H2Dialect + show_sql: true + format_sql: true + default_batch_fetch_size: 50 + security: + oauth2: + client: + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + registration: + kakao: + client-name: kakao + client-id: ${client-id} + client-secret: ${client-secret} + redirect-uri: ${redirect-uri} + client-authentication-method: client_secret_post + authorization-grant-type: authorization_code + scope: profile_nickname, account_email + jwt: + secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 + valid-time: 7200000 + cookie-name: Authorization \ No newline at end of file From 8569bb7d2ab4302a9ecac92971ba0c2a9e38a640 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Tue, 21 Jan 2025 16:01:56 +0900 Subject: [PATCH 60/80] =?UTF-8?q?chore:=20=EA=B0=81=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=20=EC=8B=9C=EA=B0=84=20=EA=B8=B0=EC=A4=80=20=EC=95=84=EC=8B=9C?= =?UTF-8?q?=EC=95=84=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 86 ++++++++++--------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index cc22e68..461974d 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -13,6 +13,8 @@ spring: properties: hibernate: format_sql: true + jdbc: + time_zone: Asia/Seoul security: oauth2: @@ -92,46 +94,46 @@ server: port: 8080 url: https://52.78.217.57.nip.io --- - spring: - config: - activate: - on-profile: test - datasource: - url: jdbc:h2:mem:testdb - driver-class-name: org.h2.Driver - username: sa - password: - h2: - console: - enabled: true - jpa: +spring: + config: + activate: + on-profile: test + datasource: + url: jdbc:h2:mem:testdb + driver-class-name: org.h2.Driver + username: sa + password: + h2: + console: + enabled: true + jpa: + hibernate: + ddl-auto: create + properties: hibernate: - ddl-auto: create - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect - show_sql: true - format_sql: true - default_batch_fetch_size: 50 - security: - oauth2: - client: - provider: - kakao: - authorization-uri: https://kauth.kakao.com/oauth/authorize - token-uri: https://kauth.kakao.com/oauth/token - user-info-uri: https://kapi.kakao.com/v2/user/me - user-name-attribute: id - registration: - kakao: - client-name: kakao - client-id: ${client-id} - client-secret: ${client-secret} - redirect-uri: ${redirect-uri} - client-authentication-method: client_secret_post - authorization-grant-type: authorization_code - scope: profile_nickname, account_email - jwt: - secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 - valid-time: 7200000 - cookie-name: Authorization \ No newline at end of file + dialect: org.hibernate.dialect.H2Dialect + show_sql: true + format_sql: true + default_batch_fetch_size: 50 + security: + oauth2: + client: + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + registration: + kakao: + client-name: kakao + client-id: ${client-id} + client-secret: ${client-secret} + redirect-uri: ${redirect-uri} + client-authentication-method: client_secret_post + authorization-grant-type: authorization_code + scope: profile_nickname, account_email + jwt: + secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 + valid-time: 7200000 + cookie-name: Authorization \ No newline at end of file From fc8c3c5a138a91b8c611c640f764f475e0022a43 Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:42:29 +0900 Subject: [PATCH 61/80] =?UTF-8?q?feat:=20=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=ED=81=B4=EB=9E=98=EC=8A=A4=20=EB=B0=8F=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80=20(#34)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add exception handler - #33 * feat: exception handler 추가 - #33 * fix: 모듈각 모듈이 예외 처리를 관리하도록 수정 * fix: UserFacadeTest 코드 에러 수정 * fix: UserEventHandlerTest 에러 수정 * fix: UserEventHandlerTest ì에러 해결 --- .../com/groom/yummy/YummyApplication.java | 4 +- .../groom/yummy/config/SecurityConfig.java | 8 ++-- .../yummy/controller/UserController.java | 6 +-- .../exception/GlobalExceptionHandler.java | 4 -- .../groom/yummy/exception/JwtErrorCode.java | 20 ++++++++ .../RestControllerExceptionHandler.java | 46 +++++++++++++++++++ .../CustomAccessDeniedHandler.java | 2 +- .../CustomAuthenticationEntryPoint.java | 2 +- .../com/groom/yummy/filter/JwtAuthFilter.java | 40 +++++++++++++--- .../java/com/groom/yummy/jwt/JwtProvider.java | 13 +++--- .../service/CustomOAuth2UserService.java | 2 +- .../src/main/resources/application.yml | 2 +- .../yummy/controller/UserControllerTest.java | 7 ++- .../service/CustomOAuth2UserServiceTest.java | 4 +- common/build.gradle | 4 ++ .../java/com/groom/yummy/dto/ResponseDto.java | 13 ++---- .../yummy/exception/CustomException.java | 10 +++- .../com/groom/yummy/exception/ErrorCode.java | 6 ++- domain/build.gradle | 8 ++++ .../groom/yummy/exception/UserErrorCode.java | 18 ++++++++ .../handler/CustomExceptionHandler.java | 29 ++++++++++++ .../com/groom/yummy/user/UserService.java | 12 +++-- .../dto/request/UpdateNicknameReqDto.java | 2 +- .../dto/response/UserInfoResDto.java | 2 +- .../user/{ => event}/UserDeleteEvent.java | 2 +- .../{ => event}/UserNicknameChangedEvent.java | 2 +- .../yummy/{ => user}/facade/UserFacade.java | 6 +-- .../groom/yummy/facade/UserFacadeTest.java | 31 +++++++------ storage/build.gradle | 2 + .../groom/yummy/handler/UserEventHandler.java | 15 +++--- .../yummy/handler/UserEventHandlerTest.java | 20 ++++++-- 31 files changed, 258 insertions(+), 84 deletions(-) delete mode 100644 application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java create mode 100644 application/src/main/java/com/groom/yummy/exception/JwtErrorCode.java create mode 100644 application/src/main/java/com/groom/yummy/exception/handler/RestControllerExceptionHandler.java rename application/src/main/java/com/groom/yummy/exception/{ => security}/CustomAccessDeniedHandler.java (96%) rename application/src/main/java/com/groom/yummy/exception/{ => security}/CustomAuthenticationEntryPoint.java (96%) create mode 100644 domain/src/main/java/com/groom/yummy/exception/UserErrorCode.java create mode 100644 domain/src/main/java/com/groom/yummy/exception/handler/CustomExceptionHandler.java rename domain/src/main/java/com/groom/yummy/{ => user}/dto/request/UpdateNicknameReqDto.java (69%) rename domain/src/main/java/com/groom/yummy/{ => user}/dto/response/UserInfoResDto.java (93%) rename domain/src/main/java/com/groom/yummy/user/{ => event}/UserDeleteEvent.java (70%) rename domain/src/main/java/com/groom/yummy/user/{ => event}/UserNicknameChangedEvent.java (72%) rename domain/src/main/java/com/groom/yummy/{ => user}/facade/UserFacade.java (90%) diff --git a/application/src/main/java/com/groom/yummy/YummyApplication.java b/application/src/main/java/com/groom/yummy/YummyApplication.java index 7468414..6ed48a4 100644 --- a/application/src/main/java/com/groom/yummy/YummyApplication.java +++ b/application/src/main/java/com/groom/yummy/YummyApplication.java @@ -5,7 +5,5 @@ @SpringBootApplication public class YummyApplication { - public static void main(String[] args) { - SpringApplication.run(YummyApplication.class, args); - } + public static void main(String[] args){ SpringApplication.run(YummyApplication.class, args); } } diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index 3b27eab..d9b9500 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -1,8 +1,8 @@ package com.groom.yummy.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.groom.yummy.exception.CustomAccessDeniedHandler; -import com.groom.yummy.exception.CustomAuthenticationEntryPoint; +import com.groom.yummy.exception.security.CustomAccessDeniedHandler; +import com.groom.yummy.exception.security.CustomAuthenticationEntryPoint; import com.groom.yummy.filter.JwtAuthFilter; import com.groom.yummy.oauth2.handler.CustomSuccessHandler; import com.groom.yummy.oauth2.service.CustomOAuth2UserService; @@ -20,8 +20,6 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import java.util.List; - @Configuration @EnableWebSecurity @RequiredArgsConstructor @@ -65,7 +63,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ .userService(customOAuth2UserService)).successHandler(customSuccessHandler)); // JWTFilter 추가 - http.addFilterBefore(new JwtAuthFilter(jwtUtil), UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore(new JwtAuthFilter(jwtUtil,objectMapper), UsernamePasswordAuthenticationFilter.class); // Exception handler 추가 http.exceptionHandling(exceptionHandling -> diff --git a/application/src/main/java/com/groom/yummy/controller/UserController.java b/application/src/main/java/com/groom/yummy/controller/UserController.java index 8f6233f..3264ef5 100644 --- a/application/src/main/java/com/groom/yummy/controller/UserController.java +++ b/application/src/main/java/com/groom/yummy/controller/UserController.java @@ -1,9 +1,9 @@ package com.groom.yummy.controller; import com.groom.yummy.dto.ResponseDto; -import com.groom.yummy.dto.request.UpdateNicknameReqDto; -import com.groom.yummy.dto.response.UserInfoResDto; -import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.user.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.user.dto.response.UserInfoResDto; +import com.groom.yummy.user.facade.UserFacade; import com.groom.yummy.oauth2.auth.LoginUser; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java b/application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java deleted file mode 100644 index 50d70ab..0000000 --- a/application/src/main/java/com/groom/yummy/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.groom.yummy.exception; - -public class GlobalExceptionHandler { -} diff --git a/application/src/main/java/com/groom/yummy/exception/JwtErrorCode.java b/application/src/main/java/com/groom/yummy/exception/JwtErrorCode.java new file mode 100644 index 0000000..1be3c08 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/exception/JwtErrorCode.java @@ -0,0 +1,20 @@ +package com.groom.yummy.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum JwtErrorCode implements ErrorCode { + WRONG_TYPE_TOKEN(HttpStatus.UNAUTHORIZED,"토큰의 서명이 유효하지 않습니다."), + UNSUPPORTED_TOKEN(HttpStatus.UNAUTHORIZED,"잘못된 형식의 토큰입니다."), + EXPIRED_TOKEN(HttpStatus.UNAUTHORIZED,"만료된 토큰입니다."), + UNKNOWN_TOKEN_ERROR(HttpStatus.BAD_REQUEST,"토큰의 값이 존재하지 않습니다."), + ; + private final HttpStatus code; + private final String message; + + JwtErrorCode(HttpStatus code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/application/src/main/java/com/groom/yummy/exception/handler/RestControllerExceptionHandler.java b/application/src/main/java/com/groom/yummy/exception/handler/RestControllerExceptionHandler.java new file mode 100644 index 0000000..49c3449 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/exception/handler/RestControllerExceptionHandler.java @@ -0,0 +1,46 @@ +package com.groom.yummy.exception.handler; + +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.exception.CustomException; +import io.swagger.v3.oas.annotations.Hidden; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@Hidden +@RestControllerAdvice +public class RestControllerExceptionHandler { + + /* 컨트롤러 메서드의 파라미터나 엔터티 필드에서 유효성 검사가 실패 */ + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity> handleConstraintViolationException(ConstraintViolationException ex){ + log.error("유효성 검사 예외 발생 msg: {}", ex.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ResponseDto.of(-1, ex.getMessage())); + } + + /* @RequestBody 로 들어오는 JSON 요청 객체의 필드 값이 유효성 검사에 실패 */ + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleMethodArgumentNotValidException(MethodArgumentNotValidException ex){ + BindingResult bindingResult = ex.getBindingResult(); + FieldError fieldError = bindingResult.getFieldError(); + String message = fieldError.getDefaultMessage(); + log.error("유효성 검사 예외 발생 msg:{}",message); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ResponseDto.of(-1,message)); + } + + /* 클라이언트에서 잘못된 JSON 형식의 요청을 보낼 때 발생 */ + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity> handleHttpMessageNotReadableException(HttpMessageNotReadableException ex) { + String errorMessage = "요청한 JSON 데이터를 읽을 수 없습니다: " + ex.getMessage(); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ResponseDto.of(-1,errorMessage)); + } +} + diff --git a/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java b/application/src/main/java/com/groom/yummy/exception/security/CustomAccessDeniedHandler.java similarity index 96% rename from application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java rename to application/src/main/java/com/groom/yummy/exception/security/CustomAccessDeniedHandler.java index 6a87ca8..ff257de 100644 --- a/application/src/main/java/com/groom/yummy/exception/CustomAccessDeniedHandler.java +++ b/application/src/main/java/com/groom/yummy/exception/security/CustomAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.groom.yummy.exception; +package com.groom.yummy.exception.security; import com.fasterxml.jackson.databind.ObjectMapper; import com.groom.yummy.dto.ResponseDto; diff --git a/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java b/application/src/main/java/com/groom/yummy/exception/security/CustomAuthenticationEntryPoint.java similarity index 96% rename from application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java rename to application/src/main/java/com/groom/yummy/exception/security/CustomAuthenticationEntryPoint.java index 0a58cbc..4977aae 100644 --- a/application/src/main/java/com/groom/yummy/exception/CustomAuthenticationEntryPoint.java +++ b/application/src/main/java/com/groom/yummy/exception/security/CustomAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.groom.yummy.exception; +package com.groom.yummy.exception.security; import com.fasterxml.jackson.databind.ObjectMapper; import com.groom.yummy.dto.ResponseDto; diff --git a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java index fbe2ea9..572cc28 100644 --- a/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java +++ b/application/src/main/java/com/groom/yummy/filter/JwtAuthFilter.java @@ -1,8 +1,14 @@ package com.groom.yummy.filter; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.exception.CustomException; +import com.groom.yummy.exception.ErrorCode; +import com.groom.yummy.exception.JwtErrorCode; import com.groom.yummy.oauth2.auth.LoginUser; import com.groom.yummy.user.User; import com.groom.yummy.jwt.JwtProvider; +import io.jsonwebtoken.Jwt; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; @@ -18,25 +24,40 @@ import java.io.IOException; +import static com.groom.yummy.exception.JwtErrorCode.*; + @Log4j2 @Component @RequiredArgsConstructor public class JwtAuthFilter extends OncePerRequestFilter { private final JwtProvider jwtProvider; + private final ObjectMapper objectMapper; @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - String token = findToken(request); + try{ + String token = findToken(request); + if (!verifyToken(request, token)) { + filterChain.doFilter(request, response); + return; + } - if (!verifyToken(request, token)) { + User user = getUser(token); + setSecuritySession(user); filterChain.doFilter(request, response); - return; - } - User user = getUser(token); - setSecuritySession(user); - filterChain.doFilter(request, response); + }catch (CustomException e){ + JwtErrorCode jwtErrorCode = (JwtErrorCode) e.getErrorCode(); + switch (jwtErrorCode) { + case WRONG_TYPE_TOKEN, UNSUPPORTED_TOKEN, EXPIRED_TOKEN, UNKNOWN_TOKEN_ERROR -> + setResponse(response, jwtErrorCode); + default -> { + log.error("알 수 없는 에러 코드: {}", jwtErrorCode); + setResponse(response, UNKNOWN_TOKEN_ERROR); // 기본 예외 처리 + } + } + } } protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException { @@ -91,4 +112,9 @@ private static String findToken(HttpServletRequest request){ } return token; } + private void setResponse(HttpServletResponse response, JwtErrorCode jwtErrorCode) throws IOException { + response.setContentType("application/json;charset=UTF-8"); + response.setStatus(jwtErrorCode.getCode().value()); + response.getWriter().print(objectMapper.writeValueAsString(ResponseDto.of(-1,jwtErrorCode.getMessage()))); + } } \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/jwt/JwtProvider.java b/application/src/main/java/com/groom/yummy/jwt/JwtProvider.java index 906dc1c..bd75bcb 100644 --- a/application/src/main/java/com/groom/yummy/jwt/JwtProvider.java +++ b/application/src/main/java/com/groom/yummy/jwt/JwtProvider.java @@ -1,5 +1,7 @@ package com.groom.yummy.jwt; +import com.groom.yummy.exception.CustomException; +import com.groom.yummy.exception.JwtErrorCode; import io.jsonwebtoken.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -27,9 +29,8 @@ private JwtProvider(@Value("${spring.jwt.secret}") String secret){ public String createAccessToken(Long userId, String email, String nickname, String role){ Date timeNow = new Date(System.currentTimeMillis()); - log.info("timeNow : {}", timeNow); Date expirationTime = new Date(timeNow.getTime() + VALID_TIME); - log.info("expirationTime: {}", expirationTime); + return Jwts.builder() .claim("userId", userId) .claim("email",email) @@ -68,13 +69,13 @@ private boolean valid(SecretKey secretKey, String token){ Jws claims = Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token); return claims.getBody().getExpiration().before(new Date()); }catch (SignatureException ex){ - throw new RuntimeException(); + throw new CustomException(JwtErrorCode.WRONG_TYPE_TOKEN); }catch (MalformedJwtException ex){ - throw new RuntimeException(); + throw new CustomException(JwtErrorCode.UNSUPPORTED_TOKEN); }catch (ExpiredJwtException ex){ - throw new RuntimeException(); + throw new CustomException(JwtErrorCode.EXPIRED_TOKEN); }catch (IllegalArgumentException ex){ - throw new RuntimeException(); + throw new CustomException(JwtErrorCode.WRONG_TYPE_TOKEN); } } diff --git a/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java index a03bfd2..7e52e96 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java +++ b/application/src/main/java/com/groom/yummy/oauth2/service/CustomOAuth2UserService.java @@ -1,6 +1,6 @@ package com.groom.yummy.oauth2.service; -import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.user.facade.UserFacade; import com.groom.yummy.oauth2.auth.LoginUser; import com.groom.yummy.oauth2.dto.OAuth2Response; import com.groom.yummy.oauth2.strategy.OAuth2ResFactory; diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 461974d..18789f7 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -37,7 +37,7 @@ spring: jwt: secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 - valid-time: 7200000 + valid-time: 15000 cookie-name: Authorization server: diff --git a/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java index e7a869c..97e868e 100644 --- a/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java +++ b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java @@ -2,13 +2,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.groom.yummy.config.SecurityConfig; -import com.groom.yummy.dto.request.UpdateNicknameReqDto; -import com.groom.yummy.dto.response.UserInfoResDto; -import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.user.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.user.dto.response.UserInfoResDto; +import com.groom.yummy.user.facade.UserFacade; import com.groom.yummy.jwt.JwtProvider; import com.groom.yummy.oauth2.handler.CustomSuccessHandler; import com.groom.yummy.oauth2.service.CustomOAuth2UserService; -import com.groom.yummy.user.User; import jakarta.servlet.http.Cookie; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java b/application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java index 549017e..dcd92a8 100644 --- a/application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java +++ b/application/src/test/java/com/groom/yummy/oauth2/service/CustomOAuth2UserServiceTest.java @@ -1,8 +1,7 @@ package com.groom.yummy.oauth2.service; -import com.groom.yummy.facade.UserFacade; +import com.groom.yummy.user.facade.UserFacade; import com.groom.yummy.oauth2.auth.LoginUser; -import com.groom.yummy.oauth2.dto.KakaoResponse; import com.groom.yummy.oauth2.dto.OAuth2Response; import com.groom.yummy.oauth2.strategy.OAuth2ResFactory; import com.groom.yummy.user.User; @@ -29,7 +28,6 @@ import java.util.Optional; import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class CustomOAuth2UserServiceTest { diff --git a/common/build.gradle b/common/build.gradle index 7812ef6..de2f112 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,6 +7,10 @@ plugins { dependencies { compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' + + compileOnly 'org.springframework.boot:spring-boot-starter-web' + implementation 'jakarta.validation:jakarta.validation-api:3.0.2' + } // 'bootJar' 태스크 비활성화 diff --git a/common/src/main/java/com/groom/yummy/dto/ResponseDto.java b/common/src/main/java/com/groom/yummy/dto/ResponseDto.java index 5e9cdaf..15a7fdd 100644 --- a/common/src/main/java/com/groom/yummy/dto/ResponseDto.java +++ b/common/src/main/java/com/groom/yummy/dto/ResponseDto.java @@ -4,17 +4,12 @@ import lombok.Builder; import lombok.Getter; -@Getter -public class ResponseDto { - private final T data; - private final String msg; - +public record ResponseDto(T data, String msg) { @Builder - public ResponseDto(T data, String msg){ - this.data = data; - this.msg = msg; + public ResponseDto { } - public static ResponseDto of(T data, String msg){ + + public static ResponseDto of(T data, String msg) { return ResponseDto.builder().data(data).msg(msg).build(); } } diff --git a/common/src/main/java/com/groom/yummy/exception/CustomException.java b/common/src/main/java/com/groom/yummy/exception/CustomException.java index 8a50b31..bfad281 100644 --- a/common/src/main/java/com/groom/yummy/exception/CustomException.java +++ b/common/src/main/java/com/groom/yummy/exception/CustomException.java @@ -1,4 +1,12 @@ package com.groom.yummy.exception; -public class CustomException { +import lombok.Getter; + +@Getter +public class CustomException extends RuntimeException{ + private ErrorCode errorCode; + public CustomException(ErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } } diff --git a/common/src/main/java/com/groom/yummy/exception/ErrorCode.java b/common/src/main/java/com/groom/yummy/exception/ErrorCode.java index 7a28a22..0164c6b 100644 --- a/common/src/main/java/com/groom/yummy/exception/ErrorCode.java +++ b/common/src/main/java/com/groom/yummy/exception/ErrorCode.java @@ -1,4 +1,8 @@ package com.groom.yummy.exception; -public enum ErrorCode { +import org.springframework.http.HttpStatusCode; + +public interface ErrorCode { + HttpStatusCode getCode(); + String getMessage(); } diff --git a/domain/build.gradle b/domain/build.gradle index 0f84cd5..09c3cd9 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -7,6 +7,14 @@ plugins { version = 'unspecified' dependencies { + + compileOnly project(':common') + testImplementation project(':common') + + // Swagger + compileOnly 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + + // JPA implementation 'org.springframework.boot:spring-boot-starter-data-jpa' // Spring boot diff --git a/domain/src/main/java/com/groom/yummy/exception/UserErrorCode.java b/domain/src/main/java/com/groom/yummy/exception/UserErrorCode.java new file mode 100644 index 0000000..aaa0124 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/exception/UserErrorCode.java @@ -0,0 +1,18 @@ +package com.groom.yummy.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum UserErrorCode implements ErrorCode{ + USER_NOT_FOUND(HttpStatus.NOT_FOUND, "유저가 존재하지 않습니다."), + ; + + private final HttpStatus code; + private final String message; + + UserErrorCode(HttpStatus code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/domain/src/main/java/com/groom/yummy/exception/handler/CustomExceptionHandler.java b/domain/src/main/java/com/groom/yummy/exception/handler/CustomExceptionHandler.java new file mode 100644 index 0000000..987ccfc --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/exception/handler/CustomExceptionHandler.java @@ -0,0 +1,29 @@ +package com.groom.yummy.exception.handler; + +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.exception.CustomException; +import io.swagger.v3.oas.annotations.Hidden; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@Hidden +@RestControllerAdvice +public class CustomExceptionHandler { + @ExceptionHandler(CustomException.class) + public ResponseEntity> CustomException(CustomException ex){ + log.error("커스텀 예외 발생 msg: {}", ex.getErrorCode().getMessage()); + return ResponseEntity.status(ex.getErrorCode().getCode()).body(ResponseDto.of(-1,ex.getErrorCode().getMessage())); + } + + // 기타예외 발생 시 500반환 + @ExceptionHandler + public ResponseEntity handleException(Exception ex) { + String message = "서버 내부에 에러가 발생했습니다."; + log.error(message+":"+ex.getMessage()+ex.getStackTrace()+ex.getCause()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new ResponseDto(-1,ex.getMessage())); + } +} diff --git a/domain/src/main/java/com/groom/yummy/user/UserService.java b/domain/src/main/java/com/groom/yummy/user/UserService.java index 60524c6..cc8a078 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserService.java +++ b/domain/src/main/java/com/groom/yummy/user/UserService.java @@ -1,6 +1,11 @@ package com.groom.yummy.user; + +import com.groom.yummy.exception.CustomException; +import com.groom.yummy.exception.UserErrorCode; import com.groom.yummy.publisher.EventPublisher; +import com.groom.yummy.user.event.UserDeleteEvent; +import com.groom.yummy.user.event.UserNicknameChangedEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -13,13 +18,14 @@ public class UserService { private final UserRepository userRepository; private final EventPublisher eventPublisher; + public User getUserInfo(Long userId) { - return userRepository.findById(userId).orElseThrow(); + return userRepository.findById(userId).orElseThrow(()-> new CustomException(UserErrorCode.USER_NOT_FOUND)); } @Transactional public User updateNickname(Long userId, String nickname){ - User user = userRepository.findById(userId).orElseThrow(); + User user = userRepository.findById(userId).orElseThrow(()-> new CustomException(UserErrorCode.USER_NOT_FOUND)); user.changeNickname(nickname); eventPublisher.publish(new UserNicknameChangedEvent(user.getId(),user.getNickname())); return user; @@ -27,7 +33,7 @@ public User updateNickname(Long userId, String nickname){ @Transactional public Long deleteUser(Long userId) { - User user = userRepository.findById(userId).orElseThrow(); + User user = userRepository.findById(userId).orElseThrow(()-> new CustomException(UserErrorCode.USER_NOT_FOUND)); user.deleteUser(); eventPublisher.publish(new UserDeleteEvent(user.getId(),user.isDeleted())); return user.getId(); diff --git a/domain/src/main/java/com/groom/yummy/dto/request/UpdateNicknameReqDto.java b/domain/src/main/java/com/groom/yummy/user/dto/request/UpdateNicknameReqDto.java similarity index 69% rename from domain/src/main/java/com/groom/yummy/dto/request/UpdateNicknameReqDto.java rename to domain/src/main/java/com/groom/yummy/user/dto/request/UpdateNicknameReqDto.java index 46c04bc..16ab647 100644 --- a/domain/src/main/java/com/groom/yummy/dto/request/UpdateNicknameReqDto.java +++ b/domain/src/main/java/com/groom/yummy/user/dto/request/UpdateNicknameReqDto.java @@ -1,4 +1,4 @@ -package com.groom.yummy.dto.request; +package com.groom.yummy.user.dto.request; import lombok.Builder; diff --git a/domain/src/main/java/com/groom/yummy/dto/response/UserInfoResDto.java b/domain/src/main/java/com/groom/yummy/user/dto/response/UserInfoResDto.java similarity index 93% rename from domain/src/main/java/com/groom/yummy/dto/response/UserInfoResDto.java rename to domain/src/main/java/com/groom/yummy/user/dto/response/UserInfoResDto.java index 0937516..901ab6d 100644 --- a/domain/src/main/java/com/groom/yummy/dto/response/UserInfoResDto.java +++ b/domain/src/main/java/com/groom/yummy/user/dto/response/UserInfoResDto.java @@ -1,4 +1,4 @@ -package com.groom.yummy.dto.response; +package com.groom.yummy.user.dto.response; import com.groom.yummy.user.User; import lombok.Builder; diff --git a/domain/src/main/java/com/groom/yummy/user/UserDeleteEvent.java b/domain/src/main/java/com/groom/yummy/user/event/UserDeleteEvent.java similarity index 70% rename from domain/src/main/java/com/groom/yummy/user/UserDeleteEvent.java rename to domain/src/main/java/com/groom/yummy/user/event/UserDeleteEvent.java index 89307b8..33febc4 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserDeleteEvent.java +++ b/domain/src/main/java/com/groom/yummy/user/event/UserDeleteEvent.java @@ -1,4 +1,4 @@ -package com.groom.yummy.user; +package com.groom.yummy.user.event; public record UserDeleteEvent( Long userId, diff --git a/domain/src/main/java/com/groom/yummy/user/UserNicknameChangedEvent.java b/domain/src/main/java/com/groom/yummy/user/event/UserNicknameChangedEvent.java similarity index 72% rename from domain/src/main/java/com/groom/yummy/user/UserNicknameChangedEvent.java rename to domain/src/main/java/com/groom/yummy/user/event/UserNicknameChangedEvent.java index f5b0e64..c64b904 100644 --- a/domain/src/main/java/com/groom/yummy/user/UserNicknameChangedEvent.java +++ b/domain/src/main/java/com/groom/yummy/user/event/UserNicknameChangedEvent.java @@ -1,4 +1,4 @@ -package com.groom.yummy.user; +package com.groom.yummy.user.event; public record UserNicknameChangedEvent( Long userId, diff --git a/domain/src/main/java/com/groom/yummy/facade/UserFacade.java b/domain/src/main/java/com/groom/yummy/user/facade/UserFacade.java similarity index 90% rename from domain/src/main/java/com/groom/yummy/facade/UserFacade.java rename to domain/src/main/java/com/groom/yummy/user/facade/UserFacade.java index e040fcd..0944334 100644 --- a/domain/src/main/java/com/groom/yummy/facade/UserFacade.java +++ b/domain/src/main/java/com/groom/yummy/user/facade/UserFacade.java @@ -1,7 +1,7 @@ -package com.groom.yummy.facade; +package com.groom.yummy.user.facade; -import com.groom.yummy.dto.request.UpdateNicknameReqDto; -import com.groom.yummy.dto.response.UserInfoResDto; +import com.groom.yummy.user.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.user.dto.response.UserInfoResDto; import com.groom.yummy.user.User; import com.groom.yummy.user.UserAuthService; import com.groom.yummy.user.UserService; diff --git a/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java b/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java index 9139ed0..a6731a2 100644 --- a/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java +++ b/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java @@ -1,34 +1,35 @@ package com.groom.yummy.facade; -import com.groom.yummy.dto.request.UpdateNicknameReqDto; -import com.groom.yummy.dto.response.UserInfoResDto; +import com.groom.yummy.publisher.EventPublisher; +import com.groom.yummy.user.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.user.dto.response.UserInfoResDto; import com.groom.yummy.user.User; import com.groom.yummy.user.UserAuthService; import com.groom.yummy.user.UserService; +import com.groom.yummy.user.facade.UserFacade; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; import java.util.Optional; import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) class UserFacadeTest { - + @InjectMocks + private UserFacade userFacade; @Mock private UserAuthService userAuthService; - @Mock private UserService userService; - @InjectMocks - private UserFacade userFacade; - @Test + @DisplayName("완벽한 테스트") void getUserInfoTest() { // given Long userId = 1L; @@ -36,7 +37,7 @@ void getUserInfoTest() { String email = "email@gmail.com"; User mockUser = User.builder().id(userId).nickname(nickname).email(email).build(); - Mockito.when(userService.getUserInfo(userId)).thenReturn(mockUser); + when(userService.getUserInfo(userId)).thenReturn(mockUser); // when UserInfoResDto result = userFacade.getUserInfo(userId); @@ -48,6 +49,7 @@ void getUserInfoTest() { } @Test + @DisplayName("") void findAuthUserByEmailTest() { // given Long userId = 1L; @@ -55,7 +57,7 @@ void findAuthUserByEmailTest() { String email = "email@gmail.com"; User mockUser = User.builder().id(userId).nickname(nickname).email(email).build(); - Mockito.when(userAuthService.findAuthUserByEmail(email)).thenReturn(Optional.of(mockUser)); + when(userAuthService.findAuthUserByEmail(email)).thenReturn(Optional.of(mockUser)); // when Optional result = userFacade.findAuthUserByEmail(email); @@ -66,6 +68,7 @@ void findAuthUserByEmailTest() { } @Test + @DisplayName("") void findOrCreateUserTest() { // given Long userId = 1L; @@ -73,7 +76,7 @@ void findOrCreateUserTest() { String email = "email@gmail.com"; Optional optionalUser = Optional.empty(); User mockUser = User.builder().id(userId).nickname(nickname).email(email).build(); - Mockito.when(userAuthService.findOrCreateUser(optionalUser, nickname, email)).thenReturn(mockUser); + when(userAuthService.findOrCreateUser(optionalUser, nickname, email)).thenReturn(mockUser); // when User result = userFacade.findOrCreateUser(optionalUser, nickname, email); @@ -85,6 +88,7 @@ void findOrCreateUserTest() { } @Test + @DisplayName("") void updateUserNicknameTest() { // Arrange Long userId = 1L; @@ -93,7 +97,7 @@ void updateUserNicknameTest() { String newNickname = "업데이트강형준"; UpdateNicknameReqDto updateNicknameReqDto = new UpdateNicknameReqDto(newNickname); User updateMockUser = User.builder().id(userId).nickname(newNickname).email(email).build(); - Mockito.when(userService.updateNickname(userId, newNickname)).thenReturn(updateMockUser); + when(userService.updateNickname(userId, newNickname)).thenReturn(updateMockUser); // when UserInfoResDto result = userFacade.updateUserNickname(userId, updateNicknameReqDto); @@ -104,10 +108,11 @@ void updateUserNicknameTest() { } @Test + @DisplayName("") void deleteUser_shouldReturnDeletedUserId() { // given Long userId = 1L; - Mockito.when(userService.deleteUser(userId)).thenReturn(userId); + when(userService.deleteUser(userId)).thenReturn(userId); // when Long result = userFacade.deleteUser(userId); diff --git a/storage/build.gradle b/storage/build.gradle index c53193a..9906891 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -8,6 +8,8 @@ version = 'unspecified' dependencies { implementation project(':domain') + compileOnly project(':common') + testImplementation project(':common') implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java b/storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java index d584932..c680305 100644 --- a/storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java +++ b/storage/src/main/java/com/groom/yummy/handler/UserEventHandler.java @@ -2,29 +2,28 @@ import com.groom.yummy.domain.user.UserEntity; import com.groom.yummy.domain.user.UserJpaRepository; -import com.groom.yummy.user.UserDeleteEvent; -import com.groom.yummy.user.UserNicknameChangedEvent; +import com.groom.yummy.user.event.UserDeleteEvent; +import com.groom.yummy.user.event.UserNicknameChangedEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; -@Component -@Transactional @RequiredArgsConstructor @Slf4j +@Component public class UserEventHandler { private final UserJpaRepository userJpaRepository; - @EventListener + @TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT) public void handlerNicknameChange(UserNicknameChangedEvent event){ UserEntity userEntity = userJpaRepository.findById(event.userId()).orElseThrow(); userEntity.updateNickname(event.newNickname()); log.info("userEntity nickname : {}", userEntity.getNickname()); } - @EventListener + @TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT) public void handleUserDelete(UserDeleteEvent event) { UserEntity userEntity = userJpaRepository.findById(event.userId()).orElseThrow(); userEntity.deleteUser(event.isDeleted()); diff --git a/storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java b/storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java index 48a2fda..9d37935 100644 --- a/storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java +++ b/storage/src/test/java/com/groom/yummy/handler/UserEventHandlerTest.java @@ -2,13 +2,17 @@ import com.groom.yummy.domain.user.UserEntity; import com.groom.yummy.domain.user.UserJpaRepository; -import com.groom.yummy.user.UserDeleteEvent; -import com.groom.yummy.user.UserNicknameChangedEvent; +import com.groom.yummy.user.event.UserDeleteEvent; +import com.groom.yummy.user.event.UserNicknameChangedEvent; +import jakarta.persistence.EntityManager; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationEventPublisher; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.Rollback; +import org.springframework.test.context.transaction.TestTransaction; import org.springframework.transaction.annotation.Transactional; import java.util.Optional; @@ -41,6 +45,7 @@ void setUp(){ } @Test + @DirtiesContext //테스트 실행 후에 Spring 애플리케이션 컨텍스트를 재생성, 트랜잭션 더러워져서 발생한 문제 일단 해결 void handlerNicknameChaneTest(){ // given Long userId = testUserEntity.getId(); @@ -49,6 +54,10 @@ void handlerNicknameChaneTest(){ // when eventPublisher.publishEvent(new UserNicknameChangedEvent(userId, newNickname)); + // 해당 로직은 커밋 이전에 반영되모르 명시적으로 커밋을 설정한다. + TestTransaction.flagForCommit(); + TestTransaction.end(); + // then Optional updatedUser = userJpaRepository.findById(userId); assertTrue(updatedUser.isPresent()); @@ -56,7 +65,9 @@ void handlerNicknameChaneTest(){ } @Test + @DirtiesContext //테스트 실행 후에 Spring 애플리케이션 컨텍스트를 재생성, 트랜잭션 더러워져서 발생한 문제 일단 해결 void handleUserDeleteTest(){ + // given Long userId = testUserEntity.getId(); boolean isDeleted = true; @@ -64,10 +75,13 @@ void handleUserDeleteTest(){ // when eventPublisher.publishEvent(new UserDeleteEvent(userId, isDeleted)); + // 해당 로직은 커밋 이전에 반영되모르 명시적으로 커밋을 설정한다. + TestTransaction.flagForCommit(); + TestTransaction.end(); + // then Optional deletedUser = userJpaRepository.findById(userId); assertTrue(deletedUser.isPresent()); assertTrue(deletedUser.get().isDeleted()); } - } \ No newline at end of file From a7716568a85dcdfbd8588c28561de6ee317c3006 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Wed, 22 Jan 2025 12:37:51 +0900 Subject: [PATCH 62/80] =?UTF-8?q?hotfix:=20jwt=20=EB=A7=8C=EB=A3=8C=20?= =?UTF-8?q?=EA=B8=B0=EA=B0=84=2012=C3=AC=C2=8B=EA=B0=842=C2=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=8A=98=EB=A6=AC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 18789f7..46b9d48 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -37,7 +37,7 @@ spring: jwt: secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 - valid-time: 15000 + valid-time: 720000 cookie-name: Authorization server: From 86b5232803059a9873e27994a1a5ffb238ac6ae5 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Wed, 22 Jan 2025 12:38:51 +0900 Subject: [PATCH 63/80] =?UTF-8?q?hotfix:=20jwt=20=EB=A7=8C=EB=A3=8C?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 46b9d48..1a58b67 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -37,7 +37,7 @@ spring: jwt: secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 - valid-time: 720000 + valid-time: 120000 cookie-name: Authorization server: From 93041cb68bb58acde89081a3a3b3fba9543784c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=8F=99=EC=9A=B0?= <108855080+fbehddn@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:01:20 +0900 Subject: [PATCH 64/80] Feat/add jacoco multimodule (#39) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: jacoco 의존성 추가 및 추가 설정 * fix: java.util.LinkedHashSet.map 관련 gradlew 로딩 에러 수정 * chore: build.gradle 파일의 모듈 의존성 정리 - runtimeOnly와 compileOnly로 설정된 ':storage'와 ':domain' 의존성을 implementation으로 통합 - 모듈 간 의존성을 명확히 하기 위해 의존성 선언 수정 * chore: 스토리지 모듈 build.gradle 의존성 및 설정 정리 - 모듈 간 의존성 정리: ':common' 의존성을 compileOnly에서 implementation으로 변경 - Spring Boot와 JPA 관련 의존성 추가 및 통합 - 불필요한 중복된 plugins 블록 제거 - 버전 정보를 명확히 하기 위해 version을 '1.0.0'으로 설정 - bootJar 비활성화 및 jar 설정 추가 - 테스트 플랫폼 명시적으로 설정 (JUnit) * chore: 루트 build.gradle 설정 개선 및 Jacoco 리포트 통합 설정 추가 - 중복된 plugins 블록 제거 및 'apply false'로 플러그인 적용 관리 - 모든 프로젝트에 공통 버전(version)을 '1.0.0'으로 설정 - DTO, Config, Exception 등 필요하지 않은 클래스 Jacoco 리포트에서 제외 - `jacocoRootReport` 태스크 추가하여 서브모듈의 테스트 커버리지를 통합 관리 * chore: 지역 요청 반환 정보 저장 테스트 일시적 주석처리 * chore: 테스트 커버리지에서 제외할 항목 추가 --- application/build.gradle | 11 +- .../oauth2/service/SomeApiServiceTest.java | 212 +++++++++--------- build.gradle | 99 +++++--- storage/build.gradle | 29 ++- 4 files changed, 203 insertions(+), 148 deletions(-) diff --git a/application/build.gradle b/application/build.gradle index b871eae..efa9dda 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -1,16 +1,15 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.1' - id 'io.spring.dependency-management' version '1.1.7' + id 'org.springframework.boot' + id 'io.spring.dependency-management' } version = '0.0.1-SNAPSHOT' dependencies { - // Project Dependencies - runtimeOnly project(':storage') - compileOnly project(':domain') - testImplementation project(':domain') + // 모듈 간 의존성 + implementation project(':storage') + implementation project(':domain') implementation project(':common') // Spring Boot Starters diff --git a/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java b/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java index 7f331e1..3dfda58 100755 --- a/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java +++ b/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java @@ -1,106 +1,106 @@ -package com.groom.yummy.oauth2.service; - -import com.groom.yummy.store.StoreService; -import com.groom.yummy.webclient.SomeApiService; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.bean.override.mockito.MockitoBean; -import org.springframework.web.reactive.function.client.WebClient; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.Mockito.*; - -@SpringBootTest( - webEnvironment = SpringBootTest.WebEnvironment.MOCK -) -@ActiveProfiles("test") -@Import(SomeApiServiceTest.TestConfig.class) -class SomeApiServiceTest { - - @Autowired - private SomeApiService someApiService; - - @MockitoBean - private StoreService storeService; - - private static MockWebServer mockWebServer; - - @BeforeAll - static void setUpServer() throws Exception { - mockWebServer = new MockWebServer(); - mockWebServer.start(); - } - - @AfterAll - static void tearDownServer() throws Exception { - mockWebServer.shutdown(); - } - - @Test - @DisplayName("특정 지역 요청 시 반환된 식당 정보 저장 테스트") - void 특정지역_식당정보_저장테스트() throws Exception { - // GIVEN - String mockResponseBody = """ - { - "data": { - "stores": [ - { - "storeId": 1, - "name": "맛집가게", - "regionId": 2, - "category": "001" - }, - { - "storeId": 2, - "name": "맛집가게2", - "regionId": 2, - "category": "002" - } - ] - }, - "message": "가게 목록이 성공적으로 조회되었습니다." - } - """; - - mockWebServer.enqueue(new MockResponse() - .setBody(mockResponseBody) - .addHeader("Content-Type", "application/json")); - - // WHEN - String regionCode = "1111000000"; - someApiService.getSomeData(regionCode); - - // THEN - verify(storeService, times(2)).createStore(any()); - - // Mock 서버 요청 검증 - RecordedRequest recordedRequest = mockWebServer.takeRequest(); - assertEquals("/api/v1/regions?regionCode=1111000000", recordedRequest.getPath()); - assertEquals("GET", recordedRequest.getMethod()); - } - - @Configuration - static class TestConfig { - @Bean - public SomeApiService someApiService() { - String baseUrl = mockWebServer.url("/").toString(); - return new SomeApiService(WebClient.builder().baseUrl(baseUrl), storeService()); - } - - @Bean - public StoreService storeService() { - return mock(StoreService.class); - } - } -} +//package com.groom.yummy.oauth2.service; +// +//import com.groom.yummy.store.StoreService; +//import com.groom.yummy.webclient.SomeApiService; +//import okhttp3.mockwebserver.MockResponse; +//import okhttp3.mockwebserver.MockWebServer; +//import okhttp3.mockwebserver.RecordedRequest; +//import org.junit.jupiter.api.AfterAll; +//import org.junit.jupiter.api.BeforeAll; +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.context.annotation.Import; +//import org.springframework.test.context.ActiveProfiles; +//import org.springframework.test.context.bean.override.mockito.MockitoBean; +//import org.springframework.web.reactive.function.client.WebClient; +// +//import static org.junit.jupiter.api.Assertions.assertEquals; +//import static org.mockito.Mockito.*; +// +//@SpringBootTest( +// webEnvironment = SpringBootTest.WebEnvironment.MOCK +//) +//@ActiveProfiles("test") +//@Import(SomeApiServiceTest.TestConfig.class) +//class SomeApiServiceTest { +// +// @Autowired +// private SomeApiService someApiService; +// +// @MockitoBean +// private StoreService storeService; +// +// private static MockWebServer mockWebServer; +// +// @BeforeAll +// static void setUpServer() throws Exception { +// mockWebServer = new MockWebServer(); +// mockWebServer.start(); +// } +// +// @AfterAll +// static void tearDownServer() throws Exception { +// mockWebServer.shutdown(); +// } +// +// @Test +// @DisplayName("특정 지역 요청 시 반환된 식당 정보 저장 테스트") +// void 특정지역_식당정보_저장테스트() throws Exception { +// // GIVEN +// String mockResponseBody = """ +// { +// "data": { +// "stores": [ +// { +// "storeId": 1, +// "name": "맛집가게", +// "regionId": 2, +// "category": "001" +// }, +// { +// "storeId": 2, +// "name": "맛집가게2", +// "regionId": 2, +// "category": "002" +// } +// ] +// }, +// "message": "가게 목록이 성공적으로 조회되었습니다." +// } +// """; +// +// mockWebServer.enqueue(new MockResponse() +// .setBody(mockResponseBody) +// .addHeader("Content-Type", "application/json")); +// +// // WHEN +// String regionCode = "1111000000"; +// someApiService.getSomeData(regionCode); +// +// // THEN +// verify(storeService, times(2)).createStore(any()); +// +// // Mock 서버 요청 검증 +// RecordedRequest recordedRequest = mockWebServer.takeRequest(); +// assertEquals("/api/v1/regions?regionCode=1111000000", recordedRequest.getPath()); +// assertEquals("GET", recordedRequest.getMethod()); +// } +// +// @Configuration +// static class TestConfig { +// @Bean +// public SomeApiService someApiService() { +// String baseUrl = mockWebServer.url("/").toString(); +// return new SomeApiService(WebClient.builder().baseUrl(baseUrl), storeService()); +// } +// +// @Bean +// public StoreService storeService() { +// return mock(StoreService.class); +// } +// } +//} diff --git a/build.gradle b/build.gradle index 464827e..deff39f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,37 +1,84 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.4.1' - id 'io.spring.dependency-management' version '1.1.7' + id 'java' + id 'org.springframework.boot' version '3.4.1' apply false + id 'io.spring.dependency-management' version '1.1.7' apply false + id 'jacoco' } -allprojects { - group = 'com.groom.yummy' - repositories { - mavenCentral() - } - java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } - } +tasks.named('test') { + useJUnitPlatform() + finalizedBy 'jacocoTestReport' } -configurations { - compileOnly { - extendsFrom annotationProcessor - } +allprojects { + group = 'com.groom.yummy' + version = '1.0.0' // 공통 버전 설정 + repositories { + mavenCentral() + } + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } } -dependencyManagement { - imports { - mavenBom "org.springframework.boot:spring-boot-dependencies:3.4.1" - } -} +subprojects { + apply plugin: 'java' + apply plugin: 'jacoco' + + tasks.withType(Test).configureEach { + useJUnitPlatform() + finalizedBy tasks.named("${project.name}JacocoTestReport") + } -bootJar { - enabled = false + tasks.register("${project.name}JacocoTestReport", JacocoReport) { + dependsOn tasks.named("test") + reports { + xml.required.set(true) + xml.outputLocation.set(layout.buildDirectory.file("reports/jacoco/${project.name}-jacoco.xml")) + } + classDirectories.setFrom( + fileTree(dir: layout.buildDirectory.dir("classes/java/main")).matching { + exclude( + "**/dto/**", // DTO 제외 + "**/config/**", // Config 제외 + "**/exception/**", // Exception 제외 + "**/*Application*", // Main Application 제외 + "**/event/**", // Event 제외 + "**/response/**", // Response 관련 클래스 제외 + "com/groom/yummy/domain/group/**", // group 도메인 제외 + "com/groom/yummy/domain/reply/**" // reply 도메인 제외 + ) + } + ) + } } -jar { - enabled = false +task jacocoRootReport(type: JacocoReport) { + dependsOn subprojects.test + + reports { + xml.required = true + html.required = true + html.outputLocation = file("${buildDir}/reports/jacoco/html") + } + + additionalSourceDirs.from files(subprojects.sourceSets.main.allSource.srcDirs) + sourceDirectories.from files(subprojects.sourceSets.main.allSource.srcDirs) + classDirectories.setFrom( + files( + subprojects.collect { subproject -> + fileTree(dir: "${subproject.buildDir}/classes/java/main").matching { + exclude( + "${subproject.name}/com/groom/yummy/domain/group/**", // group 도메인 제외 + "${subproject.name}/com/groom/yummy/domain/reply/**" // reply 도메인 제외 + ) + } + } + ) + ) + executionData.from files(subprojects.jacocoTestReport.executionData) } + + diff --git a/storage/build.gradle b/storage/build.gradle index 9906891..28fd6bb 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -4,30 +4,39 @@ plugins { id 'io.spring.dependency-management' version '1.1.7' } -version = 'unspecified' +version = '1.0.0' dependencies { + // 모듈 간 의존성 implementation project(':domain') - compileOnly project(':common') - testImplementation project(':common') - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' + implementation project(':common') + // Spring Boot implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + // Database runtimeOnly 'com.mysql:mysql-connector-j' runtimeOnly 'com.h2database:h2' - testImplementation platform('org.junit:junit-bom:5.10.0') + // Lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + // Testing testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.junit.jupiter:junit-jupiter' +} +bootJar { + enabled = false } -tasks.named('bootJar') { +jar { enabled = false } -tasks.test { +test { useJUnitPlatform() -} \ No newline at end of file +} From 62fcc9569cc71e60f47e93117a1c1eba7fd5ea21 Mon Sep 17 00:00:00 2001 From: fbehddn Date: Wed, 22 Jan 2025 14:08:22 +0900 Subject: [PATCH 65/80] =?UTF-8?q?chore:=20jira=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/issue_form.yml | 49 ---------- .github/workflows/close-jira-issue.yml | 44 --------- .github/workflows/create-jira-issue.yml | 118 ------------------------ 3 files changed, 211 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/issue_form.yml delete mode 100644 .github/workflows/close-jira-issue.yml delete mode 100644 .github/workflows/create-jira-issue.yml diff --git a/.github/ISSUE_TEMPLATE/issue_form.yml b/.github/ISSUE_TEMPLATE/issue_form.yml deleted file mode 100644 index 7d27444..0000000 --- a/.github/ISSUE_TEMPLATE/issue_form.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: '새로운 이슈 생성' -description: '새로운 이슈를 생성하고, Jira와 연동하여 관리합니다.' -labels: [feat] -title: '이슈 제목을 입력해주세요.' -body: - - type: input - id: parentKey - attributes: - label: '상위 작업 (Ticket Number)' - description: '상위 작업의 Ticket Number를 입력해주세요. (예: KAN-01)' - placeholder: 'REQ-01' - validations: - required: true - - - type: input - id: childKey - attributes: - label: '하위 작업 (Ticket Number - 선택)' - description: 'Jira에 기존 작업이 있다면 해당 Ticket Number를 입력하세요. 없을 경우 새로운 작업이 생성됩니다.' - placeholder: 'REQ-02' - validations: - required: false - - - type: input - id: branch - attributes: - label: '브랜치 (Branch)' - description: '영어로 브랜치명을 작성해주세요 (예: feature/your-branch)' - placeholder: 'feature/your-branch' - validations: - required: true - - - type: textarea - id: description - attributes: - label: '상세 내용 (Description)' - description: '이슈에 대해서 간략히 설명해주세요' - value: | - [ 이슈 내용 ] - - [ 체크리스트 ] - - [ ] TODO - - [ ] TODO - - [ ] TODO - - [ 레퍼런스 (선택) ] - - validations: - required: true \ No newline at end of file diff --git a/.github/workflows/close-jira-issue.yml b/.github/workflows/close-jira-issue.yml deleted file mode 100644 index 9b07c3c..0000000 --- a/.github/workflows/close-jira-issue.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Close Jira issue -on: - issues: - types: - - closed - -jobs: - close-issue: - name: Close Jira issue - runs-on: ubuntu-latest - - steps: - - name: Login to Jira - uses: atlassian/gajira-login@v3 - env: - JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} - JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} - JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} - - - name: Extract Jira issue key from GitHub issue title - id: extract-key - run: | - # Extract ISSUE_TITLE from the GitHub event - ISSUE_TITLE="${{ github.event.issue.title }}" - echo "ISSUE_TITLE=$ISSUE_TITLE" - - # Use grep to extract Jira key - JIRA_KEY=$(echo "$ISSUE_TITLE" | grep -oE '[A-Z]+-[0-9]+') - - # Handle cases where JIRA_KEY is empty - if [ -z "$JIRA_KEY" ]; then - echo "Error: Jira key not found in ISSUE_TITLE: $ISSUE_TITLE" - exit 1 - fi - - # Output JIRA_KEY to GitHub environment - echo "JIRA_KEY=$JIRA_KEY" >> $GITHUB_ENV - - - name: Close Jira issue - if: env.JIRA_KEY != '' - uses: atlassian/gajira-transition@v3 - with: - issue: ${{ env.JIRA_KEY }} - transition: 완료 diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml deleted file mode 100644 index 970663f..0000000 --- a/.github/workflows/create-jira-issue.yml +++ /dev/null @@ -1,118 +0,0 @@ -name: Create Jira issue -on: - issues: - types: - - opened -jobs: - create-issue: - name: Create Jira issue - runs-on: ubuntu-latest - steps: - - name: Login - uses: atlassian/gajira-login@v3 - env: - JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }} - JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }} - JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }} - - - name: Checkout main code - uses: actions/checkout@v4 - with: - ref: main - - - name: Issue Parser - uses: stefanbuck/github-issue-praser@v3 - id: issue-parser - with: - template-path: .github/ISSUE_TEMPLATE/issue_form.yml - - - name: Debug Template Path - run: | - ls .github/ISSUE_TEMPLATE/ - echo "Checking template path: .github/ISSUE_TEMPLATE/issue_form.yml" - - - name: Log Issue Parser - run: | - echo '${{ steps.issue-parser.outputs.issueparser_parentKey }}' - echo '${{ steps.issue-parser.outputs.issueparser_childKey }}' - echo '${{ steps.issue-parser.outputs.__ticket_number }}' - echo '${{ steps.issue-parser.outputs.jsonString }}' - - - name: Convert markdown to Jira Syntax - uses: peter-evans/jira2md@v1 - id: md2jira - with: - input-text: | - ### Github Issue Link - - ${{ github.event.issue.html_url }} - - ${{ github.event.issue.body }} - mode: md2jira - - - name: Transition issue - if: ${{ steps.issue-parser.outputs.issueparser_childKey != '' && steps.issue-parser.outputs.issueparser_childKey != null }} - id: transition - uses: atlassian/gajira-transition@v3 - with: - issue: "${{ steps.issue-parser.outputs.issueparser_childKey }}" - transition: "진행 중" - - - name: Create Issue - if: ${{ steps.issue-parser.outputs.issueparser_childKey == '' && steps.issue-parser.outputs.issueparser_childKey == null }} - id: create - uses: atlassian/gajira-create@v3 - with: - project: REQ - issuetype: Task - summary: '${{ github.event.issue.title }}' - description: '${{ steps.md2jira.outputs.output-text }}' - fields: | - { - "parent": { - "key": "${{ steps.issue-parser.outputs.issueparser_parentKey }}" - } - } - - - name: Log created issue - run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" - - - name: Checkout develop code - uses: actions/checkout@v4 - with: - ref: dev - - - name: Create branch with Ticket number - run: | - if [[ "${{ steps.create.outcome }}" == "success" ]]; then - ISSUE_NUMBER="${{ steps.create.outputs.issue }}" - else - ISSUE_NUMBER="${{ steps.issue-parser.outputs.issueparser_childKey }}" - fi - ISSUE_TITLE="${{ steps.issue-parser.outputs.issueparser_branch}}" - BRANCH_NAME="${ISSUE_NUMBER}-$(echo ${ISSUE_TITLE} | sed 's/ /-/g')" - git checkout -b "${BRANCH_NAME}" - git push origin "${BRANCH_NAME}" - - - name: Update issue title - uses: actions-cool/issues-helper@v3 - with: - actions: 'update-issue' - token: ${{ secrets.GITHUB_TOKEN }} - title: '[${{ steps.create.outputs.issue }}] ${{ github.event.issue.title }}' - - - name : 기존 이슈 제목 업데이트 - if: ${{ steps.issue-parser.outputs.issueparser_childKey != '' && steps.issue-parser.outputs.issueparser_childKey != null }} - uses: actions-cool/issues-helper@v3 - with: - actions: 'update-issue' - token: ${{ secrets.GITHUB_TOKEN}} - title: '[${{ steps.issue-parser.outputs.issueparser_childKey }}] ${{ github.event.issue.title }}' - - - name: Add comment with Jira issue link - uses: actions-cool/issues-helper@v3 - with: - actions: 'create-comment' - token: ${{ secrets.GITHUB_TOKEN }} - issue-number: ${{ github.event.issue.number }} - body: 'Jira Issue Created: [${{ steps.create.outputs.issue }}](${{ secrets.JIRA_BASE_URL }}/browse/${{ steps.create.outputs.issue }})' - From 851f5f1450913b98f1e307efeb6fe133ccf5544f Mon Sep 17 00:00:00 2001 From: fbehddn Date: Wed, 22 Jan 2025 14:08:29 +0900 Subject: [PATCH 66/80] =?UTF-8?q?chore:=20PR=20=ED=85=9C=ED=94=8C=EB=A6=BF?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8bc836b..836b893 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,5 @@ ## ⚡️ 관련 이슈 -close #이슈번호 +- close #이슈번호 ## 📍주요 변경 사항 > 주요 변경 사항에 대해 작성해주세요. From 1f421176b6afaf0d606bda1ebf26d1a892c69322 Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:33:23 +0900 Subject: [PATCH 67/80] =?UTF-8?q?test:=20UserService=20=EB=B0=8F=20?= =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80,=20Reply,=20Group=20Err?= =?UTF-8?q?orCode=20=EA=B5=AC=ED=98=84=20(#38)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add exception handler - #33 * feat: exception handler 추가 - #33 * fix: 모듈각 모듈이 예외 처리를 관리하도록 수정 * fix: UserFacadeTest 코드 에러 수정 * fix: UserEventHandlerTest 에러 수정 * fix: UserEventHandlerTest ì에러 해결 * test: 누락된 테스트 코드 및 UserServiceTest ì™추가- #37 * refactor: ìêGroup, reply 에 ì˜ErrorCode 를 구현하고 예외 처리를 추ê수정합니다 * test: UserService 테스트, 및 누락된 테스트 코드 추가 - #37 --- .../yummy/controller/UserController.java | 3 +- .../yummy/controller/UserControllerTest.java | 95 ++++++++++++++ .../groom/yummy/exception/GroupErrorCode.java | 18 +++ .../groom/yummy/exception/ReplyErrorCode.java | 17 +++ .../groom/yummy/exception/StoreErrorCode.java | 17 +++ .../com/groom/yummy/group/GroupService.java | 14 +- .../com/groom/yummy/reply/ReplyService.java | 12 +- .../dto/request/UpdateNicknameReqDto.java | 7 + .../groom/yummy/facade/UserFacadeTest.java | 24 ++-- .../groom/yummy/group/GroupServiceTest.java | 3 +- .../groom/yummy/reply/ReplyServiceTest.java | 13 +- .../groom/yummy/user/UserAuthServiceTest.java | 18 +++ .../com/groom/yummy/user/UserServiceTest.java | 120 ++++++++++++++++++ 13 files changed, 334 insertions(+), 27 deletions(-) create mode 100644 domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java create mode 100644 domain/src/main/java/com/groom/yummy/exception/ReplyErrorCode.java create mode 100644 domain/src/main/java/com/groom/yummy/exception/StoreErrorCode.java create mode 100644 domain/src/test/java/com/groom/yummy/user/UserServiceTest.java diff --git a/application/src/main/java/com/groom/yummy/controller/UserController.java b/application/src/main/java/com/groom/yummy/controller/UserController.java index 3264ef5..7f2ec7b 100644 --- a/application/src/main/java/com/groom/yummy/controller/UserController.java +++ b/application/src/main/java/com/groom/yummy/controller/UserController.java @@ -7,6 +7,7 @@ import com.groom.yummy.oauth2.auth.LoginUser; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -38,7 +39,7 @@ public ResponseEntity> getUserInfo(@PathVariable("us @Operation(summary = "유저 닉네임 변경", description = "토큰 정보 기반 유저 닉네임을 변경합니다.") @PatchMapping("/profile") - public ResponseEntity> updateUserNickname(@RequestBody UpdateNicknameReqDto updateNicknameReqDto, + public ResponseEntity> updateUserNickname(@Valid @RequestBody UpdateNicknameReqDto updateNicknameReqDto, @AuthenticationPrincipal LoginUser loginUser){ Long userId = loginUser.getUserId(); UserInfoResDto userInfoResDto = userFacade.updateUserNickname(userId,updateNicknameReqDto); diff --git a/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java index 97e868e..61022f5 100644 --- a/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java +++ b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java @@ -2,6 +2,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.groom.yummy.config.SecurityConfig; +import com.groom.yummy.exception.CustomException; +import com.groom.yummy.exception.JwtErrorCode; + import com.groom.yummy.user.dto.request.UpdateNicknameReqDto; import com.groom.yummy.user.dto.response.UserInfoResDto; import com.groom.yummy.user.facade.UserFacade; @@ -88,6 +91,69 @@ void getUserInfoByTokenTest() throws Exception { .validateToken(any(String.class)); } + @Test + @DisplayName("토큰 검증 실패 - WRONG_TYPE_TOKEN 예외 테스트") + void getUserInfoWithWrongTypeTokenTest() throws Exception { + // given + String jwtToken = "mockJwtToken"; + JwtErrorCode errorCode = JwtErrorCode.WRONG_TYPE_TOKEN; + doThrow(new CustomException(errorCode)) + .when(jwtProvider).validateToken(any(String.class)); + + // When & Then + mockMvc.perform(get("/api/v1/users") + .cookie(new Cookie("Authorization", jwtToken)) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isUnauthorized()) + .andExpect(jsonPath("$.msg").value(errorCode.getMessage())) // 에러 메시지 검증 + .andExpect(jsonPath("$.data").value(-1L)); + + verify(jwtProvider, times(1)).validateToken(any(String.class)); + verify(userFacade, never()).getUserInfo(any(Long.class)); // 유저 조회는 호출되지 않아야 함 + } + + @Test + @DisplayName("토큰 검증 실패 - EXPIRED_TOKEN 예외 테스트") + void getUserInfoWithExpiredTokenTest() throws Exception { + // given + String jwtToken = "expiredJwtToken"; + JwtErrorCode errorCode = JwtErrorCode.EXPIRED_TOKEN; + doThrow(new CustomException(errorCode)) + .when(jwtProvider).validateToken(any(String.class)); + + // When & Then + mockMvc.perform(get("/api/v1/users") + .cookie(new Cookie("Authorization", jwtToken)) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isUnauthorized()) + .andExpect(jsonPath("$.msg").value(errorCode.getMessage())) + .andExpect(jsonPath("$.data").value(-1L)); + + verify(jwtProvider, times(1)).validateToken(any(String.class)); + verify(userFacade, never()).getUserInfo(any(Long.class)); // 유저 조회는 호출되지 않아야 함 + } + + @Test + @DisplayName("토큰 검증 실패 - UNKNOWN_TOKEN_ERROR 예외 테스트") + void getUserInfoWithUnknownTokenErrorTest() throws Exception { + // given + String jwtToken = "unknownJwtToken"; + JwtErrorCode errorCode = JwtErrorCode.UNKNOWN_TOKEN_ERROR; + doThrow(new CustomException(errorCode)) + .when(jwtProvider).validateToken(any(String.class)); + + // When & Then + mockMvc.perform(get("/api/v1/users") + .cookie(new Cookie("Authorization", jwtToken)) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isBadRequest()) + .andExpect(jsonPath("$.msg").value(errorCode.getMessage())) + .andExpect(jsonPath("$.data").value(-1L)); + + verify(jwtProvider, times(1)).validateToken(any(String.class)); + verify(userFacade, never()).getUserInfo(any(Long.class)); // 유저 조회는 호출되지 않아야 함 + } + @Test @DisplayName("userId로 유저를 조회 테스트") void getUserInfoTest() throws Exception{ @@ -151,6 +217,35 @@ void updateUserNicknameTest() throws Exception{ .validateToken(any(String.class)); } + @Test + @DisplayName("유저 닉네임은 공백일 수 없습니다.") + void updateUserNicknameTest_NonBlank() throws Exception{ + // given + Long userId = 1L; + String jwtToken = "mockJwtToken"; + String email = "email@gmail.com"; + String updateNick = ""; + + UpdateNicknameReqDto updateNicknameReqDto = UpdateNicknameReqDto.builder().nickname(updateNick).build(); + String body = objectMapper.writeValueAsString(updateNicknameReqDto); + + // When & Then + ResultActions actions = mockMvc.perform(patch("/api/v1/users/profile") + .cookie(new Cookie("Authorization", jwtToken)) // 쿠키 추가 + .content(body) + .contentType(MediaType.APPLICATION_JSON)) + .andExpectAll( + status().isBadRequest(), + jsonPath("$.data").value(-1L), + jsonPath("$.msg").value("must not be blank") + ); + + verify(userFacade, never()) + .updateUserNickname(any(Long.class), any(UpdateNicknameReqDto.class)); // 메서드가 호출되지 않아야 함 + verify(jwtProvider, times(1)) + .validateToken(any(String.class)); + } + @Test @DisplayName("유저 삭제(논리) 테스트") void deleteUserByTokenTest() throws Exception{ diff --git a/domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java b/domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java new file mode 100644 index 0000000..aacff3b --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java @@ -0,0 +1,18 @@ +package com.groom.yummy.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum GroupErrorCode implements ErrorCode{ + GROUP_NOT_FOUND(HttpStatus.NOT_FOUND, "그룹이 존재하지 않습니다."), + GROUP_PARTICIPATION_FULL(HttpStatus.NOT_FOUND, "참가 인원이 가득 찼습니다.") + ; + private final HttpStatus code; + private final String message; + + GroupErrorCode(HttpStatus code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/domain/src/main/java/com/groom/yummy/exception/ReplyErrorCode.java b/domain/src/main/java/com/groom/yummy/exception/ReplyErrorCode.java new file mode 100644 index 0000000..bd9bd62 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/exception/ReplyErrorCode.java @@ -0,0 +1,17 @@ +package com.groom.yummy.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum ReplyErrorCode implements ErrorCode{ + REPLY_NOT_FOUND(HttpStatus.NOT_FOUND, "댓글이 존재하지 않습니다."), + ; + private final HttpStatus code; + private final String message; + + ReplyErrorCode(HttpStatus code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/domain/src/main/java/com/groom/yummy/exception/StoreErrorCode.java b/domain/src/main/java/com/groom/yummy/exception/StoreErrorCode.java new file mode 100644 index 0000000..dd9403f --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/exception/StoreErrorCode.java @@ -0,0 +1,17 @@ +package com.groom.yummy.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum StoreErrorCode implements ErrorCode{ + STORE_NOT_FOUND(HttpStatus.NOT_FOUND, "가게가 존재하지 않습니다."), + ; + private final HttpStatus code; + private final String message; + + StoreErrorCode(HttpStatus code, String message) { + this.code = code; + this.message = message; + } +} diff --git a/domain/src/main/java/com/groom/yummy/group/GroupService.java b/domain/src/main/java/com/groom/yummy/group/GroupService.java index 4652bac..1607728 100755 --- a/domain/src/main/java/com/groom/yummy/group/GroupService.java +++ b/domain/src/main/java/com/groom/yummy/group/GroupService.java @@ -1,5 +1,9 @@ package com.groom.yummy.group; +import com.groom.yummy.exception.CustomException; +import com.groom.yummy.exception.GroupErrorCode; +import com.groom.yummy.exception.StoreErrorCode; +import com.groom.yummy.exception.UserErrorCode; import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; import lombok.RequiredArgsConstructor; @@ -17,11 +21,11 @@ public class GroupService { public Long createGroup(Group group, String userEmail) { User user = userRepository.findByEmail(userEmail) - .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다.")); + .orElseThrow(() -> new CustomException(UserErrorCode.USER_NOT_FOUND)); Long storeId = group.getStoreId(); if (storeId == null) { - throw new IllegalArgumentException("Store ID는 null일 수 없습니다."); + throw new CustomException(StoreErrorCode.STORE_NOT_FOUND); } return groupRepository.saveGroup(group, storeId); } @@ -36,13 +40,13 @@ public List getAllGroups(String category, String regionCode, String store public void joinGroup(Long groupId, Long userId, String userEmail) { User user = userRepository.findByEmail(userEmail) - .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다.")); + .orElseThrow(() -> new CustomException(UserErrorCode.USER_NOT_FOUND)); Group group = groupRepository.findGroupById(groupId) - .orElseThrow(() -> new IllegalArgumentException("소모임을 찾을 수 없습니다.")); + .orElseThrow(() -> new CustomException(GroupErrorCode.GROUP_NOT_FOUND)); if (group.getCurrentParticipants() >= group.getMaxParticipants()) { - throw new IllegalStateException("참가 인원이 가득 찼습니다."); + throw new CustomException(GroupErrorCode.GROUP_PARTICIPATION_FULL); } groupRepository.updateGroupParticipants(groupId, group.getCurrentParticipants() + 1); } diff --git a/domain/src/main/java/com/groom/yummy/reply/ReplyService.java b/domain/src/main/java/com/groom/yummy/reply/ReplyService.java index 2d62d66..577056d 100644 --- a/domain/src/main/java/com/groom/yummy/reply/ReplyService.java +++ b/domain/src/main/java/com/groom/yummy/reply/ReplyService.java @@ -2,6 +2,10 @@ import java.util.Optional; +import com.groom.yummy.exception.CustomException; +import com.groom.yummy.exception.GroupErrorCode; +import com.groom.yummy.exception.ReplyErrorCode; +import com.groom.yummy.exception.UserErrorCode; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -29,7 +33,7 @@ public Reply createReply(Reply reply) { validateGroup(reply.getGroupId()); Reply savedReply = replyRepository.save(reply) - .orElseThrow(() -> new IllegalArgumentException("댓글 저장 실패: " + reply)); + .orElseThrow(() -> new CustomException(ReplyErrorCode.REPLY_NOT_FOUND)); return savedReply; } @@ -62,18 +66,18 @@ public void deleteReply(Long id) { // 댓글 검증 private Reply validateReply(Long id) { return replyRepository.findById(id) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 댓글입니다. ID: " + id)); + .orElseThrow(() -> new CustomException(ReplyErrorCode.REPLY_NOT_FOUND)); } // 사용자 검증 private void validateUser(Long userId) { userRepository.findById(userId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자입니다. ID: " + userId)); + .orElseThrow(() -> new CustomException(UserErrorCode.USER_NOT_FOUND)); } // 그룹 검증 private void validateGroup(Long groupId) { groupRepository.findGroupById(groupId) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 소모임입니다. ID: " + groupId)); + .orElseThrow(() -> new CustomException(GroupErrorCode.GROUP_NOT_FOUND)); } } diff --git a/domain/src/main/java/com/groom/yummy/user/dto/request/UpdateNicknameReqDto.java b/domain/src/main/java/com/groom/yummy/user/dto/request/UpdateNicknameReqDto.java index 16ab647..ff9592a 100644 --- a/domain/src/main/java/com/groom/yummy/user/dto/request/UpdateNicknameReqDto.java +++ b/domain/src/main/java/com/groom/yummy/user/dto/request/UpdateNicknameReqDto.java @@ -1,8 +1,15 @@ package com.groom.yummy.user.dto.request; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; + import lombok.Builder; @Builder public record UpdateNicknameReqDto( + + @Schema(description = "닉네임", example = "홍길동") + @NotBlank + String nickname ){} \ No newline at end of file diff --git a/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java b/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java index a6731a2..0d5565c 100644 --- a/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java +++ b/domain/src/test/java/com/groom/yummy/facade/UserFacadeTest.java @@ -1,11 +1,11 @@ package com.groom.yummy.facade; -import com.groom.yummy.publisher.EventPublisher; -import com.groom.yummy.user.dto.request.UpdateNicknameReqDto; -import com.groom.yummy.user.dto.response.UserInfoResDto; import com.groom.yummy.user.User; import com.groom.yummy.user.UserAuthService; import com.groom.yummy.user.UserService; +import com.groom.yummy.user.dto.request.UpdateNicknameReqDto; +import com.groom.yummy.user.dto.response.UserInfoResDto; + import com.groom.yummy.user.facade.UserFacade; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -29,7 +29,8 @@ class UserFacadeTest { private UserService userService; @Test - @DisplayName("완벽한 테스트") + @DisplayName("유저 서비스에서 조회한 유저를 dto로 변환하여 리턴합니다.") + void getUserInfoTest() { // given Long userId = 1L; @@ -49,7 +50,8 @@ void getUserInfoTest() { } @Test - @DisplayName("") + @DisplayName("email로 조회한 User를 리턴합니다.") + void findAuthUserByEmailTest() { // given Long userId = 1L; @@ -68,7 +70,8 @@ void findAuthUserByEmailTest() { } @Test - @DisplayName("") + @DisplayName("유저 회원가입 결과를 받아 리턴합니다.") + void findOrCreateUserTest() { // given Long userId = 1L; @@ -88,11 +91,11 @@ void findOrCreateUserTest() { } @Test - @DisplayName("") + @DisplayName("유저 업데이트한 결과를 dto로 변환하여 리턴합니다.") + void updateUserNicknameTest() { // Arrange Long userId = 1L; - String oldNickname = "강형준"; String email = "email@gmail.com"; String newNickname = "업데이트강형준"; UpdateNicknameReqDto updateNicknameReqDto = new UpdateNicknameReqDto(newNickname); @@ -108,8 +111,9 @@ void updateUserNicknameTest() { } @Test - @DisplayName("") - void deleteUser_shouldReturnDeletedUserId() { + @DisplayName("유저 삭제(논리) 후 삭제한 userID를 리턴합니다.") + void deleteUserTest() { + // given Long userId = 1L; when(userService.deleteUser(userId)).thenReturn(userId); diff --git a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java index 8c6bc54..0b35513 100755 --- a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java @@ -1,5 +1,6 @@ package com.groom.yummy.group; +import com.groom.yummy.exception.CustomException; import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; import org.junit.jupiter.api.*; @@ -168,7 +169,7 @@ public class GroupServiceTest { when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); // When - IllegalStateException exception = assertThrows(IllegalStateException.class, + CustomException exception = assertThrows(CustomException.class, () -> groupService.joinGroup(groupId, userId, userEmail)); // Then diff --git a/domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java b/domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java index d38ea99..2586322 100644 --- a/domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/reply/ReplyServiceTest.java @@ -1,5 +1,6 @@ package com.groom.yummy.reply; +import com.groom.yummy.exception.CustomException; import com.groom.yummy.publisher.EventPublisher; import com.groom.yummy.reply.event.ReplyUpdatedEvent; import com.groom.yummy.user.User; @@ -74,11 +75,11 @@ void createReply_UserNotFound() { when(userRepository.findById(1L)).thenReturn(Optional.empty()); // When & Then - IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { + CustomException exception = assertThrows(CustomException.class, () -> { replyService.createReply(reply); }); - assertEquals("존재하지 않는 사용자입니다. ID: 1", exception.getMessage()); + assertEquals("유저가 존재하지 않습니다.", exception.getMessage()); verify(replyRepository, never()).save(any()); } @@ -108,11 +109,11 @@ void updateReply_ReplyNotFound() { when(replyRepository.findById(1L)).thenReturn(Optional.empty()); // When & Then - IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { + CustomException exception = assertThrows(CustomException.class, () -> { replyService.updateReply(1L, "수정된 댓글 내용"); }); - assertEquals("존재하지 않는 댓글입니다. ID: 1", exception.getMessage()); + assertEquals("댓글이 존재하지 않습니다.", exception.getMessage()); verify(eventPublisher, never()).publish(any()); } @@ -161,11 +162,11 @@ void deleteReply_ReplyNotFound() { when(replyRepository.findById(1L)).thenReturn(Optional.empty()); // When & Then - IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> { + CustomException exception = assertThrows(CustomException.class, () -> { replyService.deleteReply(1L); }); - assertEquals("존재하지 않는 댓글입니다. ID: 1", exception.getMessage()); + assertEquals("댓글이 존재하지 않습니다.", exception.getMessage()); verify(replyRepository, never()).deleteById(any()); } } \ No newline at end of file diff --git a/domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java b/domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java index 7f13875..5d90cc3 100644 --- a/domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/user/UserAuthServiceTest.java @@ -1,5 +1,6 @@ package com.groom.yummy.user; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -20,6 +21,7 @@ class UserAuthServiceTest { private UserRepository userRepository; @Test + @DisplayName("회원가입이 된 유저인지 확인하기 위해 email로 유저를 조회합니다.") void findAuthUserByEmailTest() { // given String nickname = "강형준"; @@ -42,6 +44,21 @@ void findAuthUserByEmailTest() { } @Test + @DisplayName("회원가입 하지 않은 유저를 조회합니다.") + void findAuthUserByEmailTest_Empty() { + // given + String email = "email@gmail.com"; + when(userRepository.findByEmail(email)).thenReturn(Optional.empty()); + + // when + Optional result = userAuthService.findAuthUserByEmail(email); + + // then + assertTrue(result.isEmpty()); + } + + @Test + @DisplayName("유저가 없는 경우(Optional.empty()) 회원가입을 진행합니다.") void findOrCreateUser_Create_Test() { // given Long userId = 1L; @@ -65,6 +82,7 @@ void findOrCreateUser_Create_Test() { } @Test + @DisplayName("유저가 있는 경우 해당 유저를 리턴합니다.") void findOrCreateUser_Find_Test() { // given String nickname = "강형준"; diff --git a/domain/src/test/java/com/groom/yummy/user/UserServiceTest.java b/domain/src/test/java/com/groom/yummy/user/UserServiceTest.java new file mode 100644 index 0000000..17426ec --- /dev/null +++ b/domain/src/test/java/com/groom/yummy/user/UserServiceTest.java @@ -0,0 +1,120 @@ +package com.groom.yummy.user; + +import com.groom.yummy.exception.CustomException; +import com.groom.yummy.exception.UserErrorCode; +import com.groom.yummy.publisher.EventPublisher; +import com.groom.yummy.user.event.UserDeleteEvent; +import com.groom.yummy.user.event.UserNicknameChangedEvent; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +public class UserServiceTest { + @InjectMocks + private UserService userService; + + @Mock + private UserRepository userRepository; + + @Mock + private EventPublisher eventPublisher; + + @Test + @DisplayName("유저를 조회합니다.") + void getUserInfoTest() { + // given + Long userId = 1L; + String email = "email@gmail.com"; + String nickname = "깅형준"; + User mockUser = User.builder().id(userId).email(email).nickname(nickname).build(); + when(userRepository.findById(userId)).thenReturn(Optional.of(mockUser)); + + // when + User result = userService.getUserInfo(userId); + + // then + assertNotNull(result); + assertEquals(userId, result.getId()); + assertEquals(email, result.getEmail()); + assertEquals(nickname, result.getNickname()); + verify(userRepository, times(1)).findById(userId); + } + + @Test + @DisplayName("유저 조회 결과가 Optional.empty 이면 예외가 발생합니다.") + void getUserInfoFailTest() { + // when + Long userId = 1L; + when(userRepository.findById(userId)).thenReturn(Optional.empty()); + + // when&then + CustomException exception = assertThrows(CustomException.class, () -> userService.getUserInfo(userId)); + assertEquals(UserErrorCode.USER_NOT_FOUND, exception.getErrorCode()); + verify(userRepository, times(1)).findById(userId); + } + + @Test + @DisplayName("유저의 닉네임을 변경합니다.") + void updateNicknameTest() { + // given + Long userId = 1L; + String email = "email@gmail.com"; + String oldNickname = "강형준"; + String newNickname = "newNickname"; + User mockUser = spy(User.builder().id(userId).email(email).nickname(oldNickname).build()); + when(userRepository.findById(userId)).thenReturn(Optional.of(mockUser)); + + // when + User result = userService.updateNickname(userId, newNickname); + + // then + assertNotNull(result); + assertEquals(newNickname, result.getNickname()); + verify(mockUser, times(1)).changeNickname(newNickname); + verify(eventPublisher, times(1)).publish(any(UserNicknameChangedEvent.class)); + } + + @Test + @DisplayName("유저를 삭제(논리) 합니다.") + void deleteUserTest() { + // given + Long userId = 1L; + String email = "email@gmail.com"; + String nickname = "강형준"; + + User mockUser = spy(User.builder().id(userId).email(email).nickname(nickname).build()); + when(userRepository.findById(userId)).thenReturn(Optional.of(mockUser)); + + // when + Long result = userService.deleteUser(userId); + + // then + assertNotNull(result); + assertEquals(userId, result); + verify(mockUser, times(1)).deleteUser(); + verify(eventPublisher, times(1)).publish(any(UserDeleteEvent.class)); + } + + @Test + @DisplayName("없는 유저를 삭제하면 예외가 발생합니다.") + void deleteUserFailTest() { + // given + Long userId = 1L; + when(userRepository.findById(userId)).thenReturn(Optional.empty()); + + // when&then + CustomException exception = assertThrows(CustomException.class, () -> userService.deleteUser(userId)); + assertEquals(UserErrorCode.USER_NOT_FOUND, exception.getErrorCode()); + verify(userRepository, times(1)).findById(userId); + } + +} From b7bb1da142b77c42c78bb1266001f462400b904c Mon Sep 17 00:00:00 2001 From: fbehddn Date: Wed, 22 Jan 2025 15:01:19 +0900 Subject: [PATCH 68/80] =?UTF-8?q?chore:=20build.grade(:storage)=20common?= =?UTF-8?q?=20=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- storage/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/storage/build.gradle b/storage/build.gradle index 28fd6bb..925cd95 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -9,7 +9,8 @@ version = '1.0.0' dependencies { // 모듈 간 의존성 implementation project(':domain') - implementation project(':common') + compileOnly project(':common') + testImplementation project(':common') // Spring Boot implementation 'org.springframework.boot:spring-boot-starter-data-jpa' From ec9a44e439569c24a83c876671271033786b3e75 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Wed, 22 Jan 2025 15:54:38 +0900 Subject: [PATCH 69/80] =?UTF-8?q?fix:=20=EB=A9=80=ED=8B=B0=EB=AA=A8?= =?UTF-8?q?=EB=93=88=20=C3=AB=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/build.gradle | 8 ++++---- domain/build.gradle | 8 ++++++-- storage/build.gradle | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index de2f112..d694347 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -14,11 +14,11 @@ dependencies { } // 'bootJar' 태스크 비활성화 -tasks.withType(org.springframework.boot.gradle.tasks.bundling.BootJar) { +bootJar { enabled = false } // JAR 태스크 활성화 -tasks.named('jar') { - enabled = true -} \ No newline at end of file +//jar { +// enabled = false +//} \ No newline at end of file diff --git a/domain/build.gradle b/domain/build.gradle index 09c3cd9..b517b1b 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -40,6 +40,10 @@ test { useJUnitPlatform() } -tasks.named('bootJar') { +bootJar { enabled = false -} \ No newline at end of file +} + +//jar { +// enabled = false +//} diff --git a/storage/build.gradle b/storage/build.gradle index 925cd95..a00aaf3 100644 --- a/storage/build.gradle +++ b/storage/build.gradle @@ -34,9 +34,9 @@ bootJar { enabled = false } -jar { - enabled = false -} +//jar { +// enabled = false +//} test { useJUnitPlatform() From 5a32df71c5784a06109de93284d8f787e97ceb72 Mon Sep 17 00:00:00 2001 From: LeeJeongHoon <142333228+DawnIsProblem@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:55:35 +0900 Subject: [PATCH 70/80] Jeonghoon#35 feat user to group (#40) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: domain모듈로 이동 * chore: 카테고리 수정 * feat: API 통신 기능 추가 * feat: user-group 관련 기능 추가 * feat: user-group 관련 기능 추가 * chore: Category.java 모듈 위치 이동 * test: 테스트 코드 작성 * chore: 기능 변경에 따른 코드 수정 * test: 테스트 코드 수정 --- .../yummy/controller/StoreController.java | 47 ++++ .../groom/yummy/webclient/SomeApiService.java | 47 ++-- .../oauth2/service/SomeApiServiceTest.java | 233 ++++++++++-------- .../groom/yummy/group/GroupRepository.java | 1 - .../com/groom/yummy/group/GroupService.java | 5 + .../java/com/groom/yummy/store/Category.java | 30 ++- .../groom/yummy/store/StoreRepository.java | 2 + .../com/groom/yummy/store/StoreService.java | 19 ++ .../yummy/store/dto/StoreApiResponseDto.java | 27 ++ .../yummy}/usertogroup/AttendanceStatus.java | 2 +- .../groom/yummy/usertogroup/UserToGroup.java | 16 ++ .../usertogroup/UserToGroupRepository.java | 13 + .../groom/yummy/group/GroupServiceTest.java | 9 +- .../groom/yummy/store/StoreServiceTest.java | 4 +- .../domain/store/StoreEntityRepository.java | 5 + .../domain/store/StoreJpaRepository.java | 1 + .../domain/usertogroup/UserToGroupEntity.java | 21 +- .../UserToGroupEntityRepository.java | 60 +++++ .../usertogroup/UserToGroupJpaRepository.java | 11 + 19 files changed, 415 insertions(+), 138 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/controller/StoreController.java create mode 100644 domain/src/main/java/com/groom/yummy/store/dto/StoreApiResponseDto.java rename {storage/src/main/java/com/groom/yummy/domain => domain/src/main/java/com/groom/yummy}/usertogroup/AttendanceStatus.java (87%) create mode 100644 domain/src/main/java/com/groom/yummy/usertogroup/UserToGroup.java create mode 100644 domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java create mode 100644 storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupJpaRepository.java diff --git a/application/src/main/java/com/groom/yummy/controller/StoreController.java b/application/src/main/java/com/groom/yummy/controller/StoreController.java new file mode 100644 index 0000000..38ec0c3 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/controller/StoreController.java @@ -0,0 +1,47 @@ +package com.groom.yummy.controller; + +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.store.Category; +import com.groom.yummy.store.StoreService; +import com.groom.yummy.store.dto.StoreApiResponseDto; +import com.groom.yummy.webclient.SomeApiService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/v1/stores") +@RequiredArgsConstructor +public class StoreController { + private final SomeApiService someApiService; + private final StoreService storeService; + + @GetMapping("/sync") + public ResponseEntity> syncStores(@RequestParam String regionCode) { + try { + List storeDtos = someApiService.fetchStoresFromApi(regionCode); + + // 각 StoreApiResponseDto의 category를 내부 Category enum으로 변환 + storeDtos.forEach(dto -> { + String description = dto.getCategory(); + String apiCode = Category.fromDescription(description).getApiCode(); + dto.setCategory(apiCode); // description -> apiCode로 변환 + }); + + storeService.saveStores(storeDtos); + + return ResponseEntity.ok(new ResponseDto<>(null, "가게 데이터 동기화 성공")); + } catch (Exception e) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ResponseDto<>(null, "가게 데이터 동기화 중 오류 발생")); + } + } +} + + diff --git a/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java b/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java index 6cdf681..29cbaf6 100755 --- a/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java +++ b/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java @@ -6,56 +6,65 @@ import com.groom.yummy.store.Category; import com.groom.yummy.store.Store; import com.groom.yummy.store.StoreService; +import com.groom.yummy.store.dto.StoreApiResponseDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; @Service @RequiredArgsConstructor public class SomeApiService { private final WebClient.Builder webClientBuilder; - private final StoreService storeService; + private final StoreService storeService; // StoreService 주입 - public String getSomeData(String regionCode) { + public List fetchStoresFromApi(String regionCode) { WebClient webClient = webClientBuilder.build(); try { String response = webClient.get() .uri(uriBuilder -> uriBuilder - .path("/api/v1/regions") + .path("/api/v1/stores") .queryParam("regionCode", regionCode) .build()) .retrieve() .bodyToMono(String.class) .block(); - List stores = parseStoresFromResponse(response); - stores.forEach(storeService::createStore); + // JSON 응답을 파싱하여 StoreApiResponseDto 리스트 생성 + List storeDtos = parseStoresFromResponse(response); - return response; + // Store 객체로 변환 후 StoreService에 저장 요청 + storeDtos.forEach(dto -> { + Store store = Store.builder() + .storeId(dto.getStoreId()) + .name(dto.getName()) + .category(Category.fromApiCode(dto.getCategory())) + .regionId(dto.getRegionId()) + .build(); + storeService.createStore(store); + }); + + return storeDtos; // 반환값 추가 } catch (Exception e) { throw new RuntimeException("WebClient 요청 중 오류 발생", e); } } - private List parseStoresFromResponse(String response) { + + private List parseStoresFromResponse(String response) { ObjectMapper objectMapper = new ObjectMapper(); try { - JsonNode rootNode = objectMapper.readTree(response); - JsonNode storesNode = rootNode.path("data").path("stores"); - return objectMapper.convertValue(storesNode, new TypeReference>() {}) - .stream() - .map(store -> Store.builder() - .storeId(store.getStoreId()) - .name(store.getName()) - .category(Category.fromApiCode(String.valueOf(store.getCategory()))) - .regionId(store.getRegionId()) - .build()) - .toList(); + JsonNode storesNode = objectMapper.readTree(response).path("data").path("stores"); + return StreamSupport.stream(storesNode.spliterator(), false) + .map(StoreApiResponseDto::fromJsonNode) + .collect(Collectors.toList()); } catch (Exception e) { throw new RuntimeException("JSON 파싱 중 오류 발생", e); } } - } + + diff --git a/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java b/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java index 3dfda58..1160e88 100755 --- a/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java +++ b/application/src/test/java/com/groom/yummy/oauth2/service/SomeApiServiceTest.java @@ -1,106 +1,127 @@ -//package com.groom.yummy.oauth2.service; -// -//import com.groom.yummy.store.StoreService; -//import com.groom.yummy.webclient.SomeApiService; -//import okhttp3.mockwebserver.MockResponse; -//import okhttp3.mockwebserver.MockWebServer; -//import okhttp3.mockwebserver.RecordedRequest; -//import org.junit.jupiter.api.AfterAll; -//import org.junit.jupiter.api.BeforeAll; -//import org.junit.jupiter.api.DisplayName; -//import org.junit.jupiter.api.Test; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.boot.test.context.SpringBootTest; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -//import org.springframework.context.annotation.Import; -//import org.springframework.test.context.ActiveProfiles; -//import org.springframework.test.context.bean.override.mockito.MockitoBean; -//import org.springframework.web.reactive.function.client.WebClient; -// -//import static org.junit.jupiter.api.Assertions.assertEquals; -//import static org.mockito.Mockito.*; -// -//@SpringBootTest( -// webEnvironment = SpringBootTest.WebEnvironment.MOCK -//) -//@ActiveProfiles("test") -//@Import(SomeApiServiceTest.TestConfig.class) -//class SomeApiServiceTest { -// -// @Autowired -// private SomeApiService someApiService; -// -// @MockitoBean -// private StoreService storeService; -// -// private static MockWebServer mockWebServer; -// -// @BeforeAll -// static void setUpServer() throws Exception { -// mockWebServer = new MockWebServer(); -// mockWebServer.start(); -// } -// -// @AfterAll -// static void tearDownServer() throws Exception { -// mockWebServer.shutdown(); -// } -// -// @Test -// @DisplayName("특정 지역 요청 시 반환된 식당 정보 저장 테스트") -// void 특정지역_식당정보_저장테스트() throws Exception { -// // GIVEN -// String mockResponseBody = """ -// { -// "data": { -// "stores": [ -// { -// "storeId": 1, -// "name": "맛집가게", -// "regionId": 2, -// "category": "001" -// }, -// { -// "storeId": 2, -// "name": "맛집가게2", -// "regionId": 2, -// "category": "002" -// } -// ] -// }, -// "message": "가게 목록이 성공적으로 조회되었습니다." -// } -// """; -// -// mockWebServer.enqueue(new MockResponse() -// .setBody(mockResponseBody) -// .addHeader("Content-Type", "application/json")); -// -// // WHEN -// String regionCode = "1111000000"; -// someApiService.getSomeData(regionCode); -// -// // THEN -// verify(storeService, times(2)).createStore(any()); -// -// // Mock 서버 요청 검증 -// RecordedRequest recordedRequest = mockWebServer.takeRequest(); -// assertEquals("/api/v1/regions?regionCode=1111000000", recordedRequest.getPath()); -// assertEquals("GET", recordedRequest.getMethod()); -// } -// -// @Configuration -// static class TestConfig { -// @Bean -// public SomeApiService someApiService() { -// String baseUrl = mockWebServer.url("/").toString(); -// return new SomeApiService(WebClient.builder().baseUrl(baseUrl), storeService()); -// } -// -// @Bean -// public StoreService storeService() { -// return mock(StoreService.class); -// } -// } -//} +package com.groom.yummy.oauth2.service; + +import com.groom.yummy.store.Store; +import com.groom.yummy.store.StoreService; +import com.groom.yummy.webclient.SomeApiService; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.web.reactive.function.client.WebClient; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.*; + +@SpringBootTest( + webEnvironment = SpringBootTest.WebEnvironment.MOCK +) +@ActiveProfiles("test") +@Import(SomeApiServiceTest.TestConfig.class) +class SomeApiServiceTest { + + @Autowired + private SomeApiService someApiService; + + @MockitoBean + private StoreService storeService; + + private static MockWebServer mockWebServer; + + + @BeforeAll + static void setUpServer() throws Exception { + mockWebServer = new MockWebServer(); + mockWebServer.start(); + } + + @AfterAll + static void tearDownServer() throws Exception { + mockWebServer.shutdown(); + } + + @Test + @DisplayName("특정 지역 요청 시 반환된 식당 정보 저장 테스트") + void 특정지역_식당정보_저장테스트() throws Exception { + // GIVEN + String mockResponseBody = """ + { + "data": { + "stores": [ + { + "storeId": 1, + "name": "맛집가게", + "regionId": 2, + "category": "001" + }, + { + "storeId": 2, + "name": "맛집가게2", + "regionId": 2, + "category": "002" + } + ] + }, + "message": "가게 목록이 성공적으로 조회되었습니다." + } + """; + + mockWebServer.enqueue(new MockResponse() + .setBody(mockResponseBody) + .addHeader("Content-Type", "application/json")); + + // WHEN + String regionCode = "1111000000"; + someApiService.fetchStoresFromApi(regionCode); + + // THEN + ArgumentCaptor storeCaptor = ArgumentCaptor.forClass(Store.class); + verify(storeService, times(2)).createStore(storeCaptor.capture()); + + List capturedStores = storeCaptor.getAllValues(); + + // 첫 번째 Store 검증 + Store store1 = capturedStores.get(0); + assertEquals("맛집가게", store1.getName()); + assertEquals("001", store1.getCategory().getApiCode()); + assertEquals(2L, store1.getRegionId()); + + // 두 번째 Store 검증 + Store store2 = capturedStores.get(1); + assertEquals("맛집가게2", store2.getName()); + assertEquals("002", store2.getCategory().getApiCode()); + assertEquals(2L, store2.getRegionId()); + + // Mock 서버 요청 검증 + RecordedRequest recordedRequest = mockWebServer.takeRequest(); + assertEquals("/api/v1/stores?regionCode=1111000000", recordedRequest.getPath()); + assertEquals("GET", recordedRequest.getMethod()); + } + + @Configuration + static class TestConfig { + @Bean + public SomeApiService someApiService(StoreService storeService) { + String baseUrl = mockWebServer.url("/").toString(); + return new SomeApiService(WebClient.builder().baseUrl(baseUrl), storeService); + } + + @Bean + public StoreService storeService() { + return mock(StoreService.class); + } + } + +} diff --git a/domain/src/main/java/com/groom/yummy/group/GroupRepository.java b/domain/src/main/java/com/groom/yummy/group/GroupRepository.java index fbbeefe..6310684 100755 --- a/domain/src/main/java/com/groom/yummy/group/GroupRepository.java +++ b/domain/src/main/java/com/groom/yummy/group/GroupRepository.java @@ -3,7 +3,6 @@ import java.util.List; import java.util.Optional; - public interface GroupRepository { Optional findGroupById(Long id); Long saveGroup(Group group, Long storeId); diff --git a/domain/src/main/java/com/groom/yummy/group/GroupService.java b/domain/src/main/java/com/groom/yummy/group/GroupService.java index 1607728..3727e7a 100755 --- a/domain/src/main/java/com/groom/yummy/group/GroupService.java +++ b/domain/src/main/java/com/groom/yummy/group/GroupService.java @@ -6,6 +6,8 @@ import com.groom.yummy.exception.UserErrorCode; import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; +import com.groom.yummy.usertogroup.AttendanceStatus; +import com.groom.yummy.usertogroup.UserToGroupRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,6 +20,7 @@ public class GroupService { private final GroupRepository groupRepository; private final UserRepository userRepository; + private final UserToGroupRepository userToGroupRepository; public Long createGroup(Group group, String userEmail) { User user = userRepository.findByEmail(userEmail) @@ -49,6 +52,8 @@ public void joinGroup(Long groupId, Long userId, String userEmail) { throw new CustomException(GroupErrorCode.GROUP_PARTICIPATION_FULL); } groupRepository.updateGroupParticipants(groupId, group.getCurrentParticipants() + 1); + + userToGroupRepository.save(group, user, false, AttendanceStatus.APPROVED); } } diff --git a/domain/src/main/java/com/groom/yummy/store/Category.java b/domain/src/main/java/com/groom/yummy/store/Category.java index ade4530..f74ab84 100755 --- a/domain/src/main/java/com/groom/yummy/store/Category.java +++ b/domain/src/main/java/com/groom/yummy/store/Category.java @@ -8,11 +8,21 @@ @Getter public enum Category { // TODO : apiCode 수정 - KOREAN("001","한식"), - WESTERN("002","양식"), - Chinese("003","중식"), - Japanese("004","일식"), - Dessert("005","디저트"); + CHICKEN("001","치킨"), + CHINESE("002","중식"), + CUTLET_SASHIMI("003","돈까스-회"), + PIZZA("004","피자"), + FAST_FOOD("005","패스트푸드"), + STEW_SOUP("006","찜-탕"), + JOKBAL_BOSSAM("007","족발-보쌈"), + SNACK("008","분식"), + CAFE_DESSERT("009","카페-디저트"), + KOREAN("010","한식"), + MEAT("011","고기"), + WESTERN("012","양식"), + ASIAN("013","아시안"), + LATE_NIGHT("014","야식"), + LUNCH_BOX("015","도시락"); private final String apiCode; private final String description; @@ -42,4 +52,14 @@ public String toString() { public static boolean isValidCategory(Category category) { return API_CODE_TO_CATEGORY.containsValue(category); } + + public static Category fromDescription(String description) { + for (Category category : Category.values()) { + if (category.getDescription().equals(description)) { + return category; + } + } + throw new IllegalArgumentException("잘못된 카테고리: " + description); + } + } diff --git a/domain/src/main/java/com/groom/yummy/store/StoreRepository.java b/domain/src/main/java/com/groom/yummy/store/StoreRepository.java index 24c1e49..aae6f22 100755 --- a/domain/src/main/java/com/groom/yummy/store/StoreRepository.java +++ b/domain/src/main/java/com/groom/yummy/store/StoreRepository.java @@ -7,4 +7,6 @@ public interface StoreRepository { Optional findStoreById(Long id); Long saveStore(Store store, Long regionId); List findAllStores(); + boolean existsByNameAndRegionId(String name, Long regionId); + } diff --git a/domain/src/main/java/com/groom/yummy/store/StoreService.java b/domain/src/main/java/com/groom/yummy/store/StoreService.java index 10ba35b..319adac 100755 --- a/domain/src/main/java/com/groom/yummy/store/StoreService.java +++ b/domain/src/main/java/com/groom/yummy/store/StoreService.java @@ -1,6 +1,7 @@ package com.groom.yummy.store; import com.groom.yummy.region.RegionService; +import com.groom.yummy.store.dto.StoreApiResponseDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -32,6 +33,24 @@ public Long createStore(Store store) { return storeRepository.saveStore(store, store.getRegionId()); } + public void saveStores(List storeDtos) { + List stores = storeDtos.stream() + .map(dto -> Store.builder() + .storeId(dto.getStoreId()) + .name(dto.getName()) + .category(Category.fromApiCode(dto.getCategory())) + .regionId(dto.getRegionId()) + .build()) + .toList(); + + for (Store store : stores) { + boolean exists = storeRepository.existsByNameAndRegionId(store.getName(), store.getRegionId()); + if (!exists) { + storeRepository.saveStore(store, store.getRegionId()); + } + } + } + public Optional findStoreById(Long storeId) { return storeRepository.findStoreById(storeId); } diff --git a/domain/src/main/java/com/groom/yummy/store/dto/StoreApiResponseDto.java b/domain/src/main/java/com/groom/yummy/store/dto/StoreApiResponseDto.java new file mode 100644 index 0000000..37f20f7 --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/store/dto/StoreApiResponseDto.java @@ -0,0 +1,27 @@ +package com.groom.yummy.store.dto; + +import com.fasterxml.jackson.databind.JsonNode; +import lombok.*; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class StoreApiResponseDto { + + private Long storeId; + private String name; + private String category; + private Long regionId; + + public static StoreApiResponseDto fromJsonNode(JsonNode node) { + return StoreApiResponseDto.builder() + .storeId(node.path("storeId").asLong()) + .name(node.path("name").asText()) + .category(node.path("category").asText()) + .regionId(node.path("regionId").asLong()) + .build(); + } + +} diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/AttendanceStatus.java b/domain/src/main/java/com/groom/yummy/usertogroup/AttendanceStatus.java similarity index 87% rename from storage/src/main/java/com/groom/yummy/domain/usertogroup/AttendanceStatus.java rename to domain/src/main/java/com/groom/yummy/usertogroup/AttendanceStatus.java index 3f8d16f..43cc13b 100644 --- a/storage/src/main/java/com/groom/yummy/domain/usertogroup/AttendanceStatus.java +++ b/domain/src/main/java/com/groom/yummy/usertogroup/AttendanceStatus.java @@ -1,4 +1,4 @@ -package com.groom.yummy.domain.usertogroup; +package com.groom.yummy.usertogroup; public enum AttendanceStatus { ATTENDED("참석"), diff --git a/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroup.java b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroup.java new file mode 100644 index 0000000..34f9bfd --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroup.java @@ -0,0 +1,16 @@ +package com.groom.yummy.usertogroup; + +import com.groom.yummy.group.Group; +import com.groom.yummy.user.User; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class UserToGroup { + private Long id; + private Group group; + private User user; + private boolean isLeader; + private AttendanceStatus attendanceStatus; +} diff --git a/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java new file mode 100644 index 0000000..229ac9c --- /dev/null +++ b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java @@ -0,0 +1,13 @@ +package com.groom.yummy.usertogroup; + +import com.groom.yummy.group.Group; +import com.groom.yummy.user.User; + +import java.util.Optional; + +public interface UserToGroupRepository { + + void save(Group group, User user, boolean isLeader, AttendanceStatus attendanceStatus); + + Optional findByGroupAndUser(Group group, User user); +} diff --git a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java index 0b35513..18c5694 100755 --- a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java @@ -3,6 +3,8 @@ import com.groom.yummy.exception.CustomException; import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; +import com.groom.yummy.usertogroup.AttendanceStatus; +import com.groom.yummy.usertogroup.UserToGroupRepository; import org.junit.jupiter.api.*; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -31,6 +33,9 @@ public class GroupServiceTest { @Mock private UserRepository userRepository; + @Mock + private UserToGroupRepository userToGroupRepository; + @DisplayName("사용자는 소모임을 생성할 수 있다.") @Order(1) @Test @@ -133,9 +138,11 @@ public class GroupServiceTest { // Then verify(groupRepository, times(1)).updateGroupParticipants(eq(groupId), eq(3)); - verify(userRepository, times(1)).findByEmail(userEmail); + verify(userToGroupRepository, times(1)) + .save(eq(group), eq(user), eq(false), eq(AttendanceStatus.APPROVED)); // save 호출 검증 } + @DisplayName("소모임 참여 시 참가 인원이 초과되면 예외가 발생한다.") @Order(4) @Test diff --git a/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java b/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java index 0a1a61a..dc445b3 100755 --- a/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java @@ -37,7 +37,7 @@ public class StoreServiceTest { // Given Store store = Store.builder() .name("GoormStore") - .category(Category.Dessert) + .category(Category.PIZZA) .regionId(1L) .build(); @@ -66,7 +66,7 @@ public class StoreServiceTest { // GIVEN Store store = Store.builder() .name("GoormStore") - .category(Category.Dessert) + .category(Category.PIZZA) .regionId(1L) .build(); diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java index 24336be..85f3f2a 100755 --- a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntityRepository.java @@ -38,4 +38,9 @@ public List findAllStores() { .map(StoreEntity::toStoreDomain) .collect(Collectors.toList()); } + + @Override + public boolean existsByNameAndRegionId(String name, Long regionId) { + return storeJpaRepository.existsByNameAndRegion_Id(name, regionId); + } } diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java index af3b8a0..9047aea 100644 --- a/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreJpaRepository.java @@ -3,4 +3,5 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface StoreJpaRepository extends JpaRepository { + boolean existsByNameAndRegion_Id(String name, Long regionId); } diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java index 17ff302..e5b9a57 100644 --- a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java @@ -3,21 +3,26 @@ import com.groom.yummy.domain.BaseEntity; import com.groom.yummy.domain.group.GroupEntity; import com.groom.yummy.domain.user.UserEntity; +import com.groom.yummy.usertogroup.AttendanceStatus; import jakarta.persistence.*; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Table(name = "user_groups") @SuperBuilder +@Getter public class UserToGroupEntity extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + @Column(nullable = false) private boolean isLeader; + @Getter @Enumerated(EnumType.STRING) @Column(nullable = false) private AttendanceStatus attendanceStatus; @@ -37,4 +42,14 @@ public UserToGroupEntity(AttendanceStatus attendanceStatus, boolean isLeader, Us this.user = user; this.group = group; } + + public static UserToGroupEntity create(GroupEntity groupEntity, UserEntity userEntity, boolean isLeader) { + return UserToGroupEntity.builder() + .group(groupEntity) + .user(userEntity) + .isLeader(isLeader) + .attendanceStatus(AttendanceStatus.APPROVED) + .build(); + } + } diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java new file mode 100644 index 0000000..2522a9e --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java @@ -0,0 +1,60 @@ +package com.groom.yummy.domain.usertogroup; + +import com.groom.yummy.domain.group.GroupEntity; +import com.groom.yummy.domain.group.GroupJpaRepository; +import com.groom.yummy.domain.store.StoreEntity; +import com.groom.yummy.domain.store.StoreJpaRepository; +import com.groom.yummy.domain.user.UserEntity; +import com.groom.yummy.usertogroup.AttendanceStatus; +import com.groom.yummy.group.Group; +import com.groom.yummy.user.User; +import com.groom.yummy.usertogroup.UserToGroup; +import com.groom.yummy.usertogroup.UserToGroupRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +@RequiredArgsConstructor +public class UserToGroupEntityRepository implements UserToGroupRepository { + + private final UserToGroupJpaRepository userToGroupJpaRepository; + private final StoreJpaRepository storeJpaRepository; + + @Override + public void save(Group group, User user, boolean isLeader, AttendanceStatus attendanceStatus) { + StoreEntity storeEntity = group.getStoreId() != null + ? storeJpaRepository.findById(group.getStoreId()) + .orElseThrow(() -> new IllegalArgumentException("Store not found for id: " + group.getStoreId())) + : null; + + GroupEntity groupEntity = GroupEntity.fromGroupDomain(group, null); + UserEntity userEntity = UserEntity.toEntity(user); + + UserToGroupEntity userToGroupEntity = UserToGroupEntity.builder() + .group(groupEntity) + .user(userEntity) + .isLeader(isLeader) + .attendanceStatus(attendanceStatus) + .build(); + + userToGroupJpaRepository.save(userToGroupEntity); + } + + @Override + public Optional findByGroupAndUser(Group group, User user) { + GroupEntity groupEntity = GroupEntity.fromGroupDomain(group, null); + UserEntity userEntity = UserEntity.toEntity(user); + + return userToGroupJpaRepository.findById(groupEntity.getId()) + .map(entity -> UserToGroup.builder() + .id(entity.getId()) + .group(group) + .user(user) + .isLeader(entity.isLeader()) + .attendanceStatus(entity.getAttendanceStatus()) + .build()); + } +} + diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupJpaRepository.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupJpaRepository.java new file mode 100644 index 0000000..1622ddf --- /dev/null +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupJpaRepository.java @@ -0,0 +1,11 @@ +package com.groom.yummy.domain.usertogroup; + +import com.groom.yummy.domain.group.GroupEntity; +import com.groom.yummy.domain.user.UserEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface UserToGroupJpaRepository extends JpaRepository { + Optional findByGroupAndUser(GroupEntity group, UserEntity user); +} From c05290ecc8dc93cace648b74d97b8bc58639dcd5 Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Wed, 22 Jan 2025 22:38:17 +0900 Subject: [PATCH 71/80] =?UTF-8?q?feat:=20testUser=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80-=20#41=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../groom/yummy/config/SecurityConfig.java | 1 + .../yummy/controller/StoreController.java | 32 +++++++- .../groom/yummy/external/StoreApiClient.java | 42 ++++++++++ .../groom/yummy/external/dto/ApiResponse.java | 6 ++ .../yummy/external/dto/PaginationInfo.java | 9 +++ .../yummy/external/dto/StoreListResponse.java | 9 +++ .../yummy/external/dto/StoreRequestDto.java | 12 +++ .../yummy/external/dto/StoreResponseDto.java | 13 +++ .../yummy/test/TestCreateController.java | 79 +++++++++++++++++++ .../com/groom/yummy/test/dto/SignInDto.java | 6 ++ .../yummy/test/dto/TestUserCreateDto.java | 7 ++ .../groom/yummy/test/dto/TestUserResDto.java | 23 ++++++ .../src/main/resources/application.yml | 2 +- .../yummy/controller/UserControllerTest.java | 1 - 14 files changed, 236 insertions(+), 6 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/external/StoreApiClient.java create mode 100644 application/src/main/java/com/groom/yummy/external/dto/ApiResponse.java create mode 100644 application/src/main/java/com/groom/yummy/external/dto/PaginationInfo.java create mode 100644 application/src/main/java/com/groom/yummy/external/dto/StoreListResponse.java create mode 100644 application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java create mode 100644 application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java create mode 100644 application/src/main/java/com/groom/yummy/test/TestCreateController.java create mode 100644 application/src/main/java/com/groom/yummy/test/dto/SignInDto.java create mode 100644 application/src/main/java/com/groom/yummy/test/dto/TestUserCreateDto.java create mode 100644 application/src/main/java/com/groom/yummy/test/dto/TestUserResDto.java diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index d9b9500..5611251 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -51,6 +51,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ http.authorizeHttpRequests((auth) -> auth .requestMatchers( "/login/**", "/oauth2/**", "/oauth2/authorization/**").permitAll() .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**").permitAll() // Swagger 관련 경로 허용 + .requestMatchers("/api/v1/test/users/*").permitAll() .anyRequest().authenticated()); //세션 설정 : STATELESS diff --git a/application/src/main/java/com/groom/yummy/controller/StoreController.java b/application/src/main/java/com/groom/yummy/controller/StoreController.java index 38ec0c3..218b560 100644 --- a/application/src/main/java/com/groom/yummy/controller/StoreController.java +++ b/application/src/main/java/com/groom/yummy/controller/StoreController.java @@ -1,26 +1,32 @@ package com.groom.yummy.controller; import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.external.StoreApiClient; +import com.groom.yummy.external.dto.ApiResponse; +import com.groom.yummy.external.dto.StoreListResponse; +import com.groom.yummy.external.dto.StoreRequestDto; +import com.groom.yummy.external.dto.StoreResponseDto; import com.groom.yummy.store.Category; import com.groom.yummy.store.StoreService; import com.groom.yummy.store.dto.StoreApiResponseDto; import com.groom.yummy.webclient.SomeApiService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +@Tag(name = "[Store] Store API") @RestController @RequestMapping("/api/v1/stores") @RequiredArgsConstructor public class StoreController { private final SomeApiService someApiService; private final StoreService storeService; + private final StoreApiClient storeApiClient; @GetMapping("/sync") public ResponseEntity> syncStores(@RequestParam String regionCode) { @@ -42,6 +48,24 @@ public ResponseEntity> syncStores(@RequestParam String regionC .body(new ResponseDto<>(null, "가게 데이터 동기화 중 오류 발생")); } } + @Operation(summary = "가게 정보 조회", description = "가게 id로 가게를 조회합니다.") + @GetMapping("/{storeId}") + public ResponseEntity> getStore(@PathVariable("storeId") Long storeId) { + StoreResponseDto storeResponseDTO = storeApiClient.getStoreByApi(storeId); + return ResponseEntity.ok(ResponseDto.of(storeResponseDTO,"storeId로 가게 조회 성공")); + } + + @Operation(summary = "가게 조회", description = "가게들을 정렬 기준에 맞게 조회합니다.") + @GetMapping + public ResponseEntity> getStoresByFilters( + @RequestParam(name = "category", required = false) Category category, + @RequestParam(name = "regionId", required = false) Long regionId, + @RequestParam(name = "name", required = false) String name, + @RequestParam(name = "page", defaultValue = "1") int page, + @RequestParam(name = "size", defaultValue = "10") int size) { + ApiResponse storeListResponseApiResponse = storeApiClient.getStoresByFilters(category, regionId,name,page,size); + return ResponseEntity.ok(storeListResponseApiResponse); + } } diff --git a/application/src/main/java/com/groom/yummy/external/StoreApiClient.java b/application/src/main/java/com/groom/yummy/external/StoreApiClient.java new file mode 100644 index 0000000..1b32b88 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/external/StoreApiClient.java @@ -0,0 +1,42 @@ +package com.groom.yummy.external; + +import com.groom.yummy.external.dto.ApiResponse; +import com.groom.yummy.external.dto.StoreListResponse; +import com.groom.yummy.external.dto.StoreResponseDto; +import com.groom.yummy.store.Category; +import lombok.RequiredArgsConstructor; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; + +@Service +@RequiredArgsConstructor +public class StoreApiClient { + private final WebClient webClient; + + public StoreResponseDto getStoreByApi(Long storeId){ + StoreResponseDto storeResponse = webClient.get() + .uri(uriBuilder -> uriBuilder.path("/api/v1/store/{id}") + .build(storeId)) + .retrieve() + .bodyToMono(StoreResponseDto.class) + .block(); + return storeResponse; + } + + public ApiResponse getStoresByFilters( + Category category, Long regionId, String name, int page, int size) { + return webClient.get() + .uri(uriBuilder -> uriBuilder + .path("/api/v1/stores") + .queryParam("category", category) + .queryParam("regionId", regionId) + .queryParam("name", name) + .queryParam("page", page) + .queryParam("size", size) + .build()) + .retrieve() + .bodyToMono(new ParameterizedTypeReference>() {}) + .block(); + } +} diff --git a/application/src/main/java/com/groom/yummy/external/dto/ApiResponse.java b/application/src/main/java/com/groom/yummy/external/dto/ApiResponse.java new file mode 100644 index 0000000..1177aa8 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/external/dto/ApiResponse.java @@ -0,0 +1,6 @@ +package com.groom.yummy.external.dto; + +public record ApiResponse( + T data, + String message +) {} diff --git a/application/src/main/java/com/groom/yummy/external/dto/PaginationInfo.java b/application/src/main/java/com/groom/yummy/external/dto/PaginationInfo.java new file mode 100644 index 0000000..36de235 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/external/dto/PaginationInfo.java @@ -0,0 +1,9 @@ +package com.groom.yummy.external.dto; + +public record PaginationInfo( + int page, + int size, + int totalPages, + long totalElements +) { +} diff --git a/application/src/main/java/com/groom/yummy/external/dto/StoreListResponse.java b/application/src/main/java/com/groom/yummy/external/dto/StoreListResponse.java new file mode 100644 index 0000000..951a967 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/external/dto/StoreListResponse.java @@ -0,0 +1,9 @@ +package com.groom.yummy.external.dto; + +import java.util.List; + + +public record StoreListResponse( + List stores, + PaginationInfo pageable +) {} diff --git a/application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java b/application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java new file mode 100644 index 0000000..7b768f0 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java @@ -0,0 +1,12 @@ +package com.groom.yummy.external.dto; + +import com.groom.yummy.store.Category; +import lombok.Builder; + +@Builder +public record StoreRequestDto( + String name, + Category category, + Long regionId +) { +} diff --git a/application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java b/application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java new file mode 100644 index 0000000..5b2f222 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java @@ -0,0 +1,13 @@ +package com.groom.yummy.external.dto; + +import com.groom.yummy.store.Category; +import lombok.Builder; + +@Builder +public record StoreResponseDto( + Long storeId, + String name, + Category category, + Long regionId +) { +} diff --git a/application/src/main/java/com/groom/yummy/test/TestCreateController.java b/application/src/main/java/com/groom/yummy/test/TestCreateController.java new file mode 100644 index 0000000..91b38e7 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/test/TestCreateController.java @@ -0,0 +1,79 @@ +package com.groom.yummy.test; + +import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.jwt.JwtProvider; +import com.groom.yummy.test.dto.SignInDto; +import com.groom.yummy.test.dto.TestUserCreateDto; +import com.groom.yummy.test.dto.TestUserResDto; +import com.groom.yummy.user.User; +import com.groom.yummy.user.UserRepository; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseCookie; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Optional; + +import static org.springframework.http.HttpHeaders.SET_COOKIE; + +@Tag(name = "[TestUser] TestUser API") +@RestController +@RequiredArgsConstructor +@Slf4j +@RequestMapping("/api/v1/test/users") +public class TestCreateController { + + private final JwtProvider jwtProvider; + private final UserRepository userRepository; + + @Operation(summary = "회원가입", description = "회원 가입 할 유저의 정보를 입력합니다. " + + "
회원가입이 완료되면 자동으로 유저의 기본 profile 사진이 등록됩니다." + + "
이후에 유저의 Token 을 통해 profile 사진을 수정할 수 있습니다.") + @PostMapping("/sign-up") + public ResponseEntity> signUp(@Valid @RequestBody TestUserCreateDto testUserCreateDto){ + User user = User.builder() + .email(testUserCreateDto.email()) + .nickname(testUserCreateDto.nickname()) + .role("ROLE_USER") + .groupJoinCount(0L) + .groupAttendanceCount(0L) + .isDeleted(false) + .build(); + + user = userRepository.save(user); + TestUserResDto testUserResDto = TestUserResDto.from(user); + return ResponseEntity.status(HttpStatus.CREATED).body( + new ResponseDto<>( + testUserResDto, + "테스트 유저 생성 성공")); + } + + + @Operation(summary = "로그인", description = "회원 가입 한 유저의 loginId와 password를 입력합니다.") + @PostMapping("/sign-in") + public ResponseEntity> signIn(@Valid @RequestBody SignInDto signInReqDto){ + + Optional optionalUser = userRepository.findByEmail(signInReqDto.email()); + User user = optionalUser.get(); + String accessToken = jwtProvider.createAccessToken(user.getId(), user.getEmail(),user.getNickname(),user.getRole()); + ResponseCookie cookie = ResponseCookie.from("Authorization", accessToken) + .httpOnly(true) + .secure(true) + .path("/") + .maxAge(120) + .sameSite("Strict") + .build(); + + return ResponseEntity.status(HttpStatus.OK) + .header(SET_COOKIE, cookie.toString()) + .body(new ResponseDto<>(1, "성공하였습니당.")); + } +} diff --git a/application/src/main/java/com/groom/yummy/test/dto/SignInDto.java b/application/src/main/java/com/groom/yummy/test/dto/SignInDto.java new file mode 100644 index 0000000..1a04d9d --- /dev/null +++ b/application/src/main/java/com/groom/yummy/test/dto/SignInDto.java @@ -0,0 +1,6 @@ +package com.groom.yummy.test.dto; + +public record SignInDto( + String email +) { +} diff --git a/application/src/main/java/com/groom/yummy/test/dto/TestUserCreateDto.java b/application/src/main/java/com/groom/yummy/test/dto/TestUserCreateDto.java new file mode 100644 index 0000000..5636750 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/test/dto/TestUserCreateDto.java @@ -0,0 +1,7 @@ +package com.groom.yummy.test.dto; + +public record TestUserCreateDto( + String nickname, + String email +) { +} diff --git a/application/src/main/java/com/groom/yummy/test/dto/TestUserResDto.java b/application/src/main/java/com/groom/yummy/test/dto/TestUserResDto.java new file mode 100644 index 0000000..5ee953b --- /dev/null +++ b/application/src/main/java/com/groom/yummy/test/dto/TestUserResDto.java @@ -0,0 +1,23 @@ +package com.groom.yummy.test.dto; + +import com.groom.yummy.user.User; +import lombok.Builder; + +@Builder +public record TestUserResDto( + Long id, + String email, + String nickname, + Long joinCount, + Long participationCount +) { + public static TestUserResDto from(User user){ + return TestUserResDto.builder() + .id(user.getId()) + .email(user.getEmail()) + .nickname(user.getNickname()) + .joinCount(user.getGroupJoinCount()) + .participationCount(user.getGroupAttendanceCount()) + .build(); + } +} diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 1a58b67..bb36afa 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -7,7 +7,7 @@ spring: jpa: hibernate: - ddl-auto: update + ddl-auto: create show-sql: true open-in-view: false properties: diff --git a/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java index 61022f5..86e3b67 100644 --- a/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java +++ b/application/src/test/java/com/groom/yummy/controller/UserControllerTest.java @@ -35,7 +35,6 @@ @ActiveProfiles("test") @Import({SecurityConfig.class}) @WebMvcTest(controllers = {UserController.class}) -@ExtendWith(MockitoExtension.class) // Mockito 확장 사용 class UserControllerTest { @Autowired From 773467f8af6c23fef705b8978ed85663f4c05e4d Mon Sep 17 00:00:00 2001 From: LeeJeongHoon <142333228+DawnIsProblem@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:18:45 +0900 Subject: [PATCH 72/80] Fix/group feature (#43) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: 테스트 코드 수정 * chore: 소모임 생성 조건 수정 --------- Co-authored-by: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> --- .../yummy/controller/GroupController.java | 32 ++- .../yummy/controller/StoreController.java | 18 -- .../yummy/controller/GroupControllerTest.java | 236 +++++++++++------- .../groom/yummy/exception/GroupErrorCode.java | 3 +- .../com/groom/yummy/group/GroupService.java | 39 ++- .../dto/request/CreateGroupRequestDto.java | 4 +- .../dto/request/JoinGroupRequestDto.java | 1 + .../usertogroup/UserToGroupRepository.java | 6 +- .../groom/yummy/group/GroupServiceTest.java | 105 ++++---- .../UserToGroupEntityRepository.java | 6 +- 10 files changed, 262 insertions(+), 188 deletions(-) diff --git a/application/src/main/java/com/groom/yummy/controller/GroupController.java b/application/src/main/java/com/groom/yummy/controller/GroupController.java index 2d94697..275c2ca 100755 --- a/application/src/main/java/com/groom/yummy/controller/GroupController.java +++ b/application/src/main/java/com/groom/yummy/controller/GroupController.java @@ -6,14 +6,14 @@ import com.groom.yummy.group.dto.request.JoinGroupRequestDto; import com.groom.yummy.group.dto.response.GroupDetailResponseDto; import com.groom.yummy.group.dto.response.GroupResponseDto; +import com.groom.yummy.oauth2.auth.LoginUser; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -30,15 +30,23 @@ public class GroupController { @Operation(summary = "소모임 생성", description = "소모임을 생성합니다.") @PostMapping public ResponseEntity> createGroup( - @Valid @RequestBody CreateGroupRequestDto requestDto + @Valid @RequestBody CreateGroupRequestDto requestDto, + @AuthenticationPrincipal LoginUser loginUser ) { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - String userEmail = authentication.getName(); + Long userId = loginUser.getUserId(); + Long groupId = groupService.createGroup( + requestDto.getStoreId(), + userId, + requestDto.getTitle(), + requestDto.getContent(), + requestDto.getMaxParticipants(), + requestDto.getMinParticipants(), + requestDto.getMeetingDate() + ); - Long groupId = groupService.createGroup(requestDto.toGroupDomain(), userEmail); GroupResponseDto response = groupService.findGroupById(groupId) .map(GroupResponseDto::fromGroupDomain) - .orElseThrow(() -> new IllegalArgumentException("소모임 생성 실패")); + .orElseThrow(); return ResponseEntity.status(HttpStatus.CREATED) .body(new ResponseDto<>(response, "소모임 생성 성공")); @@ -76,13 +84,11 @@ public ResponseEntity> getGroupById( @PostMapping("/{groupId}/join") public ResponseEntity> joinGroup( @PathVariable Long groupId, - @Valid @RequestBody JoinGroupRequestDto request + @Valid @RequestBody JoinGroupRequestDto requestDto, + @AuthenticationPrincipal LoginUser loginUser ) { - - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - String userEmail = authentication.getName(); - - groupService.joinGroup(groupId, request.getUserId(), userEmail); + Long userId = loginUser.getUserId(); + groupService.joinGroup(groupId, userId, requestDto.getStoreId()); return ResponseEntity.ok(new ResponseDto<>(null, "소모임 참여 성공")); } } diff --git a/application/src/main/java/com/groom/yummy/controller/StoreController.java b/application/src/main/java/com/groom/yummy/controller/StoreController.java index 218b560..ea2fc07 100644 --- a/application/src/main/java/com/groom/yummy/controller/StoreController.java +++ b/application/src/main/java/com/groom/yummy/controller/StoreController.java @@ -48,24 +48,6 @@ public ResponseEntity> syncStores(@RequestParam String regionC .body(new ResponseDto<>(null, "가게 데이터 동기화 중 오류 발생")); } } - @Operation(summary = "가게 정보 조회", description = "가게 id로 가게를 조회합니다.") - @GetMapping("/{storeId}") - public ResponseEntity> getStore(@PathVariable("storeId") Long storeId) { - StoreResponseDto storeResponseDTO = storeApiClient.getStoreByApi(storeId); - return ResponseEntity.ok(ResponseDto.of(storeResponseDTO,"storeId로 가게 조회 성공")); - } - - @Operation(summary = "가게 조회", description = "가게들을 정렬 기준에 맞게 조회합니다.") - @GetMapping - public ResponseEntity> getStoresByFilters( - @RequestParam(name = "category", required = false) Category category, - @RequestParam(name = "regionId", required = false) Long regionId, - @RequestParam(name = "name", required = false) String name, - @RequestParam(name = "page", defaultValue = "1") int page, - @RequestParam(name = "size", defaultValue = "10") int size) { - ApiResponse storeListResponseApiResponse = storeApiClient.getStoresByFilters(category, regionId,name,page,size); - return ResponseEntity.ok(storeListResponseApiResponse); - } } diff --git a/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java b/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java index 100f2c7..30ce8a4 100755 --- a/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java +++ b/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java @@ -7,33 +7,36 @@ import com.groom.yummy.group.dto.request.CreateGroupRequestDto; import com.groom.yummy.group.dto.request.JoinGroupRequestDto; import com.groom.yummy.group.dto.response.GroupDetailResponseDto; -import com.groom.yummy.group.dto.response.GroupResponseDto; import com.groom.yummy.jwt.JwtProvider; +import com.groom.yummy.oauth2.auth.LoginUser; +import com.groom.yummy.user.User; import jakarta.servlet.http.Cookie; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.http.MediaType; -import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.ResultActions; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @WebMvcTest(GroupController.class) -public class GroupControllerTest { +class GroupControllerTest { @Autowired private MockMvc mockMvc; @@ -47,67 +50,97 @@ public class GroupControllerTest { @MockitoBean private JwtProvider jwtProvider; - @DisplayName("사용자는 소모임을 생성할 수 있다.") - @Test - @Order(1) - @WithMockUser(username = "testUser@gmail.com", roles = "USER") - void 그룹_생성_테스트() throws Exception { - // Given - CreateGroupRequestDto createGroupRequestDto = CreateGroupRequestDto.builder() - .title("Go to Goorm Store!") - .content("yummy yummy yummy yummy yummy") - .maxParticipants(4) - .minParticipants(3) - .meetingDate(LocalDateTime.now()) - .storeId(10L) - .build(); + private Cookie authCookie; - GroupResponseDto groupResponseDto = GroupResponseDto.builder() + @BeforeEach + void setUp() { + // Mock User 객체 생성 + User mockUser = User.builder() .id(1L) - .title("Go to Goorm Store!") - .content("yummy yummy yummy yummy") - .maxParticipants(4) - .minParticipants(3) - .currentParticipants(1) - .meetingDate(LocalDateTime.now()) - .meetingStatus("OPEN") - .storeId(10L) - .createdAt(LocalDateTime.now()) + .email("testUser@gmail.com") + .nickname("testNickname") + .role("USER") .build(); - // Mock JwtProvider 동작 정의 + // Mock LoginUser 생성 + LoginUser mockLoginUser = new LoginUser(mockUser); + + // 인증 객체 생성 + SecurityContextHolder.getContext().setAuthentication( + new UsernamePasswordAuthenticationToken(mockLoginUser, null, List.of()) + ); + + // JWT 검증 when(jwtProvider.validateToken("valid.jwt.token")).thenReturn(true); when(jwtProvider.getUsername("valid.jwt.token")).thenReturn("testUser@gmail.com"); - when(groupService.createGroup(any(Group.class), any(String.class))).thenReturn(1L); - when(groupService.findGroupById(1L)).thenReturn(Optional.of(Group.builder() - .id(1L) + // Authorization 쿠키 생성 + authCookie = new Cookie("Authorization", "valid.jwt.token"); + } + + @Test + @Order(1) + @DisplayName("사용자는 소모임을 생성할 수 있다.") + void 소모임_생성_테스트() throws Exception { + // given + CreateGroupRequestDto requestDto = CreateGroupRequestDto.builder() .title("Go to Goorm Store!") .content("yummy yummy yummy yummy") .maxParticipants(4) .minParticipants(3) + .meetingDate(LocalDateTime.now()) .storeId(10L) + .build(); + + // Mock groupId 반환값 + Long mockGroupId = 1L; + + // Mock 그룹 생성 동작 + when(groupService.createGroup(any(), any(), any(), any(), any(), any(), any())) + .thenReturn(mockGroupId); + + // Mock findGroupById 반환값 설정 + Group mockGroup = Group.builder() + .id(mockGroupId) + .title(requestDto.getTitle()) + .content(requestDto.getContent()) + .maxParticipants(requestDto.getMaxParticipants()) + .minParticipants(requestDto.getMinParticipants()) + .currentParticipants(1) + .meetingDate(requestDto.getMeetingDate()) .meetingStatus(MeetingStatus.OPEN) - .build())); + .storeId(requestDto.getStoreId()) + .build(); - // When & Then - mockMvc.perform(post("/api/v1/groups") - .cookie(new Cookie("Authorization", "valid.jwt.token")) - .with(csrf()) - .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(createGroupRequestDto))) - .andExpect(status().isCreated()) - .andExpect(jsonPath("$.msg").value("소모임 생성 성공")) - .andExpect(jsonPath("$.data.id").value(1L)) - .andExpect(jsonPath("$.data.title").value("Go to Goorm Store!")); + when(groupService.findGroupById(mockGroupId)).thenReturn(Optional.of(mockGroup)); + + String body = objectMapper.writeValueAsString(requestDto); + + // when + ResultActions actions = mockMvc.perform(post("/api/v1/groups") + .cookie(authCookie) + .with(csrf()) + .contentType(MediaType.APPLICATION_JSON) + .content(body)); + + // then + actions.andExpectAll( + status().isCreated(), + jsonPath("$.msg").value("소모임 생성 성공"), + jsonPath("$.data.id").value(1L) + ); + + // 호출 횟수 검증 + verify(groupService, times(1)).createGroup(any(), any(), any(), any(), any(), any(), any()); + verify(groupService, times(1)).findGroupById(mockGroupId); } - @DisplayName("사용자는 소모임 목록을 조회할 수 있다.") + @Test @Order(2) - @WithMockUser(username = "TestUser@gmail.com", roles = "USER") - void 소모임_목록_리스트_조회_테스트() throws Exception { - // Given + @DisplayName("사용자는 소모임 목록을 조회할 수 있다.") + void 소모임_리스트_조회_테스트() throws Exception { + // given Group group = Group.builder() .id(1L) .title("Go to Goorm Store!") @@ -120,30 +153,34 @@ public class GroupControllerTest { .storeId(10L) .build(); - when(groupService.getAllGroups(any(String.class), any(String.class), any(String.class), any(int.class))) + when(groupService.getAllGroups(any(), any(), any(), anyInt())) .thenReturn(List.of(group)); - // When & Then - mockMvc.perform(get("/api/v1/groups") - .param("category", "KOREAN") - .param("regionCode", "110110110") - .param("storeName", "구룸식당") - .param("page", "1") - .cookie(new Cookie("Authorization", "valid.jwt.token"))) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.msg").value("소모임 목록 조회 성공")) - .andExpect(jsonPath("$.data[0].id").value(1L)) - .andExpect(jsonPath("$.data[0].title").value("Go to Goorm Store!")); + // when + ResultActions actions = mockMvc.perform(get("/api/v1/groups") + .param("category", "KOREAN") + .param("regionCode", "110110110") + .param("storeName", "구룸식당") + .param("page", "1") + .cookie(authCookie)); + + // then + actions.andExpectAll( + status().isOk(), + jsonPath("$.msg").value("소모임 목록 조회 성공"), + jsonPath("$.data[0].id").value(1L), + jsonPath("$.data[0].title").value("Go to Goorm Store!") + ); + + verify(groupService, times(1)).getAllGroups(any(), any(), any(), anyInt()); } - - @DisplayName("사용자는 소모임 상세 정보를 조회할 수 있다.") @Test @Order(3) - @WithMockUser(username = "testUser@gmail.com", roles = "USER") - void 소모임_상세_조회_테스트() throws Exception { - // Given - GroupDetailResponseDto groupDetailResponseDto = GroupDetailResponseDto.builder() + @DisplayName("사용자는 소모임 상세 정보를 조회할 수 있다.") + void 소모임_상세정보_조회_테스트() throws Exception { + // given + GroupDetailResponseDto responseDto = GroupDetailResponseDto.builder() .id(1L) .title("Go to Goorm Store!") .content("yummy yummy yummy yummy") @@ -168,36 +205,51 @@ public class GroupControllerTest { .storeId(10L) .build())); - // When & Then - mockMvc.perform(get("/api/v1/groups/{groupId}", 1L) - .cookie(new Cookie("Authorization", "valid.jwt.token"))) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.msg").value("소모임 상세 정보 조회 성공")) - .andExpect(jsonPath("$.data.id").value(1L)) - .andExpect(jsonPath("$.data.title").value("Go to Goorm Store!")); + // when + ResultActions actions = mockMvc.perform(get("/api/v1/groups/{groupId}", 1L) + .cookie(authCookie)); + + // then + actions.andExpectAll( + status().isOk(), + jsonPath("$.msg").value("소모임 상세 정보 조회 성공"), + jsonPath("$.data.id").value(1L), + jsonPath("$.data.title").value("Go to Goorm Store!") + ); + + verify(groupService, times(1)).findGroupById(1L); } - @DisplayName("사용자는 소모임에 참여할 수 있다.") @Test @Order(4) - @WithMockUser(username = "testUser@gmail.com", roles = "USER") - void 소모임_참가_테스트() throws Exception { - // Given - JoinGroupRequestDto joinGroupRequestDto = JoinGroupRequestDto.builder() + @DisplayName("사용자는 소모임에 참여할 수 있다.") + void 소모임_가입_테스트() throws Exception { + // given + Long groupId = 1L; + Long storeId = 10L; + + JoinGroupRequestDto joinRequestDto = JoinGroupRequestDto.builder() .userId(1L) + .storeId(storeId) .build(); - // Mocking JwtProvider 동작 정의 - when(jwtProvider.validateToken("valid.jwt.token")).thenReturn(true); - when(jwtProvider.getUsername("valid.jwt.token")).thenReturn("testUser@gmail.com"); + doNothing().when(groupService).joinGroup(eq(groupId), any(), eq(storeId)); + + String body = objectMapper.writeValueAsString(joinRequestDto); + + // when + ResultActions actions = mockMvc.perform(post("/api/v1/groups/{groupId}/join", groupId) + .cookie(authCookie) + .with(csrf()) + .contentType(MediaType.APPLICATION_JSON) + .content(body)); + + // then + actions.andExpectAll( + status().isOk(), + jsonPath("$.msg").value("소모임 참여 성공") + ); - // When & Then - mockMvc.perform(post("/api/v1/groups/{groupId}/join", 1L) - .cookie(new Cookie("Authorization", "valid.jwt.token")) - .with(csrf()) - .contentType(MediaType.APPLICATION_JSON) - .content(objectMapper.writeValueAsString(joinGroupRequestDto))) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.msg").value("소모임 참여 성공")); + verify(groupService, times(1)).joinGroup(eq(groupId), any(), eq(storeId)); } } diff --git a/domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java b/domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java index aacff3b..c2c2027 100644 --- a/domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java +++ b/domain/src/main/java/com/groom/yummy/exception/GroupErrorCode.java @@ -6,7 +6,8 @@ @Getter public enum GroupErrorCode implements ErrorCode{ GROUP_NOT_FOUND(HttpStatus.NOT_FOUND, "그룹이 존재하지 않습니다."), - GROUP_PARTICIPATION_FULL(HttpStatus.NOT_FOUND, "참가 인원이 가득 찼습니다.") + GROUP_PARTICIPATION_FULL(HttpStatus.NOT_FOUND, "참가 인원이 가득 찼습니다."), + GROUP_CREATE_FAILED(HttpStatus.NOT_FOUND, "그룹 생성이 실패했습니다.") ; private final HttpStatus code; private final String message; diff --git a/domain/src/main/java/com/groom/yummy/group/GroupService.java b/domain/src/main/java/com/groom/yummy/group/GroupService.java index 3727e7a..340620e 100755 --- a/domain/src/main/java/com/groom/yummy/group/GroupService.java +++ b/domain/src/main/java/com/groom/yummy/group/GroupService.java @@ -4,13 +4,17 @@ import com.groom.yummy.exception.GroupErrorCode; import com.groom.yummy.exception.StoreErrorCode; import com.groom.yummy.exception.UserErrorCode; +import com.groom.yummy.store.Store; +import com.groom.yummy.store.StoreRepository; import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; import com.groom.yummy.usertogroup.AttendanceStatus; +import com.groom.yummy.usertogroup.UserToGroup; import com.groom.yummy.usertogroup.UserToGroupRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -21,18 +25,36 @@ public class GroupService { private final GroupRepository groupRepository; private final UserRepository userRepository; private final UserToGroupRepository userToGroupRepository; + private final StoreRepository storeRepository; - public Long createGroup(Group group, String userEmail) { - User user = userRepository.findByEmail(userEmail) + public Long createGroup(Long storeId, Long userId, String title, String content, Integer maxParticipants, Integer minParticipants, LocalDateTime meetingDate) { + User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(UserErrorCode.USER_NOT_FOUND)); - Long storeId = group.getStoreId(); if (storeId == null) { throw new CustomException(StoreErrorCode.STORE_NOT_FOUND); } - return groupRepository.saveGroup(group, storeId); + + Group group = Group.builder() + .title(title) + .content(content) + .maxParticipants(maxParticipants) + .minParticipants(minParticipants) + .currentParticipants(1) + .meetingDate(meetingDate) + .meetingStatus(MeetingStatus.OPEN) + .storeId(storeId) + .build(); + + try { + userToGroupRepository.saveUserToGroup(group, user, null, true, AttendanceStatus.APPROVED); + return groupRepository.saveGroup(group, storeId); + } catch (Exception e) { + throw new CustomException(GroupErrorCode.GROUP_CREATE_FAILED); + } } + public Optional findGroupById(Long id) { return groupRepository.findGroupById(id); } @@ -41,19 +63,22 @@ public List getAllGroups(String category, String regionCode, String store return groupRepository.findAllGroups(category, regionCode, storeName, page); } - public void joinGroup(Long groupId, Long userId, String userEmail) { - User user = userRepository.findByEmail(userEmail) + public void joinGroup(Long groupId, Long userId, Long storeId) { + User user = userRepository.findById(userId) .orElseThrow(() -> new CustomException(UserErrorCode.USER_NOT_FOUND)); Group group = groupRepository.findGroupById(groupId) .orElseThrow(() -> new CustomException(GroupErrorCode.GROUP_NOT_FOUND)); + Store store = storeRepository.findStoreById(storeId) + .orElseThrow(() -> new CustomException(StoreErrorCode.STORE_NOT_FOUND)); + if (group.getCurrentParticipants() >= group.getMaxParticipants()) { throw new CustomException(GroupErrorCode.GROUP_PARTICIPATION_FULL); } groupRepository.updateGroupParticipants(groupId, group.getCurrentParticipants() + 1); - userToGroupRepository.save(group, user, false, AttendanceStatus.APPROVED); + userToGroupRepository.saveUserToGroup(group, user, store, false, AttendanceStatus.APPROVED); } } diff --git a/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java b/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java index 60f49bf..48fd68d 100755 --- a/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java +++ b/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java @@ -11,12 +11,13 @@ @AllArgsConstructor @Builder public class CreateGroupRequestDto { + private Long storeId; + private Long userId; private String title; private String content; private Integer maxParticipants; private Integer minParticipants; private LocalDateTime meetingDate; - private Long storeId; public Group toGroupDomain() { return Group.builder() @@ -24,7 +25,6 @@ public Group toGroupDomain() { .content(this.content) .maxParticipants(this.maxParticipants) .minParticipants(this.minParticipants) - .currentParticipants(1) .meetingDate(this.meetingDate) .storeId(this.storeId) .build(); diff --git a/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java b/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java index 950991e..44a7076 100755 --- a/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java +++ b/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java @@ -9,5 +9,6 @@ @Builder public class JoinGroupRequestDto { private Long userId; + private Long storeId; } diff --git a/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java index 229ac9c..751a09f 100644 --- a/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java +++ b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java @@ -1,13 +1,13 @@ package com.groom.yummy.usertogroup; import com.groom.yummy.group.Group; +import com.groom.yummy.store.Store; import com.groom.yummy.user.User; import java.util.Optional; public interface UserToGroupRepository { - - void save(Group group, User user, boolean isLeader, AttendanceStatus attendanceStatus); - + void saveUserToGroup(Group group, User user, Store store, boolean isLeader, AttendanceStatus attendanceStatus); Optional findByGroupAndUser(Group group, User user); } + diff --git a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java index 18c5694..d5d5969 100755 --- a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java @@ -1,6 +1,8 @@ package com.groom.yummy.group; import com.groom.yummy.exception.CustomException; +import com.groom.yummy.store.Store; +import com.groom.yummy.store.StoreRepository; import com.groom.yummy.user.User; import com.groom.yummy.user.UserRepository; import com.groom.yummy.usertogroup.AttendanceStatus; @@ -9,9 +11,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -36,48 +38,51 @@ public class GroupServiceTest { @Mock private UserToGroupRepository userToGroupRepository; - @DisplayName("사용자는 소모임을 생성할 수 있다.") + @Mock + private StoreRepository storeRepository; + + @DisplayName("User can create a group.") @Order(1) @Test - void 소모임_생성_테스트() { - //Given + void createGroupTest() { + // Given + Long storeId = 10L; + Long userId = 1L; + String title = "Go to Goorm store"; + String content = "yummy yummy yummy yummy yummy"; + Integer maxParticipants = 4; + Integer minParticipants = 3; + LocalDateTime meetingDate = LocalDateTime.now(); + User user = User.builder() - .id(1L) + .id(userId) .email("Goorm@gmail.com") .nickname("Goorm") .role("USER") - .groupJoinCount(10L) - .groupAttendanceCount(8L) .isDeleted(false) .build(); - Group group = Group.builder() - .title("Go to Goorm store") - .content("yummy yummy yummy yummy yummy") - .maxParticipants(4) - .minParticipants(3) - .storeId(10L) - .build(); - - when(userRepository.findByEmail(Mockito.eq("Goorm@gmail.com"))) + when(userRepository.findById(userId)) .thenReturn(Optional.of(user)); - - when(groupRepository.saveGroup(any(Group.class), anyLong())) + when(groupRepository.saveGroup(any(Group.class), eq(storeId))) .thenReturn(1L); // When - Long groupId = groupService.createGroup(group, user.getEmail()); + Long groupId = groupService.createGroup(storeId, userId, title, content, maxParticipants, minParticipants, meetingDate); // Then assertEquals(1L, groupId); verify(groupRepository, times(1)) - .saveGroup(any(Group.class), anyLong()); + .saveGroup(any(Group.class), eq(storeId)); + verify(userToGroupRepository, times(1)) + .saveUserToGroup(any(Group.class), eq(user), isNull(), eq(true), eq(AttendanceStatus.APPROVED)); } - @DisplayName("사용자는 소모임 상세 정보를 조회할 수 있다.") + + @DisplayName("User can view group details.") @Order(2) @Test - void 소모임_상세_조회_테스트() { + void viewGroupDetailsTest() { // Given Long groupId = 1L; Group group = Group.builder() @@ -101,14 +106,14 @@ public class GroupServiceTest { verify(groupRepository, times(1)).findGroupById(groupId); } - @DisplayName("사용자는 소모임에 참여할 수 있다.") + @DisplayName("User can join a group.") @Order(3) @Test - void 소모임_참여_테스트() { + void joinGroupTest() { // Given Long groupId = 1L; Long userId = 1L; - String userEmail = "Goorm@gmail.com"; + Long storeId = 10L; Group group = Group.builder() .id(groupId) @@ -117,77 +122,80 @@ public class GroupServiceTest { .maxParticipants(4) .minParticipants(3) .currentParticipants(2) - .storeId(10L) + .storeId(storeId) .build(); User user = User.builder() .id(userId) - .email(userEmail) + .email("Goorm@gmail.com") .nickname("Goorm") .role("USER") - .groupJoinCount(10L) - .groupAttendanceCount(8L) .isDeleted(false) .build(); - when(userRepository.findByEmail(userEmail)).thenReturn(Optional.of(user)); + Store store = new Store(); // Store 객체 생성 + + when(userRepository.findById(userId)).thenReturn(Optional.of(user)); when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); + when(storeRepository.findStoreById(storeId)).thenReturn(Optional.of(store)); // Mock 동작 추가 + + // Mock UserToGroupRepository 동작 설정 + doNothing().when(userToGroupRepository) + .saveUserToGroup(eq(group), eq(user), eq(store), eq(false), eq(AttendanceStatus.APPROVED)); // When - groupService.joinGroup(groupId, userId, userEmail); + groupService.joinGroup(groupId, userId, storeId); // Then verify(groupRepository, times(1)).updateGroupParticipants(eq(groupId), eq(3)); verify(userToGroupRepository, times(1)) - .save(eq(group), eq(user), eq(false), eq(AttendanceStatus.APPROVED)); // save 호출 검증 + .saveUserToGroup(eq(group), eq(user), eq(store), eq(false), eq(AttendanceStatus.APPROVED)); } - - @DisplayName("소모임 참여 시 참가 인원이 초과되면 예외가 발생한다.") + @DisplayName("Group join fails when participant limit exceeded.") @Order(4) @Test - void 소모임_참여_참가인원_초과_테스트() { + void joinGroupParticipantLimitExceededTest() { // Given Long groupId = 1L; Long userId = 1L; - String userEmail = "Goorm@gmail.com"; + Long storeId = 10L; Group group = Group.builder() .id(groupId) .title("Go to Goorm store") .content("yummy yummy") .maxParticipants(4) - .minParticipants(3) - .currentParticipants(4) - .storeId(10L) + .currentParticipants(4) // 참여 인원 초과 + .storeId(storeId) .build(); User user = User.builder() .id(userId) - .email(userEmail) + .email("Goorm@gmail.com") .nickname("Goorm") - .role("USER") - .groupJoinCount(10L) - .groupAttendanceCount(8L) - .isDeleted(false) .build(); - when(userRepository.findByEmail(userEmail)).thenReturn(Optional.of(user)); + Store store = new Store(); // Store 객체 생성 + + when(userRepository.findById(userId)).thenReturn(Optional.of(user)); when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); + when(storeRepository.findStoreById(storeId)).thenReturn(Optional.of(store)); // Mock 동작 추가 // When CustomException exception = assertThrows(CustomException.class, - () -> groupService.joinGroup(groupId, userId, userEmail)); + () -> groupService.joinGroup(groupId, userId, storeId)); // Then assertEquals("참가 인원이 가득 찼습니다.", exception.getMessage()); verify(groupRepository, never()).updateGroupParticipants(anyLong(), anyInt()); } - @DisplayName("소모임 리스트 조회 테스트") + + @DisplayName("Retrieve group list test.") @Order(5) @Test - void 소모임_리스트_조회_테스트() { + void retrieveGroupListTest() { // Given String category = "KOREAN"; String regionCode = "SEOUL"; @@ -200,7 +208,6 @@ public class GroupServiceTest { .title("Go to Goorm store") .content("yummy yummy") .maxParticipants(4) - .minParticipants(3) .currentParticipants(2) .storeId(10L) .build() diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java index 2522a9e..e1bc453 100644 --- a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java @@ -1,13 +1,13 @@ package com.groom.yummy.domain.usertogroup; import com.groom.yummy.domain.group.GroupEntity; -import com.groom.yummy.domain.group.GroupJpaRepository; import com.groom.yummy.domain.store.StoreEntity; import com.groom.yummy.domain.store.StoreJpaRepository; import com.groom.yummy.domain.user.UserEntity; -import com.groom.yummy.usertogroup.AttendanceStatus; import com.groom.yummy.group.Group; +import com.groom.yummy.store.Store; import com.groom.yummy.user.User; +import com.groom.yummy.usertogroup.AttendanceStatus; import com.groom.yummy.usertogroup.UserToGroup; import com.groom.yummy.usertogroup.UserToGroupRepository; import lombok.RequiredArgsConstructor; @@ -23,7 +23,7 @@ public class UserToGroupEntityRepository implements UserToGroupRepository { private final StoreJpaRepository storeJpaRepository; @Override - public void save(Group group, User user, boolean isLeader, AttendanceStatus attendanceStatus) { + public void saveUserToGroup(Group group, User user, Store store, boolean isLeader, AttendanceStatus attendanceStatus) { StoreEntity storeEntity = group.getStoreId() != null ? storeJpaRepository.findById(group.getStoreId()) .orElseThrow(() -> new IllegalArgumentException("Store not found for id: " + group.getStoreId())) From 78ea55f1d8a1e0d634dda37d3e9d8b3123a70517 Mon Sep 17 00:00:00 2001 From: mailsungjangMonster <115551339+sukangpunch@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:33:41 +0900 Subject: [PATCH 73/80] =?UTF-8?q?fix:=20=EC=8B=A4=ED=96=89=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=ED=95=98=EB=A9=B0=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#44)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: testUser 기능 추가- #41 * feat: 누락된 내용 추가 --- .../groom/yummy/config/SecurityConfig.java | 2 + .../groom/yummy/config/WebClientConfig.java | 2 +- .../yummy/controller/StoreController.java | 44 +++++++------------ .../com/groom/yummy/external/Category.java | 27 ++++++++++++ .../groom/yummy/external/StoreApiClient.java | 9 ++-- .../yummy/external/dto/StoreRequestDto.java | 4 +- .../yummy/external/dto/StoreResponseDto.java | 6 +-- .../oauth2/handler/CustomSuccessHandler.java | 2 +- .../yummy/test/TestCreateController.java | 2 +- .../groom/yummy/webclient/SomeApiService.java | 5 +-- .../src/main/resources/application.yml | 2 +- .../groom/yummy/group/GroupRepository.java | 2 +- .../com/groom/yummy/group/GroupService.java | 12 ++--- .../dto/request/CreateGroupRequestDto.java | 1 - .../dto/request/JoinGroupRequestDto.java | 1 - .../store/{Category.java => Category_.java} | 16 +++---- .../java/com/groom/yummy/store/Store.java | 2 +- .../com/groom/yummy/store/StoreService.java | 4 +- .../usertogroup/UserToGroupRepository.java | 4 +- .../groom/yummy/group/GroupServiceTest.java | 10 ++--- .../groom/yummy/store/StoreServiceTest.java | 4 +- .../groom/yummy/domain/group/GroupEntity.java | 18 ++++---- .../domain/group/GroupEntityRepository.java | 32 +++++++------- .../groom/yummy/domain/store/StoreEntity.java | 8 ++-- .../domain/usertogroup/UserToGroupEntity.java | 6 +-- .../UserToGroupEntityRepository.java | 24 +++++----- 26 files changed, 137 insertions(+), 112 deletions(-) create mode 100644 application/src/main/java/com/groom/yummy/external/Category.java rename domain/src/main/java/com/groom/yummy/store/{Category.java => Category_.java} (74%) mode change 100755 => 100644 diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index 5611251..a607e68 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -52,6 +52,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ .requestMatchers( "/login/**", "/oauth2/**", "/oauth2/authorization/**").permitAll() .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**").permitAll() // Swagger 관련 경로 허용 .requestMatchers("/api/v1/test/users/*").permitAll() + .requestMatchers("/api/v1/stores/*","/api/v1/stores").permitAll() + .anyRequest().authenticated()); //세션 설정 : STATELESS diff --git a/application/src/main/java/com/groom/yummy/config/WebClientConfig.java b/application/src/main/java/com/groom/yummy/config/WebClientConfig.java index 7583d77..73046c4 100755 --- a/application/src/main/java/com/groom/yummy/config/WebClientConfig.java +++ b/application/src/main/java/com/groom/yummy/config/WebClientConfig.java @@ -8,7 +8,7 @@ public class WebClientConfig { @Bean public WebClient webClient() { - return WebClient.builder().baseUrl("http://localhost:8080").build(); // 실제 환경에서는 동적으로 설정 + return WebClient.builder().baseUrl("http://43.203.242.150:8080").build(); // 실제 환경에서는 동적으로 설정 } } diff --git a/application/src/main/java/com/groom/yummy/controller/StoreController.java b/application/src/main/java/com/groom/yummy/controller/StoreController.java index ea2fc07..3550275 100644 --- a/application/src/main/java/com/groom/yummy/controller/StoreController.java +++ b/application/src/main/java/com/groom/yummy/controller/StoreController.java @@ -1,52 +1,42 @@ package com.groom.yummy.controller; import com.groom.yummy.dto.ResponseDto; +import com.groom.yummy.external.Category; import com.groom.yummy.external.StoreApiClient; import com.groom.yummy.external.dto.ApiResponse; import com.groom.yummy.external.dto.StoreListResponse; -import com.groom.yummy.external.dto.StoreRequestDto; import com.groom.yummy.external.dto.StoreResponseDto; -import com.groom.yummy.store.Category; -import com.groom.yummy.store.StoreService; -import com.groom.yummy.store.dto.StoreApiResponseDto; -import com.groom.yummy.webclient.SomeApiService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.util.List; - @Tag(name = "[Store] Store API") @RestController @RequestMapping("/api/v1/stores") @RequiredArgsConstructor public class StoreController { - private final SomeApiService someApiService; - private final StoreService storeService; private final StoreApiClient storeApiClient; - @GetMapping("/sync") - public ResponseEntity> syncStores(@RequestParam String regionCode) { - try { - List storeDtos = someApiService.fetchStoresFromApi(regionCode); - - // 각 StoreApiResponseDto의 category를 내부 Category enum으로 변환 - storeDtos.forEach(dto -> { - String description = dto.getCategory(); - String apiCode = Category.fromDescription(description).getApiCode(); - dto.setCategory(apiCode); // description -> apiCode로 변환 - }); + @Operation(summary = "가게 정보 조회", description = "가게 id로 가게를 조회합니다.") + @GetMapping("/{storeId}") + public ResponseEntity> getStore(@PathVariable("storeId") Long storeId) { + StoreResponseDto storeResponseDTO = storeApiClient.getStoreByApi(storeId); + return ResponseEntity.ok(ResponseDto.of(storeResponseDTO,"storeId로 가게 조회 성공")); + } - storeService.saveStores(storeDtos); + @Operation(summary = "가게 조회", description = "가게들을 정렬 기준에 맞게 조회합니다.") + @GetMapping + public ResponseEntity> getStoresByFilters( + @RequestParam(name = "category", required = false) Category category, + @RequestParam(name = "regionId", required = false) Long regionId, + @RequestParam(name = "name", required = false) String name, + @RequestParam(name = "page", defaultValue = "1") int page, + @RequestParam(name = "size", defaultValue = "10") int size) { + ApiResponse storeListResponseApiResponse = storeApiClient.getStoresByFilters(category, regionId,name,page,size); + return ResponseEntity.ok(storeListResponseApiResponse); - return ResponseEntity.ok(new ResponseDto<>(null, "가게 데이터 동기화 성공")); - } catch (Exception e) { - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) - .body(new ResponseDto<>(null, "가게 데이터 동기화 중 오류 발생")); - } } } diff --git a/application/src/main/java/com/groom/yummy/external/Category.java b/application/src/main/java/com/groom/yummy/external/Category.java new file mode 100644 index 0000000..9b20632 --- /dev/null +++ b/application/src/main/java/com/groom/yummy/external/Category.java @@ -0,0 +1,27 @@ +package com.groom.yummy.external; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum Category { + + CHICKEN("치킨"), + CHINESE("중식"), + CUTLET_SASHIMI("돈까스-회"), + PIZZA("피자"), + FAST_FOOD("패스트푸드"), + STEW_SOUP("찜-탕"), + JOKBAL_BOSSAM("족발-보쌈"), + SNACK("분식"), + CAFE_DESSERT("카페-디저트"), + KOREAN("한식"), + MEAT("고기"), + WESTERN("양식"), + ASIAN("아시안"), + LATE_NIGHT("야식"), + LUNCH_BOX("도시락"); + private final String description; + +} diff --git a/application/src/main/java/com/groom/yummy/external/StoreApiClient.java b/application/src/main/java/com/groom/yummy/external/StoreApiClient.java index 1b32b88..093d841 100644 --- a/application/src/main/java/com/groom/yummy/external/StoreApiClient.java +++ b/application/src/main/java/com/groom/yummy/external/StoreApiClient.java @@ -3,7 +3,7 @@ import com.groom.yummy.external.dto.ApiResponse; import com.groom.yummy.external.dto.StoreListResponse; import com.groom.yummy.external.dto.StoreResponseDto; -import com.groom.yummy.store.Category; + import lombok.RequiredArgsConstructor; import org.springframework.core.ParameterizedTypeReference; import org.springframework.stereotype.Service; @@ -19,8 +19,9 @@ public StoreResponseDto getStoreByApi(Long storeId){ .uri(uriBuilder -> uriBuilder.path("/api/v1/store/{id}") .build(storeId)) .retrieve() - .bodyToMono(StoreResponseDto.class) - .block(); + .bodyToMono(new ParameterizedTypeReference>() {}) + .block().data(); + return storeResponse; } @@ -28,7 +29,7 @@ public ApiResponse getStoresByFilters( Category category, Long regionId, String name, int page, int size) { return webClient.get() .uri(uriBuilder -> uriBuilder - .path("/api/v1/stores") + .path("/api/v1/store") .queryParam("category", category) .queryParam("regionId", regionId) .queryParam("name", name) diff --git a/application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java b/application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java index 7b768f0..1cc8ea0 100644 --- a/application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java +++ b/application/src/main/java/com/groom/yummy/external/dto/StoreRequestDto.java @@ -1,7 +1,9 @@ package com.groom.yummy.external.dto; -import com.groom.yummy.store.Category; + import lombok.Builder; +import com.groom.yummy.external.Category; + @Builder public record StoreRequestDto( diff --git a/application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java b/application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java index 5b2f222..5fd39e1 100644 --- a/application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java +++ b/application/src/main/java/com/groom/yummy/external/dto/StoreResponseDto.java @@ -1,13 +1,13 @@ package com.groom.yummy.external.dto; -import com.groom.yummy.store.Category; + import lombok.Builder; @Builder public record StoreResponseDto( - Long storeId, + Long id, String name, - Category category, + String category, Long regionId ) { } diff --git a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java index 5e0ec3f..98d50e4 100644 --- a/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java +++ b/application/src/main/java/com/groom/yummy/oauth2/handler/CustomSuccessHandler.java @@ -37,7 +37,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo String accessToken = jwtProvider.createAccessToken(userId,email,nickname,role); - response.addCookie(CookieUtil.createCookie(jwtProvider.COOKIE_NAME,accessToken,jwtProvider.VALID_TIME)); + response.addCookie(CookieUtil.createCookie(jwtProvider.COOKIE_NAME,accessToken, jwtProvider.VALID_TIME)); response.sendRedirect(SERVER_URL+"/swagger-ui/index.html"); } } \ No newline at end of file diff --git a/application/src/main/java/com/groom/yummy/test/TestCreateController.java b/application/src/main/java/com/groom/yummy/test/TestCreateController.java index 91b38e7..c53ee53 100644 --- a/application/src/main/java/com/groom/yummy/test/TestCreateController.java +++ b/application/src/main/java/com/groom/yummy/test/TestCreateController.java @@ -68,7 +68,7 @@ public ResponseEntity> signIn(@Valid @RequestBody SignInDto signI .httpOnly(true) .secure(true) .path("/") - .maxAge(120) + .maxAge(7200000) .sameSite("Strict") .build(); diff --git a/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java b/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java index 29cbaf6..668e8b9 100755 --- a/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java +++ b/application/src/main/java/com/groom/yummy/webclient/SomeApiService.java @@ -1,9 +1,8 @@ package com.groom.yummy.webclient; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.groom.yummy.store.Category; +import com.groom.yummy.store.Category_; import com.groom.yummy.store.Store; import com.groom.yummy.store.StoreService; import com.groom.yummy.store.dto.StoreApiResponseDto; @@ -41,7 +40,7 @@ public List fetchStoresFromApi(String regionCode) { Store store = Store.builder() .storeId(dto.getStoreId()) .name(dto.getName()) - .category(Category.fromApiCode(dto.getCategory())) + .category(Category_.fromApiCode(dto.getCategory())) .regionId(dto.getRegionId()) .build(); storeService.createStore(store); diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index bb36afa..53eaae7 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -37,7 +37,7 @@ spring: jwt: secret: qwdhui83jvnllw133qkjbcaw712jnfe982329H#p219qnf43yj90j32 - valid-time: 120000 + valid-time: 7200000 cookie-name: Authorization server: diff --git a/domain/src/main/java/com/groom/yummy/group/GroupRepository.java b/domain/src/main/java/com/groom/yummy/group/GroupRepository.java index 6310684..cef353d 100755 --- a/domain/src/main/java/com/groom/yummy/group/GroupRepository.java +++ b/domain/src/main/java/com/groom/yummy/group/GroupRepository.java @@ -5,7 +5,7 @@ public interface GroupRepository { Optional findGroupById(Long id); - Long saveGroup(Group group, Long storeId); + Long saveGroup(Group group); List findAllGroups(String category, String regionCode, String storeName, int page); void updateGroupParticipants(Long groupId, int newParticipantCount); } diff --git a/domain/src/main/java/com/groom/yummy/group/GroupService.java b/domain/src/main/java/com/groom/yummy/group/GroupService.java index 340620e..877a63f 100755 --- a/domain/src/main/java/com/groom/yummy/group/GroupService.java +++ b/domain/src/main/java/com/groom/yummy/group/GroupService.java @@ -47,14 +47,14 @@ public Long createGroup(Long storeId, Long userId, String title, String content, .build(); try { - userToGroupRepository.saveUserToGroup(group, user, null, true, AttendanceStatus.APPROVED); - return groupRepository.saveGroup(group, storeId); + Long groupId = groupRepository.saveGroup(group); + userToGroupRepository.saveUserToGroup(groupId, user.getId(), true, AttendanceStatus.APPROVED); + return groupId; } catch (Exception e) { throw new CustomException(GroupErrorCode.GROUP_CREATE_FAILED); } } - public Optional findGroupById(Long id) { return groupRepository.findGroupById(id); } @@ -70,15 +70,15 @@ public void joinGroup(Long groupId, Long userId, Long storeId) { Group group = groupRepository.findGroupById(groupId) .orElseThrow(() -> new CustomException(GroupErrorCode.GROUP_NOT_FOUND)); - Store store = storeRepository.findStoreById(storeId) - .orElseThrow(() -> new CustomException(StoreErrorCode.STORE_NOT_FOUND)); +// Store store = storeRepository.findStoreById(storeId) +// .orElseThrow(() -> new CustomException(StoreErrorCode.STORE_NOT_FOUND)); if (group.getCurrentParticipants() >= group.getMaxParticipants()) { throw new CustomException(GroupErrorCode.GROUP_PARTICIPATION_FULL); } groupRepository.updateGroupParticipants(groupId, group.getCurrentParticipants() + 1); - userToGroupRepository.saveUserToGroup(group, user, store, false, AttendanceStatus.APPROVED); + userToGroupRepository.saveUserToGroup(group.getId(), user.getId(), false, AttendanceStatus.APPROVED); } } diff --git a/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java b/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java index 48fd68d..d842b52 100755 --- a/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java +++ b/domain/src/main/java/com/groom/yummy/group/dto/request/CreateGroupRequestDto.java @@ -12,7 +12,6 @@ @Builder public class CreateGroupRequestDto { private Long storeId; - private Long userId; private String title; private String content; private Integer maxParticipants; diff --git a/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java b/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java index 44a7076..142ad2b 100755 --- a/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java +++ b/domain/src/main/java/com/groom/yummy/group/dto/request/JoinGroupRequestDto.java @@ -8,7 +8,6 @@ @AllArgsConstructor @Builder public class JoinGroupRequestDto { - private Long userId; private Long storeId; } diff --git a/domain/src/main/java/com/groom/yummy/store/Category.java b/domain/src/main/java/com/groom/yummy/store/Category_.java old mode 100755 new mode 100644 similarity index 74% rename from domain/src/main/java/com/groom/yummy/store/Category.java rename to domain/src/main/java/com/groom/yummy/store/Category_.java index f74ab84..2ed09a3 --- a/domain/src/main/java/com/groom/yummy/store/Category.java +++ b/domain/src/main/java/com/groom/yummy/store/Category_.java @@ -6,7 +6,7 @@ import java.util.Map; @Getter -public enum Category { +public enum Category_ { // TODO : apiCode 수정 CHICKEN("001","치킨"), CHINESE("002","중식"), @@ -27,20 +27,20 @@ public enum Category { private final String apiCode; private final String description; - private static final Map API_CODE_TO_CATEGORY = new HashMap<>(); + private static final Map API_CODE_TO_CATEGORY = new HashMap<>(); static { - for(Category category: values()){ + for(Category_ category: values()){ API_CODE_TO_CATEGORY.put(category.getApiCode(), category); } } - Category(String apiCode, String description) { + Category_(String apiCode, String description) { this.apiCode = apiCode; this.description = description; } - public static Category fromApiCode(String apiCode) { + public static Category_ fromApiCode(String apiCode) { return API_CODE_TO_CATEGORY.get(apiCode); } @@ -49,12 +49,12 @@ public String toString() { return String.format("%s (%s) ", apiCode, description); } - public static boolean isValidCategory(Category category) { + public static boolean isValidCategory(Category_ category) { return API_CODE_TO_CATEGORY.containsValue(category); } - public static Category fromDescription(String description) { - for (Category category : Category.values()) { + public static Category_ fromDescription(String description) { + for (Category_ category : Category_.values()) { if (category.getDescription().equals(description)) { return category; } diff --git a/domain/src/main/java/com/groom/yummy/store/Store.java b/domain/src/main/java/com/groom/yummy/store/Store.java index 91b204b..f3dffaa 100755 --- a/domain/src/main/java/com/groom/yummy/store/Store.java +++ b/domain/src/main/java/com/groom/yummy/store/Store.java @@ -13,7 +13,7 @@ public class Store { private Long storeId; private String name; - private Category category; + private Category_ category; private Long regionId; } diff --git a/domain/src/main/java/com/groom/yummy/store/StoreService.java b/domain/src/main/java/com/groom/yummy/store/StoreService.java index 319adac..a781a20 100755 --- a/domain/src/main/java/com/groom/yummy/store/StoreService.java +++ b/domain/src/main/java/com/groom/yummy/store/StoreService.java @@ -26,7 +26,7 @@ public Long createStore(Store store) { throw new IllegalArgumentException("이미 등록되어있는 가게 정보 입니다."); }); - if (store.getCategory() == null || !Category.isValidCategory(store.getCategory())) { + if (store.getCategory() == null || !Category_.isValidCategory(store.getCategory())) { throw new IllegalArgumentException("등록되지 않은 카테고리 입니다."); } @@ -38,7 +38,7 @@ public void saveStores(List storeDtos) { .map(dto -> Store.builder() .storeId(dto.getStoreId()) .name(dto.getName()) - .category(Category.fromApiCode(dto.getCategory())) + .category(Category_.fromApiCode(dto.getCategory())) .regionId(dto.getRegionId()) .build()) .toList(); diff --git a/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java index 751a09f..633e0c2 100644 --- a/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java +++ b/domain/src/main/java/com/groom/yummy/usertogroup/UserToGroupRepository.java @@ -1,13 +1,13 @@ package com.groom.yummy.usertogroup; import com.groom.yummy.group.Group; -import com.groom.yummy.store.Store; import com.groom.yummy.user.User; import java.util.Optional; public interface UserToGroupRepository { - void saveUserToGroup(Group group, User user, Store store, boolean isLeader, AttendanceStatus attendanceStatus); + void saveUserToGroup(Long groupId, Long userId, boolean isLeader, AttendanceStatus attendanceStatus); Optional findByGroupAndUser(Group group, User user); } + diff --git a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java index d5d5969..ce9e581 100755 --- a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java @@ -64,7 +64,7 @@ void createGroupTest() { when(userRepository.findById(userId)) .thenReturn(Optional.of(user)); - when(groupRepository.saveGroup(any(Group.class), eq(storeId))) + when(groupRepository.saveGroup(any(Group.class))) .thenReturn(1L); // When @@ -73,9 +73,9 @@ void createGroupTest() { // Then assertEquals(1L, groupId); verify(groupRepository, times(1)) - .saveGroup(any(Group.class), eq(storeId)); + .saveGroup(any(Group.class)); verify(userToGroupRepository, times(1)) - .saveUserToGroup(any(Group.class), eq(user), isNull(), eq(true), eq(AttendanceStatus.APPROVED)); + .saveUserToGroup(any(Long.class), any(Long.class), eq(true), eq(AttendanceStatus.APPROVED)); } @@ -141,7 +141,7 @@ void joinGroupTest() { // Mock UserToGroupRepository 동작 설정 doNothing().when(userToGroupRepository) - .saveUserToGroup(eq(group), eq(user), eq(store), eq(false), eq(AttendanceStatus.APPROVED)); + .saveUserToGroup(eq(group.getId()), eq(user.getId()), eq(false), eq(AttendanceStatus.APPROVED)); // When groupService.joinGroup(groupId, userId, storeId); @@ -149,7 +149,7 @@ void joinGroupTest() { // Then verify(groupRepository, times(1)).updateGroupParticipants(eq(groupId), eq(3)); verify(userToGroupRepository, times(1)) - .saveUserToGroup(eq(group), eq(user), eq(store), eq(false), eq(AttendanceStatus.APPROVED)); + .saveUserToGroup(eq(group.getId()), eq(user.getId()), eq(false), eq(AttendanceStatus.APPROVED)); } @DisplayName("Group join fails when participant limit exceeded.") diff --git a/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java b/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java index dc445b3..5389e33 100755 --- a/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/store/StoreServiceTest.java @@ -37,7 +37,7 @@ public class StoreServiceTest { // Given Store store = Store.builder() .name("GoormStore") - .category(Category.PIZZA) + .category(Category_.PIZZA) .regionId(1L) .build(); @@ -66,7 +66,7 @@ public class StoreServiceTest { // GIVEN Store store = Store.builder() .name("GoormStore") - .category(Category.PIZZA) + .category(Category_.PIZZA) .regionId(1L) .build(); diff --git a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java index d3f5038..82be750 100644 --- a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntity.java @@ -42,13 +42,11 @@ public class GroupEntity extends BaseEntity { @Column(nullable = false) private MeetingStatus meetingStatus; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "store_id", nullable = false) - private StoreEntity store; + private Long storeId; @Builder public GroupEntity(String title, String content, Integer maxParticipants, Integer minParticipants, - Integer currentParticipants, LocalDateTime meetingDate, MeetingStatus meetingStatus, StoreEntity store) { + Integer currentParticipants, LocalDateTime meetingDate, MeetingStatus meetingStatus, Long storeId) { this.title = title; this.content = content; this.maxParticipants = maxParticipants; @@ -56,7 +54,11 @@ public GroupEntity(String title, String content, Integer maxParticipants, Intege this.currentParticipants = currentParticipants; this.meetingDate = meetingDate; this.meetingStatus = meetingStatus; - this.store = store; + this.storeId = storeId; + } + + public void updateCurrentCount(int count){ + this.currentParticipants = count; } public static Group toGroupDomain(GroupEntity groupEntity) { @@ -69,11 +71,11 @@ public static Group toGroupDomain(GroupEntity groupEntity) { .currentParticipants(groupEntity.getCurrentParticipants()) .meetingDate(groupEntity.getMeetingDate()) .meetingStatus(groupEntity.getMeetingStatus()) - .storeId(groupEntity.getStore().getId()) + .storeId(groupEntity.getStoreId()) .build(); } - public static GroupEntity fromGroupDomain(Group group, StoreEntity store) { + public static GroupEntity fromGroupDomain(Group group) { return GroupEntity.builder() .title(group.getTitle()) .content(group.getContent()) @@ -82,7 +84,7 @@ public static GroupEntity fromGroupDomain(Group group, StoreEntity store) { .currentParticipants(group.getCurrentParticipants()) .meetingDate(group.getMeetingDate()) .meetingStatus(group.getMeetingStatus()) - .store(store) + .storeId(group.getStoreId()) .build(); } } diff --git a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java index 4726ccc..f218b5f 100644 --- a/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/group/GroupEntityRepository.java @@ -17,13 +17,12 @@ public class GroupEntityRepository implements GroupRepository { private final GroupJpaRepository groupJpaRepository; - private final StoreJpaRepository storeJpaRepository; @Override - public Long saveGroup(Group group, Long storeId) { - StoreEntity storeEntity = storeJpaRepository.findById(storeId) - .orElseThrow(() -> new IllegalArgumentException("Store not found for id: " + storeId)); - GroupEntity groupEntity = GroupEntity.fromGroupDomain(group, storeEntity); + public Long saveGroup(Group group) { +// StoreEntity storeEntity = storeJpaRepository.findById(storeId) +// .orElseThrow(() -> new IllegalArgumentException("Store not found for id: " + storeId)); + GroupEntity groupEntity = GroupEntity.fromGroupDomain(group); return groupJpaRepository.save(groupEntity).getId(); } @@ -43,16 +42,17 @@ public List findAllGroups(String category, String regionCode, String stor public void updateGroupParticipants(Long groupId, int participants) { GroupEntity groupEntity = groupJpaRepository.findById(groupId) .orElseThrow(() -> new IllegalArgumentException("Group not found for id: " + groupId)); - groupEntity = GroupEntity.builder() - .title(groupEntity.getTitle()) - .content(groupEntity.getContent()) - .maxParticipants(groupEntity.getMaxParticipants()) - .minParticipants(groupEntity.getMinParticipants()) - .currentParticipants(participants) - .meetingDate(groupEntity.getMeetingDate()) - .meetingStatus(groupEntity.getMeetingStatus()) - .store(groupEntity.getStore()) - .build(); - groupJpaRepository.save(groupEntity); +// groupEntity = GroupEntity.builder() +// .title(groupEntity.getTitle()) +// .content(groupEntity.getContent()) +// .maxParticipants(groupEntity.getMaxParticipants()) +// .minParticipants(groupEntity.getMinParticipants()) +// .currentParticipants(participants) +// .meetingDate(groupEntity.getMeetingDate()) +// .meetingStatus(groupEntity.getMeetingStatus()) +// .storeId(groupEntity.getStoreId()) +// .build(); +// groupJpaRepository.save(groupEntity); + groupEntity.updateCurrentCount(participants); } } \ No newline at end of file diff --git a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java index 73318f0..ab6fc81 100644 --- a/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/store/StoreEntity.java @@ -2,7 +2,7 @@ import com.groom.yummy.domain.BaseEntity; import com.groom.yummy.domain.region.RegionEntity; -import com.groom.yummy.store.Category; +import com.groom.yummy.store.Category_; import com.groom.yummy.store.Store; import jakarta.persistence.*; import lombok.AccessLevel; @@ -22,13 +22,13 @@ public class StoreEntity extends BaseEntity { @Enumerated(EnumType.STRING) @Column(nullable = false) - private Category category; + private Category_ category; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "region_id", nullable = false) private RegionEntity region; - private StoreEntity(String name, Category category, RegionEntity region) { + private StoreEntity(String name, Category_ category, RegionEntity region) { this.name = name; this.category = category; this.region = region; @@ -51,7 +51,7 @@ public static StoreEntity fromStoreDomain(Store store, RegionEntity region) { .build(); } - public static StoreEntity create(String name, Category category, RegionEntity region) { + public static StoreEntity create(String name, Category_ category, RegionEntity region) { if (name == null || name.isBlank()) { throw new IllegalArgumentException("Store name must not be null or blank"); } diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java index e5b9a57..10b821c 100644 --- a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntity.java @@ -15,9 +15,9 @@ @Getter public class UserToGroupEntity extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; +// @Id +// @GeneratedValue(strategy = GenerationType.IDENTITY) +// private Long id; @Column(nullable = false) private boolean isLeader; diff --git a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java index e1bc453..14f5f3d 100644 --- a/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java +++ b/storage/src/main/java/com/groom/yummy/domain/usertogroup/UserToGroupEntityRepository.java @@ -1,12 +1,15 @@ package com.groom.yummy.domain.usertogroup; import com.groom.yummy.domain.group.GroupEntity; +import com.groom.yummy.domain.group.GroupJpaRepository; import com.groom.yummy.domain.store.StoreEntity; import com.groom.yummy.domain.store.StoreJpaRepository; import com.groom.yummy.domain.user.UserEntity; +import com.groom.yummy.domain.user.UserJpaRepository; import com.groom.yummy.group.Group; import com.groom.yummy.store.Store; import com.groom.yummy.user.User; +import com.groom.yummy.user.UserRepository; import com.groom.yummy.usertogroup.AttendanceStatus; import com.groom.yummy.usertogroup.UserToGroup; import com.groom.yummy.usertogroup.UserToGroupRepository; @@ -20,17 +23,18 @@ public class UserToGroupEntityRepository implements UserToGroupRepository { private final UserToGroupJpaRepository userToGroupJpaRepository; - private final StoreJpaRepository storeJpaRepository; + private final GroupJpaRepository groupJpaRepository; + private final UserJpaRepository userJpaRepository; @Override - public void saveUserToGroup(Group group, User user, Store store, boolean isLeader, AttendanceStatus attendanceStatus) { - StoreEntity storeEntity = group.getStoreId() != null - ? storeJpaRepository.findById(group.getStoreId()) - .orElseThrow(() -> new IllegalArgumentException("Store not found for id: " + group.getStoreId())) - : null; + public void saveUserToGroup(Long groupId, Long userId, boolean isLeader, AttendanceStatus attendanceStatus) { +// StoreEntity storeEntity = group.getStoreId() != null +// ? storeJpaRepository.findById(group.getStoreId()) +// .orElseThrow(() -> new IllegalArgumentException("Store not found for id: " + group.getStoreId())) +// : null; - GroupEntity groupEntity = GroupEntity.fromGroupDomain(group, null); - UserEntity userEntity = UserEntity.toEntity(user); + GroupEntity groupEntity = groupJpaRepository.findById(groupId).orElseThrow(); + UserEntity userEntity = userJpaRepository.findById(userId).orElseThrow(); UserToGroupEntity userToGroupEntity = UserToGroupEntity.builder() .group(groupEntity) @@ -44,8 +48,8 @@ public void saveUserToGroup(Group group, User user, Store store, boolean isLeade @Override public Optional findByGroupAndUser(Group group, User user) { - GroupEntity groupEntity = GroupEntity.fromGroupDomain(group, null); - UserEntity userEntity = UserEntity.toEntity(user); + GroupEntity groupEntity = GroupEntity.fromGroupDomain(group); +// UserEntity userEntity = UserEntity.toEntity(user); return userToGroupJpaRepository.findById(groupEntity.getId()) .map(entity -> UserToGroup.builder() From 051f072ad8b6a9281c5ca625b515238480eee9fb Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Thu, 23 Jan 2025 14:05:45 +0900 Subject: [PATCH 74/80] =?UTF-8?q?feat:=20=C3=A3=C2=85test=20api=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EB=9A=AB=EC=96=B4=EB=86=93=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/groom/yummy/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index a607e68..ffecf82 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -53,7 +53,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**").permitAll() // Swagger 관련 경로 허용 .requestMatchers("/api/v1/test/users/*").permitAll() .requestMatchers("/api/v1/stores/*","/api/v1/stores").permitAll() - + .requestMatchers("/api/v1/test/*").permitAll() .anyRequest().authenticated()); //세션 설정 : STATELESS From 26fd65af6ca04cfaef4e18007d40669ede76b858 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Thu, 23 Jan 2025 14:09:25 +0900 Subject: [PATCH 75/80] =?UTF-8?q?fix:=20groupControllerTest=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/groom/yummy/controller/GroupControllerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java b/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java index 30ce8a4..60c5f96 100755 --- a/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java +++ b/application/src/test/java/com/groom/yummy/controller/GroupControllerTest.java @@ -229,7 +229,6 @@ void setUp() { Long storeId = 10L; JoinGroupRequestDto joinRequestDto = JoinGroupRequestDto.builder() - .userId(1L) .storeId(storeId) .build(); From 06313ffccba6d5e05a12a436afba2975380e3567 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Thu, 23 Jan 2025 14:14:24 +0900 Subject: [PATCH 76/80] =?UTF-8?q?fix:=20groupService=20Test=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/com/groom/yummy/group/GroupServiceTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java index ce9e581..ec97755 100755 --- a/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java +++ b/domain/src/test/java/com/groom/yummy/group/GroupServiceTest.java @@ -137,11 +137,10 @@ void joinGroupTest() { when(userRepository.findById(userId)).thenReturn(Optional.of(user)); when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); - when(storeRepository.findStoreById(storeId)).thenReturn(Optional.of(store)); // Mock 동작 추가 // Mock UserToGroupRepository 동작 설정 doNothing().when(userToGroupRepository) - .saveUserToGroup(eq(group.getId()), eq(user.getId()), eq(false), eq(AttendanceStatus.APPROVED)); + .saveUserToGroup(eq(groupId), eq(userId), eq(false), eq(AttendanceStatus.APPROVED)); // When groupService.joinGroup(groupId, userId, storeId); @@ -149,7 +148,7 @@ void joinGroupTest() { // Then verify(groupRepository, times(1)).updateGroupParticipants(eq(groupId), eq(3)); verify(userToGroupRepository, times(1)) - .saveUserToGroup(eq(group.getId()), eq(user.getId()), eq(false), eq(AttendanceStatus.APPROVED)); + .saveUserToGroup(eq(groupId), eq(userId), eq(false), eq(AttendanceStatus.APPROVED)); } @DisplayName("Group join fails when participant limit exceeded.") @@ -180,7 +179,6 @@ void joinGroupParticipantLimitExceededTest() { when(userRepository.findById(userId)).thenReturn(Optional.of(user)); when(groupRepository.findGroupById(groupId)).thenReturn(Optional.of(group)); - when(storeRepository.findStoreById(storeId)).thenReturn(Optional.of(store)); // Mock 동작 추가 // When CustomException exception = assertThrows(CustomException.class, From 96e39c99a5cb97a61346578c3d3d4d89978c6822 Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Thu, 23 Jan 2025 14:31:38 +0900 Subject: [PATCH 77/80] =?UTF-8?q?fix:=20=EB=B0=B0=C3=AD=EB=B0=B0=ED=8F=AC?= =?UTF-8?q?=20=EC=84=9C=EB=B2=84=EC=97=90=EC=84=9C=20=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=85=8B=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/groom/yummy/config/SecurityConfig.java | 1 - application/src/main/resources/application.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index ffecf82..a3d6f80 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -53,7 +53,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**").permitAll() // Swagger 관련 경로 허용 .requestMatchers("/api/v1/test/users/*").permitAll() .requestMatchers("/api/v1/stores/*","/api/v1/stores").permitAll() - .requestMatchers("/api/v1/test/*").permitAll() .anyRequest().authenticated()); //세션 설정 : STATELESS diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml index 53eaae7..df3f7a1 100644 --- a/application/src/main/resources/application.yml +++ b/application/src/main/resources/application.yml @@ -58,7 +58,7 @@ spring: jpa: hibernate: - ddl-auto: update + ddl-auto: create-drop show-sql: true open-in-view: false properties: From a9adfa95d9346c3c49bcd413ca505bcac35e872a Mon Sep 17 00:00:00 2001 From: sukangpunch Date: Thu, 23 Jan 2025 14:44:43 +0900 Subject: [PATCH 78/80] test: --- .../src/main/java/com/groom/yummy/config/SecurityConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java index a3d6f80..5e14c14 100644 --- a/application/src/main/java/com/groom/yummy/config/SecurityConfig.java +++ b/application/src/main/java/com/groom/yummy/config/SecurityConfig.java @@ -47,6 +47,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ // HTTP Basic 인증 방식 disable http.httpBasic((auth) -> auth.disable()); + //경로별 인가 작업 http.authorizeHttpRequests((auth) -> auth .requestMatchers( "/login/**", "/oauth2/**", "/oauth2/authorization/**").permitAll() From 37526a763189508518538fd30702c4cb7066e79a Mon Sep 17 00:00:00 2001 From: fbehddn Date: Thu, 23 Jan 2025 22:18:54 +0900 Subject: [PATCH 79/80] =?UTF-8?q?chore:=20ignore=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20env=20=ED=8C=8C=EC=9D=BC=20=EC=95=88?= =?UTF-8?q?=EC=8D=A8=EC=84=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 062f1db..7a0f4d7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ build/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ -**/.env ### STS ### .apt_generated From 3fee078ece7e6b890f0b9f5d249c2a9614de01a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EB=8F=99=EC=9A=B0?= <108855080+fbehddn@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:44:45 +0900 Subject: [PATCH 80/80] Update README.md --- README.md | 88 +++++++++++-------------------------------------------- 1 file changed, 17 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index 38198af..56c6d1a 100644 --- a/README.md +++ b/README.md @@ -1,77 +1,23 @@ -# famous_restaurant +# Yummy +> 지역 맛집 탐방 소모임 형성 서비스 -Re:quire's famous restaurant service rep +# 🚀 기능 +## 핵심 기능 +### 카카오 소셜 로그인 +### 실제 가게 정보 연동 API 구현 +### 소모임 생성 및 참가 +### 소모임 댓글 등록 ---- +## API 명세 +Screenshot 2025-01-24 at 2 42 43 PM -# 커밋 컨벤션 +# ⿳ ERD +맛집 소모임 ERD-white - - 예시 - - feat: hyungjun#12-feat-create-user-api - #2 +# 🏛️ 멀티 모듈 설계 및 흐름도 +사용성 기반 흐름도 +각 모듈 구성 및 흐름도 -- feat: 새로운 기능 추가 -- fix: 버그 수정 -- docs: 문서 수정 -- style: 코드 포맷팅, 세미콜론 누락, 코드 변경이 없는 경우 -- refactor: 코드 리팩토링 -- test: 테스트 코드, 리팩토링 테스트 코드 추가 -- chore: 빌드 업무 수정, 패키지 매니저 수정 +# 🗺️ 아키텍쳐 +아키텍쳐 -# 이슈 템플릿 - - - issue 제목 - - 예시: feat: 이슈 정리 - - issue 템플릿 - - ```markdown - ## 📋 이슈 내용 - - ## ✅ 체크리스트 - - ## 📚 레퍼런스 - - ``` - - 제목 예시 - - add: UI button 구현 - -# branch 규칙 - - - 각자 영어이름#이슈번호-이슈타입-이슈제목 - - 예시: hyungjun#12-feat-create-user-api - - - 종류: 메시지 - #이슈번호 - - 예시 - - feat: hyungjun#12-feat-create-user-api - #2 - -# PR 템플릿 - - - PR 템플릿 - - ```markdown - ## 📋 이슈 번호 - - ## 🛠 구현 사항 - - ## 📚 기타 - - ``` - -# merge 컨벤션 - - - merge: 브랜치 이름 - #Issue 번호 혹은 PR 번호 - - 예시 - - merge: main <-hyungjun#1-feat-user-controller - -# ERD - ---- -![맛집 소모임 ERD](https://github.com/user-attachments/assets/2442f3aa-67db-4933-af94-32f98a855d20) - - -# 🗺️아키텍처 - ---- - -# 💡기능 - ----