From 125555d698cfa46e67da92363a0715afc6f89a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Sun, 12 Oct 2025 16:43:36 +0900 Subject: [PATCH 01/11] mission/#6 --- .gitattributes | 3 + .gitignore | 37 +++ build.gradle | 39 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../com/example/umc9th/Umc9thApplication.java | 15 ++ .../umc9th/domain/member/entity/Food.java | 24 ++ .../umc9th/domain/member/entity/Member.java | 68 +++++ .../member/entity/mapping/MemberFood.java | 29 ++ .../umc9th/domain/member/enums/FoodName.java | 5 + .../umc9th/domain/member/enums/Gender.java | 5 + .../domain/member/enums/MemberStatus.java | 5 + .../umc9th/domain/mission/entity/Mission.java | 41 +++ .../mission/entity/mapping/MemberMission.java | 30 +++ .../umc9th/domain/review/entity/Reply.java | 26 ++ .../umc9th/domain/review/entity/Review.java | 43 +++ .../domain/review/entity/ReviewPhoto.java | 26 ++ .../umc9th/domain/store/entity/Region.java | 27 ++ .../umc9th/domain/store/entity/Store.java | 47 ++++ .../domain/store/enums/StoreStatus.java | 5 + .../umc9th/global/entity/BaseEntity.java | 18 ++ src/main/resources/application.yml | 19 ++ .../umc9th/Umc9thApplicationTests.java | 13 + 26 files changed, 878 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/example/umc9th/Umc9thApplication.java create mode 100644 src/main/java/com/example/umc9th/domain/member/entity/Food.java create mode 100644 src/main/java/com/example/umc9th/domain/member/entity/Member.java create mode 100644 src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java create mode 100644 src/main/java/com/example/umc9th/domain/member/enums/FoodName.java create mode 100644 src/main/java/com/example/umc9th/domain/member/enums/Gender.java create mode 100644 src/main/java/com/example/umc9th/domain/member/enums/MemberStatus.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/entity/Mission.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java create mode 100644 src/main/java/com/example/umc9th/domain/review/entity/Reply.java create mode 100644 src/main/java/com/example/umc9th/domain/review/entity/Review.java create mode 100644 src/main/java/com/example/umc9th/domain/review/entity/ReviewPhoto.java create mode 100644 src/main/java/com/example/umc9th/domain/store/entity/Region.java create mode 100644 src/main/java/com/example/umc9th/domain/store/entity/Store.java create mode 100644 src/main/java/com/example/umc9th/domain/store/enums/StoreStatus.java create mode 100644 src/main/java/com/example/umc9th/global/entity/BaseEntity.java create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/example/umc9th/Umc9thApplicationTests.java 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/.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/build.gradle b/build.gradle new file mode 100644 index 0000000..ee064e0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,39 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.6' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' +description = 'Demo project for Spring Boot' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + 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\n' "$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="\\\"\\\"" + + +# 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, 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..db3a6ac --- /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= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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..0ec607f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'umc9th' diff --git a/src/main/java/com/example/umc9th/Umc9thApplication.java b/src/main/java/com/example/umc9th/Umc9thApplication.java new file mode 100644 index 0000000..bc54005 --- /dev/null +++ b/src/main/java/com/example/umc9th/Umc9thApplication.java @@ -0,0 +1,15 @@ +package com.example.umc9th; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class Umc9thApplication { + + public static void main(String[] args) { + SpringApplication.run(Umc9thApplication.class, args); + } + +} diff --git a/src/main/java/com/example/umc9th/domain/member/entity/Food.java b/src/main/java/com/example/umc9th/domain/member/entity/Food.java new file mode 100644 index 0000000..0fc7d74 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/Food.java @@ -0,0 +1,24 @@ +package com.example.umc9th.domain.member.entity; + +import com.example.umc9th.domain.member.enums.FoodName; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "food") +public class Food extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name") + @Enumerated(EnumType.STRING) + private FoodName name; + +} diff --git a/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/src/main/java/com/example/umc9th/domain/member/entity/Member.java new file mode 100644 index 0000000..ad0c241 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -0,0 +1,68 @@ +package com.example.umc9th.domain.member.entity; + + +import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import com.example.umc9th.domain.member.enums.Gender; +import com.example.umc9th.domain.member.enums.MemberStatus; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member") +@EntityListeners(AuditingEntityListener.class) +public class Member extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", length = 3, nullable = false) + private String name; + + @Column(name = "gender", nullable = false) + @Enumerated(EnumType.STRING) + @Builder.Default + private Gender gender = Gender.NONE; + + @Column(name = "birth", nullable = false) + private LocalDate birth; + + @Column(name = "address", nullable = false) + private String address; + + @Column(name = "status", nullable = false) + @Enumerated(EnumType.STRING) + private MemberStatus status; + + @Column(name = "inactive_date") + private LocalDate inactiveDate; + + @Column(name = "email") + private String email; + + @Column(name = "phone_number", length = 11, nullable = false) + private String phoneNumber; + + @Column(name = "point") + private int point; + + @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + private List memberFoodList = new ArrayList<>(); + + @OneToMany(mappedBy = "member") + private List reviewList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java b/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java new file mode 100644 index 0000000..21eccd9 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java @@ -0,0 +1,29 @@ +package com.example.umc9th.domain.member.entity.mapping; + +import com.example.umc9th.domain.member.entity.Food; +import com.example.umc9th.domain.member.entity.Member; +import jakarta.persistence.*; +import lombok.*; +import org.springframework.context.annotation.Lazy; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_food") +public class MemberFood { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food food; + +} diff --git a/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java b/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java new file mode 100644 index 0000000..e269124 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.member.enums; + +public enum FoodName { + KOREAN,JAPANESE,CHINESE,WESTERN,CHICKEN,NONE +} diff --git a/src/main/java/com/example/umc9th/domain/member/enums/Gender.java b/src/main/java/com/example/umc9th/domain/member/enums/Gender.java new file mode 100644 index 0000000..2d54bbc --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/Gender.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.member.enums; + +public enum Gender { + MALE,FEMALE,NONE +} diff --git a/src/main/java/com/example/umc9th/domain/member/enums/MemberStatus.java b/src/main/java/com/example/umc9th/domain/member/enums/MemberStatus.java new file mode 100644 index 0000000..3af9ec1 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/MemberStatus.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.member.enums; + +public enum MemberStatus { + ACTIVE,INACTIVE +} diff --git a/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java b/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java new file mode 100644 index 0000000..1c897a1 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java @@ -0,0 +1,41 @@ +package com.example.umc9th.domain.mission.entity; + +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "mission") +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @Column(name = "conditional", nullable = false) + private String conditional; + + @Column(name = "deadline", nullable = false) + private LocalDate deadline; + + @Column(name = "point_reward", nullable = false) + private int pointReward; + + @OneToMany(mappedBy = "mission") + private List memberMissionList = new ArrayList<>(); + +} diff --git a/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java b/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java new file mode 100644 index 0000000..09c9cd7 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java @@ -0,0 +1,30 @@ +package com.example.umc9th.domain.mission.entity.mapping; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_mission") +public class MemberMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; + + +} diff --git a/src/main/java/com/example/umc9th/domain/review/entity/Reply.java b/src/main/java/com/example/umc9th/domain/review/entity/Reply.java new file mode 100644 index 0000000..8c6f2df --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/entity/Reply.java @@ -0,0 +1,26 @@ +package com.example.umc9th.domain.review.entity; + +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "reply") +public class Reply extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; + + @Column(name = "content", nullable = false) + private String content; + +} diff --git a/src/main/java/com/example/umc9th/domain/review/entity/Review.java b/src/main/java/com/example/umc9th/domain/review/entity/Review.java new file mode 100644 index 0000000..745d39e --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/entity/Review.java @@ -0,0 +1,43 @@ +package com.example.umc9th.domain.review.entity; + + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "review") +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "content", nullable = false) + private String content; + + @Column(name = "rating", nullable = false) + private Double rating; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToOne(mappedBy = "review") + private Reply reply; + + @OneToMany(mappedBy = "review", cascade = CascadeType.REMOVE) + private List reviewPhotoList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc9th/domain/review/entity/ReviewPhoto.java b/src/main/java/com/example/umc9th/domain/review/entity/ReviewPhoto.java new file mode 100644 index 0000000..7e70620 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/entity/ReviewPhoto.java @@ -0,0 +1,26 @@ +package com.example.umc9th.domain.review.entity; + +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "review_photo") +public class ReviewPhoto extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; + + @Column(name = "photo_url", nullable = false) + private String photoUrl; +} diff --git a/src/main/java/com/example/umc9th/domain/store/entity/Region.java b/src/main/java/com/example/umc9th/domain/store/entity/Region.java new file mode 100644 index 0000000..dea0850 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/entity/Region.java @@ -0,0 +1,27 @@ +package com.example.umc9th.domain.store.entity; + +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "region") +public class Region extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name" , nullable = false) + private String name; + + @OneToMany(mappedBy = "region") + private List storeList = new ArrayList<>(); + +} diff --git a/src/main/java/com/example/umc9th/domain/store/entity/Store.java b/src/main/java/com/example/umc9th/domain/store/entity/Store.java new file mode 100644 index 0000000..58143da --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/entity/Store.java @@ -0,0 +1,47 @@ +package com.example.umc9th.domain.store.entity; + + +import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.store.enums.StoreStatus; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "store") +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "address", nullable = false) + private String address; + + @Column(name = "rating", nullable = false) + private Double rating; + + @Column(name = "status", nullable = false) + @Enumerated(EnumType.STRING) + private StoreStatus status; + + @OneToMany(mappedBy = "store", cascade = CascadeType.REMOVE) + private List missionList = new ArrayList<>(); + + @OneToMany(mappedBy = "store") + private List reviewList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc9th/domain/store/enums/StoreStatus.java b/src/main/java/com/example/umc9th/domain/store/enums/StoreStatus.java new file mode 100644 index 0000000..234d7e0 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/enums/StoreStatus.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.store.enums; + +public enum StoreStatus { + OPEN,CLOSED,PREPARED,BREAK_TIME,NONE +} diff --git a/src/main/java/com/example/umc9th/global/entity/BaseEntity.java b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java new file mode 100644 index 0000000..49a3865 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java @@ -0,0 +1,18 @@ +package com.example.umc9th.global.entity; + +import jakarta.persistence.Column; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; + +import java.time.LocalDateTime; + +public class BaseEntity { + + @CreatedDate + @Column(name = "created_at", nullable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at", nullable = false) + private LocalDateTime updatedAt; +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..748fd54 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + application: + name: "umc9th" # "umc9th" + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver # MySQL JDBC ???? ??? ?? + url: ${DB_URL} # jdbc:mysql://localhost:3306/{???????} + username: ${DB_USER} # MySQL ?? ?? + password: ${DB_PW} # MySQL ???? + + jpa: + database: mysql # ??? ?????? ?? ?? (MySQL) + database-platform: org.hibernate.dialect.MySQLDialect # Hibernate?? ??? MySQL ??(dialect) ?? + show-sql: true # ??? SQL ??? ??? ???? ?? ?? + hibernate: + ddl-auto: create # ?????? ?? ? ?????? ???? ??? ?? + properties: + hibernate: + format_sql: true # ???? SQL ??? ?? ?? ???spring.application.name=umc9th diff --git a/src/test/java/com/example/umc9th/Umc9thApplicationTests.java b/src/test/java/com/example/umc9th/Umc9thApplicationTests.java new file mode 100644 index 0000000..bbdf1bd --- /dev/null +++ b/src/test/java/com/example/umc9th/Umc9thApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.umc9th; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Umc9thApplicationTests { + + @Test + void contextLoads() { + } + +} From 21edbfba0c2606007f4a4b3a5a973983cb869aa8 Mon Sep 17 00:00:00 2001 From: CokaNuri <83066622+CokaNuri@users.noreply.github.com> Date: Sun, 12 Oct 2025 17:27:45 +0900 Subject: [PATCH 02/11] Add files via upload --- README.md | 220 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 146 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index a2f07e0..119c4aa 100644 --- a/README.md +++ b/README.md @@ -1,74 +1,146 @@ -# :leaves: Spring_Boot D - -DGU-UMC 9기 Spring Boot 스터디 D조 - -## 💻 Member - -| 애나 | 루크 | 미로 | 누리 | -| :-----------------------------------: | :-----------------------------------: | :-----------------------------------: | :-----------------------------------: | -| [김민선](https://github.com/sunnyanna0) | [김도훈](https://github.com/DOHOON0127) | [이시은](https://github.com/miro-oss) | [정준영](https://github.com/cokanuri) | - -## 📁 디렉토리 구조 - -- src 디렉토리를 실제 작업을 진행하는 Spring Boot의 src와 일치시켜 주세요. -- 미션 및 실습, 주차를 정확히 구분하기 위해 아래의 commit 규칙을 ‼️반드시‼️ 준수하여 commit 후 push 해 주세요. - -```bash -├─.github -│ └─PULL_REQUEST_TEMPLATE -│ └─ISSUE_TEMPLATE -├─README.md -└─src - ├─main - │ - └─test - │ - └─... - -``` - -## 🎨 commit 규칙 - -- 해당 commit이 미션에 관한 것일 경우: "mission/#해당 주차" - -``` -Ex) 1주차 미션 수행 후 -mission/#01 -``` - -- 해당 commit이 실습에 관한 것일 경우: "practice/#해당 주차" - -``` -Ex) 2주차 실습 수행 후 -practice/#02 -``` - -- 해당 주차에 미션이나 실습이 없는 경우, 있는 주차에만 수행하시면 됩니다. - -## 🌳 branch 규칙 - -```bash -├─main - ├─angela/main - │ └─angela/#1 -``` - -1. `닉네임/main 브랜치`가 기본 브랜치로 pr 보낼 때 root 브랜치(main 브랜치)가 아닌 닉네임/main 브랜치로 올립니다. -2. 매주 워크북, 실습, 그리고 미션은 각자의 닉네임/main 브랜치를 base 브랜치로 삼아 `닉네임/이슈번호 브랜치`를 생성하여 관련 파일을 업로드합니다. -3. 모든 팀원들의 approve를 받으면, pr을 머지하고 해당 pr을 생성한 브랜치(닉네임/이슈번호 브랜치)는 삭제합니다. approve와 merge는 스터디 진행 중에 이루어집니다. - -## 🔖 커밋 컨벤션 - -| Message | 설명 | -| :------: | :-------------------- | -| mission | 미션 수행 | -| practice | 실습 수행 | -| keyword | 키워드 정리 | -| workbook | 워크북 정리 | -| fix | 버그 수정 | -| docs | 문서 수정 | -| comment | 주석 추가 및 변경 | -| test | 테스트 코드 추가 | -| rename | 파일 혹은 폴더명 수정 | -| remove | 파일 혹은 폴더 삭제 | -| chore | 기타 변경사항 | +# 🗂 속성별 제약조건 정리 + +## 🧑‍💻 member + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| member_id | BIGINT(20) | PK, NOT NULL | 회원 고유 ID | +| name | VARCHAR(50) | NOT NULL | 회원 이름 | +| nickname | VARCHAR(50) | NOT NULL | 닉네임 | +| gender | VARCHAR(10) | NOT NULL | 성별 | +| birth | DATE | NOT NULL | 생년월일 | +| address | VARCHAR(255) | NOT NULL | 주소 | +| status | VARCHAR(15) | NOT NULL | 회원 상태 (정상/탈퇴 등) | +| withdrawal_date | DATETIME | NULL | 탈퇴일 | +| email | VARCHAR(255) | NULL | 이메일 | +| phone | VARCHAR(20) | NULL | 전화번호 | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | +| point | INT(20) | NOT NULL | 보유 포인트 | + +--- + +## 🍽 food + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| category_id | BIGINT(20) | PK, NOT NULL | 음식 카테고리 ID | +| category_name | VARCHAR(50) | NOT NULL | 음식 카테고리명 | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 🧍 member_food + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| id | BIGINT(20) | PK, NOT NULL | 고유 ID | +| member_id | BIGINT(20) | FK → member.member_id | 회원 ID | +| category_id | BIGINT(20) | FK → food.category_id | 음식 카테고리 ID | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 🏁 mission + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| mission_id | BIGINT(20) | PK, NOT NULL | 미션 고유 ID | +| store_id | BIGINT(20) | FK → store.store_id | 가게 ID | +| mission_condition | VARCHAR(50) | NOT NULL | 미션 조건 | +| mission_deadline | DATE | NOT NULL | 미션 기한 | +| point | INT(20) | NOT NULL | 포인트 | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 🎯 member_mission + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| id | BIGINT(20) | PK, NOT NULL | 고유 ID | +| member_id | BIGINT(20) | FK → member.member_id | 회원 ID | +| mission_id | BIGINT(20) | FK → mission.mission_id | 미션 ID | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 🏪 store + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| store_id | BIGINT(20) | PK, NOT NULL | 가게 ID | +| region_id | BIGINT(20) | FK → region.region_id | 지역 ID | +| name | VARCHAR(50) | NOT NULL | 가게 이름 | +| address | VARCHAR(255) | NOT NULL | 가게 주소 | +| rating | DECIMAL(2,1) | NOT NULL | 평점 | +| status | VARCHAR(50) | NOT NULL | 영업 상태 | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 📍 region + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| region_id | BIGINT(20) | PK, NOT NULL | 지역 고유 ID | +| name | VARCHAR(50) | NOT NULL | 지역명 | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 📝 review + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| review_id | BIGINT(20) | PK, NOT NULL | 리뷰 고유 ID | +| store_id | BIGINT(20) | FK → store.store_id | 가게 ID | +| member_id | BIGINT(20) | FK → member.member_id | 작성자 ID | +| content | VARCHAR(255) | NOT NULL | 리뷰 내용 | +| rating | DECIMAL(2,1) | NOT NULL | 평점 | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 💬 review_reply + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| reply_id | BIGINT(20) | PK, NOT NULL | 댓글 ID | +| review_id | BIGINT(20) | FK → review.review_id | 리뷰 ID | +| content | VARCHAR(255) | NOT NULL | 댓글 내용 | +| created_at | DATETIME(6) | NOT NULL | 생성일 | +| updated_at | DATETIME(6) | NOT NULL | 수정일 | + +--- + +## 🖼 review_photo + +| 컬럼명 | 데이터 타입 | 제약조건 | 설명 | +|--------|--------------|-----------|------| +| photo_id | BIGINT(20) | PK, NOT NULL | 사진 ID | +| review_id | BIGINT(20) | FK → review.review_id | 리뷰 ID | +| photo_url | VARCHAR(255) | NULL | 사진 URL | + +--- + +# 🔗 연관관계 매핑 설계 근거 + +| 관계 | 매핑 방향 | 관계 유형 | Cascade | 설계 이유 | +|------|------------|------------|-----------|------------| +| Member – Review | 양방향 | 1:N | ❌ | 회원이 작성한 리뷰 목록 조회 기능 필요 | +| Member – MemberFood | 양방향 | 1:N | ✅ (REMOVE) | 회원이 좋아하는 음식 탐색 기능 구현 | +| Member – MemberMission | 단방향 | 1:N | ❌ | 순환 참조 방지 및 단순화 | +| Mission – MemberMission | 양방향 | 1:N | ❌ | ‘자신의 미션 조회’ 기능 구현 | +| Mission – Store | 양방향 | N:1 | ✅ (REMOVE) | 특정 가게의 모든 미션 조회 기능 필요 | +| Store – Region | 양방향 | N:1 | ❌ | 지역별 가게 목록 조회 기능 구현 | +| Review – ReviewReply | 양방향 | 1:1 | ✅ (REMOVE) | 리뷰 상세화면에서 댓글 함께 표시 | +| Review – ReviewPhoto | 양방향 | 1:N | ❌ | 리뷰 상세화면에서 사진 함께 표시 | +| Food – MemberFood | 단방향 | 1:N | ❌ | 음식 기준으로 회원 탐색 필요 없음 | From fcf7b7fff34bba9fb60d618302fa1224fd5ab48b Mon Sep 17 00:00:00 2001 From: CokaNuri <83066622+CokaNuri@users.noreply.github.com> Date: Sun, 12 Oct 2025 17:32:20 +0900 Subject: [PATCH 03/11] Update README.md --- README.md | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 119c4aa..de1f0c7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# 🗂 속성별 제약조건 정리 + 속성별 제약조건 정리 -## 🧑‍💻 member +## member | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -20,7 +20,7 @@ --- -## 🍽 food +## food | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -31,7 +31,7 @@ --- -## 🧍 member_food +## member_food | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -43,7 +43,7 @@ --- -## 🏁 mission +## mission | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -57,7 +57,7 @@ --- -## 🎯 member_mission +## member_mission | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -69,7 +69,7 @@ --- -## 🏪 store +## store | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -84,7 +84,7 @@ --- -## 📍 region +## region | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -95,7 +95,7 @@ --- -## 📝 review +## review | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -109,7 +109,7 @@ --- -## 💬 review_reply +## review_reply | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -121,7 +121,7 @@ --- -## 🖼 review_photo +## review_photo | 컬럼명 | 데이터 타입 | 제약조건 | 설명 | |--------|--------------|-----------|------| @@ -131,16 +131,16 @@ --- -# 🔗 연관관계 매핑 설계 근거 - -| 관계 | 매핑 방향 | 관계 유형 | Cascade | 설계 이유 | -|------|------------|------------|-----------|------------| -| Member – Review | 양방향 | 1:N | ❌ | 회원이 작성한 리뷰 목록 조회 기능 필요 | -| Member – MemberFood | 양방향 | 1:N | ✅ (REMOVE) | 회원이 좋아하는 음식 탐색 기능 구현 | -| Member – MemberMission | 단방향 | 1:N | ❌ | 순환 참조 방지 및 단순화 | -| Mission – MemberMission | 양방향 | 1:N | ❌ | ‘자신의 미션 조회’ 기능 구현 | -| Mission – Store | 양방향 | N:1 | ✅ (REMOVE) | 특정 가게의 모든 미션 조회 기능 필요 | -| Store – Region | 양방향 | N:1 | ❌ | 지역별 가게 목록 조회 기능 구현 | -| Review – ReviewReply | 양방향 | 1:1 | ✅ (REMOVE) | 리뷰 상세화면에서 댓글 함께 표시 | -| Review – ReviewPhoto | 양방향 | 1:N | ❌ | 리뷰 상세화면에서 사진 함께 표시 | -| Food – MemberFood | 단방향 | 1:N | ❌ | 음식 기준으로 회원 탐색 필요 없음 | +# 연관관계 매핑 + +| 관계 | 매핑 방향 | 관계 유형 +|------|------------|------------| +| Member – Review | 양방향 | 1:N | +| Member – MemberFood | 양방향 | 1:N | +| Member – MemberMission | 단방향 | 1:N | +| Mission – MemberMission | 양방향 | 1:N | +| Mission – Store | 양방향 | N:1 | +| Store – Region | 양방향 | N:1 | +| Review – ReviewReply | 양방향 | 1:1 | +| Review – ReviewPhoto | 양방향 | 1:N | +| Food – MemberFood | 단방향 | 1:N | From 2183661d0df59a1cadd473dd9d219ca0ac175684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Sun, 2 Nov 2025 12:24:29 +0900 Subject: [PATCH 04/11] =?UTF-8?q?mission/#5:=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/dto/MemberInfoResponseDTO.java | 18 +++ .../repository/MemberMissionRepository.java | 32 ++++++ .../member/repository/MemberRepository.java | 9 ++ .../domain/member/service/MemberService.java | 31 ++++++ .../dto/ChallengeMissionResponseDTO.java | 20 ++++ .../mission/dto/HomeMissionResponseDTO.java | 21 ++++ .../mission/dto/MissionResponseDTO.java | 21 ++++ .../mission/entity/mapping/MemberMission.java | 4 + .../mission/enums/MemberMissionStatus.java | 7 ++ .../repository/MemberMissionRepository.java | 43 ++++++++ .../mission/repository/MissionRepository.java | 27 +++++ .../mission/service/MissionService.java | 62 +++++++++++ .../domain/review/dto/ReviewRequestDTO.java | 15 +++ .../domain/review/dto/ReviewResponseDTO.java | 19 ++++ .../umc9th/domain/review/entity/Review.java | 1 + .../review/repository/ReviewRepository.java | 21 ++++ .../domain/review/service/ReviewService.java | 53 +++++++++ .../umc9th/domain/store/entity/Region.java | 1 + .../umc9th/domain/store/entity/Store.java | 1 + .../store/repository/StoreRepository.java | 9 ++ .../member/service/MemberServiceTest.java | 66 +++++++++++ .../mission/service/MissionServiceTest.java | 103 ++++++++++++++++++ .../review/service/ReviewServiceTest.java | 87 +++++++++++++++ 23 files changed, 671 insertions(+) create mode 100644 src/main/java/com/example/umc9th/domain/member/dto/MemberInfoResponseDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/MemberService.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/dto/HomeMissionResponseDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/enums/MemberMissionStatus.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/service/MissionService.java create mode 100644 src/main/java/com/example/umc9th/domain/review/dto/ReviewRequestDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/review/dto/ReviewResponseDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/review/service/ReviewService.java create mode 100644 src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java create mode 100644 src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java create mode 100644 src/test/java/com/example/umc9th/domain/mission/service/MissionServiceTest.java create mode 100644 src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java diff --git a/src/main/java/com/example/umc9th/domain/member/dto/MemberInfoResponseDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/MemberInfoResponseDTO.java new file mode 100644 index 0000000..91cef08 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/dto/MemberInfoResponseDTO.java @@ -0,0 +1,18 @@ +package com.example.umc9th.domain.member.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class MemberInfoResponseDTO { + + private String nickname; + private String phoneNumber; + private Integer point; + private String email; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java b/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java new file mode 100644 index 0000000..248181e --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java @@ -0,0 +1,32 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface MemberMissionRepository extends JpaRepository { + + @Query("SELECT mm FROM MemberMission mm " + + "JOIN FETCH mm.mission m " + + "JOIN FETCH m.store s " + + "WHERE mm.member.id = :memberId AND mm.status = :status " + + "ORDER BY m.id DESC") + Page findMissionsByMemberAndStatus( + @Param("memberId") Long memberId, + @Param("status") String status, + Pageable pageable + ); + + @Query("SELECT COUNT(m) " + + "FROM MemberMission m JOIN m.mission ms JOIN ms.store s " + + "WHERE m.member.id = :memberId " + + "AND m.status = 'COMPLETED' " + + "AND s.region.id = :regionId") + Long countCompletedMissionsByMemberAndRegion( + @Param("memberId") Long memberId, + @Param("regionId") Long regionId + ); +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java b/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..472efc6 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java @@ -0,0 +1,9 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberRepository extends JpaRepository { + + +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/src/main/java/com/example/umc9th/domain/member/service/MemberService.java new file mode 100644 index 0000000..45fc616 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -0,0 +1,31 @@ +package com.example.umc9th.domain.member.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.example.umc9th.domain.member.dto.MemberInfoResponseDTO; +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.repository.MemberRepository; + +import java.util.NoSuchElementException; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class MemberService { + + private final MemberRepository memberRepository; + + public MemberInfoResponseDTO getMemberInfo(Long memberId) { + + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new NoSuchElementException( memberId + "를 찾을 수 없습니다")); + + return MemberInfoResponseDTO.builder() + .nickname(member.getName()) + .phoneNumber(member.getPhoneNumber()) + .point(member.getPoint()) + .email(member.getEmail()) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java new file mode 100644 index 0000000..75abc24 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java @@ -0,0 +1,20 @@ +package com.example.umc9th.domain.mission.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import java.time.LocalDateTime; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ChallengeMissionResponseDTO { + + private Long missionId; + private String storeName; + private LocalDateTime deadline; + private String condition; + private Integer point; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/HomeMissionResponseDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/HomeMissionResponseDTO.java new file mode 100644 index 0000000..42f053c --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/dto/HomeMissionResponseDTO.java @@ -0,0 +1,21 @@ +package com.example.umc9th.domain.mission.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.domain.Page; + + +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class HomeMissionResponseDTO { + + private Long completedCount; + private Long totalCount; + + // 미션 목록 + private Page missionList; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java new file mode 100644 index 0000000..a6b4e46 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java @@ -0,0 +1,21 @@ +package com.example.umc9th.domain.mission.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class MissionResponseDTO { + + private Long missionId; + private String storeName; + private String condition; + private Integer point; + private String missionStatus; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java b/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java index 09c9cd7..49c00b8 100644 --- a/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java +++ b/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java @@ -2,6 +2,7 @@ import com.example.umc9th.domain.member.entity.Member; import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.domain.mission.enums.MemberMissionStatus; import com.example.umc9th.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; @@ -26,5 +27,8 @@ public class MemberMission extends BaseEntity { @JoinColumn(name = "mission_id") private Mission mission; + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private MemberMissionStatus status; } diff --git a/src/main/java/com/example/umc9th/domain/mission/enums/MemberMissionStatus.java b/src/main/java/com/example/umc9th/domain/mission/enums/MemberMissionStatus.java new file mode 100644 index 0000000..ed07a6a --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/enums/MemberMissionStatus.java @@ -0,0 +1,7 @@ +package com.example.umc9th.domain.mission.enums; + + +public enum MemberMissionStatus { + ONGOING, + COMPLETED, +} diff --git a/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java b/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java new file mode 100644 index 0000000..4d2c209 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java @@ -0,0 +1,43 @@ +package com.example.umc9th.domain.mission.repository; + +import com.example.umc9th.domain.mission.dto.ChallengeMissionResponseDTO; +import com.example.umc9th.domain.mission.enums.MemberMissionStatus; +import com.example.umc9th.domain.mission.dto.MissionResponseDTO; +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.time.LocalDateTime; + +public interface MemberMissionRepository extends JpaRepository { + + + @Query("SELECT new com.example.umc9th.domain.mission.dto.MissionResponseDTO(" + + "ms.id, s.name, ms.condition, ms.point, m.status) " + + "FROM MemberMission m " + + "JOIN m.mission ms " + + "JOIN ms.store s " + + "WHERE m.member.id = :memberId AND m.status = :status " + + "ORDER BY m.createdAt DESC") + Page findMemberMissionsByStatus( + @Param("memberId") Long memberId, + @Param("status") MemberMissionStatus status, + Pageable pageable + ); + + @Query("SELECT COUNT(m) " + + "FROM MemberMission m JOIN m.mission ms JOIN ms.store s " + + "WHERE m.member.id = :memberId " + + "AND m.status = 'COMPLETED' " + + "AND s.region.id = :regionId") + Long countCompletedMissionsByMemberAndRegion( + @Param("memberId") Long memberId, + @Param("regionId") Long regionId + ); + + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java b/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java new file mode 100644 index 0000000..228310e --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java @@ -0,0 +1,27 @@ +package com.example.umc9th.domain.mission.repository; + +import com.example.umc9th.domain.mission.dto.ChallengeMissionResponseDTO; +import com.example.umc9th.domain.mission.entity.Mission; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.time.LocalDateTime; + +public interface MissionRepository extends JpaRepository { + + + @Query("SELECT new com.example.umc9th.domain.mission.dto.ChallengeMissionResponseDTO(" + + "ms.id, s.name, ms.deadline, ms.condition, ms.point) " + + "FROM Mission ms JOIN ms.store s " + + "WHERE s.region.id = :regionId " + + "AND ms.deadline > :now " + + "ORDER BY ms.createdAt DESC") + Page findChallengeableMissionsByRegion( + @Param("regionId") Long regionId, + @Param("now") LocalDateTime now, + Pageable pageable + ); +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java b/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java new file mode 100644 index 0000000..6c021b6 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java @@ -0,0 +1,62 @@ +package com.example.umc9th.domain.mission.service; + +import com.example.umc9th.domain.mission.dto.ChallengeMissionResponseDTO; +import com.example.umc9th.domain.mission.dto.HomeMissionResponseDTO; +import com.example.umc9th.domain.mission.enums.MemberMissionStatus; +import com.example.umc9th.domain.mission.dto.MissionResponseDTO; +import com.example.umc9th.domain.mission.repository.MemberMissionRepository; + +import com.example.umc9th.domain.mission.repository.MissionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class MissionService { + + private final MemberMissionRepository memberMissionRepository; + private final MissionRepository missionRepository; + + public Page getOngoingMissions(Long memberId, Pageable pageable) { + return memberMissionRepository.findMemberMissionsByStatus( + memberId, + MemberMissionStatus.ONGOING, // 진행 중 상태 + pageable + ); + } + + public Page getCompletedMissions(Long memberId, Pageable pageable) { + return memberMissionRepository.findMemberMissionsByStatus( + memberId, + MemberMissionStatus.COMPLETED, // 완료 상태 + pageable + ); + } + + public HomeMissionResponseDTO getHomeMissions(Long memberId, Long regionId, Pageable pageable) { + + // 지역에서 도전 가능한 미션 목록 조회 + Page challengeableMissions = + missionRepository.findChallengeableMissionsByRegion(regionId, LocalDateTime.now(), pageable); + + // 지역에서 회원이 성공한 미션 개수 조회 + Long completedCount = memberMissionRepository.countCompletedMissionsByMemberAndRegion(memberId, regionId); + + // 총 미션 개수는 해당 지역의 도전 가능한 미션 총 개수 + Long totalCount = challengeableMissions.getTotalElements(); + + // 두 결과를 최종 응답 DTO로 묶어서 반환 + return HomeMissionResponseDTO.builder() + .completedCount(completedCount) + .totalCount(totalCount) + .missionList(challengeableMissions) + .build(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewRequestDTO.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewRequestDTO.java new file mode 100644 index 0000000..c7a895c --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewRequestDTO.java @@ -0,0 +1,15 @@ +package com.example.umc9th.domain.review.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class ReviewRequestDTO { + + private String content; + private Double rating; + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewResponseDTO.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResponseDTO.java new file mode 100644 index 0000000..54884b2 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResponseDTO.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.review.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ReviewResponseDTO { + + private Long reviewId; + private String storeName; + private String content; + private Double rating; + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/entity/Review.java b/src/main/java/com/example/umc9th/domain/review/entity/Review.java index 745d39e..18c095a 100644 --- a/src/main/java/com/example/umc9th/domain/review/entity/Review.java +++ b/src/main/java/com/example/umc9th/domain/review/entity/Review.java @@ -15,6 +15,7 @@ @AllArgsConstructor(access = AccessLevel.PRIVATE) @Getter @Table(name = "review") +@Builder public class Review extends BaseEntity { @Id diff --git a/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java b/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java new file mode 100644 index 0000000..5f0ee8e --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java @@ -0,0 +1,21 @@ +package com.example.umc9th.domain.review.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import com.example.umc9th.domain.review.dto.ReviewResponseDTO; +import com.example.umc9th.domain.review.entity.Review; +import java.util.List; + +public interface ReviewRepository extends JpaRepository { + + + @Query("SELECT new com.example.umc9th.domain.review.dto.ReviewResponseDTO(" + + "r.id, s.name, r.content, r.rating) " + + "FROM Review r JOIN r.store s " + + "WHERE r.member.id = :memberId " + + "ORDER BY r.createdAt DESC") + List findMemberReviews(@Param("memberId") Long memberId); + + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java b/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java new file mode 100644 index 0000000..07ae0a0 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java @@ -0,0 +1,53 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.domain.review.dto.ReviewRequestDTO; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.domain.store.repository.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.example.umc9th.domain.review.dto.ReviewResponseDTO; +import com.example.umc9th.domain.review.repository.ReviewRepository; + +import java.util.List; +import java.util.NoSuchElementException; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class ReviewService { + + private final ReviewRepository reviewRepository; + private final MemberRepository memberRepository; + private final StoreRepository storeRepository; + + public List getMyReviews(Long memberId) { + + return reviewRepository.findMemberReviews(memberId); + } + + @Transactional + public Review createReview(Long storeId, Long memberId, ReviewRequestDTO request) { + + // 엔티티 조회 + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new NoSuchElementException(memberId + "를 찾을 수 없습니다.")); + + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new NoSuchElementException("가게 ID: " + storeId + "를 찾을 수 없습니다.")); + + // Review 엔티티 생성 + Review newReview = Review.builder() + .member(member) + .store(store) + .content(request.getContent()) + .rating(request.getRating()) + .build(); + + return reviewRepository.save(newReview); + } + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/store/entity/Region.java b/src/main/java/com/example/umc9th/domain/store/entity/Region.java index dea0850..12a2377 100644 --- a/src/main/java/com/example/umc9th/domain/store/entity/Region.java +++ b/src/main/java/com/example/umc9th/domain/store/entity/Region.java @@ -12,6 +12,7 @@ @AllArgsConstructor(access = AccessLevel.PRIVATE) @Getter @Table(name = "region") +@Builder public class Region extends BaseEntity { @Id diff --git a/src/main/java/com/example/umc9th/domain/store/entity/Store.java b/src/main/java/com/example/umc9th/domain/store/entity/Store.java index 58143da..7d19b4b 100644 --- a/src/main/java/com/example/umc9th/domain/store/entity/Store.java +++ b/src/main/java/com/example/umc9th/domain/store/entity/Store.java @@ -16,6 +16,7 @@ @AllArgsConstructor(access = AccessLevel.PRIVATE) @Getter @Table(name = "store") +@Builder public class Store extends BaseEntity { @Id diff --git a/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java b/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java new file mode 100644 index 0000000..28c3249 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java @@ -0,0 +1,9 @@ +package com.example.umc9th.domain.store.repository; + +import com.example.umc9th.domain.store.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +public interface StoreRepository extends JpaRepository { + +} diff --git a/src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java b/src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java new file mode 100644 index 0000000..fe6c278 --- /dev/null +++ b/src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java @@ -0,0 +1,66 @@ +package com.example.umc9th.domain.member.service; + +import com.example.umc9th.domain.member.dto.MemberInfoResponseDTO; +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.repository.MemberRepository; +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.NoSuchElementException; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class MemberServiceTest { + + @InjectMocks // 테스트 대상 서비스 + private MemberService memberService; + + @Mock // Mocking 할 Repository + private MemberRepository memberRepository; + + @Test + @DisplayName("마이페이지 정보 조회 성공 테스트") + void getMemberInfo_success() { + // Given + Long memberId = 1L; + Member mockMember = Member.builder() + .id(memberId) + .name("nickname012") // 닉네임 (name) + .email("test@naver.com") + .phoneNumber("010-1234-5678") + .point(2500) + .build(); + + // Mocking 설정: findById 호출 시 mockMember 반환 + when(memberRepository.findById(memberId)).thenReturn(Optional.of(mockMember)); + + // When + MemberInfoResponseDTO result = memberService.getMemberInfo(memberId); + + // Then + assertThat(result.getNickname()).isEqualTo("nickname012"); + assertThat(result.getEmail()).isEqualTo("test@naver.com"); + } + + @Test + @DisplayName("마이페이지 정보 조회 실패 (회원 없음) 테스트") + void getMemberInfo_failure_not_found() { + // Given + Long nonExistentId = 999L; + + // Mocking 설정: findById 호출 시 빈 Optional 반환 + when(memberRepository.findById(nonExistentId)).thenReturn(Optional.empty()); + + // When & Then + // NoSuchElementException이 발생하는지 확인 + assertThrows(NoSuchElementException.class, () -> memberService.getMemberInfo(nonExistentId)); + } +} \ No newline at end of file diff --git a/src/test/java/com/example/umc9th/domain/mission/service/MissionServiceTest.java b/src/test/java/com/example/umc9th/domain/mission/service/MissionServiceTest.java new file mode 100644 index 0000000..55016f8 --- /dev/null +++ b/src/test/java/com/example/umc9th/domain/mission/service/MissionServiceTest.java @@ -0,0 +1,103 @@ +package com.example.umc9th.domain.mission.service; + +import com.example.umc9th.domain.mission.enums.MemberMissionStatus; +import com.example.umc9th.domain.mission.dto.ChallengeMissionResponseDTO; +import com.example.umc9th.domain.mission.dto.HomeMissionResponseDTO; +import com.example.umc9th.domain.mission.dto.MissionResponseDTO; +import com.example.umc9th.domain.mission.repository.MemberMissionRepository; +import com.example.umc9th.domain.mission.repository.MissionRepository; +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.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; + +import java.time.LocalDateTime; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class MissionServiceTest { + + @InjectMocks + private MissionService missionService; + + @Mock + private MemberMissionRepository memberMissionRepository; + @Mock + private MissionRepository missionRepository; + + @Test + @DisplayName("진행 완료 미션 목록 조회 테스트") + void getCompletedMissionsTest() { + // Given + Long memberId = 1L; + Pageable pageable = PageRequest.of(0, 5); + + MissionResponseDTO completedMission = MissionResponseDTO.builder() + .missionStatus(MemberMissionStatus.COMPLETED.name()) + .storeName("완료가게").build(); + + Page mockPage = new PageImpl<>(List.of(completedMission), pageable, 1); + + // Mocking 설정 + when(memberMissionRepository.findMemberMissionsByStatus( + eq(memberId), + eq(MemberMissionStatus.COMPLETED), + eq(pageable))) + .thenReturn(mockPage); + + // When + Page result = missionService.getCompletedMissions(memberId, pageable); + + // Then + assertThat(result.getTotalElements()).isEqualTo(1); + assertThat(result.getContent().get(0).getStoreName()).isEqualTo("완료가게"); + } + + @Test + @DisplayName("홈 화면 정보 조회 및 통계 테스트") + void getHomeMissionsTest() { + // Given + Long memberId = 1L; + Long regionId = 10L; + Pageable pageable = PageRequest.of(0, 5); + + // Mock 1: 도전 가능 미션 목록 + ChallengeMissionResponseDTO missionDto = ChallengeMissionResponseDTO.builder().missionId(5L).storeName("도전가게").build(); + Page mockMissionPage = new PageImpl<>(List.of(missionDto), pageable, 10); // 총 10개 가정 + + // Mock 2: 완료된 미션 개수 + Long completedCount = 7L; // 7개 완료 가정 + + // Mocking 설정 + when(missionRepository.findChallengeableMissionsByRegion( + eq(regionId), any(LocalDateTime.class), eq(pageable))) + .thenReturn(mockMissionPage); + + when(memberMissionRepository.countCompletedMissionsByMemberAndRegion( + eq(memberId), eq(regionId))) + .thenReturn(completedCount); + + // When + HomeMissionResponseDTO result = missionService.getHomeMissions(memberId, regionId, pageable); + + // Then + // 통계 검증: 7/10 + assertThat(result.getCompletedCount()).isEqualTo(7L); + assertThat(result.getTotalCount()).isEqualTo(10L); // PageImpl의 TotalElements + + // 목록 검증 + assertThat(result.getMissionList().getContent()).hasSize(1); + assertThat(result.getMissionList().getContent().get(0).getStoreName()).isEqualTo("도전가게"); + } +} \ No newline at end of file diff --git a/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java b/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java new file mode 100644 index 0000000..751bf94 --- /dev/null +++ b/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java @@ -0,0 +1,87 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.domain.review.dto.ReviewRequestDTO; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.repository.ReviewRepository; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.domain.store.repository.StoreRepository; +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.NoSuchElementException; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@ExtendWith(MockitoExtension.class) +class ReviewServiceTest { + + @InjectMocks + private ReviewService reviewService; + + @Mock + private ReviewRepository reviewRepository; + @Mock + private MemberRepository memberRepository; + @Mock + private StoreRepository storeRepository; + + @Test + @DisplayName("리뷰 작성 성공 테스트") + void createReview_success() { + // Given + Long storeId = 1L; + Long memberId = 2L; + // DTO의 필드에 접근하기 위해 @AllArgsConstructor를 잠시 사용했다고 가정합니다. + ReviewRequestDTO request = new ReviewRequestDTO("새로운 리뷰 내용", 5.0); + + // Mock 엔티티 생성 + Member mockMember = Member.builder().id(memberId).build(); + Store mockStore = Store.builder().id(storeId).build(); + Review mockReview = Review.builder().id(10L).member(mockMember).store(mockStore).content(request.getContent()).rating(request.getRating()).build(); + + // Mocking 설정 + when(memberRepository.findById(memberId)).thenReturn(Optional.of(mockMember)); // 회원 조회 성공 + when(storeRepository.findById(storeId)).thenReturn(Optional.of(mockStore)); // 가게 조회 성공 + when(reviewRepository.save(any(Review.class))).thenReturn(mockReview); // save 호출 시 mockReview 반환 + + // When + Review createdReview = reviewService.createReview(storeId, memberId, request); + + // Then + // 1. save 메서드가 호출되었는지 검증 + verify(reviewRepository).save(any(Review.class)); + // 2. 반환된 리뷰 내용 검증 + assertThat(createdReview.getContent()).isEqualTo("새로운 리뷰 내용"); + assertThat(createdReview.getRating()).isEqualTo(5.0); + } + + @Test + @DisplayName("리뷰 작성 실패 (회원 없음) 테스트") + void createReview_failure_member_not_found() { + // Given + Long nonExistentMemberId = 999L; + Long storeId = 1L; // 가게 ID는 사용되지 않지만, 메서드 호출을 위해 필요 + ReviewRequestDTO request = new ReviewRequestDTO("내용", 4.0); + + // Mocking 설정: 회원 조회 실패 (가장 먼저 발생하는 실패 조건을 설정) + // storeRepository.findById에 대한 Mocking은 제거합니다. + when(memberRepository.findById(nonExistentMemberId)).thenReturn(Optional.empty()); + + // When & Then + // 회원 조회 실패 시 바로 예외가 발생하는지 검증 + assertThrows(NoSuchElementException.class, + () -> reviewService.createReview(storeId, nonExistentMemberId, request)); + } + +} \ No newline at end of file From 8e6c7d03cbc2971c6b2b22827e90a45cd8387de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Sun, 9 Nov 2025 15:58:37 +0900 Subject: [PATCH 05/11] mission/#6: querydsl --- .../umc9th/domain/member/entity/Member.java | 4 +- .../repository/MemberMissionRepository.java | 32 ------- .../mission/dto/MissionResponseDTO.java | 2 +- .../repository/MemberMissionRepository.java | 2 +- .../mission/repository/MissionRepository.java | 6 +- .../mission/service/MissionService.java | 8 +- .../review/dto/ReviewDetailResponseDTO.java | 31 +++++++ .../review/dto/ReviewFilterRequest.java | 15 ++++ .../umc9th/domain/review/entity/Reply.java | 2 +- .../umc9th/domain/review/entity/Review.java | 6 +- .../review/repository/ReviewQueryDsl.java | 15 ++++ .../review/repository/ReviewQueryDslImpl.java | 85 +++++++++++++++++++ .../review/repository/ReviewRepository.java | 3 +- .../review/service/ReviewQueryService.java | 26 ++++++ .../domain/review/service/ReviewService.java | 4 +- .../umc9th/domain/store/entity/Region.java | 4 +- .../umc9th/domain/store/entity/Store.java | 4 +- .../member/service/MemberServiceTest.java | 4 +- .../review/service/ReviewServiceTest.java | 30 ++++++- 19 files changed, 225 insertions(+), 58 deletions(-) delete mode 100644 src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/review/dto/ReviewDetailResponseDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/review/dto/ReviewFilterRequest.java create mode 100644 src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDsl.java create mode 100644 src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java diff --git a/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/src/main/java/com/example/umc9th/domain/member/entity/Member.java index ad0c241..e3360fc 100644 --- a/src/main/java/com/example/umc9th/domain/member/entity/Member.java +++ b/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -19,8 +19,8 @@ @Entity @Builder -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor(access = AccessLevel.PRIVATE) +@NoArgsConstructor +@AllArgsConstructor @Getter @Table(name = "member") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java b/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java deleted file mode 100644 index 248181e..0000000 --- a/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.example.umc9th.domain.member.repository; - -import com.example.umc9th.domain.mission.entity.mapping.MemberMission; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface MemberMissionRepository extends JpaRepository { - - @Query("SELECT mm FROM MemberMission mm " + - "JOIN FETCH mm.mission m " + - "JOIN FETCH m.store s " + - "WHERE mm.member.id = :memberId AND mm.status = :status " + - "ORDER BY m.id DESC") - Page findMissionsByMemberAndStatus( - @Param("memberId") Long memberId, - @Param("status") String status, - Pageable pageable - ); - - @Query("SELECT COUNT(m) " + - "FROM MemberMission m JOIN m.mission ms JOIN ms.store s " + - "WHERE m.member.id = :memberId " + - "AND m.status = 'COMPLETED' " + - "AND s.region.id = :regionId") - Long countCompletedMissionsByMemberAndRegion( - @Param("memberId") Long memberId, - @Param("regionId") Long regionId - ); -} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java index a6b4e46..5b20158 100644 --- a/src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java +++ b/src/main/java/com/example/umc9th/domain/mission/dto/MissionResponseDTO.java @@ -15,7 +15,7 @@ public class MissionResponseDTO { private Long missionId; private String storeName; - private String condition; + private String conditional; private Integer point; private String missionStatus; } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java b/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java index 4d2c209..e7223c5 100644 --- a/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java +++ b/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java @@ -25,7 +25,7 @@ public interface MemberMissionRepository extends JpaRepository findMemberMissionsByStatus( @Param("memberId") Long memberId, - @Param("status") MemberMissionStatus status, + @Param("status") String status, Pageable pageable ); diff --git a/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java b/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java index 228310e..2f76824 100644 --- a/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java +++ b/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java @@ -8,20 +8,20 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.time.LocalDateTime; +import java.time.LocalDate; public interface MissionRepository extends JpaRepository { @Query("SELECT new com.example.umc9th.domain.mission.dto.ChallengeMissionResponseDTO(" + - "ms.id, s.name, ms.deadline, ms.condition, ms.point) " + + "ms.id, s.name, ms.deadline, ms.conditional, ms.pointReward) " + "FROM Mission ms JOIN ms.store s " + "WHERE s.region.id = :regionId " + "AND ms.deadline > :now " + "ORDER BY ms.createdAt DESC") Page findChallengeableMissionsByRegion( @Param("regionId") Long regionId, - @Param("now") LocalDateTime now, + @Param("now") LocalDate now, Pageable pageable ); } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java b/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java index 6c021b6..35a1c9c 100644 --- a/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java +++ b/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; +import java.time.LocalDate; @Service @RequiredArgsConstructor @@ -26,7 +26,7 @@ public class MissionService { public Page getOngoingMissions(Long memberId, Pageable pageable) { return memberMissionRepository.findMemberMissionsByStatus( memberId, - MemberMissionStatus.ONGOING, // 진행 중 상태 + MemberMissionStatus.ONGOING.name(), // 진행 중 상태 pageable ); } @@ -34,7 +34,7 @@ public Page getOngoingMissions(Long memberId, Pageable pagea public Page getCompletedMissions(Long memberId, Pageable pageable) { return memberMissionRepository.findMemberMissionsByStatus( memberId, - MemberMissionStatus.COMPLETED, // 완료 상태 + MemberMissionStatus.COMPLETED.name(), // 완료 상태 pageable ); } @@ -43,7 +43,7 @@ public HomeMissionResponseDTO getHomeMissions(Long memberId, Long regionId, Page // 지역에서 도전 가능한 미션 목록 조회 Page challengeableMissions = - missionRepository.findChallengeableMissionsByRegion(regionId, LocalDateTime.now(), pageable); + missionRepository.findChallengeableMissionsByRegion(regionId, LocalDate.now(), pageable); // 지역에서 회원이 성공한 미션 개수 조회 Long completedCount = memberMissionRepository.countCompletedMissionsByMemberAndRegion(memberId, regionId); diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewDetailResponseDTO.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewDetailResponseDTO.java new file mode 100644 index 0000000..72de417 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewDetailResponseDTO.java @@ -0,0 +1,31 @@ +package com.example.umc9th.domain.review.dto; + +import com.querydsl.core.annotations.QueryProjection; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Getter +@NoArgsConstructor +public class ReviewDetailResponseDTO { + + private Long reviewId; + private String nickname; + private Double rating; + private String content; + private LocalDateTime createdAt; + private String replyContent; + private LocalDateTime replyCreatedAt; + + @QueryProjection + public ReviewDetailResponseDTO(Long reviewId, String nickname, Double rating, String content, LocalDateTime createdAt, String replyContent, LocalDateTime replyCreatedAt) { + this.reviewId = reviewId; + this.nickname = nickname; + this.rating = rating; + this.content = content; + this.createdAt = createdAt; + this.replyContent = replyContent; + this.replyCreatedAt = replyCreatedAt; + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewFilterRequest.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewFilterRequest.java new file mode 100644 index 0000000..38553a8 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewFilterRequest.java @@ -0,0 +1,15 @@ +package com.example.umc9th.domain.review.dto; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class ReviewFilterRequest { + + private Long storeId; + + private Double rating; +} diff --git a/src/main/java/com/example/umc9th/domain/review/entity/Reply.java b/src/main/java/com/example/umc9th/domain/review/entity/Reply.java index 8c6f2df..0cd9934 100644 --- a/src/main/java/com/example/umc9th/domain/review/entity/Reply.java +++ b/src/main/java/com/example/umc9th/domain/review/entity/Reply.java @@ -6,7 +6,7 @@ @Entity @Builder -@NoArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PRIVATE) @Getter @Table(name = "reply") diff --git a/src/main/java/com/example/umc9th/domain/review/entity/Review.java b/src/main/java/com/example/umc9th/domain/review/entity/Review.java index 18c095a..da311ab 100644 --- a/src/main/java/com/example/umc9th/domain/review/entity/Review.java +++ b/src/main/java/com/example/umc9th/domain/review/entity/Review.java @@ -4,6 +4,8 @@ import com.example.umc9th.domain.member.entity.Member; import com.example.umc9th.domain.store.entity.Store; import com.example.umc9th.global.entity.BaseEntity; +import com.querydsl.core.annotations.QueryType; +import com.querydsl.core.types.PathType; import jakarta.persistence.*; import lombok.*; @@ -11,8 +13,8 @@ import java.util.List; @Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor(access = AccessLevel.PRIVATE) +@NoArgsConstructor +@AllArgsConstructor @Getter @Table(name = "review") @Builder diff --git a/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDsl.java b/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDsl.java new file mode 100644 index 0000000..2bb133e --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDsl.java @@ -0,0 +1,15 @@ +package com.example.umc9th.domain.review.repository; + +import com.example.umc9th.domain.review.dto.ReviewDetailResponseDTO; +import com.example.umc9th.domain.review.dto.ReviewFilterRequest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +public interface ReviewQueryDsl { + Page findMyReviewsWithFilter( + Long memberId, + ReviewFilterRequest request, + Pageable pageable); +} diff --git a/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java b/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java new file mode 100644 index 0000000..a2cab75 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java @@ -0,0 +1,85 @@ +package com.example.umc9th.domain.review.repository; + +import com.example.umc9th.domain.review.dto.ReviewDetailResponseDTO; +import com.example.umc9th.domain.review.dto.ReviewFilterRequest; +import com.example.umc9th.domain.review.dto.QReviewDetailResponseDTO; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.support.PageableExecutionUtils; + +import java.util.List; + +import static com.example.umc9th.domain.review.entity.QReview.review; +import static com.example.umc9th.domain.member.entity.QMember.member; +import static com.example.umc9th.domain.review.entity.QReply.reply; + +@RequiredArgsConstructor +public class ReviewQueryDslImpl implements ReviewQueryDsl { + + private final JPAQueryFactory queryFactory; + + @Override + public Page findMyReviewsWithFilter( + Long memberId, + ReviewFilterRequest request, + Pageable pageable) { + + BooleanBuilder builder = new BooleanBuilder(); + + builder.and(review.member.id.eq(memberId)); + + if (request.getStoreId() != null) { + builder.and(storeIdEq(request.getStoreId())); + } + + if (request.getRating() != null) { + builder.and(ratingBetween(request.getRating())); + } + + List content = queryFactory + .select(new QReviewDetailResponseDTO( + review.id, + review.member.name, + review.rating, + review.content, + review.createdAt, + reply.content, + reply.createdAt + )) + .from(review) + .join(review.member, member) + .leftJoin(reply).on(reply.review.eq(review)) + .where(builder) + .orderBy(review.createdAt.desc()) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .fetch(); + + long total = queryFactory + .select(review.count()) + .from(review) + .where(builder) + .fetchOne(); + + return PageableExecutionUtils.getPage(content, pageable, () -> total); + } + + + private BooleanExpression storeIdEq(Long storeId) { + return storeId != null ? review.store.id.eq(storeId) : null; + } + + private BooleanExpression ratingBetween(Double rating) { + if (rating == null) { + return null; + } + double nextRating = rating + 1.0; + + return review.rating.goe(rating) + .lt(nextRating); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java b/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java index 5f0ee8e..498df93 100644 --- a/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java +++ b/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java @@ -7,7 +7,7 @@ import com.example.umc9th.domain.review.entity.Review; import java.util.List; -public interface ReviewRepository extends JpaRepository { +public interface ReviewRepository extends JpaRepository, ReviewQueryDsl { @Query("SELECT new com.example.umc9th.domain.review.dto.ReviewResponseDTO(" + @@ -17,5 +17,4 @@ public interface ReviewRepository extends JpaRepository { "ORDER BY r.createdAt DESC") List findMemberReviews(@Param("memberId") Long memberId); - } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java b/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java new file mode 100644 index 0000000..7624619 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java @@ -0,0 +1,26 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.review.dto.ReviewDetailResponseDTO; +import com.example.umc9th.domain.review.dto.ReviewFilterRequest; +import com.example.umc9th.domain.review.repository.ReviewQueryDsl; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class ReviewQueryService { + + private final ReviewQueryDsl reviewQueryDsl; + + public Page getMyFilteredReviews( + Long memberId, + ReviewFilterRequest request, + Pageable pageable) { + + return reviewQueryDsl.findMyReviewsWithFilter(memberId, request, pageable); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java b/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java index 07ae0a0..098217a 100644 --- a/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java @@ -32,14 +32,12 @@ public List getMyReviews(Long memberId) { @Transactional public Review createReview(Long storeId, Long memberId, ReviewRequestDTO request) { - // 엔티티 조회 Member member = memberRepository.findById(memberId) .orElseThrow(() -> new NoSuchElementException(memberId + "를 찾을 수 없습니다.")); Store store = storeRepository.findById(storeId) - .orElseThrow(() -> new NoSuchElementException("가게 ID: " + storeId + "를 찾을 수 없습니다.")); + .orElseThrow(() -> new NoSuchElementException( storeId + "를 찾을 수 없습니다.")); - // Review 엔티티 생성 Review newReview = Review.builder() .member(member) .store(store) diff --git a/src/main/java/com/example/umc9th/domain/store/entity/Region.java b/src/main/java/com/example/umc9th/domain/store/entity/Region.java index 12a2377..bf4ad4e 100644 --- a/src/main/java/com/example/umc9th/domain/store/entity/Region.java +++ b/src/main/java/com/example/umc9th/domain/store/entity/Region.java @@ -8,8 +8,8 @@ import java.util.List; @Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor(access = AccessLevel.PRIVATE) +@NoArgsConstructor +@AllArgsConstructor @Getter @Table(name = "region") @Builder diff --git a/src/main/java/com/example/umc9th/domain/store/entity/Store.java b/src/main/java/com/example/umc9th/domain/store/entity/Store.java index 7d19b4b..81ca55d 100644 --- a/src/main/java/com/example/umc9th/domain/store/entity/Store.java +++ b/src/main/java/com/example/umc9th/domain/store/entity/Store.java @@ -12,8 +12,8 @@ import java.util.List; @Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor(access = AccessLevel.PRIVATE) +@NoArgsConstructor +@AllArgsConstructor @Getter @Table(name = "store") @Builder diff --git a/src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java b/src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java index fe6c278..a4dc238 100644 --- a/src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java +++ b/src/test/java/com/example/umc9th/domain/member/service/MemberServiceTest.java @@ -33,7 +33,7 @@ void getMemberInfo_success() { Long memberId = 1L; Member mockMember = Member.builder() .id(memberId) - .name("nickname012") // 닉네임 (name) + .name("jjy0107") .email("test@naver.com") .phoneNumber("010-1234-5678") .point(2500) @@ -46,7 +46,7 @@ void getMemberInfo_success() { MemberInfoResponseDTO result = memberService.getMemberInfo(memberId); // Then - assertThat(result.getNickname()).isEqualTo("nickname012"); + assertThat(result.getNickname()).isEqualTo("jjy0107"); assertThat(result.getEmail()).isEqualTo("test@naver.com"); } diff --git a/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java b/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java index 751bf94..4cb58f2 100644 --- a/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java +++ b/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java @@ -3,6 +3,7 @@ import com.example.umc9th.domain.member.entity.Member; import com.example.umc9th.domain.member.repository.MemberRepository; import com.example.umc9th.domain.review.dto.ReviewRequestDTO; +import com.example.umc9th.domain.review.dto.ReviewResponseDTO; import com.example.umc9th.domain.review.entity.Review; import com.example.umc9th.domain.review.repository.ReviewRepository; import com.example.umc9th.domain.store.entity.Store; @@ -14,6 +15,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.List; import java.util.NoSuchElementException; import java.util.Optional; @@ -42,7 +44,6 @@ void createReview_success() { // Given Long storeId = 1L; Long memberId = 2L; - // DTO의 필드에 접근하기 위해 @AllArgsConstructor를 잠시 사용했다고 가정합니다. ReviewRequestDTO request = new ReviewRequestDTO("새로운 리뷰 내용", 5.0); // Mock 엔티티 생성 @@ -66,6 +67,33 @@ void createReview_success() { assertThat(createdReview.getRating()).isEqualTo(5.0); } + @Test + @DisplayName("작성한 리뷰 목록 조회 테스트") + void getMyReviewsTest() { + // Given + Long memberId = 1L; + + // JPQL 쿼리 결과로 가정할 Mock DTO 리스트 + List mockReviews = List.of( + ReviewResponseDTO.builder().storeName("신승호").content("맛있어요!").rating(4.5).build(), + ReviewResponseDTO.builder().storeName("버거킹").content("별로네요.").rating(2.0).build() + ); + + // Mocking 설정: reviewRepository.findMemberReviews(memberId) 호출 시 mockReviews 반환 + when(reviewRepository.findMemberReviews(memberId)).thenReturn(mockReviews); + + // When + List result = reviewService.getMyReviews(memberId); + + // Then + // 1. 결과 리스트 크기 검증 + assertThat(result).hasSize(2); + // 2. 리뷰 내용이 예상대로 포함되어 있는지 검증 (순서 무관) + assertThat(result.stream().map(ReviewResponseDTO::getContent)) + .containsExactlyInAnyOrder("맛있어요!", "별로네요."); + } + + @Test @DisplayName("리뷰 작성 실패 (회원 없음) 테스트") void createReview_failure_member_not_found() { From 66c61ae5b81db9bd27cae16bf3cc9a30b8e921c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Tue, 11 Nov 2025 00:27:30 +0900 Subject: [PATCH 06/11] mission/#7 --- build.gradle | 30 +++++++++++++++++++ .../umc9th/global/entity/BaseEntity.java | 2 ++ 2 files changed, 32 insertions(+) diff --git a/build.gradle b/build.gradle index ee064e0..8258bcc 100644 --- a/build.gradle +++ b/build.gradle @@ -32,8 +32,38 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // QueryDSL : OpenFeign + implementation "io.github.openfeign.querydsl:querydsl-jpa:7.0" + implementation "io.github.openfeign.querydsl:querydsl-core:7.0" + annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:7.0:jpa" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + + compileJava { + options.compilerArgs << '-Aquerydsl.entityAccessors=true' + } } tasks.named('test') { useJUnitPlatform() } + +// QueryDSL 관련 설정 +// generated/querydsl 폴더 생성 & 삽입 +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +// 소스 세트에 생성 경로 추가 (구체적인 경로 지정) +sourceSets { + main.java.srcDirs += [ querydslDir ] +} + +// 컴파일 시 생성 경로 지정 +tasks.withType(JavaCompile).configureEach { + options.generatedSourceOutputDirectory.set(querydslDir) +} + +// clean 태스크에 생성 폴더 삭제 로직 추가 +clean.doLast { + file(querydslDir).deleteDir() +} diff --git a/src/main/java/com/example/umc9th/global/entity/BaseEntity.java b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java index 49a3865..a1188e4 100644 --- a/src/main/java/com/example/umc9th/global/entity/BaseEntity.java +++ b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java @@ -1,11 +1,13 @@ package com.example.umc9th.global.entity; +import com.querydsl.core.annotations.QuerySupertype; import jakarta.persistence.Column; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import java.time.LocalDateTime; +@QuerySupertype public class BaseEntity { @CreatedDate From 675f299d9743383bb622b4138e5786f93a5a64bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Sun, 16 Nov 2025 16:19:40 +0900 Subject: [PATCH 07/11] mission/#7 --- .../test/controller/TestController.java | 44 +++++++++++++++++++ .../domain/test/converter/TestConverter.java | 24 ++++++++++ .../domain/test/dto/req/TestReqDTO.java | 4 ++ .../domain/test/dto/res/TestResDTO.java | 19 ++++++++ .../domain/test/exception/TestException.java | 10 +++++ .../test/exception/code/TestErrorCode.java | 19 ++++++++ .../service/command/TestCommandService.java | 4 ++ .../command/TestCommandServiceImpl.java | 4 ++ .../test/service/query/TestQueryService.java | 5 +++ .../service/query/TestQueryServiceImpl.java | 18 ++++++++ .../umc9th/global/apiPayload/ApiResponse.java | 37 ++++++++++++++++ .../global/apiPayload/code/BaseErrorCode.java | 10 +++++ .../apiPayload/code/BaseSuccessCode.java | 10 +++++ .../apiPayload/code/GeneralErrorCode.java | 31 +++++++++++++ .../apiPayload/code/GeneralSuccessCode.java | 31 +++++++++++++ .../exception/GeneralException.java | 12 +++++ .../handler/GeneralExceptionAdvice.java | 42 ++++++++++++++++++ 17 files changed, 324 insertions(+) create mode 100644 src/main/java/com/example/umc9th/domain/test/controller/TestController.java create mode 100644 src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java create mode 100644 src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/test/exception/TestException.java create mode 100644 src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java create mode 100644 src/main/java/com/example/umc9th/domain/test/service/command/TestCommandService.java create mode 100644 src/main/java/com/example/umc9th/domain/test/service/command/TestCommandServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java create mode 100644 src/main/java/com/example/umc9th/domain/test/service/query/TestQueryServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java diff --git a/src/main/java/com/example/umc9th/domain/test/controller/TestController.java b/src/main/java/com/example/umc9th/domain/test/controller/TestController.java new file mode 100644 index 0000000..851510f --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/controller/TestController.java @@ -0,0 +1,44 @@ +package com.example.umc9th.domain.test.controller; + +import com.example.umc9th.domain.test.converter.TestConverter; +import com.example.umc9th.domain.test.dto.res.TestResDTO; +import com.example.umc9th.domain.test.service.query.TestQueryService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import lombok.RequiredArgsConstructor; +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; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/temp") +public class TestController { + + private final TestQueryService testQueryService; + + @GetMapping("/test") + public ApiResponse test() { + // 응답 코드 정의 + GeneralSuccessCode code = GeneralSuccessCode.OK; + + return ApiResponse.onSuccess( + code, + TestConverter.toTestingDTO("This is Test!") + ); + } + + // 예외 상황 + @GetMapping("/exception") + public ApiResponse exception( + @RequestParam Long flag + ) { + + testQueryService.checkFlag(flag); + + // 응답 코드 정의 + GeneralSuccessCode code = GeneralSuccessCode.OK; + return ApiResponse.onSuccess(code, TestConverter.toExceptionDTO("This is Test!")); + } +} diff --git a/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java b/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java new file mode 100644 index 0000000..af81183 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java @@ -0,0 +1,24 @@ +package com.example.umc9th.domain.test.converter; + +import com.example.umc9th.domain.test.dto.res.TestResDTO; + +public class TestConverter { + + // 객체 -> DTO + public static TestResDTO.Testing toTestingDTO( + String testing + ) { + return TestResDTO.Testing.builder() + .testString(testing) + .build(); + } + + // 객체 -> DTO + public static TestResDTO.Exception toExceptionDTO( + String testing + ){ + return TestResDTO.Exception.builder() + .testString(testing) + .build(); + } +} diff --git a/src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java b/src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java new file mode 100644 index 0000000..405e3b9 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java @@ -0,0 +1,4 @@ +package com.example.umc9th.domain.test.dto.req; + +public class TestReqDTO { +} diff --git a/src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java b/src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java new file mode 100644 index 0000000..9f13f52 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.test.dto.res; + +import lombok.Builder; +import lombok.Getter; + +public class TestResDTO { + + @Builder + @Getter + public static class Testing { + private String testString; + } + + @Builder + @Getter + public static class Exception { + private String testString; + } +} diff --git a/src/main/java/com/example/umc9th/domain/test/exception/TestException.java b/src/main/java/com/example/umc9th/domain/test/exception/TestException.java new file mode 100644 index 0000000..1faf200 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/exception/TestException.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.test.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; + +public class TestException extends GeneralException { + public TestException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java b/src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java new file mode 100644 index 0000000..7264f21 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.test.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum TestErrorCode implements BaseErrorCode { + + // For test + TEST_EXCEPTION(HttpStatus.BAD_REQUEST, "TEST400_1", "이거는 테스트"), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandService.java b/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandService.java new file mode 100644 index 0000000..b1102dd --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandService.java @@ -0,0 +1,4 @@ +package com.example.umc9th.domain.test.service.command; + +public interface TestCommandService { +} diff --git a/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandServiceImpl.java b/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandServiceImpl.java new file mode 100644 index 0000000..3e5a276 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandServiceImpl.java @@ -0,0 +1,4 @@ +package com.example.umc9th.domain.test.service.command; + +public class TestCommandServiceImpl { +} diff --git a/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java b/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java new file mode 100644 index 0000000..a6419ab --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.test.service.query; + +public interface TestQueryService { + void checkFlag(Long flag); +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryServiceImpl.java new file mode 100644 index 0000000..4097085 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryServiceImpl.java @@ -0,0 +1,18 @@ +package com.example.umc9th.domain.test.service.query; + +import com.example.umc9th.domain.test.exception.TestException; +import com.example.umc9th.domain.test.exception.code.TestErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class TestQueryServiceImpl implements TestQueryService { + + @Override + public void checkFlag(Long flag){ + if (flag == 1){ + throw new TestException(TestErrorCode.TEST_EXCEPTION); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java b/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java new file mode 100644 index 0000000..f5392eb --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java @@ -0,0 +1,37 @@ +package com.example.umc9th.global.apiPayload; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.code.BaseSuccessCode; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + + @JsonProperty("code") + private final String code; + + @JsonProperty("message") + private final String message; + + @JsonProperty("result") + private T result; + + // 성공한 경우 (result 포함) + public static ApiResponse onSuccess(BaseSuccessCode code, T result) { + return new ApiResponse<>(true, code.getCode(), code.getMessage(), result); + } + + + // 실패한 경우 (result 포함) + public static ApiResponse onFailure(BaseErrorCode code, T result) { + return new ApiResponse<>(false, code.getCode(), code.getMessage(), result); + } +} diff --git a/src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java b/src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java new file mode 100644 index 0000000..d0d553f --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java @@ -0,0 +1,10 @@ +package com.example.umc9th.global.apiPayload.code; + +import org.springframework.http.HttpStatus; + +public interface BaseErrorCode { + + HttpStatus getStatus(); + String getCode(); + String getMessage(); +} diff --git a/src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java b/src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java new file mode 100644 index 0000000..fb269df --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java @@ -0,0 +1,10 @@ +package com.example.umc9th.global.apiPayload.code; + +import org.springframework.http.HttpStatus; + +public interface BaseSuccessCode { + + HttpStatus getStatus(); + String getCode(); + String getMessage(); +} diff --git a/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java new file mode 100644 index 0000000..6509ef0 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java @@ -0,0 +1,31 @@ +package com.example.umc9th.global.apiPayload.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum GeneralErrorCode implements BaseErrorCode{ + + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, + "COMMON500_1", + "예기치 않은 서버 에러가 발생했습니다."), + BAD_REQUEST(HttpStatus.BAD_REQUEST, + "COMMON400_1", + "잘못된 요청입니다."), + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, + "AUTH401_1", + "인증이 필요합니다."), + FORBIDDEN(HttpStatus.FORBIDDEN, + "AUTH403_1", + "요청이 거부되었습니다."), + NOT_FOUND(HttpStatus.NOT_FOUND, + "COMMON404_1", + "요청한 리소스를 찾을 수 없습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java new file mode 100644 index 0000000..3b9b00b --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java @@ -0,0 +1,31 @@ +package com.example.umc9th.global.apiPayload.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum GeneralSuccessCode implements BaseSuccessCode { + + OK(HttpStatus.OK, + "COMMON200", + "성공적으로 요청을 처리했습니다."), + + CREATED(HttpStatus.CREATED, + "COMMON201_1", + "리소스를 성공적으로 생성했습니다."), + + ACCEPTED(HttpStatus.ACCEPTED, + "COMMON202_1", + "요청이 성공적으로 접수되었습니다."), + + NO_CONTENT(HttpStatus.NO_CONTENT, + "COMMON204_1", + "요청에 성공했으며, 응답할 내용이 없습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java b/src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java new file mode 100644 index 0000000..bd7517f --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java @@ -0,0 +1,12 @@ +package com.example.umc9th.global.apiPayload.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private final BaseErrorCode code; +} diff --git a/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java b/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java new file mode 100644 index 0000000..195e36c --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java @@ -0,0 +1,42 @@ +package com.example.umc9th.global.apiPayload.handler; + +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GeneralExceptionAdvice { + + // 애플리케이션에서 발생하는 커스텀 예외를 처리 + @ExceptionHandler(GeneralException.class) + public ResponseEntity> handleException( + GeneralException ex + ) { + + return ResponseEntity.status(ex.getCode().getStatus()) + .body(ApiResponse.onFailure( + ex.getCode(), + null + ) + ); + } + + // 그 외의 정의되지 않은 모든 예외 처리 + @ExceptionHandler(Exception.class) + public ResponseEntity> handleException( + Exception ex + ) { + + BaseErrorCode code = GeneralErrorCode.INTERNAL_SERVER_ERROR; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure( + code, + ex.getMessage() + ) + ); + } +} From 5906e5e2af0d3df4f3b7bebe2afbc7118eb6093a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Sun, 16 Nov 2025 17:44:04 +0900 Subject: [PATCH 08/11] mission/#7 --- .../member/controller/MemberController.java | 37 ++++++++++++ .../mission/controller/MissionController.java | 57 +++++++++++++++++++ .../review/controller/ReviewController.java | 57 +++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 src/main/java/com/example/umc9th/domain/member/controller/MemberController.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java create mode 100644 src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java diff --git a/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java new file mode 100644 index 0000000..760affe --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -0,0 +1,37 @@ +package com.example.umc9th.domain.member.controller; + +import com.example.umc9th.domain.member.dto.MemberInfoResponseDTO; +import com.example.umc9th.domain.member.service.MemberService; +import com.example.umc9th.domain.review.dto.ReviewResponseDTO; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/members") +public class MemberController { + + private final MemberService memberService; + + + @GetMapping("{id}/mypage") + public ApiResponse getMyInfo(@PathVariable Long id) { + MemberInfoResponseDTO response = memberService.getMemberInfo(id); + return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); + } + + +// @GetMapping("{id}/reviews") +// public ApiResponse> getMyReviews() { +// List response = memberService.getMyReviews(id); +// +// return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); +// } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java b/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java new file mode 100644 index 0000000..53a1bc4 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java @@ -0,0 +1,57 @@ +package com.example.umc9th.domain.mission.controller; + +import com.example.umc9th.domain.mission.dto.HomeMissionResponseDTO; +import com.example.umc9th.domain.mission.dto.MissionResponseDTO; +import com.example.umc9th.domain.mission.service.MissionService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/missions") +public class MissionController { + + private final MissionService missionService; + + + @GetMapping("/home") + public ApiResponse getHomeMissions( + @PathVariable Long memberId, + @PathVariable Long regionId, + @PageableDefault(size = 5) Pageable pageable) { + + HomeMissionResponseDTO response = + missionService.getHomeMissions(memberId, regionId , pageable); + + return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); + } + + + @GetMapping("/ongoing") + public ApiResponse> getOngoingMissions( + @PathVariable Long memberId, + @PageableDefault(size = 10) Pageable pageable) { + + Page response = + missionService.getOngoingMissions(memberId, pageable); + + return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); + } + + + @GetMapping("/completed") + public ApiResponse> getCompletedMissions( + @PathVariable Long memberId, + @PageableDefault(size = 10) Pageable pageable) { + + Page response = + missionService.getCompletedMissions(memberId, pageable); + + return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java b/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java new file mode 100644 index 0000000..fa47494 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java @@ -0,0 +1,57 @@ +package com.example.umc9th.domain.review.controller; + +import com.example.umc9th.domain.review.dto.ReviewDetailResponseDTO; +import com.example.umc9th.domain.review.dto.ReviewFilterRequest; +import com.example.umc9th.domain.review.dto.ReviewRequestDTO; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.service.ReviewQueryService; // 필터링 조회 +import com.example.umc9th.domain.review.service.ReviewService; // 리뷰 작성 +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.web.bind.annotation.*; + +import java.net.URI; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/stores/{storeId}/reviews") +public class ReviewController { + + private final ReviewService reviewService; + private final ReviewQueryService reviewQueryService; + + + @PostMapping + public ApiResponse createReview(@PathVariable Long storeId, + @PathVariable Long memberId, + @RequestBody ReviewRequestDTO request) { + + Review review = reviewService.createReview(storeId, memberId, request); + + return ApiResponse.onSuccess(GeneralSuccessCode.CREATED, request); + } + + + @GetMapping("/my") + public ApiResponse> getMyFilteredReviews( + @PathVariable Long storeId, + @PathVariable Long memberId, + @RequestParam(required = false) Double rating, // 별점대 필터링 (예: 4.0, 3.0) + @PageableDefault(size = 10) Pageable pageable) { + + ReviewFilterRequest filterRequest = new ReviewFilterRequest(); + + // Request DTO에 필터링 조건 설정 + filterRequest.setStoreId(storeId); // 경로 변수 storeId 사용 + filterRequest.setRating(rating); // 쿼리 파라미터 rating 사용 + + Page response = + reviewQueryService.getMyFilteredReviews(memberId, filterRequest, pageable); + + return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); + } +} \ No newline at end of file From 2d117ba229aafa31eb1d0a50fccb50175ed979ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Sun, 16 Nov 2025 17:45:19 +0900 Subject: [PATCH 09/11] =?UTF-8?q?mission/#7=20:=20API=20=EC=9D=91=EB=8B=B5?= =?UTF-8?q?=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 8258bcc..5b6eb93 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,7 @@ dependencies { runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'com.h2database:h2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' // QueryDSL : OpenFeign From 53b7c60ffecaabee0c3fc2a15da9212f7795d6b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Mon, 17 Nov 2025 22:50:32 +0900 Subject: [PATCH 10/11] mission/#8 : API & Swagger & Annotation --- build.gradle | 40 ++++++----- .../member/controller/MemberController.java | 13 ++++ .../member/converter/MemberConverter.java | 28 ++++++++ .../domain/member/dto/req/MemberReqDTO.java | 28 ++++++++ .../domain/member/dto/res/MemberResDTO.java | 14 ++++ .../umc9th/domain/member/entity/Member.java | 11 ++- .../umc9th/domain/member/enums/Address.java | 6 ++ .../member/exception/FoodException.java | 10 +++ .../member/exception/MemberException.java | 10 +++ .../member/exception/code/FoodErrorCode.java | 19 ++++++ .../exception/code/MemberErrorCode.java | 20 ++++++ .../exception/code/MemberSuccessCode.java | 20 ++++++ .../member/repository/FoodRepository.java | 7 ++ .../repository/MemberFoodRepository.java | 8 +++ .../member/service/MemberCommandService.java | 9 +++ .../service/MemberCommandServiceImpl.java | 68 +++++++++++++++++++ .../member/service/MemberQueryService.java | 8 +++ .../service/MemberQueryServiceImpl.java | 4 ++ .../mission/controller/MissionController.java | 12 ++++ .../dto/ChallengeMissionResponseDTO.java | 5 +- .../mission/exception/MissionException.java | 10 +++ .../exception/code/MissionErrorCode.java | 19 ++++++ .../exception/code/MissionSuccessCode.java | 21 ++++++ .../repository/MemberMissionRepository.java | 2 +- .../service/MissionCommandService.java | 8 +++ .../service/MissionCommandServiceImpl.java | 53 +++++++++++++++ .../review/controller/ReviewController.java | 14 ++-- .../review/exception/ReviewException.java | 10 +++ .../exception/code/ReviewErrorCode.java | 19 ++++++ .../exception/code/ReviewSuccessCode.java | 19 ++++++ .../review/repository/ReviewQueryDslImpl.java | 11 ++- .../review/service/ReviewCommandService.java | 8 +++ .../service/ReviewCommandServiceImpl.java | 60 ++++++++++++++++ .../review/service/ReviewQueryService.java | 5 +- .../domain/review/service/ReviewService.java | 10 +-- .../store/exception/StoreException.java | 10 +++ .../store/exception/code/StoreErrorCode.java | 19 ++++++ .../exception/code/StoreSuccessCode.java | 19 ++++++ .../umc9th/global/annotation/ExistFoods.java | 20 ++++++ .../handler/GeneralExceptionAdvice.java | 20 ++++++ .../umc9th/global/config/QueryDslConfig.java | 19 ++++++ .../umc9th/global/config/SwaggerConfig.java | 35 ++++++++++ .../umc9th/global/entity/BaseEntity.java | 7 ++ .../global/validator/FoodExistValidator.java | 31 +++++++++ src/main/resources/application.yml | 2 +- .../review/service/ReviewServiceTest.java | 1 + 46 files changed, 746 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java create mode 100644 src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/member/enums/Address.java create mode 100644 src/main/java/com/example/umc9th/domain/member/exception/FoodException.java create mode 100644 src/main/java/com/example/umc9th/domain/member/exception/MemberException.java create mode 100644 src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java create mode 100644 src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java create mode 100644 src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java create mode 100644 src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/MemberCommandService.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/service/MissionCommandService.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/service/MissionCommandServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/review/exception/ReviewException.java create mode 100644 src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java create mode 100644 src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java create mode 100644 src/main/java/com/example/umc9th/domain/review/service/ReviewCommandService.java create mode 100644 src/main/java/com/example/umc9th/domain/review/service/ReviewCommandServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/store/exception/StoreException.java create mode 100644 src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java create mode 100644 src/main/java/com/example/umc9th/domain/store/exception/code/StoreSuccessCode.java create mode 100644 src/main/java/com/example/umc9th/global/annotation/ExistFoods.java create mode 100644 src/main/java/com/example/umc9th/global/config/QueryDslConfig.java create mode 100644 src/main/java/com/example/umc9th/global/config/SwaggerConfig.java create mode 100644 src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java diff --git a/build.gradle b/build.gradle index 5b6eb93..f378bf6 100644 --- a/build.gradle +++ b/build.gradle @@ -34,37 +34,35 @@ dependencies { testImplementation 'com.h2database:h2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - // QueryDSL : OpenFeign - implementation "io.github.openfeign.querydsl:querydsl-jpa:7.0" - implementation "io.github.openfeign.querydsl:querydsl-core:7.0" - annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:7.0:jpa" - annotationProcessor "jakarta.persistence:jakarta.persistence-api" - annotationProcessor "jakarta.annotation:jakarta.annotation-api" + // QueryDSL - 공식 버전 사용 + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta' + annotationProcessor 'jakarta.annotation:jakarta.annotation-api' + annotationProcessor 'jakarta.persistence:jakarta.persistence-api' - compileJava { - options.compilerArgs << '-Aquerydsl.entityAccessors=true' - } + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.13' + + // Validation + implementation 'org.springframework.boot:spring-boot-starter-validation' } tasks.named('test') { useJUnitPlatform() } -// QueryDSL 관련 설정 -// generated/querydsl 폴더 생성 & 삽입 -def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile +// QueryDSL 설정 +def generated = layout.buildDirectory.dir('generated/querydsl').get().asFile -// 소스 세트에 생성 경로 추가 (구체적인 경로 지정) sourceSets { - main.java.srcDirs += [ querydslDir ] + main.java.srcDirs += [generated] } -// 컴파일 시 생성 경로 지정 -tasks.withType(JavaCompile).configureEach { - options.generatedSourceOutputDirectory.set(querydslDir) +tasks.withType(JavaCompile) { + options.getGeneratedSourceOutputDirectory().set(file(generated)) } -// clean 태스크에 생성 폴더 삭제 로직 추가 -clean.doLast { - file(querydslDir).deleteDir() -} +clean { + delete file(generated) +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index 760affe..8f48180 100644 --- a/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -1,10 +1,15 @@ package com.example.umc9th.domain.member.controller; import com.example.umc9th.domain.member.dto.MemberInfoResponseDTO; +import com.example.umc9th.domain.member.dto.req.MemberReqDTO; +import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.domain.member.exception.code.MemberSuccessCode; +import com.example.umc9th.domain.member.service.MemberCommandService; import com.example.umc9th.domain.member.service.MemberService; import com.example.umc9th.domain.review.dto.ReviewResponseDTO; import com.example.umc9th.global.apiPayload.ApiResponse; import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -19,6 +24,14 @@ public class MemberController { private final MemberService memberService; + private final MemberCommandService memberCommandService; + + @PostMapping("/sign-up") + public ApiResponse signUp( + @RequestBody @Valid MemberReqDTO.JoinDTO dto + ) { + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberCommandService.signUp(dto)); + } @GetMapping("{id}/mypage") diff --git a/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java b/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java new file mode 100644 index 0000000..f4367b5 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java @@ -0,0 +1,28 @@ +package com.example.umc9th.domain.member.converter; + +import com.example.umc9th.domain.member.dto.req.MemberReqDTO; +import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.domain.member.entity.Member; + +public class MemberConverter { + + public static MemberResDTO.JoinDTO toJoinDTO( + Member member + ) { + return MemberResDTO.JoinDTO.builder() + .memberId(member.getId()) + .createAt(member.getCreatedAt()) + .build(); + } + + public static Member toMember( + MemberReqDTO.JoinDTO dto + ) { + return Member.builder() + .name(dto.name()) + .birth(dto.birth()) + .address(dto.address()) + .gender(dto.gender()) + .build(); + } +} diff --git a/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java new file mode 100644 index 0000000..0ca90f1 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java @@ -0,0 +1,28 @@ +package com.example.umc9th.domain.member.dto.req; + +import com.example.umc9th.domain.member.enums.Address; +import com.example.umc9th.domain.member.enums.Gender; +import com.example.umc9th.global.annotation.ExistFoods; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +import java.time.LocalDate; +import java.util.List; + +public class MemberReqDTO { + + public record JoinDTO( + @NotBlank + String name, + @NotNull + Gender gender, + @NotNull + LocalDate birth, + @NotNull + Address address, + @NotNull + String specAddress, + @ExistFoods + List preferCategory + ){} +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java new file mode 100644 index 0000000..6de331d --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java @@ -0,0 +1,14 @@ +package com.example.umc9th.domain.member.dto.res; + +import lombok.Builder; + +import java.time.LocalDateTime; + +public class MemberResDTO { + + @Builder + public record JoinDTO( + Long memberId, + LocalDateTime createAt + ){} +} diff --git a/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/src/main/java/com/example/umc9th/domain/member/entity/Member.java index e3360fc..9919e3c 100644 --- a/src/main/java/com/example/umc9th/domain/member/entity/Member.java +++ b/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -2,6 +2,7 @@ import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import com.example.umc9th.domain.member.enums.Address; import com.example.umc9th.domain.member.enums.Gender; import com.example.umc9th.domain.member.enums.MemberStatus; import com.example.umc9th.domain.review.entity.Review; @@ -42,7 +43,11 @@ public class Member extends BaseEntity { private LocalDate birth; @Column(name = "address", nullable = false) - private String address; + @Enumerated(EnumType.STRING) + private Address address; + + @Column(name = "detail_address") + private String detailAddress; @Column(name = "status", nullable = false) @Enumerated(EnumType.STRING) @@ -58,9 +63,11 @@ public class Member extends BaseEntity { private String phoneNumber; @Column(name = "point") - private int point; + @Builder.Default + private Integer point = 0 ; @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + @Builder.Default private List memberFoodList = new ArrayList<>(); @OneToMany(mappedBy = "member") diff --git a/src/main/java/com/example/umc9th/domain/member/enums/Address.java b/src/main/java/com/example/umc9th/domain/member/enums/Address.java new file mode 100644 index 0000000..fe6d9fb --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/Address.java @@ -0,0 +1,6 @@ +package com.example.umc9th.domain.member.enums; + +public enum Address { + 안암, + 신촌 +} diff --git a/src/main/java/com/example/umc9th/domain/member/exception/FoodException.java b/src/main/java/com/example/umc9th/domain/member/exception/FoodException.java new file mode 100644 index 0000000..71f7432 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/exception/FoodException.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.member.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; + +public class FoodException extends GeneralException { + public FoodException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/example/umc9th/domain/member/exception/MemberException.java b/src/main/java/com/example/umc9th/domain/member/exception/MemberException.java new file mode 100644 index 0000000..1e4d7a1 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/exception/MemberException.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.member.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; + +public class MemberException extends GeneralException { + public MemberException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java b/src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java new file mode 100644 index 0000000..34a9f18 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.member.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum FoodErrorCode implements BaseErrorCode { + + NOT_FOUND(HttpStatus.NOT_FOUND, + "FOOD404_1", + "해당 음식을 찾지 못했습니다"); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java b/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java new file mode 100644 index 0000000..64645ae --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java @@ -0,0 +1,20 @@ +package com.example.umc9th.domain.member.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MemberErrorCode implements BaseErrorCode { + + NOT_FOUND(HttpStatus.NOT_FOUND, + "MEMBER404_1", + "해당 사용자를 찾지 못했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java b/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java new file mode 100644 index 0000000..5b1e0e0 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java @@ -0,0 +1,20 @@ +package com.example.umc9th.domain.member.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MemberSuccessCode implements BaseSuccessCode { + + FOUND(HttpStatus.OK, + "MEMBER200_1", + "성공적으로 사용자를 조회했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java b/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java new file mode 100644 index 0000000..4107892 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java @@ -0,0 +1,7 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.Food; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FoodRepository extends JpaRepository { +} diff --git a/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java b/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java new file mode 100644 index 0000000..10e8d97 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java @@ -0,0 +1,8 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.Food; +import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberFoodRepository extends JpaRepository { +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberCommandService.java b/src/main/java/com/example/umc9th/domain/member/service/MemberCommandService.java new file mode 100644 index 0000000..19cc6c7 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberCommandService.java @@ -0,0 +1,9 @@ +package com.example.umc9th.domain.member.service; + +import com.example.umc9th.domain.member.dto.req.MemberReqDTO; +import com.example.umc9th.domain.member.dto.res.MemberResDTO; + +public interface MemberCommandService { + + public MemberResDTO.JoinDTO signUp(MemberReqDTO.JoinDTO dto); +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java new file mode 100644 index 0000000..5e4cd34 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java @@ -0,0 +1,68 @@ +package com.example.umc9th.domain.member.service; + +import com.example.umc9th.domain.member.converter.MemberConverter; +import com.example.umc9th.domain.member.dto.req.MemberReqDTO; +import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.domain.member.entity.Food; +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import com.example.umc9th.domain.member.exception.FoodException; +import com.example.umc9th.domain.member.exception.code.FoodErrorCode; +import com.example.umc9th.domain.member.repository.FoodRepository; +import com.example.umc9th.domain.member.repository.MemberFoodRepository; +import com.example.umc9th.domain.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class MemberCommandServiceImpl implements MemberCommandService { + + private final MemberRepository memberRepository; + private final FoodRepository foodRepository; + private final MemberFoodRepository memberFoodRepository; + + //회원가입 + @Override + @Transactional + public MemberResDTO.JoinDTO signUp( + MemberReqDTO.JoinDTO dto + ) { + Member member = MemberConverter.toMember(dto); + memberRepository.save(member); + +// if (dto.preferCategory().size() > 1) { +// List memberFoodList = new ArrayList<>(); +// +// for (Long id : dto.preferCategory()) { +// Food food = foodRepository.findById(id) +// .orElseThrow(() -> new FoodException(FoodErrorCode.NOT_FOUND)); +// +// MemberFood memberFood = MemberFood.builder() +// .member(member) +// .food(food) +// .build(); +// +// memberFoodList.add(memberFood); +// } +// memberFoodRepository.saveAll(memberFoodList); +// } + + if (dto.preferCategory().size() > 1) { + List memberFoodList = dto.preferCategory().stream() + .map(id -> MemberFood.builder() + .member(member) + .food(foodRepository.findById(id) + .orElseThrow(()->new FoodException(FoodErrorCode.NOT_FOUND))) + .build() + ).collect(Collectors.toList()); + memberFoodRepository.saveAll(memberFoodList); + } + return MemberConverter.toJoinDTO(member); + } +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java new file mode 100644 index 0000000..a7c6f76 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java @@ -0,0 +1,8 @@ +package com.example.umc9th.domain.member.service; + +import com.example.umc9th.domain.member.dto.res.MemberResDTO; + +public interface MemberQueryService { + + +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java new file mode 100644 index 0000000..df70812 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java @@ -0,0 +1,4 @@ +package com.example.umc9th.domain.member.service; + +public class MemberQueryServiceImpl { +} diff --git a/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java b/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java index 53a1bc4..ac2d746 100644 --- a/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java +++ b/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java @@ -1,7 +1,10 @@ package com.example.umc9th.domain.mission.controller; +import com.example.umc9th.domain.mission.dto.ChallengeMissionResponseDTO; import com.example.umc9th.domain.mission.dto.HomeMissionResponseDTO; import com.example.umc9th.domain.mission.dto.MissionResponseDTO; +import com.example.umc9th.domain.mission.exception.code.MissionSuccessCode; +import com.example.umc9th.domain.mission.service.MissionCommandService; import com.example.umc9th.domain.mission.service.MissionService; import com.example.umc9th.global.apiPayload.ApiResponse; import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; @@ -17,7 +20,16 @@ public class MissionController { private final MissionService missionService; + private final MissionCommandService missionCommandService; + @PostMapping( "/{missionId}/members/{memberId}/challenge") + public ApiResponse challengeMission( + @PathVariable Long memberId, + @PathVariable Long missionId + ) { + + return ApiResponse.onSuccess(MissionSuccessCode.MISSION_CREATED, missionCommandService.challengeMission(memberId, missionId)); + } @GetMapping("/home") public ApiResponse getHomeMissions( diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java index 75abc24..186a32d 100644 --- a/src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java +++ b/src/main/java/com/example/umc9th/domain/mission/dto/ChallengeMissionResponseDTO.java @@ -4,6 +4,8 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; + +import java.time.LocalDate; import java.time.LocalDateTime; @Getter @@ -11,10 +13,9 @@ @AllArgsConstructor @Builder public class ChallengeMissionResponseDTO { - private Long missionId; private String storeName; - private LocalDateTime deadline; + private LocalDate deadline; // LocalDateTime → LocalDate private String condition; private Integer point; } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java b/src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java new file mode 100644 index 0000000..1b05a66 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.mission.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; + +public class MissionException extends GeneralException { + public MissionException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java b/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..4ed5809 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.mission.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MissionErrorCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.NOT_FOUND, + "MISSION404_1", + "해당 미션을 찾지 못했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java b/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java new file mode 100644 index 0000000..e52acef --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java @@ -0,0 +1,21 @@ +package com.example.umc9th.domain.mission.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MissionSuccessCode implements BaseSuccessCode { + + MISSION_LIST_FETCHED(HttpStatus.OK, "MISSION200_1", "미션 목록 조회가 완료되었습니다."), + HOME_MISSIONS_FETCHED(HttpStatus.OK, "MISSION200_2", "홈 화면 미션 조회가 완료되었습니다."), + MISSION_CREATED(HttpStatus.CREATED, "MISSION201_1", "미션이 성공적으로 생성되었습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java b/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java index e7223c5..a6270fb 100644 --- a/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java +++ b/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java @@ -17,7 +17,7 @@ public interface MemberMissionRepository extends JpaRepository new MemberException(MemberErrorCode.NOT_FOUND)); + Mission mission = missionRepository.findById(missionId) + .orElseThrow(() -> new MissionException(MissionErrorCode.NOT_FOUND)); + + MemberMission memberMission = MemberMission.builder() + .member(member) + .mission(mission) + .status(MemberMissionStatus.ONGOING) + .build(); + + memberMissionRepository.save(memberMission); + + return ChallengeMissionResponseDTO.builder() + .missionId(mission.getId()) + .storeName(mission.getStore().getName()) + .deadline(mission.getDeadline()) + .condition(mission.getConditional()) + .point(mission.getPointReward()) + .build(); + } +} diff --git a/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java b/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java index fa47494..6e45558 100644 --- a/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java +++ b/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java @@ -3,7 +3,9 @@ import com.example.umc9th.domain.review.dto.ReviewDetailResponseDTO; import com.example.umc9th.domain.review.dto.ReviewFilterRequest; import com.example.umc9th.domain.review.dto.ReviewRequestDTO; +import com.example.umc9th.domain.review.dto.ReviewResponseDTO; import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.service.ReviewCommandService; import com.example.umc9th.domain.review.service.ReviewQueryService; // 필터링 조회 import com.example.umc9th.domain.review.service.ReviewService; // 리뷰 작성 import com.example.umc9th.global.apiPayload.ApiResponse; @@ -22,17 +24,17 @@ public class ReviewController { private final ReviewService reviewService; + private final ReviewCommandService reviewCommandService; private final ReviewQueryService reviewQueryService; - @PostMapping - public ApiResponse createReview(@PathVariable Long storeId, - @PathVariable Long memberId, - @RequestBody ReviewRequestDTO request) { - Review review = reviewService.createReview(storeId, memberId, request); + @PostMapping("/members/{memberId}") + public ApiResponse createReview(@PathVariable Long storeId, + @PathVariable Long memberId, + @RequestBody ReviewRequestDTO request) { - return ApiResponse.onSuccess(GeneralSuccessCode.CREATED, request); + return ApiResponse.onSuccess(GeneralSuccessCode.CREATED, reviewCommandService.createReview(storeId, memberId, request)); } diff --git a/src/main/java/com/example/umc9th/domain/review/exception/ReviewException.java b/src/main/java/com/example/umc9th/domain/review/exception/ReviewException.java new file mode 100644 index 0000000..afde6b0 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/exception/ReviewException.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.review.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; + +public class ReviewException extends GeneralException { + public ReviewException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java b/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java new file mode 100644 index 0000000..51738c8 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.review.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ReviewErrorCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.NOT_FOUND, + "REVIEW404_1", + "해당 미션을 찾지 못했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java b/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java new file mode 100644 index 0000000..a91b743 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.review.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ReviewSuccessCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.CREATED, + "REVIEW201_1", + "리뷰를 성공적으로 생성했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java b/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java index a2cab75..3349d1b 100644 --- a/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java +++ b/src/main/java/com/example/umc9th/domain/review/repository/ReviewQueryDslImpl.java @@ -8,8 +8,8 @@ import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; -import org.springframework.data.support.PageableExecutionUtils; import java.util.List; @@ -29,7 +29,6 @@ public Page findMyReviewsWithFilter( Pageable pageable) { BooleanBuilder builder = new BooleanBuilder(); - builder.and(review.member.id.eq(memberId)); if (request.getStoreId() != null) { @@ -59,16 +58,15 @@ public Page findMyReviewsWithFilter( .limit(pageable.getPageSize()) .fetch(); - long total = queryFactory + Long total = queryFactory .select(review.count()) .from(review) .where(builder) .fetchOne(); - return PageableExecutionUtils.getPage(content, pageable, () -> total); + return new PageImpl<>(content, pageable, total != null ? total : 0L); } - private BooleanExpression storeIdEq(Long storeId) { return storeId != null ? review.store.id.eq(storeId) : null; } @@ -79,7 +77,8 @@ private BooleanExpression ratingBetween(Double rating) { } double nextRating = rating + 1.0; + // rating은 Double이므로 goe, lt 사용 가능 return review.rating.goe(rating) - .lt(nextRating); + .and(review.rating.lt(nextRating)); } } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewCommandService.java b/src/main/java/com/example/umc9th/domain/review/service/ReviewCommandService.java new file mode 100644 index 0000000..f484357 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewCommandService.java @@ -0,0 +1,8 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.review.dto.ReviewRequestDTO; +import com.example.umc9th.domain.review.dto.ReviewResponseDTO; + +public interface ReviewCommandService { + ReviewResponseDTO createReview(Long storeId, Long memberId, ReviewRequestDTO request); +} diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewCommandServiceImpl.java b/src/main/java/com/example/umc9th/domain/review/service/ReviewCommandServiceImpl.java new file mode 100644 index 0000000..17b7199 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewCommandServiceImpl.java @@ -0,0 +1,60 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.exception.MemberException; +import com.example.umc9th.domain.member.exception.code.MemberErrorCode; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.domain.mission.exception.MissionException; +import com.example.umc9th.domain.mission.exception.code.MissionErrorCode; +import com.example.umc9th.domain.review.dto.ReviewRequestDTO; +import com.example.umc9th.domain.review.dto.ReviewResponseDTO; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.exception.ReviewException; +import com.example.umc9th.domain.review.exception.code.ReviewErrorCode; +import com.example.umc9th.domain.review.repository.ReviewRepository; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.domain.store.exception.StoreException; +import com.example.umc9th.domain.store.exception.code.StoreErrorCode; +import com.example.umc9th.domain.store.repository.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.NoSuchElementException; + +@Service +@RequiredArgsConstructor +public class ReviewCommandServiceImpl implements ReviewCommandService{ + + private final MemberRepository memberRepository; + private final StoreRepository storeRepository; + private final ReviewRepository reviewRepository; + + @Override + @Transactional + public ReviewResponseDTO createReview(Long storeId, Long memberId, ReviewRequestDTO request) { + + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.NOT_FOUND)); + + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new StoreException(StoreErrorCode.NOT_FOUND)); + + Review newReview = Review.builder() + .member(member) + .store(store) + .content(request.getContent()) + .rating(request.getRating()) + .build(); + + reviewRepository.save(newReview); + + return ReviewResponseDTO.builder() + .reviewId(newReview.getId()) + .storeName(newReview.getStore().getName()) + .content(request.getContent()) + .rating(request.getRating()) + .build(); + + } +} diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java b/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java index 7624619..5edaa6d 100644 --- a/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java @@ -3,6 +3,7 @@ import com.example.umc9th.domain.review.dto.ReviewDetailResponseDTO; import com.example.umc9th.domain.review.dto.ReviewFilterRequest; import com.example.umc9th.domain.review.repository.ReviewQueryDsl; +import com.example.umc9th.domain.review.repository.ReviewRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -14,13 +15,13 @@ @Transactional(readOnly = true) public class ReviewQueryService { - private final ReviewQueryDsl reviewQueryDsl; + private final ReviewRepository reviewRepository; public Page getMyFilteredReviews( Long memberId, ReviewFilterRequest request, Pageable pageable) { - return reviewQueryDsl.findMyReviewsWithFilter(memberId, request, pageable); + return reviewRepository.findMyReviewsWithFilter(memberId, request, pageable); } } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java b/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java index 098217a..59bd275 100644 --- a/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java @@ -29,14 +29,13 @@ public List getMyReviews(Long memberId) { return reviewRepository.findMemberReviews(memberId); } - @Transactional public Review createReview(Long storeId, Long memberId, ReviewRequestDTO request) { Member member = memberRepository.findById(memberId) .orElseThrow(() -> new NoSuchElementException(memberId + "를 찾을 수 없습니다.")); Store store = storeRepository.findById(storeId) - .orElseThrow(() -> new NoSuchElementException( storeId + "를 찾을 수 없습니다.")); + .orElseThrow(() -> new NoSuchElementException(storeId + "를 찾을 수 없습니다.")); Review newReview = Review.builder() .member(member) @@ -45,7 +44,8 @@ public Review createReview(Long storeId, Long memberId, ReviewRequestDTO request .rating(request.getRating()) .build(); - return reviewRepository.save(newReview); - } + reviewRepository.save(newReview); -} \ No newline at end of file + return newReview; + } +} diff --git a/src/main/java/com/example/umc9th/domain/store/exception/StoreException.java b/src/main/java/com/example/umc9th/domain/store/exception/StoreException.java new file mode 100644 index 0000000..a6e94bc --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/exception/StoreException.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.store.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; + +public class StoreException extends GeneralException { + public StoreException(BaseErrorCode code) { + super(code); + } +} diff --git a/src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java b/src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java new file mode 100644 index 0000000..98e2a02 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.store.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum StoreErrorCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.NOT_FOUND, + "STORE404_1", + "해당 가게를 찾지 못했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/domain/store/exception/code/StoreSuccessCode.java b/src/main/java/com/example/umc9th/domain/store/exception/code/StoreSuccessCode.java new file mode 100644 index 0000000..42194ae --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/exception/code/StoreSuccessCode.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.store.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum StoreSuccessCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.CREATED, + "STORE201_1", + "가게를 성공적으로 생성했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc9th/global/annotation/ExistFoods.java b/src/main/java/com/example/umc9th/global/annotation/ExistFoods.java new file mode 100644 index 0000000..2a6f985 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/annotation/ExistFoods.java @@ -0,0 +1,20 @@ +package com.example.umc9th.global.annotation; + + +import com.example.umc9th.global.validator.FoodExistValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = FoodExistValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistFoods { + + //디폴트 메시지 설정 + String message() default "해당 음식이 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java b/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java index 195e36c..05a8f59 100644 --- a/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java +++ b/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java @@ -5,12 +5,32 @@ import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; import com.example.umc9th.global.apiPayload.exception.GeneralException; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import java.util.HashMap; +import java.util.Map; + @RestControllerAdvice public class GeneralExceptionAdvice { + // 컨트롤러 메서드에서 @Valid 어노테이션 사용하여 DTO 유효성 검사 수행 + @ExceptionHandler + protected ResponseEntity>> handleMethodArgumentNotValidException( + MethodArgumentNotValidException ex + ) { + // 검사에 실패한 필드와 메시지 저장하는 Map + HashMap errors = new HashMap<>(); + ex.getBindingResult().getFieldErrors().forEach(error -> + errors.put(error.getField(), error.getDefaultMessage())); + + GeneralErrorCode code = GeneralErrorCode.NOT_FOUND; + ApiResponse> errorResponse = ApiResponse.onFailure(code, errors); + + return ResponseEntity.status(code.getStatus()).body(errorResponse); + } + // 애플리케이션에서 발생하는 커스텀 예외를 처리 @ExceptionHandler(GeneralException.class) public ResponseEntity> handleException( diff --git a/src/main/java/com/example/umc9th/global/config/QueryDslConfig.java b/src/main/java/com/example/umc9th/global/config/QueryDslConfig.java new file mode 100644 index 0000000..4f203d1 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/config/QueryDslConfig.java @@ -0,0 +1,19 @@ +package com.example.umc9th.global.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QueryDslConfig { + + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/global/config/SwaggerConfig.java b/src/main/java/com/example/umc9th/global/config/SwaggerConfig.java new file mode 100644 index 0000000..0795172 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/config/SwaggerConfig.java @@ -0,0 +1,35 @@ +package com.example.umc9th.global.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI swagger() { + Info info = new Info().title("Project").description("Project Swagger").version("0.0.1"); + + String securityScheme = "JWT TOKEN"; + SecurityRequirement securityRequirement = new SecurityRequirement().addList(securityScheme); + + Components components = new Components().addSecuritySchemes(securityScheme, new SecurityScheme() + .name(securityScheme) + .type(SecurityScheme.Type.HTTP) + .scheme("Bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .info(info) + .addServersItem(new Server().url("/")) + .addSecurityItem(securityRequirement) + .components(components); + + } +} diff --git a/src/main/java/com/example/umc9th/global/entity/BaseEntity.java b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java index a1188e4..47563e5 100644 --- a/src/main/java/com/example/umc9th/global/entity/BaseEntity.java +++ b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java @@ -2,11 +2,18 @@ import com.querydsl.core.annotations.QuerySupertype; import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; import java.time.LocalDateTime; +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter @QuerySupertype public class BaseEntity { diff --git a/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java b/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java new file mode 100644 index 0000000..d87b1e9 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java @@ -0,0 +1,31 @@ +package com.example.umc9th.global.validator; + +import com.example.umc9th.domain.member.exception.code.FoodErrorCode; +import com.example.umc9th.domain.member.repository.FoodRepository; +import com.example.umc9th.global.annotation.ExistFoods; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class FoodExistValidator implements ConstraintValidator> { + + private final FoodRepository foodRepository; + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> foodRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(FoodErrorCode.NOT_FOUND.getMessage()).addConstraintViolation(); + + } + return isValid; + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 748fd54..cdf1fab 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -13,7 +13,7 @@ spring: database-platform: org.hibernate.dialect.MySQLDialect # Hibernate?? ??? MySQL ??(dialect) ?? show-sql: true # ??? SQL ??? ??? ???? ?? ?? hibernate: - ddl-auto: create # ?????? ?? ? ?????? ???? ??? ?? + ddl-auto: update # ?????? ?? ? ?????? ???? ??? ?? properties: hibernate: format_sql: true # ???? SQL ??? ?? ?? ???spring.application.name=umc9th diff --git a/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java b/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java index 4cb58f2..71c82c4 100644 --- a/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java +++ b/src/test/java/com/example/umc9th/domain/review/service/ReviewServiceTest.java @@ -38,6 +38,7 @@ class ReviewServiceTest { @Mock private StoreRepository storeRepository; + @Test @DisplayName("리뷰 작성 성공 테스트") void createReview_success() { From 7f1cca38388739a7a60f63f3405c202d4e213f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=A4=80=EC=98=81?= Date: Fri, 2 Jan 2026 17:03:28 +0900 Subject: [PATCH 11/11] =?UTF-8?q?mission/#10=20:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EB=B0=8F=20=ED=9A=8C=EC=9B=90=20=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 +++ .../member/controller/MemberController.java | 11 +++ .../member/converter/MemberConverter.java | 15 +++- .../domain/member/dto/req/MemberReqDTO.java | 5 ++ .../umc9th/domain/member/entity/Member.java | 15 +++- .../exception/code/MemberErrorCode.java | 4 +- .../member/repository/MemberRepository.java | 4 +- .../service/MemberCommandServiceImpl.java | 9 ++- .../member/service/MemberQueryService.java | 6 +- .../service/MemberQueryServiceImpl.java | 39 ++++++++- .../auth/AuthenticationEntryPointImpl.java | 29 +++++++ .../umc9th/global/auth/JwtAuthFilter.java | 56 +++++++++++++ .../example/umc9th/global/auth/JwtUtil.java | 80 +++++++++++++++++++ .../umc9th/global/auth/dto/MemberReqDTO.java | 13 +++ .../umc9th/global/auth/dto/MemberResDTO.java | 12 +++ .../global/auth/entity/CustomUserDetails.java | 31 +++++++ .../auth/entity/CustomUserDetailsService.java | 25 ++++++ .../umc9th/global/auth/enums/Role.java | 5 ++ .../umc9th/global/config/SecurityConfig.java | 68 ++++++++++++++++ src/main/resources/application.yml | 6 ++ 20 files changed, 433 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/example/umc9th/global/auth/AuthenticationEntryPointImpl.java create mode 100644 src/main/java/com/example/umc9th/global/auth/JwtAuthFilter.java create mode 100644 src/main/java/com/example/umc9th/global/auth/JwtUtil.java create mode 100644 src/main/java/com/example/umc9th/global/auth/dto/MemberReqDTO.java create mode 100644 src/main/java/com/example/umc9th/global/auth/dto/MemberResDTO.java create mode 100644 src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetails.java create mode 100644 src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetailsService.java create mode 100644 src/main/java/com/example/umc9th/global/auth/enums/Role.java create mode 100644 src/main/java/com/example/umc9th/global/config/SecurityConfig.java diff --git a/build.gradle b/build.gradle index f378bf6..032fd01 100644 --- a/build.gradle +++ b/build.gradle @@ -46,6 +46,16 @@ dependencies { // Validation implementation 'org.springframework.boot:spring-boot-starter-validation' + + // Security + implementation 'org.springframework.boot:spring-boot-starter-security' + testImplementation 'org.springframework.security:spring-security-test' + + // 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' + implementation 'org.springframework.boot:spring-boot-configuration-processor' } tasks.named('test') { diff --git a/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index 8f48180..579dda4 100644 --- a/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -5,6 +5,7 @@ import com.example.umc9th.domain.member.dto.res.MemberResDTO; import com.example.umc9th.domain.member.exception.code.MemberSuccessCode; import com.example.umc9th.domain.member.service.MemberCommandService; +import com.example.umc9th.domain.member.service.MemberQueryService; import com.example.umc9th.domain.member.service.MemberService; import com.example.umc9th.domain.review.dto.ReviewResponseDTO; import com.example.umc9th.global.apiPayload.ApiResponse; @@ -25,7 +26,9 @@ public class MemberController { private final MemberService memberService; private final MemberCommandService memberCommandService; + private final MemberQueryService memberQueryService; + //회원가입 @PostMapping("/sign-up") public ApiResponse signUp( @RequestBody @Valid MemberReqDTO.JoinDTO dto @@ -33,6 +36,14 @@ public ApiResponse signUp( return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberCommandService.signUp(dto)); } + //로그인 + @PostMapping("/login") + public ApiResponse login( + @RequestBody @Valid com.example.umc9th.global.auth.dto.MemberReqDTO.LoginDTO dto + ){ + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberQueryService.login(dto)); + } + @GetMapping("{id}/mypage") public ApiResponse getMyInfo(@PathVariable Long id) { diff --git a/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java b/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java index f4367b5..4d65a6a 100644 --- a/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java +++ b/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java @@ -3,6 +3,7 @@ import com.example.umc9th.domain.member.dto.req.MemberReqDTO; import com.example.umc9th.domain.member.dto.res.MemberResDTO; import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.global.auth.enums.Role; public class MemberConverter { @@ -16,13 +17,25 @@ public static MemberResDTO.JoinDTO toJoinDTO( } public static Member toMember( - MemberReqDTO.JoinDTO dto + MemberReqDTO.JoinDTO dto, + String password, + Role role ) { return Member.builder() .name(dto.name()) + .email(dto.email()) + .password(password) + .role(role) .birth(dto.birth()) .address(dto.address()) .gender(dto.gender()) .build(); } + + public static com.example.umc9th.global.auth.dto.MemberResDTO.LoginDTO toLoginDTO(Member member, String accessToken) { + return com.example.umc9th.global.auth.dto.MemberResDTO.LoginDTO.builder() + .memberId(member.getId()) + .accessToken(accessToken) + .build(); + } } diff --git a/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java index 0ca90f1..71f85c8 100644 --- a/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java +++ b/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java @@ -3,6 +3,7 @@ import com.example.umc9th.domain.member.enums.Address; import com.example.umc9th.domain.member.enums.Gender; import com.example.umc9th.global.annotation.ExistFoods; +import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -14,6 +15,10 @@ public class MemberReqDTO { public record JoinDTO( @NotBlank String name, + @Email + String email, + @NotBlank + String password, @NotNull Gender gender, @NotNull diff --git a/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/src/main/java/com/example/umc9th/domain/member/entity/Member.java index 9919e3c..ece4794 100644 --- a/src/main/java/com/example/umc9th/domain/member/entity/Member.java +++ b/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -6,6 +6,7 @@ import com.example.umc9th.domain.member.enums.Gender; import com.example.umc9th.domain.member.enums.MemberStatus; import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.global.auth.enums.Role; import com.example.umc9th.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; @@ -31,7 +32,7 @@ public class Member extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "name", length = 3, nullable = false) + @Column(name = "name", length = 5, nullable = false) private String name; @Column(name = "gender", nullable = false) @@ -49,17 +50,23 @@ public class Member extends BaseEntity { @Column(name = "detail_address") private String detailAddress; - @Column(name = "status", nullable = false) + @Column(name = "status" , nullable = true) @Enumerated(EnumType.STRING) private MemberStatus status; @Column(name = "inactive_date") private LocalDate inactiveDate; - @Column(name = "email") + @Column(name = "email",nullable = false,unique = true) private String email; - @Column(name = "phone_number", length = 11, nullable = false) + @Column(nullable = false) + private String password; + + @Enumerated(EnumType.STRING) + private Role role; + + @Column(name = "phone_number") private String phoneNumber; @Column(name = "point") diff --git a/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java b/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java index 64645ae..76f5c6f 100644 --- a/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java +++ b/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java @@ -12,7 +12,9 @@ public enum MemberErrorCode implements BaseErrorCode { NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER404_1", "해당 사용자를 찾지 못했습니다."), - ; + INVALID(HttpStatus.BAD_REQUEST, + "MEMBER404_2" , + "비밀번호가 일치하지 않습니다." ); private final HttpStatus status; private final String code; diff --git a/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java b/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java index 472efc6..ea767c8 100644 --- a/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java +++ b/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java @@ -3,7 +3,9 @@ import com.example.umc9th.domain.member.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; -public interface MemberRepository extends JpaRepository { +import java.util.Optional; +public interface MemberRepository extends JpaRepository { + Optional findByEmail(String email); } diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java index 5e4cd34..d0c83db 100644 --- a/src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberCommandServiceImpl.java @@ -11,7 +11,9 @@ import com.example.umc9th.domain.member.repository.FoodRepository; import com.example.umc9th.domain.member.repository.MemberFoodRepository; import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.global.auth.enums.Role; import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,13 +29,18 @@ public class MemberCommandServiceImpl implements MemberCommandService { private final FoodRepository foodRepository; private final MemberFoodRepository memberFoodRepository; + private final PasswordEncoder passwordEncoder; + //회원가입 @Override @Transactional public MemberResDTO.JoinDTO signUp( MemberReqDTO.JoinDTO dto ) { - Member member = MemberConverter.toMember(dto); + + String salt = passwordEncoder.encode(dto.password()); + + Member member = MemberConverter.toMember(dto,salt, Role.ROLE_USER); memberRepository.save(member); // if (dto.preferCategory().size() > 1) { diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java index a7c6f76..94c9e1b 100644 --- a/src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryService.java @@ -1,8 +1,12 @@ package com.example.umc9th.domain.member.service; -import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.global.auth.dto.MemberReqDTO; +import com.example.umc9th.global.auth.dto.MemberResDTO; +import jakarta.validation.Valid; public interface MemberQueryService { + MemberResDTO.LoginDTO login(MemberReqDTO.LoginDTO dto); + } diff --git a/src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java index df70812..2ef943a 100644 --- a/src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java +++ b/src/main/java/com/example/umc9th/domain/member/service/MemberQueryServiceImpl.java @@ -1,4 +1,41 @@ package com.example.umc9th.domain.member.service; -public class MemberQueryServiceImpl { +import com.example.umc9th.domain.member.converter.MemberConverter; +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.exception.MemberException; +import com.example.umc9th.domain.member.exception.code.MemberErrorCode; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.global.auth.JwtUtil; +import com.example.umc9th.global.auth.dto.MemberReqDTO; +import com.example.umc9th.global.auth.dto.MemberResDTO; +import com.example.umc9th.global.auth.entity.CustomUserDetails; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberQueryServiceImpl implements MemberQueryService { + + private final MemberRepository memberRepository; + private final JwtUtil jwtUtil; + private final PasswordEncoder encoder; + + @Override + public MemberResDTO.LoginDTO login(MemberReqDTO.@Valid LoginDTO dto) + { + Member member = memberRepository.findByEmail(dto.email()) + .orElseThrow(() -> new MemberException(MemberErrorCode.NOT_FOUND)); + + if (!encoder.matches(dto.password(), member.getPassword())) { + throw new MemberException(MemberErrorCode.INVALID); + } + + CustomUserDetails userDetails = new CustomUserDetails(member); + + String accessToken = jwtUtil.createAccessToken(userDetails); + + return MemberConverter.toLoginDTO(member, accessToken); + } } diff --git a/src/main/java/com/example/umc9th/global/auth/AuthenticationEntryPointImpl.java b/src/main/java/com/example/umc9th/global/auth/AuthenticationEntryPointImpl.java new file mode 100644 index 0000000..e2d01f4 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/AuthenticationEntryPointImpl.java @@ -0,0 +1,29 @@ +package com.example.umc9th.global.auth; + +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; + +import java.io.IOException; + +public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint { + private final ObjectMapper objectMapper = new ObjectMapper(); + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { + response.setContentType("application/json;charset=UTF-8"); + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + + ApiResponse errorResponse = ApiResponse.onFailure( + GeneralErrorCode.UNAUTHORIZED, + null + ); + + objectMapper.writeValue(response.getOutputStream(), errorResponse); + } +} diff --git a/src/main/java/com/example/umc9th/global/auth/JwtAuthFilter.java b/src/main/java/com/example/umc9th/global/auth/JwtAuthFilter.java new file mode 100644 index 0000000..33a6b2c --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/JwtAuthFilter.java @@ -0,0 +1,56 @@ +package com.example.umc9th.global.auth; + +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; +import com.example.umc9th.global.auth.entity.CustomUserDetailsService; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +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.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@RequiredArgsConstructor +public class JwtAuthFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + private final CustomUserDetailsService customUserDetailsService; + + @Override + protected void doFilterInternal( + @NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain) + throws ServletException, IOException { + + + String token = request.getHeader("Authorization"); + if (token == null || !token.startsWith("Bearer ")) { + filterChain.doFilter(request, response); + return; + } + token = token.replace("Bearer ", ""); + + if (jwtUtil.isValid(token)) { + String email = jwtUtil.getEmail(token); + UserDetails user = customUserDetailsService.loadUserByUsername(email); + + Authentication auth = new UsernamePasswordAuthenticationToken( + user, + null, + user.getAuthorities() + ); + SecurityContextHolder.getContext().setAuthentication(auth); + } + filterChain.doFilter(request, response); + } + } + diff --git a/src/main/java/com/example/umc9th/global/auth/JwtUtil.java b/src/main/java/com/example/umc9th/global/auth/JwtUtil.java new file mode 100644 index 0000000..00578d1 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/JwtUtil.java @@ -0,0 +1,80 @@ +package com.example.umc9th.global.auth; + +import com.example.umc9th.global.auth.entity.CustomUserDetails; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.time.Instant; +import java.util.Date; +import java.util.stream.Collectors; + +@Component +public class JwtUtil { + + private final SecretKey secretKey; + private final Duration accessExpiration; + + public JwtUtil( + @Value("${jwt.token.secretKey}") String secret, + @Value("${jwt.token.expiration.access}") Long accessExpiration + ) { + this.secretKey = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8)); + this.accessExpiration = Duration.ofMillis(accessExpiration); + } + + public String createAccessToken(CustomUserDetails user) { + return createToken(user, accessExpiration); + } + + public String getEmail(String token) { + try { + return getClaims(token).getPayload().getSubject(); + } catch (JwtException e) { + return null; + } + } + + public boolean isValid(String token) { + try { + getClaims(token); + return true; + } catch (JwtException e) { + return false; + } + } + + private String createToken(CustomUserDetails user, Duration expiration) { + Instant now = Instant.now(); + + String authorities = user.getAuthorities().stream() + .map(GrantedAuthority::getAuthority) + .collect(Collectors.joining(",")); + + return Jwts.builder() + .subject(user.getUsername()) + .claim("role",authorities) + .claim("email",user.getUsername()) + .issuedAt(Date.from(now)) + .expiration(Date.from(now.plus(expiration))) + .signWith(secretKey) + .compact(); + } + + private Jws getClaims(String token) throws JwtException { + return Jwts.parser() + .verifyWith(secretKey) + .clockSkewSeconds(60) + .build() + .parseSignedClaims(token); + } + +} diff --git a/src/main/java/com/example/umc9th/global/auth/dto/MemberReqDTO.java b/src/main/java/com/example/umc9th/global/auth/dto/MemberReqDTO.java new file mode 100644 index 0000000..92b51b8 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/dto/MemberReqDTO.java @@ -0,0 +1,13 @@ +package com.example.umc9th.global.auth.dto; + +import jakarta.validation.constraints.NotBlank; + +public class MemberReqDTO { + + public record LoginDTO( + @NotBlank + String email, + @NotBlank + String password + ){} +} diff --git a/src/main/java/com/example/umc9th/global/auth/dto/MemberResDTO.java b/src/main/java/com/example/umc9th/global/auth/dto/MemberResDTO.java new file mode 100644 index 0000000..4155633 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/dto/MemberResDTO.java @@ -0,0 +1,12 @@ +package com.example.umc9th.global.auth.dto; + +import lombok.Builder; + +public class MemberResDTO { + + @Builder + public record LoginDTO( + Long memberId, + String accessToken + ){} +} diff --git a/src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetails.java b/src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetails.java new file mode 100644 index 0000000..80749ee --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetails.java @@ -0,0 +1,31 @@ +package com.example.umc9th.global.auth.entity; + +import com.example.umc9th.domain.member.entity.Member; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; + +@RequiredArgsConstructor +public class CustomUserDetails implements UserDetails { + + private final Member member; + + @Override + public Collection getAuthorities() { + return List.of(new SimpleGrantedAuthority(member.getRole().toString())); + } + + @Override + public String getPassword() { + return member.getPassword(); + } + + @Override + public String getUsername() { + return member.getEmail(); + } +} diff --git a/src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetailsService.java b/src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetailsService.java new file mode 100644 index 0000000..86a75b8 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/entity/CustomUserDetailsService.java @@ -0,0 +1,25 @@ +package com.example.umc9th.global.auth.entity; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.exception.MemberException; +import com.example.umc9th.domain.member.exception.code.MemberErrorCode; +import com.example.umc9th.domain.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final MemberRepository memberRepository; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + Member member = memberRepository.findByEmail(username) + .orElseThrow(() -> new MemberException(MemberErrorCode.NOT_FOUND)); + return new CustomUserDetails(member); + } +} diff --git a/src/main/java/com/example/umc9th/global/auth/enums/Role.java b/src/main/java/com/example/umc9th/global/auth/enums/Role.java new file mode 100644 index 0000000..673e30c --- /dev/null +++ b/src/main/java/com/example/umc9th/global/auth/enums/Role.java @@ -0,0 +1,5 @@ +package com.example.umc9th.global.auth.enums; + +public enum Role { + ROLE_ADMIN, ROLE_USER +} diff --git a/src/main/java/com/example/umc9th/global/config/SecurityConfig.java b/src/main/java/com/example/umc9th/global/config/SecurityConfig.java new file mode 100644 index 0000000..1f6c259 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/config/SecurityConfig.java @@ -0,0 +1,68 @@ +package com.example.umc9th.global.config; + +import com.example.umc9th.global.auth.AuthenticationEntryPointImpl; +import com.example.umc9th.global.auth.JwtAuthFilter; +import com.example.umc9th.global.auth.JwtUtil; +import com.example.umc9th.global.auth.entity.CustomUserDetailsService; +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.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@EnableWebSecurity +@Configuration +@RequiredArgsConstructor +public class SecurityConfig { + + private final JwtUtil jwtUtil; + private final CustomUserDetailsService customUserDetailsService; + + private final String[] allowUris = { + "/members/login", + "/swagger-ui/**", + "/swagger-resources/**", + "/v3/api-docs/**", + }; + + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeHttpRequests(requests -> requests + .requestMatchers(allowUris).permitAll() + .requestMatchers("/admin/**").hasRole("ADMIN") + .anyRequest().authenticated() + ) + .formLogin(AbstractHttpConfigurer::disable) + .addFilterBefore(jwtAuthFilter(), UsernamePasswordAuthenticationFilter.class) + .csrf(AbstractHttpConfigurer::disable) + .logout(logout->logout + .logoutUrl("/logout") + .logoutSuccessUrl("/login?logout") + .permitAll() + ) + .exceptionHandling(exception -> exception.authenticationEntryPoint(authenticationEntryPoint())); + return http.build(); + } + + @Bean + public JwtAuthFilter jwtAuthFilter() { + return new JwtAuthFilter(jwtUtil, customUserDetailsService); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationEntryPoint authenticationEntryPoint() { + return new AuthenticationEntryPointImpl(); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cdf1fab..3dda363 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,3 +17,9 @@ spring: properties: hibernate: format_sql: true # ???? SQL ??? ?? ?? ???spring.application.name=umc9th + +jwt: + token: + secretKey: ZGh3YWlkc2F2ZXdhZXZ3b2EgMTM5ZXUgMDMxdWMyIHEyMiBAIDAgKTJFVio= + expiration: + access: 14400000