From 9ba80ae36599e73dcbd9e73ed1257bb50c77cbff Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Fri, 10 Oct 2025 00:42:32 +0900 Subject: [PATCH 01/14] =?UTF-8?q?Feat=20:=20Entity=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .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 + .../umc9th/domain/member/entity/Food.java | 23 ++ .../umc9th/domain/member/entity/Member.java | 82 ++++++ .../umc9th/domain/member/entity/Term.java | 23 ++ .../member/entity/mapping/MemberFood.java | 37 +++ .../member/entity/mapping/MemberTerm.java | 28 ++ .../umc9th/domain/member/enums/Address.java | 12 + .../umc9th/domain/member/enums/FoodName.java | 16 ++ .../umc9th/domain/member/enums/Gender.java | 5 + .../domain/member/enums/SocialType.java | 5 + .../umc9th/domain/member/enums/Status.java | 5 + .../umc9th/domain/member/enums/TermName.java | 9 + .../umc9th/domain/mission/entity/Mission.java | 43 +++ .../mission/entity/mapping/MemberMission.java | 38 +++ .../umc9th/domain/mission/enums/Status.java | 5 + .../umc9th/domain/review/entity/Reply.java | 31 +++ .../umc9th/domain/review/entity/Review.java | 46 ++++ .../domain/review/entity/ReviewPhoto.java | 25 ++ .../umc9th/domain/store/entity/Location.java | 29 ++ .../umc9th/domain/store/entity/Store.java | 41 +++ .../store/entity/mapping/MemberFoodStore.java | 33 +++ .../umc9th/global/Umc9thApplication.java | 15 ++ .../umc9th/global/entity/BaseEntity.java | 25 ++ src/main/resources/application.yml | 19 ++ .../umc9th/Umc9thApplicationTests.java | 13 + 32 files changed, 1040 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/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/Term.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/entity/mapping/MemberTerm.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/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/SocialType.java create mode 100644 src/main/java/com/example/umc9th/domain/member/enums/Status.java create mode 100644 src/main/java/com/example/umc9th/domain/member/enums/TermName.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/mission/enums/Status.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/Location.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/entity/mapping/MemberFoodStore.java create mode 100644 src/main/java/com/example/umc9th/global/Umc9thApplication.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..118b98c --- /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(17) + } +} + +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/domain/member/entity/Food.java b/src/main/java/com/example/umc9th/domain/member/entity/Food.java new file mode 100644 index 0000000..4867baf --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/Food.java @@ -0,0 +1,23 @@ +package com.example.umc9th.domain.member.entity; + + +import com.example.umc9th.domain.member.enums.FoodName; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "food") +public class Food { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", nullable = false, unique = true, length = 30) + @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..c8fc1c3 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -0,0 +1,82 @@ +package com.example.umc9th.domain.member.entity; + +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.SocialType; +import com.example.umc9th.domain.member.enums.Status; +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +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") +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 = "email", length = 255, nullable = false) + private String email; + + @Column(name = "nickname", length = 20, nullable = false, unique = true) + private String nickname; + + @Column(name = "gender", nullable = false) + @Enumerated(EnumType.STRING) + @Builder.Default + private Gender gender = Gender.NONE; + + @Column(name = "birthday") + private LocalDateTime birthday; + + @Column(name = "address", nullable = false) + @Enumerated(EnumType.STRING) + private Address address; + + @Column(name = "phone_num", nullable = false, length = 15) + private String phoneNum; + + @Column(name = "point", nullable = false) + @Builder.Default + private Integer point = 0; + + @Column(name = "social_uid", unique = true, length = 100) + private String social_uid; + + @Column(name = "social_type") + @Enumerated(EnumType.STRING) + private SocialType social_type; + + @Column(name = "status", nullable = false) + @Enumerated(EnumType.STRING) + @Builder.Default + private Status status = Status.active; + + @Column(name = "inactive_at") + private LocalDateTime inactiveAt; + + @Column(name = "delete_at") + private LocalDateTime deleteAt; + + // 회원이 참여한 미션 목록 — 회원 삭제 시 미션 매핑도 함께 삭제 + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true) + private List memberMissions = new ArrayList<>(); + + // 회원의 선호 음식 — 회원 삭제 시 연결된 유저 선호 음식 데이터도 함께 삭제 + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true) + private List memberFoods = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc9th/domain/member/entity/Term.java b/src/main/java/com/example/umc9th/domain/member/entity/Term.java new file mode 100644 index 0000000..e3ca9ba --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/Term.java @@ -0,0 +1,23 @@ +package com.example.umc9th.domain.member.entity; + + +import com.example.umc9th.domain.member.enums.TermName; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "term") +public class Term { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", nullable = false) + @Enumerated(EnumType.STRING) + private TermName name; +} 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..8a32e18 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java @@ -0,0 +1,37 @@ +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 com.example.umc9th.domain.store.entity.mapping.MemberFoodStore; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table( + name = "member_food", + uniqueConstraints = @UniqueConstraint(columnNames = {"member_id", "food_id"}) +) +public class MemberFood { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id", nullable = false) + private Food food; + + @OneToMany(mappedBy = "memberFood", cascade = CascadeType.ALL, orphanRemoval = true) + private List memberFoodStores = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberTerm.java b/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberTerm.java new file mode 100644 index 0000000..6c6ce9b --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberTerm.java @@ -0,0 +1,28 @@ +package com.example.umc9th.domain.member.entity.mapping; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.entity.Term; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_term", + uniqueConstraints = @UniqueConstraint(columnNames = {"member_id", "term_id"})) +public class MemberTerm { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "term_id", nullable = false) + private Term term; +} 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..da2453b --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/Address.java @@ -0,0 +1,12 @@ +package com.example.umc9th.domain.member.enums; + +public enum Address { + ANAM, + CHEONGDAM, + HONGDAE, + JONGRO, + ITAEWON, + SINCHON, + MYEONGDONG, + YEOKSAM +} 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..9452055 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java @@ -0,0 +1,16 @@ +package com.example.umc9th.domain.member.enums; + +public enum FoodName { + KOREAN, // 한식 + JAPANESE, // 일식 + CHINESE, // 중식 + WESTERN, // 양식 + CHICKEN, // 치킨 + SNACK, // 분식 + MEAT, // 고기 + LUNCHBOX, // 도시락 + LATE_NIGHT, // 야식 + FAST_FOOD, // 패스트푸드 + DESSERT, // 디저트 + ASIAN // 아시안푸드 +} 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..400401b --- /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/SocialType.java b/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java new file mode 100644 index 0000000..d44c110 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.member.enums; + +public enum SocialType { + GOOGLE, KAKAO +} diff --git a/src/main/java/com/example/umc9th/domain/member/enums/Status.java b/src/main/java/com/example/umc9th/domain/member/enums/Status.java new file mode 100644 index 0000000..e31e7f5 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/Status.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.member.enums; + +public enum Status { + active, inactive +} diff --git a/src/main/java/com/example/umc9th/domain/member/enums/TermName.java b/src/main/java/com/example/umc9th/domain/member/enums/TermName.java new file mode 100644 index 0000000..7884ac0 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/TermName.java @@ -0,0 +1,9 @@ +package com.example.umc9th.domain.member.enums; + +public enum TermName { + SERVICE_TERMS, + PRIVACY_POLICY, + LOCATION_TERMS, + MARKETING_AGREEMENT, + AGE_CONFIRMATION +} 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..561bdba --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java @@ -0,0 +1,43 @@ +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.LocalDateTime; +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; + + // 하나의 미션은 특정 가게(Store)에 속함 + @ManyToOne(fetch = FetchType.LAZY,optional = false) + @JoinColumn(name = "store_id", nullable = false) + private Store store; + + @Column(name = "deadline", nullable = false) + private LocalDateTime deadline; + + @Column(name = "conditional", length = 255) + private String conditional; + + @Column(name = "point", nullable = false) + private Integer point; + + // 한 미션은 여러 회원-미션(MemberMission)을 가질 수 있음 + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL, orphanRemoval = true) + private List memberMissions = 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..b8cbe5f --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/entity/mapping/MemberMission.java @@ -0,0 +1,38 @@ +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.domain.mission.enums.Status; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table( + name = "member_mission", + uniqueConstraints = @UniqueConstraint(columnNames = {"member_id", "mission_id"}) +) +public class MemberMission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "status", nullable = false) + @Enumerated(EnumType.STRING) + private Status status; + + // 한 회원은 여러 미션을 수행할 수 있음 + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + // 한 미션은 여러 회원에게 부여될 수 있음 + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "mission_id", nullable = false) + private Mission mission; + +} diff --git a/src/main/java/com/example/umc9th/domain/mission/enums/Status.java b/src/main/java/com/example/umc9th/domain/mission/enums/Status.java new file mode 100644 index 0000000..d87e577 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/enums/Status.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.mission.enums; + +public enum Status { + ONGOING, COMPLETED, CANCELED; +} 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..7c313bc --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/entity/Reply.java @@ -0,0 +1,31 @@ +package com.example.umc9th.domain.review.entity; + +import com.example.umc9th.domain.member.entity.Member; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "reply") +public class Reply { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "content", nullable = false, length = 500) + private String content; + + //어떤 리뷰에 달린 댓글인지 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id", nullable = false) + private Review review; + + //댓글 작성자 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; +} 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..8881532 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/entity/Review.java @@ -0,0 +1,46 @@ +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 +@Builder +@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; + + // 한 명의 회원은 여러 리뷰를 작성할 수 있음 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + // 하나의 가게에는 여러 리뷰가 달릴 수 있음 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) + private Store store; + + @Column(name = "star", nullable = false) + private float star; + + @Column(name = "content", nullable = false, length = 1000) + private String content; + + // 리뷰에 달린 댓글 + @OneToMany(mappedBy = "review", cascade = CascadeType.ALL, orphanRemoval = true) + private List replies = new ArrayList<>(); + + @OneToMany(mappedBy = "review", cascade = CascadeType.ALL, orphanRemoval = true) + private List photos = 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..f2e1884 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/entity/ReviewPhoto.java @@ -0,0 +1,25 @@ +package com.example.umc9th.domain.review.entity; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "review_photo") +public class ReviewPhoto { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "photo_url", nullable = false, length = 300) + private String photoUrl; + + // 어떤 리뷰의 사진인지 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id", nullable = false) + private Review review; +} diff --git a/src/main/java/com/example/umc9th/domain/store/entity/Location.java b/src/main/java/com/example/umc9th/domain/store/entity/Location.java new file mode 100644 index 0000000..a7e0fa0 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/entity/Location.java @@ -0,0 +1,29 @@ +package com.example.umc9th.domain.store.entity; + +import com.example.umc9th.domain.member.enums.Address; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "location") +public class Location { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", nullable = false, length = 30) + @Enumerated(EnumType.STRING) + private Address address; + + // 한 지역에는 여러 가게가 존재 + @OneToMany(mappedBy = "location", cascade = CascadeType.ALL, orphanRemoval = true) + private List stores = 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..2f35837 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/entity/Store.java @@ -0,0 +1,41 @@ +package com.example.umc9th.domain.store.entity; + +import com.example.umc9th.domain.store.entity.mapping.MemberFoodStore; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@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; + + @Column(name = "name", nullable = false, length = 50) + private String name; + + @Column(name = "address_detail", nullable = false, length = 255) + private String addressDetail; + + // 어느 지역에 속한 가게인지 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "location_id", nullable = false) + private Location location; + + @Column(name = "manager_num", nullable = false) + private Integer managerNum; + + // 사용자 선호 음식별 가게 매핑 + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL, orphanRemoval = true) + private List memberFoodStores = new ArrayList<>(); + +} diff --git a/src/main/java/com/example/umc9th/domain/store/entity/mapping/MemberFoodStore.java b/src/main/java/com/example/umc9th/domain/store/entity/mapping/MemberFoodStore.java new file mode 100644 index 0000000..969be35 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/store/entity/mapping/MemberFoodStore.java @@ -0,0 +1,33 @@ +package com.example.umc9th.domain.store.entity.mapping; + +import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import com.example.umc9th.domain.store.entity.Store; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table( + name = "member_food_store", + uniqueConstraints = @UniqueConstraint(columnNames = {"store_id", "member_food_id"}) +) +public class MemberFoodStore { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // 어떤 가게와 연결되어 있는지 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) + private Store store; + + //어떤 회원의 음식 취향과 연결되어 있는지 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_food_id", nullable = false) + private MemberFood memberFood; + +} diff --git a/src/main/java/com/example/umc9th/global/Umc9thApplication.java b/src/main/java/com/example/umc9th/global/Umc9thApplication.java new file mode 100644 index 0000000..ab71e1e --- /dev/null +++ b/src/main/java/com/example/umc9th/global/Umc9thApplication.java @@ -0,0 +1,15 @@ +package com.example.umc9th.global; + +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/global/entity/BaseEntity.java b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java new file mode 100644 index 0000000..a0a7434 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java @@ -0,0 +1,25 @@ +package com.example.umc9th.global.entity; + +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 +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..e32e115 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + application: + name: "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: update # 애플리케이션 실행 시 데이터베이스 스키마의 상태를 설정 + properties: + hibernate: + format_sql: true # 출력되는 SQL 쿼리를 보기 좋게 포맷팅 \ No newline at end of file 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 b09789ed22b0556fde7cf233317e3e8571ad3b18 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Fri, 31 Oct 2025 12:29:04 +0900 Subject: [PATCH 02/14] =?UTF-8?q?BaseEntity=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/umc9th/domain/member/entity/Member.java | 3 --- .../java/com/example/umc9th/domain/review/entity/Review.java | 1 + src/main/java/com/example/umc9th/global/entity/BaseEntity.java | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) 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 c8fc1c3..85deeb4 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 @@ -69,9 +69,6 @@ public class Member extends BaseEntity { @Column(name = "inactive_at") private LocalDateTime inactiveAt; - @Column(name = "delete_at") - private LocalDateTime deleteAt; - // 회원이 참여한 미션 목록 — 회원 삭제 시 미션 매핑도 함께 삭제 @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true) private List memberMissions = new ArrayList<>(); 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 8881532..ea84f43 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 @@ -6,6 +6,7 @@ import jakarta.persistence.*; import lombok.*; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; 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 a0a7434..a5feafa 100644 --- a/src/main/java/com/example/umc9th/global/entity/BaseEntity.java +++ b/src/main/java/com/example/umc9th/global/entity/BaseEntity.java @@ -22,4 +22,7 @@ public class BaseEntity { @LastModifiedDate @Column(name = "updated_at", nullable = false) private LocalDateTime updatedAt; + + @Column(name = "deleted_at") + private LocalDateTime deletedAt; } From 072543f8a331da1a5c9ceaa842137d61b32464d0 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Fri, 31 Oct 2025 12:43:23 +0900 Subject: [PATCH 03/14] =?UTF-8?q?Feat=20:=20JPQL=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/repository/MemberRepository.java | 14 ++++++ .../repository/MemberMissionRepository.java | 24 +++++++++ .../mission/repository/MissionRepository.java | 50 +++++++++++++++++++ .../review/repository/ReviewRepository.java | 20 ++++++++ 4 files changed, 108 insertions(+) create mode 100644 src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.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/review/repository/ReviewRepository.java 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..e7cc1a7 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java @@ -0,0 +1,14 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; +public interface MemberRepository extends JpaRepository { + + // 이메일로 회원 조회 (삭제되지 않은) + Optional findByEmailAndDeletedAtIsNull(String email); + + // 닉네임으로 회원 조회 (삭제되지 않은) + Optional findByNicknameAndDeletedAtIsNull(String nickname); +} 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..809d974 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/repository/MemberMissionRepository.java @@ -0,0 +1,24 @@ +package com.example.umc9th.domain.mission.repository; + +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import com.example.umc9th.domain.mission.enums.Status; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberMissionRepository extends JpaRepository { + + // 페이징과 함께 mission, mission.store를 함께 로드하도록 EntityGraph 사용 + @EntityGraph(attributePaths = {"mission", "mission.store"}) + Page findByMember_IdAndStatusOrderByMission_DeadlineDesc(Long memberId, Status status, Pageable pageable); + + // 진행중(ONGOING) / 완료(COMPLETED) 조회 + default Page findOngoingMissionsByMemberId(Long memberId, Pageable pageable) { + return findByMember_IdAndStatusOrderByMission_DeadlineDesc(memberId, Status.ONGOING, pageable); + } + + default Page findCompletedMissionsByMemberId(Long memberId, Pageable pageable) { + return findByMember_IdAndStatusOrderByMission_DeadlineDesc(memberId, Status.COMPLETED, 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 new file mode 100644 index 0000000..76e2db0 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java @@ -0,0 +1,50 @@ +package com.example.umc9th.domain.mission.repository; + +import com.example.umc9th.domain.member.enums.Address; +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 m + FROM Mission m + JOIN m.store s + JOIN s.location l + WHERE l.address = :address + AND m.deadline > :now + ORDER BY m.deadline ASC + """) + Page findAvailableMissionsByLocation( + @Param("address") Address address, + @Param("now") LocalDateTime now, + Pageable pageable + ); + + // 홈 — 특정 멤버가 이미 완료한 미션을 제외한 현재 선택된 지역의 미션 목록 (로그인한 회원) + @Query(""" + SELECT m + FROM Mission m + JOIN m.store s + JOIN s.location l + LEFT JOIN MemberMission mm + ON mm.mission = m AND mm.member.id = :memberId + WHERE l.address = :address + AND m.deadline > :now + AND (mm IS NULL OR mm.status <> com.example.umc9th.domain.mission.enums.Status.COMPLETED) + ORDER BY m.deadline ASC + """) + Page findAvailableMissionsByLocationExcludingMemberCompleted( + @Param("memberId") Long memberId, + @Param("address") Address address, + @Param("now") LocalDateTime now, + Pageable pageable + ); +} 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..ffc80fa --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java @@ -0,0 +1,20 @@ +package com.example.umc9th.domain.review.repository; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.store.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface ReviewRepository extends JpaRepository { + + // 특정 가게(Store)에 작성된 모든 리뷰 (삭제되지 않은 것만) + List findByStoreAndDeletedAtIsNull(Store store); + + // 특정 회원(Member)이 작성한 리뷰 (마이페이지용) + List findByMemberAndDeletedAtIsNull(Member member); + + // 닉네임으로 리뷰 조회 (가게 관리자 페이지에서 검색 가능) + List findByMember_NicknameAndDeletedAtIsNull(String nickname); +} From fbaefc93252dce4943693f8df6d34fdebe09f5f5 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Thu, 6 Nov 2025 11:17:46 +0900 Subject: [PATCH 04/14] =?UTF-8?q?Feat=20:=20QueryDSL=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 26 ++++++++++ .../review/repository/ReviewRepository.java | 3 +- .../repository/querydsl/ReviewQueryDsl.java | 12 +++++ .../querydsl/ReviewQueryDslImpl.java | 30 ++++++++++++ .../review/service/ReviewQueryService.java | 49 +++++++++++++++++++ 5 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java create mode 100644 src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java diff --git a/build.gradle b/build.gradle index 118b98c..4d494bb 100644 --- a/build.gradle +++ b/build.gradle @@ -32,8 +32,34 @@ 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" } 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/domain/review/repository/ReviewRepository.java b/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java index ffc80fa..d14c043 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 @@ -2,12 +2,13 @@ import com.example.umc9th.domain.member.entity.Member; import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.repository.querydsl.ReviewQueryDsl; import com.example.umc9th.domain.store.entity.Store; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface ReviewRepository extends JpaRepository { +public interface ReviewRepository extends JpaRepository, ReviewQueryDsl { // 특정 가게(Store)에 작성된 모든 리뷰 (삭제되지 않은 것만) List findByStoreAndDeletedAtIsNull(Store store); diff --git a/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java new file mode 100644 index 0000000..2b0b268 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java @@ -0,0 +1,12 @@ +package com.example.umc9th.domain.review.repository.querydsl; + +import com.example.umc9th.domain.review.entity.Review; +import com.querydsl.core.types.Predicate; + +import java.util.List; + +public interface ReviewQueryDsl { + + // Predicate를 받아 필터링된 리뷰 검색 + List searchReviews(Predicate predicate); +} diff --git a/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java new file mode 100644 index 0000000..5706208 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java @@ -0,0 +1,30 @@ +package com.example.umc9th.domain.review.repository.querydsl; + +import com.example.umc9th.domain.review.entity.QReview; +import com.example.umc9th.domain.review.entity.Review; +import com.querydsl.core.types.Predicate; +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +@RequiredArgsConstructor +public class ReviewQueryDslImpl implements ReviewQueryDsl { + + private final EntityManager em; + + @Override + public List searchReviews(Predicate predicate) { + JPAQueryFactory queryFactory = new JPAQueryFactory(em); + QReview review = QReview.review; + + return queryFactory + .selectFrom(review) + .where(predicate) + .orderBy(review.createdAt.desc()) + .fetch(); + } +} \ 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..5302c8b --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java @@ -0,0 +1,49 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.review.entity.QReview; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.repository.ReviewRepository; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Predicate; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ReviewQueryService { + + private final ReviewRepository reviewRepository; + + public List getMyFilteredReviews(Long memberId, String storeName, Integer star) { + // Q클래스 정의 + QReview review = QReview.review; + // BooleanBuilder 정의 + BooleanBuilder builder = new BooleanBuilder(); + + // 동적 쿼리: 검색 조건 + if (memberId != null) { + builder.and(review.member.id.eq(memberId)); + } + + if (storeName != null && !storeName.isEmpty()) { + builder.and(review.store.name.containsIgnoreCase(storeName)); + } + + if (star != null) { + if (star == 5) { + builder.and(review.star.eq(5.0f)); + } else { + float min = star.floatValue(); + float max = star + 0.9f; + builder.and(review.star.between(min, max)); + } + } + + builder.and(review.deletedAt.isNull()); + + Predicate predicate = builder; + return reviewRepository.searchReviews(predicate); + } +} From ccd9ef3e93cd97435a74204750c200ece1b949f8 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Wed, 12 Nov 2025 20:01:17 +0900 Subject: [PATCH 05/14] =?UTF-8?q?Feat=20:=20API=20=EC=9D=91=EB=8B=B5=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC=EA=B3=BC=20=EC=97=90=EB=9F=AC=20=ED=95=B8?= =?UTF-8?q?=EB=93=A4=EB=9F=AC=20=EB=94=B0=EB=9D=BC=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/controller/TestController.java | 38 +++++++++++++++++ .../domain/test/converter/TestConverter.java | 20 +++++++++ .../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 | 18 ++++++++ .../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 | 41 +++++++++++++++++++ .../global/apiPayload/code/BaseErrorCode.java | 10 +++++ .../apiPayload/code/BaseSuccessCode.java | 10 +++++ .../apiPayload/code/GeneralErrorCode.java | 31 ++++++++++++++ .../apiPayload/code/GeneralSuccessCode.java | 27 ++++++++++++ .../exception/GeneralException.java | 12 ++++++ .../handler/GeneralExceptionAdvice.java | 28 +++++++++++++ 17 files changed, 299 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..1f6438f --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/controller/TestController.java @@ -0,0 +1,38 @@ +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.exception.TestException; +import com.example.umc9th.domain.test.service.query.TestQueryService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; +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..d0dc9b8 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java @@ -0,0 +1,20 @@ +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() + .testing(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..47dcbc4 --- /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 testing; + } + + @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..9fe17e7 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java @@ -0,0 +1,18 @@ +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; +} 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..2163565 --- /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); +} 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..17ff689 --- /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); + } + } +} 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..9322ea0 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java @@ -0,0 +1,41 @@ +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 onSuccess(BaseSuccessCode code) { + return new ApiResponse<>(true, code.getCode(), code.getMessage(), null); + } + + // 실패한 경우 (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..1964712 --- /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 { + + BAD_REQUEST(HttpStatus.BAD_REQUEST, + "COMMON400_1", + "잘못된 요청입니다."), + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, + "AUTH401_1", + "인증이 필요합니다."), + FORBIDDEN(HttpStatus.FORBIDDEN, + "AUTH403_1", + "요청이 거부되었습니다."), + NOT_FOUND(HttpStatus.NOT_FOUND, + "COMMON404_1", + "요청한 리소스를 찾을 수 없습니다."), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, + "COMMON500_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..f7bc5fd --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java @@ -0,0 +1,27 @@ +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", + "리소스가 성공적으로 생성되었습니다."), + ACCEPTED(HttpStatus.ACCEPTED, + "COMMON202", + "요청이 접수되었습니다."), + NO_CONTENT(HttpStatus.NO_CONTENT, + "COMMON204", + "성공했지만 반환할 내용이 없습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} 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..5650fb9 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java @@ -0,0 +1,28 @@ +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 7484593e3c1e7530105de434b67522fb61b0e13a Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Thu, 13 Nov 2025 11:16:17 +0900 Subject: [PATCH 06/14] =?UTF-8?q?Fix=20:=20N+1=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0=20(EntityGraph=20=EC=A0=81=EC=9A=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/repository/MissionRepository.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 76e2db0..3addc8b 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 @@ -4,6 +4,7 @@ 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.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -12,13 +13,12 @@ public interface MissionRepository extends JpaRepository { - // 홈 화면 — 현재 선택된 지역에서 도전 가능한 미션 목록 조회 (비로그인) + // 홈 화면 — 현재 선택된 지역에서 도전 가능한 미션 목록 조회 (비로그인) / N + 1 방지 + @EntityGraph(attributePaths = {"store", "store.location"}) @Query(""" SELECT m FROM Mission m - JOIN m.store s - JOIN s.location l - WHERE l.address = :address + WHERE m.store.location.address = :address AND m.deadline > :now ORDER BY m.deadline ASC """) @@ -28,15 +28,14 @@ Page findAvailableMissionsByLocation( Pageable pageable ); - // 홈 — 특정 멤버가 이미 완료한 미션을 제외한 현재 선택된 지역의 미션 목록 (로그인한 회원) + // 홈 — 특정 멤버가 이미 완료한 미션을 제외한 현재 선택된 지역의 미션 목록 (로그인한 회원) / N + 1 방지 + @EntityGraph(attributePaths = {"store", "store.location"}) @Query(""" SELECT m FROM Mission m - JOIN m.store s - JOIN s.location l LEFT JOIN MemberMission mm ON mm.mission = m AND mm.member.id = :memberId - WHERE l.address = :address + WHERE m.store.location.address = :address AND m.deadline > :now AND (mm IS NULL OR mm.status <> com.example.umc9th.domain.mission.enums.Status.COMPLETED) ORDER BY m.deadline ASC From 8158f6465489660935c083e34f91d55154ab3c38 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Thu, 13 Nov 2025 18:37:10 +0900 Subject: [PATCH 07/14] =?UTF-8?q?Refactor=20:=20QueryDSL=20=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=ED=95=84=ED=84=B0=EB=A7=81=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umc9th/domain/review/entity/Review.java | 4 ++-- .../repository/querydsl/ReviewQueryDsl.java | 7 +++--- .../querydsl/ReviewQueryDslImpl.java | 23 +++++++++++++++++-- .../review/service/ReviewQueryService.java | 8 +++---- 4 files changed, 31 insertions(+), 11 deletions(-) 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 ea84f43..2f0bb70 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 @@ -40,8 +40,8 @@ public class Review extends BaseEntity { // 리뷰에 달린 댓글 @OneToMany(mappedBy = "review", cascade = CascadeType.ALL, orphanRemoval = true) - private List replies = new ArrayList<>(); + private List replyList = new ArrayList<>(); @OneToMany(mappedBy = "review", cascade = CascadeType.ALL, orphanRemoval = true) - private List photos = new ArrayList<>(); + private List reviewPhotoList = new ArrayList<>(); } diff --git a/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java index 2b0b268..0a1ba08 100644 --- a/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java +++ b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDsl.java @@ -2,11 +2,12 @@ import com.example.umc9th.domain.review.entity.Review; import com.querydsl.core.types.Predicate; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; -import java.util.List; public interface ReviewQueryDsl { - // Predicate를 받아 필터링된 리뷰 검색 - List searchReviews(Predicate predicate); + // Predicate + Pageable 기반 동적 쿼리 + Page searchReviews(Predicate predicate, Pageable pageable); } diff --git a/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java index 5706208..66527b1 100644 --- a/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java +++ b/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDslImpl.java @@ -1,14 +1,20 @@ package com.example.umc9th.domain.review.repository.querydsl; +import com.example.umc9th.domain.review.entity.QReply; import com.example.umc9th.domain.review.entity.QReview; +import com.example.umc9th.domain.review.entity.QReviewPhoto; import com.example.umc9th.domain.review.entity.Review; import com.querydsl.core.types.Predicate; import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Optional; @Repository @RequiredArgsConstructor @@ -17,14 +23,27 @@ public class ReviewQueryDslImpl implements ReviewQueryDsl { private final EntityManager em; @Override - public List searchReviews(Predicate predicate) { + public Page searchReviews(Predicate predicate, Pageable pageable) { JPAQueryFactory queryFactory = new JPAQueryFactory(em); QReview review = QReview.review; - return queryFactory + // 필터링된 리뷰 조회 + List results = queryFactory .selectFrom(review) .where(predicate) .orderBy(review.createdAt.desc()) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) .fetch(); + + // 전체 개수 계산 (count 쿼리) + Long total = Optional.ofNullable( + queryFactory.select(review.count()) + .from(review) + .where(predicate) + .fetchOne() + ).orElse(0L); + + return new PageImpl<>(results, pageable, total); } } \ 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 index 5302c8b..2c2dcca 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 @@ -6,17 +6,17 @@ import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.Predicate; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.List; - @Service @RequiredArgsConstructor public class ReviewQueryService { private final ReviewRepository reviewRepository; - public List getMyFilteredReviews(Long memberId, String storeName, Integer star) { + public Page getMyFilteredReviews(Long memberId, String storeName, Integer star, Pageable pageable) { // Q클래스 정의 QReview review = QReview.review; // BooleanBuilder 정의 @@ -44,6 +44,6 @@ public List getMyFilteredReviews(Long memberId, String storeName, Intege builder.and(review.deletedAt.isNull()); Predicate predicate = builder; - return reviewRepository.searchReviews(predicate); + return reviewRepository.searchReviews(predicate, pageable); } } From 0437ccb4cfa070e0bcd28d7bd070bd9b06f15f1c Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Sat, 15 Nov 2025 23:27:53 +0900 Subject: [PATCH 08/14] =?UTF-8?q?Feat:=20API=20=EC=9D=91=EB=8B=B5=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ReviewController.java | 39 +++++++++++++++++ .../review/converter/ReviewConverter.java | 43 +++++++++++++++++++ .../domain/review/dto/ReviewResDto.java | 19 ++++++++ .../review/service/ReviewQueryService.java | 2 +- .../umc9th/global/dto/PagedResponse.java | 16 +++++++ 5 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java create mode 100644 src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java create mode 100644 src/main/java/com/example/umc9th/domain/review/dto/ReviewResDto.java create mode 100644 src/main/java/com/example/umc9th/global/dto/PagedResponse.java 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..49c7088 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java @@ -0,0 +1,39 @@ +package com.example.umc9th.domain.review.controller; + + +import com.example.umc9th.domain.review.converter.ReviewConverter; +import com.example.umc9th.domain.review.dto.ReviewResDto; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.service.ReviewQueryService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import com.example.umc9th.global.dto.PagedResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +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("/reviews") +public class ReviewController { + + private final ReviewQueryService reviewQueryService; + + @GetMapping("/my") + public ApiResponse> getMyFilteredReviews( + @RequestParam(required = false) Long memberId, + @RequestParam(required = false) String storeName, + @RequestParam(required = false) Integer star, + Pageable pageable) { + + Page reviewPage = reviewQueryService.getMyFilteredReviews(memberId, storeName, star, pageable); + + PagedResponse response = ReviewConverter.toPagedMyReviewPreview(reviewPage); + + return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); + } +} diff --git a/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java b/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java new file mode 100644 index 0000000..2f50f61 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java @@ -0,0 +1,43 @@ +package com.example.umc9th.domain.review.converter; + +import com.example.umc9th.domain.review.dto.ReviewResDto; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.global.dto.PagedResponse; +import org.springframework.data.domain.Page; + +import java.util.List; +import java.util.stream.Collectors; + +public class ReviewConverter { + + // 개별 DTO 변환 + public static ReviewResDto.MyReviewPreview toMyReviewPreview(Review review) { + return ReviewResDto.MyReviewPreview.builder() + .reviewId(review.getId()) + .storeName(review.getStore().getName()) + .star(review.getStar()) + .content(review.getContent()) + .createdAt(review.getCreatedAt()) + .build(); + } + + // List 변환 + public static List toMyReviewPreviewList(List reviews) { + return reviews.stream() + .map(ReviewConverter::toMyReviewPreview) + .collect(Collectors.toList()); + } + + // Page 변환 + public static PagedResponse toPagedMyReviewPreview(Page reviewPage) { + return PagedResponse.builder() + .content(reviewPage.getContent().stream() + .map(ReviewConverter::toMyReviewPreview) + .collect(Collectors.toList())) + .page(reviewPage.getNumber()) + .size(reviewPage.getSize()) + .totalElements(reviewPage.getTotalElements()) + .totalPages(reviewPage.getTotalPages()) + .build(); + } +} diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDto.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDto.java new file mode 100644 index 0000000..d00a80f --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDto.java @@ -0,0 +1,19 @@ +package com.example.umc9th.domain.review.dto; + +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +public class ReviewResDto { + + @Builder + @Getter + public static class MyReviewPreview{ + private Long reviewId; + private String storeName; + private String content; + private Float star; + private LocalDateTime createdAt; + } +} 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 2c2dcca..6af29d8 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 @@ -42,8 +42,8 @@ public Page getMyFilteredReviews(Long memberId, String storeName, Intege } builder.and(review.deletedAt.isNull()); - Predicate predicate = builder; + return reviewRepository.searchReviews(predicate, pageable); } } diff --git a/src/main/java/com/example/umc9th/global/dto/PagedResponse.java b/src/main/java/com/example/umc9th/global/dto/PagedResponse.java new file mode 100644 index 0000000..3412bb9 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/dto/PagedResponse.java @@ -0,0 +1,16 @@ +package com.example.umc9th.global.dto; + +import lombok.Builder; +import lombok.Getter; + +import java.util.List; + +@Getter +@Builder +public class PagedResponse { + private List content; + private int page; + private int size; + private long totalElements; + private int totalPages; +} From 761e2c814086048cce088e16ac982940ad0494a2 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Thu, 20 Nov 2025 11:26:27 +0900 Subject: [PATCH 09/14] =?UTF-8?q?Feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20API=20&=20Swagger=20&=20validation=20=EB=94=B0?= =?UTF-8?q?=EB=9D=BC=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 7 ++ .../{global => }/Umc9thApplication.java | 2 +- .../member/controller/MemberController.java | 27 ++++++++ .../member/converter/MemberConverter.java | 34 ++++++++++ .../domain/member/dto/MemberReqDTO.java | 50 ++++++++++++++ .../domain/member/dto/MemberResDTO.java | 14 ++++ .../umc9th/domain/member/entity/Member.java | 10 ++- .../domain/member/enums/SocialType.java | 2 +- .../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 | 9 +++ .../repository/MemberFoodRepository.java | 7 ++ .../service/command/MemberCommandService.java | 9 +++ .../command/MemberCommandServiceImpl.java | 68 +++++++++++++++++++ .../service/query/MemberQueryService.java | 4 ++ .../service/query/MemberQueryServiceImpl.java | 4 ++ .../umc9th/global/annotation/ExistFoods.java | 18 +++++ .../apiPayload/code/GeneralErrorCode.java | 5 +- .../handler/GeneralExceptionAdvice.java | 22 ++++++ .../umc9th/global/config/SwaggerConfig.java | 37 ++++++++++ .../global/validator/FoodExistValidator.java | 33 +++++++++ 24 files changed, 436 insertions(+), 5 deletions(-) rename src/main/java/com/example/umc9th/{global => }/Umc9thApplication.java (91%) create mode 100644 src/main/java/com/example/umc9th/domain/member/controller/MemberController.java 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/MemberReqDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.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/command/MemberCommandService.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java create mode 100644 src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.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/SwaggerConfig.java create mode 100644 src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java diff --git a/build.gradle b/build.gradle index 4d494bb..c351deb 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,13 @@ dependencies { annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:7.0:jpa" annotationProcessor "jakarta.persistence:jakarta.persistence-api" annotationProcessor "jakarta.annotation:jakarta.annotation-api" + + // 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') { diff --git a/src/main/java/com/example/umc9th/global/Umc9thApplication.java b/src/main/java/com/example/umc9th/Umc9thApplication.java similarity index 91% rename from src/main/java/com/example/umc9th/global/Umc9thApplication.java rename to src/main/java/com/example/umc9th/Umc9thApplication.java index ab71e1e..bc54005 100644 --- a/src/main/java/com/example/umc9th/global/Umc9thApplication.java +++ b/src/main/java/com/example/umc9th/Umc9thApplication.java @@ -1,4 +1,4 @@ -package com.example.umc9th.global; +package com.example.umc9th; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; 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..0e41e6a --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -0,0 +1,27 @@ +package com.example.umc9th.domain.member.controller; + +import com.example.umc9th.domain.member.dto.MemberReqDTO; +import com.example.umc9th.domain.member.dto.MemberResDTO; +import com.example.umc9th.domain.member.exception.code.MemberSuccessCode; +import com.example.umc9th.domain.member.service.command.MemberCommandService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +public class MemberController { + + private final MemberCommandService memberCommandService; + + // 회원가입 + @PostMapping("/sign-up") + public ApiResponse signUp( + @RequestBody @Valid MemberReqDTO.JoinDTO dto + ){ + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberCommandService.signup(dto)); + } +} 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..916750d --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java @@ -0,0 +1,34 @@ +package com.example.umc9th.domain.member.converter; + +import com.example.umc9th.domain.member.dto.MemberReqDTO; +import com.example.umc9th.domain.member.dto.MemberResDTO; +import com.example.umc9th.domain.member.entity.Member; + +public class MemberConverter { + + // Entity → DTO + public static MemberResDTO.JoinDTO toJoinDTO(Member member) { + return MemberResDTO.JoinDTO.builder() + .memberId(member.getId()) + .createdAt(member.getCreatedAt()) + .build(); + } + + // DTO → Entity + public static Member toMember(MemberReqDTO.JoinDTO dto) { + return Member.builder() + .name(dto.name()) + .email(dto.email()) + .nickname(dto.nickname()) + .gender(dto.gender()) + .birthday(dto.birthday()) + .address(dto.address()) + .detailAddress(dto.specAddress()) + .phoneNum(dto.phoneNum()) + .point(0) + .status(null) + .social_uid(null) + .social_type(null) + .build(); + } +} diff --git a/src/main/java/com/example/umc9th/domain/member/dto/MemberReqDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/MemberReqDTO.java new file mode 100644 index 0000000..831660d --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/dto/MemberReqDTO.java @@ -0,0 +1,50 @@ +package com.example.umc9th.domain.member.dto; + +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.*; + +import java.time.LocalDate; +import java.util.List; + +public class MemberReqDTO { + + public record JoinDTO( + + @NotBlank(message = "이름은 필수 입력값입니다.") + String name, + + @NotBlank(message = "이메일은 필수 입력값입니다.") + @Email(message = "올바른 이메일 형식이어야 합니다.") + String email, + + @NotBlank(message = "닉네임은 필수 입력값입니다.") + String nickname, + + @NotNull(message = "성별은 필수 입력값입니다.") + Gender gender, + + @NotNull(message = "생년월일은 필수 입력값입니다.") + @Past(message = "생년월일은 과거 날짜여야 합니다.") + LocalDate birthday, + + @NotNull(message = "주소는 필수 입력값입니다.") + Address address, + + @NotBlank(message = "전화번호는 필수 입력값입니다.") + String phoneNum, + + @NotBlank(message = "비밀번호는 필수 입력값입니다.") + String password, + + @NotBlank(message = "상세 주소는 필수 입력값입니다.") + String specAddress, + + @ExistFoods + @NotNull(message = "선호 음식 카테고리는 필수입니다.") + @Size(min = 1, message = "선호 음식은 최소 1개 이상 선택해야 합니다.") + List preferCategory + + ) {} +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.java new file mode 100644 index 0000000..1d545af --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.java @@ -0,0 +1,14 @@ +package com.example.umc9th.domain.member.dto; + +import lombok.Builder; + +import java.time.LocalDateTime; + +public class MemberResDTO { + + @Builder + public record JoinDTO( + Long memberId, + LocalDateTime createdAt + ){} +} 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 85deeb4..b4921cc 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 @@ -10,6 +10,7 @@ import jakarta.persistence.*; import lombok.*; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -41,12 +42,15 @@ public class Member extends BaseEntity { private Gender gender = Gender.NONE; @Column(name = "birthday") - private LocalDateTime birthday; + private LocalDate birthday; @Column(name = "address", nullable = false) @Enumerated(EnumType.STRING) private Address address; + @Column(name = "detail_address") + private String detailAddress; + @Column(name = "phone_num", nullable = false, length = 15) private String phoneNum; @@ -59,7 +63,7 @@ public class Member extends BaseEntity { @Column(name = "social_type") @Enumerated(EnumType.STRING) - private SocialType social_type; + private SocialType social_type = SocialType.LOCAL; @Column(name = "status", nullable = false) @Enumerated(EnumType.STRING) @@ -71,9 +75,11 @@ public class Member extends BaseEntity { // 회원이 참여한 미션 목록 — 회원 삭제 시 미션 매핑도 함께 삭제 @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true) + @Builder.Default private List memberMissions = new ArrayList<>(); // 회원의 선호 음식 — 회원 삭제 시 연결된 유저 선호 음식 데이터도 함께 삭제 @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true) + @Builder.Default private List memberFoods = new ArrayList<>(); } diff --git a/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java b/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java index d44c110..8d353b2 100644 --- a/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java +++ b/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java @@ -1,5 +1,5 @@ package com.example.umc9th.domain.member.enums; public enum SocialType { - GOOGLE, KAKAO + LOCAL, GOOGLE, KAKAO } 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..cb2c134 --- /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..d88cd68 --- /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..beb41b3 --- /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; +} 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..7bcbde6 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java @@ -0,0 +1,9 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.Food; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +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..0a6bebc --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java @@ -0,0 +1,7 @@ +package com.example.umc9th.domain.member.repository; + +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/command/MemberCommandService.java b/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandService.java new file mode 100644 index 0000000..7d1822f --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandService.java @@ -0,0 +1,9 @@ +package com.example.umc9th.domain.member.service.command; + +import com.example.umc9th.domain.member.dto.MemberReqDTO; +import com.example.umc9th.domain.member.dto.MemberResDTO; + +public interface MemberCommandService { + //회원가입 + MemberResDTO.JoinDTO signup(MemberReqDTO.JoinDTO dto); +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java new file mode 100644 index 0000000..4512b30 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java @@ -0,0 +1,68 @@ +package com.example.umc9th.domain.member.service.command; + +import com.example.umc9th.domain.member.converter.MemberConverter; +import com.example.umc9th.domain.member.dto.MemberReqDTO; +import com.example.umc9th.domain.member.dto.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; + +@Service +@RequiredArgsConstructor +public class MemberCommandServiceImpl implements MemberCommandService { + + private final MemberRepository memberRepository; + private final MemberFoodRepository memberFoodRepository; + private final FoodRepository foodRepository; + + // 회원가입 + @Override + @Transactional + public MemberResDTO.JoinDTO signup( + MemberReqDTO.JoinDTO dto + ){ + // 사용자 생성 + Member member = MemberConverter.toMember(dto); + // DB 적용 + memberRepository.save(member); + + // 선호 음식 존재 여부 확인 + if (dto.preferCategory().size() > 1){ + List memberFoodList = new ArrayList<>(); + + // 선호 음식 ID별 조회 + for (Long id : dto.preferCategory()){ + + // 음식 존재 여부 검증 + Food food = foodRepository.findById(id) + .orElseThrow(() -> new FoodException(FoodErrorCode.NOT_FOUND)); + + // MemberFood 엔티티 생성 (컨버터 사용해야 함) + MemberFood memberFood = MemberFood.builder() + .member(member) + .food(food) + .build(); + + // 사용자 - 음식 (선호 음식) 추가 + memberFoodList.add(memberFood); + } + + // 모든 선호 음식 추가: DB 적용 + memberFoodRepository.saveAll(memberFoodList); + } + + // 응답 DTO 생성 + return MemberConverter.toJoinDTO(member); + } +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java new file mode 100644 index 0000000..eaa74bc --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java @@ -0,0 +1,4 @@ +package com.example.umc9th.domain.member.service.query; + +public interface MemberQueryService { +} diff --git a/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.java new file mode 100644 index 0000000..7ce41c8 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.java @@ -0,0 +1,4 @@ +package com.example.umc9th.domain.member.service.query; + +public class MemberQueryServiceImpl { +} 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..b5c8041 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/annotation/ExistFoods.java @@ -0,0 +1,18 @@ +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/code/GeneralErrorCode.java b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java index 1964712..541ea44 100644 --- a/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java +++ b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java @@ -23,7 +23,10 @@ public enum GeneralErrorCode implements BaseErrorCode { INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500_1", "예기치 않은 서버 에러가 발생했습니다."), - ; + VALID_FAIL(HttpStatus.BAD_REQUEST, + "COMMON400_2", + "유효성 검사에 실패했습니다."), + ; private final HttpStatus status; private final String 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 index 5650fb9..621ada6 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,9 +5,13 @@ 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 { @@ -25,4 +29,22 @@ public ResponseEntity> handleException(Exception ex) { return ResponseEntity.status(code.getStatus()) .body(ApiResponse.onFailure(code, ex.getMessage())); } + + // 컨트롤러 메서드에서 @Valid 어노테이션을 사용하여 DTO의 유효성 검사를 수행 + @ExceptionHandler(MethodArgumentNotValidException.class) + protected ResponseEntity>> handleMethodArgumentNotValidException( + MethodArgumentNotValidException ex + ) { + // 검사에 실패한 필드와 그에 대한 메시지를 저장하는 Map + Map errors = new HashMap<>(); + ex.getBindingResult().getFieldErrors().forEach(error -> + errors.put(error.getField(), error.getDefaultMessage()) + ); + + GeneralErrorCode code = GeneralErrorCode.VALID_FAIL; + ApiResponse> errorResponse = ApiResponse.onFailure(code, errors); + + // 에러 코드, 메시지와 함께 errors를 반환 + return ResponseEntity.status(code.getStatus()).body(errorResponse); + } } 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..09f24a9 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/config/SwaggerConfig.java @@ -0,0 +1,37 @@ +package com.example.umc9th.global.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.servers.Server; +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; + +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"); + + // JWT 토큰 헤더 방식 + 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/validator/FoodExistValidator.java b/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java new file mode 100644 index 0000000..0e3abbf --- /dev/null +++ b/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java @@ -0,0 +1,33 @@ +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(foodRepository::existsById); + + if (!isValid) { + // 이 부분에서 아까 디폴트 메시지를 초기화 시키고, 새로운 메시지로 덮어씌우게 됩니다. + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(FoodErrorCode.NOT_FOUND.getMessage()).addConstraintViolation(); + } + + return isValid; + + } +} From 16f8791cc673af6004b4c2e6797b0faadf766a26 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Sun, 23 Nov 2025 13:30:52 +0900 Subject: [PATCH 10/14] =?UTF-8?q?Feat:=20API=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/code/MemberErrorCode.java | 4 +- .../controller/MemberMissionController.java | 31 ++++++++++ .../converter/MemberMissionConverter.java | 22 ++++++++ .../mission/dto/MemberMissionResDTO.java | 27 +++++++++ .../mission/entity/mapping/MemberMission.java | 3 +- .../exception/MemberMissionException.java | 10 ++++ .../mission/exception/MissionException.java | 10 ++++ .../code/MemberMissionErrorCode.java | 20 +++++++ .../exception/code/MissionErrorCode.java | 22 ++++++++ .../exception/code/MissionSuccessCode.java | 17 ++++++ .../repository/MemberMissionRepository.java | 3 + .../command/MemberMissionCommandService.java | 56 +++++++++++++++++++ .../review/controller/ReviewController.java | 38 +++++++++---- .../review/converter/ReviewConverter.java | 22 ++++++-- .../domain/review/dto/ReviewReqDTO.java | 22 ++++++++ .../{ReviewResDto.java => ReviewResDTO.java} | 15 ++++- .../review/exception/ReviewException.java | 10 ++++ .../exception/code/ReviewErrorCode.java | 18 ++++++ .../exception/code/ReviewSuccessCode.java | 17 ++++++ .../review/repository/ReviewRepository.java | 1 + .../service/command/ReviewCommandService.java | 45 +++++++++++++++ .../{ => query}/ReviewQueryService.java | 2 +- .../store/repository/StoreRepository.java | 9 +++ 23 files changed, 399 insertions(+), 25 deletions(-) create mode 100644 src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/exception/MemberMissionException.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/MemberMissionErrorCode.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/command/MemberMissionCommandService.java create mode 100644 src/main/java/com/example/umc9th/domain/review/dto/ReviewReqDTO.java rename src/main/java/com/example/umc9th/domain/review/dto/{ReviewResDto.java => ReviewResDTO.java} (54%) 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/command/ReviewCommandService.java rename src/main/java/com/example/umc9th/domain/review/service/{ => query}/ReviewQueryService.java (96%) create mode 100644 src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java 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..4db0b94 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 @@ -9,9 +9,9 @@ @AllArgsConstructor public enum MemberErrorCode implements BaseErrorCode { - NOT_FOUND(HttpStatus.NOT_FOUND, + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER404_1", - "해당 사용자를 찾지 못했습니다."), + "회원을 찾을 수 없습니다."), ; private final HttpStatus status; diff --git a/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java b/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java new file mode 100644 index 0000000..c7ff4a1 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java @@ -0,0 +1,31 @@ +package com.example.umc9th.domain.mission.controller; + +import com.example.umc9th.domain.mission.converter.MemberMissionConverter; +import com.example.umc9th.domain.mission.dto.MemberMissionResDTO; +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import com.example.umc9th.domain.mission.service.command.MemberMissionCommandService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.domain.mission.exception.code.MissionSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +public class MemberMissionController { + + private final MemberMissionCommandService memberMissionCommandService; + + @PostMapping("/members/{memberId}/missions/{missionId}") + public ApiResponse challengeMission( + @PathVariable Long memberId, + @PathVariable Long missionId + ) { + MemberMission memberMission = + memberMissionCommandService.challengeMission(memberId, missionId); + + return ApiResponse.onSuccess( + MissionSuccessCode.CHALLENGED, + MemberMissionConverter.toChallengeDTO(memberMission) + ); + } +} diff --git a/src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java b/src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java new file mode 100644 index 0000000..36c41b8 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java @@ -0,0 +1,22 @@ +package com.example.umc9th.domain.mission.converter; + +import com.example.umc9th.domain.mission.dto.MemberMissionResDTO; +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; + +public class MemberMissionConverter { + + // 미션 도전 후 DTO 변환 + public static MemberMissionResDTO.ChallengeDTO toChallengeDTO(MemberMission memberMission) { + return MemberMissionResDTO.ChallengeDTO.builder() + .memberMissionId(memberMission.getId()) + .missionId(memberMission.getMission().getId()) + .storeId(memberMission.getMission().getStore().getId()) + .storeName(memberMission.getMission().getStore().getName()) + .status(memberMission.getStatus()) + .deadline(memberMission.getMission().getDeadline()) + .point(memberMission.getMission().getPoint()) + .createdAt(memberMission.getCreatedAt()) + .build(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java new file mode 100644 index 0000000..4f0681a --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java @@ -0,0 +1,27 @@ +package com.example.umc9th.domain.mission.dto; + +import com.example.umc9th.domain.mission.enums.Status; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +public class MemberMissionResDTO { + + @Builder + @Getter + public static class ChallengeDTO { + private Long memberMissionId; + private Long missionId; + + private Long storeId; + private String storeName; + + private Status status; + private LocalDateTime deadline; + private Integer point; + + private LocalDateTime createdAt; + } + +} \ 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 b8cbe5f..8323107 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 @@ -3,6 +3,7 @@ import com.example.umc9th.domain.member.entity.Member; import com.example.umc9th.domain.mission.entity.Mission; import com.example.umc9th.domain.mission.enums.Status; +import com.example.umc9th.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; @@ -15,7 +16,7 @@ name = "member_mission", uniqueConstraints = @UniqueConstraint(columnNames = {"member_id", "mission_id"}) ) -public class MemberMission { +public class MemberMission extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/example/umc9th/domain/mission/exception/MemberMissionException.java b/src/main/java/com/example/umc9th/domain/mission/exception/MemberMissionException.java new file mode 100644 index 0000000..4166124 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/exception/MemberMissionException.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 MemberMissionException extends GeneralException { + public MemberMissionException(BaseErrorCode code) { + super(code); + } +} 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..f3ad4c3 --- /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); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/exception/code/MemberMissionErrorCode.java b/src/main/java/com/example/umc9th/domain/mission/exception/code/MemberMissionErrorCode.java new file mode 100644 index 0000000..1d97bbe --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/exception/code/MemberMissionErrorCode.java @@ -0,0 +1,20 @@ +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 MemberMissionErrorCode implements BaseErrorCode { + + ALREADY_CHALLENGED(HttpStatus.BAD_REQUEST, + "MEMBERMISSION400_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/MissionErrorCode.java b/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..0d38a45 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,22 @@ +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 { + + DEADLINE_EXPIRED(HttpStatus.BAD_REQUEST, + "MISSION400_2", + "이미 마감된 미션입니다."), + MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, + "MISSION404_2", + "미션을 찾을 수 없습니다."); + + 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..cf0004f --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java @@ -0,0 +1,17 @@ +package com.example.umc9th.domain.mission.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 MissionSuccessCode implements BaseSuccessCode { + + CHALLENGED(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 809d974..e622f12 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 @@ -21,4 +21,7 @@ default Page findOngoingMissionsByMemberId(Long memberId, Pageabl default Page findCompletedMissionsByMemberId(Long memberId, Pageable pageable) { return findByMember_IdAndStatusOrderByMission_DeadlineDesc(memberId, Status.COMPLETED, pageable); } + + // 이미 도전했는지 확인용 메서드 + boolean existsByMember_IdAndMission_Id(Long memberId, Long missionId); } diff --git a/src/main/java/com/example/umc9th/domain/mission/service/command/MemberMissionCommandService.java b/src/main/java/com/example/umc9th/domain/mission/service/command/MemberMissionCommandService.java new file mode 100644 index 0000000..4c1fa76 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/service/command/MemberMissionCommandService.java @@ -0,0 +1,56 @@ +package com.example.umc9th.domain.mission.service.command; + +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.entity.Mission; +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import com.example.umc9th.domain.mission.enums.Status; +import com.example.umc9th.domain.mission.exception.MemberMissionException; +import com.example.umc9th.domain.mission.exception.MissionException; +import com.example.umc9th.domain.mission.exception.code.MemberMissionErrorCode; +import com.example.umc9th.domain.mission.exception.code.MissionErrorCode; +import com.example.umc9th.domain.mission.repository.MemberMissionRepository; +import com.example.umc9th.domain.mission.repository.MissionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; + +@Service +@RequiredArgsConstructor +public class MemberMissionCommandService { + + private final MemberMissionRepository memberMissionRepository; + private final MissionRepository missionRepository; + private final MemberRepository memberRepository; + + @Transactional + public MemberMission challengeMission(Long memberId, Long missionId) { + + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + Mission mission = missionRepository.findById(missionId) + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); + + if (mission.getDeadline().isBefore(LocalDateTime.now())) { + throw new MissionException(MissionErrorCode.DEADLINE_EXPIRED); + } + + if (memberMissionRepository.existsByMember_IdAndMission_Id(memberId, missionId)) + throw new MemberMissionException(MemberMissionErrorCode.ALREADY_CHALLENGED); + + MemberMission memberMission = MemberMission.builder() + .member(member) + .mission(mission) + .status(Status.ONGOING) + .build(); + + return memberMissionRepository.save(memberMission); + } + + +} 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 49c7088..4db2ee7 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 @@ -1,39 +1,53 @@ package com.example.umc9th.domain.review.controller; - import com.example.umc9th.domain.review.converter.ReviewConverter; -import com.example.umc9th.domain.review.dto.ReviewResDto; +import com.example.umc9th.domain.review.dto.ReviewReqDTO; +import com.example.umc9th.domain.review.dto.ReviewResDTO; import com.example.umc9th.domain.review.entity.Review; -import com.example.umc9th.domain.review.service.ReviewQueryService; +import com.example.umc9th.domain.review.exception.code.ReviewSuccessCode; +import com.example.umc9th.domain.review.service.command.ReviewCommandService; +import com.example.umc9th.domain.review.service.query.ReviewQueryService; import com.example.umc9th.global.apiPayload.ApiResponse; import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; import com.example.umc9th.global.dto.PagedResponse; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor -@RequestMapping("/reviews") public class ReviewController { private final ReviewQueryService reviewQueryService; + private final ReviewCommandService reviewCommandService; - @GetMapping("/my") - public ApiResponse> getMyFilteredReviews( + // 내 리뷰 조회 + 필터링 + @GetMapping("/reviews/my") + public ApiResponse> getMyFilteredReviews( @RequestParam(required = false) Long memberId, @RequestParam(required = false) String storeName, @RequestParam(required = false) Integer star, Pageable pageable) { Page reviewPage = reviewQueryService.getMyFilteredReviews(memberId, storeName, star, pageable); - - PagedResponse response = ReviewConverter.toPagedMyReviewPreview(reviewPage); + PagedResponse response = ReviewConverter.toPagedMyReviewPreview(reviewPage); return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); } + + // 가게에 리뷰 추가하기 + @PostMapping("/stores/{storeId}/reviews") + public ApiResponse createReview( + @PathVariable Long storeId, + @RequestBody @Valid ReviewReqDTO.CreateDTO dto + ) { + Review review = reviewCommandService.createReview(dto, storeId); + + return ApiResponse.onSuccess( + ReviewSuccessCode.CREATED, + ReviewConverter.toCreateDTO(review) + ); + } } diff --git a/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java b/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java index 2f50f61..f9e3ebc 100644 --- a/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java +++ b/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java @@ -1,6 +1,6 @@ package com.example.umc9th.domain.review.converter; -import com.example.umc9th.domain.review.dto.ReviewResDto; +import com.example.umc9th.domain.review.dto.ReviewResDTO; import com.example.umc9th.domain.review.entity.Review; import com.example.umc9th.global.dto.PagedResponse; import org.springframework.data.domain.Page; @@ -11,8 +11,8 @@ public class ReviewConverter { // 개별 DTO 변환 - public static ReviewResDto.MyReviewPreview toMyReviewPreview(Review review) { - return ReviewResDto.MyReviewPreview.builder() + public static ReviewResDTO.MyReviewPreview toMyReviewPreview(Review review) { + return ReviewResDTO.MyReviewPreview.builder() .reviewId(review.getId()) .storeName(review.getStore().getName()) .star(review.getStar()) @@ -22,15 +22,15 @@ public static ReviewResDto.MyReviewPreview toMyReviewPreview(Review review) { } // List 변환 - public static List toMyReviewPreviewList(List reviews) { + public static List toMyReviewPreviewList(List reviews) { return reviews.stream() .map(ReviewConverter::toMyReviewPreview) .collect(Collectors.toList()); } // Page 변환 - public static PagedResponse toPagedMyReviewPreview(Page reviewPage) { - return PagedResponse.builder() + public static PagedResponse toPagedMyReviewPreview(Page reviewPage) { + return PagedResponse.builder() .content(reviewPage.getContent().stream() .map(ReviewConverter::toMyReviewPreview) .collect(Collectors.toList())) @@ -40,4 +40,14 @@ public static PagedResponse toPagedMyReviewPreview .totalPages(reviewPage.getTotalPages()) .build(); } + + // Review 엔티티를 리뷰 생성 응답 DTO로 변환하는 메서드 + public static ReviewResDTO.CreateDTO toCreateDTO(Review review) { + return ReviewResDTO.CreateDTO.builder() + .reviewId(review.getId()) + .storeId(review.getStore().getId()) + .storeName(review.getStore().getName()) + .createdAt(review.getCreatedAt()) + .build(); + } } diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewReqDTO.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewReqDTO.java new file mode 100644 index 0000000..8a2c088 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewReqDTO.java @@ -0,0 +1,22 @@ +package com.example.umc9th.domain.review.dto; + +import jakarta.validation.constraints.*; +import java.util.List; + +public class ReviewReqDTO { + + public record CreateDTO( + + @NotNull(message = "회원 ID는 필수입니다.") + Long memberId, + + @NotNull(message = "별점은 필수입니다.") + @DecimalMin(value = "0.5", message = "별점은 최소 0.5 이상이어야 합니다.") + @DecimalMax(value = "5.0", message = "별점은 최대 5.0 이하여야 합니다.") + Float star, + + @NotBlank(message = "리뷰 내용은 필수입니다.") + String content + + ) {} +} diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDto.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDTO.java similarity index 54% rename from src/main/java/com/example/umc9th/domain/review/dto/ReviewResDto.java rename to src/main/java/com/example/umc9th/domain/review/dto/ReviewResDTO.java index d00a80f..c08a9df 100644 --- a/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDto.java +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDTO.java @@ -5,15 +5,24 @@ import java.time.LocalDateTime; -public class ReviewResDto { +public class ReviewResDTO { @Builder @Getter - public static class MyReviewPreview{ + public static class MyReviewPreview { private Long reviewId; private String storeName; private String content; private Float star; private LocalDateTime createdAt; } -} + + @Builder + @Getter + public static class CreateDTO { + private Long reviewId; + private Long storeId; + private String storeName; + private LocalDateTime createdAt; + } +} \ No newline at end of file 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..f25653c --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java @@ -0,0 +1,18 @@ +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 { + + STORE_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_1", "가게를 찾을 수 없습니다."), + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_2", "회원을 찾을 수 없습니다."); + + 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/review/exception/code/ReviewSuccessCode.java b/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java new file mode 100644 index 0000000..8395a2a --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java @@ -0,0 +1,17 @@ +package com.example.umc9th.domain.review.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 ReviewSuccessCode implements BaseSuccessCode { + + CREATED(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/ReviewRepository.java b/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java index d14c043..6930142 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 @@ -18,4 +18,5 @@ public interface ReviewRepository extends JpaRepository, ReviewQue // 닉네임으로 리뷰 조회 (가게 관리자 페이지에서 검색 가능) List findByMember_NicknameAndDeletedAtIsNull(String nickname); + } diff --git a/src/main/java/com/example/umc9th/domain/review/service/command/ReviewCommandService.java b/src/main/java/com/example/umc9th/domain/review/service/command/ReviewCommandService.java new file mode 100644 index 0000000..105f4f5 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/service/command/ReviewCommandService.java @@ -0,0 +1,45 @@ +package com.example.umc9th.domain.review.service.command; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.domain.review.dto.ReviewReqDTO; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.exception.ReviewException; +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 jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import static com.example.umc9th.domain.review.exception.code.ReviewErrorCode.MEMBER_NOT_FOUND; +import static com.example.umc9th.domain.review.exception.code.ReviewErrorCode.STORE_NOT_FOUND; + +@Service +@RequiredArgsConstructor +public class ReviewCommandService { + + private final ReviewRepository reviewRepository; + private final StoreRepository storeRepository; + private final MemberRepository memberRepository; + + @Transactional + public Review createReview(ReviewReqDTO.CreateDTO dto, Long storeId) { + + Member member = memberRepository.findById(dto.memberId()) + .orElseThrow(() -> new ReviewException(MEMBER_NOT_FOUND)); + + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new ReviewException(STORE_NOT_FOUND)); + + Review review = Review.builder() + .member(member) + .store(store) + .star(dto.star()) + .content(dto.content()) + .build(); + + return reviewRepository.saveAndFlush(review); + } + +} diff --git a/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java b/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryService.java similarity index 96% rename from src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java rename to src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryService.java index 6af29d8..5789297 100644 --- a/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java +++ b/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryService.java @@ -1,4 +1,4 @@ -package com.example.umc9th.domain.review.service; +package com.example.umc9th.domain.review.service.query; import com.example.umc9th.domain.review.entity.QReview; import com.example.umc9th.domain.review.entity.Review; 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..5bda511 --- /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; + +@Repository +public interface StoreRepository extends JpaRepository { +} From 2ef53fa3715ce170f791a938d29a1ebb7677e591 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Sat, 29 Nov 2025 23:30:51 +0900 Subject: [PATCH 11/14] =?UTF-8?q?Feat:=20=EA=B0=80=EA=B2=8C=EC=9D=98=20?= =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EB=AA=A9=EB=A1=9D=20&=20=EB=82=B4?= =?UTF-8?q?=EA=B0=80=20=EC=9E=91=EC=84=B1=ED=95=9C=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ReviewController.java | 34 ++++---- .../controller/ReviewControllerDocs.java | 36 ++++++++ .../review/converter/ReviewConverter.java | 57 ++++++------- .../domain/review/dto/ReviewResDTO.java | 21 +++++ .../exception/code/ReviewErrorCode.java | 5 +- .../exception/code/ReviewSuccessCode.java | 8 +- .../review/repository/ReviewRepository.java | 4 + .../service/command/ReviewCommandService.java | 17 ++-- .../service/query/ReviewQueryService.java | 48 +---------- .../service/query/ReviewQueryServiceImpl.java | 84 +++++++++++++++++++ .../umc9th/global/annotation/ValidPage.java | 17 ++++ .../apiPayload/code/GeneralErrorCode.java | 6 +- .../exception/PageNumberException.java | 8 ++ .../handler/GeneralExceptionAdvice.java | 10 +++ .../global/validator/FoodExistValidator.java | 1 - .../global/validator/ValidPageValidator.java | 25 ++++++ 16 files changed, 279 insertions(+), 102 deletions(-) create mode 100644 src/main/java/com/example/umc9th/domain/review/controller/ReviewControllerDocs.java create mode 100644 src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryServiceImpl.java create mode 100644 src/main/java/com/example/umc9th/global/annotation/ValidPage.java create mode 100644 src/main/java/com/example/umc9th/global/apiPayload/exception/PageNumberException.java create mode 100644 src/main/java/com/example/umc9th/global/validator/ValidPageValidator.java 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 4db2ee7..b1cdee4 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 @@ -7,36 +7,32 @@ import com.example.umc9th.domain.review.exception.code.ReviewSuccessCode; import com.example.umc9th.domain.review.service.command.ReviewCommandService; import com.example.umc9th.domain.review.service.query.ReviewQueryService; +import com.example.umc9th.global.annotation.ValidPage; import com.example.umc9th.global.apiPayload.ApiResponse; -import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; -import com.example.umc9th.global.dto.PagedResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor -public class ReviewController { +public class ReviewController implements ReviewControllerDocs{ private final ReviewQueryService reviewQueryService; private final ReviewCommandService reviewCommandService; - // 내 리뷰 조회 + 필터링 + // 내 리뷰 조회 + 필터링 (페이징) @GetMapping("/reviews/my") - public ApiResponse> getMyFilteredReviews( - @RequestParam(required = false) Long memberId, + public ApiResponse getMyReviews( + @RequestParam Long memberId, @RequestParam(required = false) String storeName, @RequestParam(required = false) Integer star, - Pageable pageable) { - - Page reviewPage = reviewQueryService.getMyFilteredReviews(memberId, storeName, star, pageable); - PagedResponse response = ReviewConverter.toPagedMyReviewPreview(reviewPage); - - return ApiResponse.onSuccess(GeneralSuccessCode.OK, response); + @RequestParam @ValidPage Integer page + ) { + ReviewSuccessCode code = ReviewSuccessCode.REVIEW_LIST_OK; + return ApiResponse.onSuccess(code, reviewQueryService.findMyReviews(memberId, storeName, star, page)); } + // 가게에 리뷰 추가하기 @PostMapping("/stores/{storeId}/reviews") public ApiResponse createReview( @@ -50,4 +46,14 @@ public ApiResponse createReview( ReviewConverter.toCreateDTO(review) ); } + + // 가게의 리뷰 목록 조회 + @GetMapping("/reviews") + public ApiResponse getReviews( + @RequestParam String storeName, + @RequestParam @ValidPage Integer page + ){ + ReviewSuccessCode code = ReviewSuccessCode.REVIEW_LIST_OK; + return ApiResponse.onSuccess(code, reviewQueryService.findReview(storeName, page)); + } } diff --git a/src/main/java/com/example/umc9th/domain/review/controller/ReviewControllerDocs.java b/src/main/java/com/example/umc9th/domain/review/controller/ReviewControllerDocs.java new file mode 100644 index 0000000..103a6f8 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/controller/ReviewControllerDocs.java @@ -0,0 +1,36 @@ +package com.example.umc9th.domain.review.controller; + +import com.example.umc9th.domain.review.dto.ReviewResDTO; +import com.example.umc9th.global.annotation.ValidPage; +import com.example.umc9th.global.apiPayload.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import org.springframework.web.bind.annotation.RequestParam; + +public interface ReviewControllerDocs { + + @Operation( + summary = "가게의 리뷰 목록 조회 API By 비비 (개발 중)", + description = "특정 가게의 리뷰를 모두 조회합니다. 페이지네이션으로 제공합니다." + ) + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") + }) + ApiResponse getReviews( + @RequestParam String storeName, + @RequestParam @ValidPage Integer page + ); + + @Operation(summary = "내 리뷰 조회", description = "특정 회원의 리뷰를 페이지네이션으로 조회합니다.") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") + }) + ApiResponse getMyReviews( + @RequestParam Long memberId, + @RequestParam(required = false) String storeName, + @RequestParam(required = false) Integer star, + @RequestParam @ValidPage Integer page + ); +} diff --git a/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java b/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java index f9e3ebc..7078cf1 100644 --- a/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java +++ b/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java @@ -2,51 +2,44 @@ import com.example.umc9th.domain.review.dto.ReviewResDTO; import com.example.umc9th.domain.review.entity.Review; -import com.example.umc9th.global.dto.PagedResponse; import org.springframework.data.domain.Page; -import java.util.List; -import java.util.stream.Collectors; - public class ReviewConverter { - // 개별 DTO 변환 - public static ReviewResDTO.MyReviewPreview toMyReviewPreview(Review review) { - return ReviewResDTO.MyReviewPreview.builder() + // Review 엔티티를 리뷰 생성 응답 DTO로 변환하는 메서드 + public static ReviewResDTO.CreateDTO toCreateDTO(Review review) { + return ReviewResDTO.CreateDTO.builder() .reviewId(review.getId()) + .storeId(review.getStore().getId()) .storeName(review.getStore().getName()) - .star(review.getStar()) - .content(review.getContent()) .createdAt(review.getCreatedAt()) .build(); } - // List 변환 - public static List toMyReviewPreviewList(List reviews) { - return reviews.stream() - .map(ReviewConverter::toMyReviewPreview) - .collect(Collectors.toList()); - } - - // Page 변환 - public static PagedResponse toPagedMyReviewPreview(Page reviewPage) { - return PagedResponse.builder() - .content(reviewPage.getContent().stream() - .map(ReviewConverter::toMyReviewPreview) - .collect(Collectors.toList())) - .page(reviewPage.getNumber()) - .size(reviewPage.getSize()) - .totalElements(reviewPage.getTotalElements()) - .totalPages(reviewPage.getTotalPages()) + // result -> DTO + public static ReviewResDTO.ReviewPreViewListDTO toReviewPreviewListDTO( + Page result + ){ + return ReviewResDTO.ReviewPreViewListDTO.builder() + .reviewList(result.getContent().stream() + .map(ReviewConverter::toReviewPreviewDTO) + .toList() + ) + .listSize(result.getNumberOfElements()) + .totalPage(result.getTotalPages()) + .totalElements(result.getTotalElements()) + .isFirst(result.isFirst()) + .isLast(result.isLast()) .build(); } - // Review 엔티티를 리뷰 생성 응답 DTO로 변환하는 메서드 - public static ReviewResDTO.CreateDTO toCreateDTO(Review review) { - return ReviewResDTO.CreateDTO.builder() - .reviewId(review.getId()) - .storeId(review.getStore().getId()) - .storeName(review.getStore().getName()) + public static ReviewResDTO.ReviewPreViewDTO toReviewPreviewDTO( + Review review + ){ + return ReviewResDTO.ReviewPreViewDTO.builder() + .memberNickname(review.getMember().getNickname()) + .star(review.getStar()) + .content(review.getContent()) .createdAt(review.getCreatedAt()) .build(); } diff --git a/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDTO.java b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDTO.java index c08a9df..9fa994b 100644 --- a/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDTO.java +++ b/src/main/java/com/example/umc9th/domain/review/dto/ReviewResDTO.java @@ -1,9 +1,12 @@ package com.example.umc9th.domain.review.dto; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import java.time.LocalDateTime; +import java.util.List; public class ReviewResDTO { @@ -25,4 +28,22 @@ public static class CreateDTO { private String storeName; private LocalDateTime createdAt; } + + @Builder + public record ReviewPreViewListDTO( + List reviewList, + Integer listSize, + Integer totalPage, + Long totalElements, + Boolean isFirst, + Boolean isLast + ){} + + @Builder + public record ReviewPreViewDTO( + String memberNickname, + Float star, + String content, + LocalDateTime createdAt + ){} } \ No newline at end of file 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 index f25653c..6bc9863 100644 --- 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 @@ -9,8 +9,9 @@ @AllArgsConstructor public enum ReviewErrorCode implements BaseErrorCode { - STORE_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_1", "가게를 찾을 수 없습니다."), - MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_2", "회원을 찾을 수 없습니다."); + REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, + "REVIEW404_1", + "해당 리뷰를 찾을 수 없습니다."); private final HttpStatus status; private final String code; 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 index 8395a2a..ee2ac65 100644 --- 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 @@ -9,7 +9,13 @@ @AllArgsConstructor public enum ReviewSuccessCode implements BaseSuccessCode { - CREATED(HttpStatus.CREATED, "REVIEW201_1", "리뷰가 성공적으로 등록되었습니다."); + REVIEW_LIST_OK(HttpStatus.OK, + "REVIEW200_1", + "리뷰 목록 조회 성공"), + CREATED(HttpStatus.CREATED, + "REVIEW201_1", + "리뷰가 성공적으로 등록되었습니다."), + ; private final HttpStatus status; private final String code; 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 6930142..9cffc60 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 @@ -4,6 +4,8 @@ import com.example.umc9th.domain.review.entity.Review; import com.example.umc9th.domain.review.repository.querydsl.ReviewQueryDsl; import com.example.umc9th.domain.store.entity.Store; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; @@ -19,4 +21,6 @@ public interface ReviewRepository extends JpaRepository, ReviewQue // 닉네임으로 리뷰 조회 (가게 관리자 페이지에서 검색 가능) List findByMember_NicknameAndDeletedAtIsNull(String nickname); + // 가게 리뷰 페이징 조회 + Page findAllByStoreAndDeletedAtIsNull(Store store, Pageable pageable); } diff --git a/src/main/java/com/example/umc9th/domain/review/service/command/ReviewCommandService.java b/src/main/java/com/example/umc9th/domain/review/service/command/ReviewCommandService.java index 105f4f5..e69b911 100644 --- a/src/main/java/com/example/umc9th/domain/review/service/command/ReviewCommandService.java +++ b/src/main/java/com/example/umc9th/domain/review/service/command/ReviewCommandService.java @@ -1,19 +1,21 @@ package com.example.umc9th.domain.review.service.command; import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.exception.MemberException; import com.example.umc9th.domain.member.repository.MemberRepository; import com.example.umc9th.domain.review.dto.ReviewReqDTO; import com.example.umc9th.domain.review.entity.Review; -import com.example.umc9th.domain.review.exception.ReviewException; 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.repository.StoreRepository; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import static com.example.umc9th.domain.review.exception.code.ReviewErrorCode.MEMBER_NOT_FOUND; -import static com.example.umc9th.domain.review.exception.code.ReviewErrorCode.STORE_NOT_FOUND; +import static com.example.umc9th.domain.member.exception.code.MemberErrorCode.MEMBER_NOT_FOUND; +import static com.example.umc9th.domain.store.exception.code.StoreErrorCode.NOT_FOUND; + @Service @RequiredArgsConstructor @@ -26,12 +28,15 @@ public class ReviewCommandService { @Transactional public Review createReview(ReviewReqDTO.CreateDTO dto, Long storeId) { + // 회원 검증 Member member = memberRepository.findById(dto.memberId()) - .orElseThrow(() -> new ReviewException(MEMBER_NOT_FOUND)); + .orElseThrow(() -> new MemberException(MEMBER_NOT_FOUND)); + // 가게 검증 Store store = storeRepository.findById(storeId) - .orElseThrow(() -> new ReviewException(STORE_NOT_FOUND)); + .orElseThrow(() -> new StoreException(NOT_FOUND)); + // 리뷰 생성 Review review = Review.builder() .member(member) .store(store) @@ -41,5 +46,5 @@ public Review createReview(ReviewReqDTO.CreateDTO dto, Long storeId) { return reviewRepository.saveAndFlush(review); } - } + diff --git a/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryService.java b/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryService.java index 5789297..9e4ba6f 100644 --- a/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryService.java +++ b/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryService.java @@ -1,49 +1,9 @@ package com.example.umc9th.domain.review.service.query; -import com.example.umc9th.domain.review.entity.QReview; -import com.example.umc9th.domain.review.entity.Review; -import com.example.umc9th.domain.review.repository.ReviewRepository; -import com.querydsl.core.BooleanBuilder; -import com.querydsl.core.types.Predicate; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; +import com.example.umc9th.domain.review.dto.ReviewResDTO; -@Service -@RequiredArgsConstructor -public class ReviewQueryService { +public interface ReviewQueryService { + ReviewResDTO.ReviewPreViewListDTO findMyReviews(Long memberId, String storeName, Integer star, Integer page); - private final ReviewRepository reviewRepository; - - public Page getMyFilteredReviews(Long memberId, String storeName, Integer star, Pageable pageable) { - // Q클래스 정의 - QReview review = QReview.review; - // BooleanBuilder 정의 - BooleanBuilder builder = new BooleanBuilder(); - - // 동적 쿼리: 검색 조건 - if (memberId != null) { - builder.and(review.member.id.eq(memberId)); - } - - if (storeName != null && !storeName.isEmpty()) { - builder.and(review.store.name.containsIgnoreCase(storeName)); - } - - if (star != null) { - if (star == 5) { - builder.and(review.star.eq(5.0f)); - } else { - float min = star.floatValue(); - float max = star + 0.9f; - builder.and(review.star.between(min, max)); - } - } - - builder.and(review.deletedAt.isNull()); - Predicate predicate = builder; - - return reviewRepository.searchReviews(predicate, pageable); - } + ReviewResDTO.ReviewPreViewListDTO findReview(String storeName, Integer page); } diff --git a/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryServiceImpl.java new file mode 100644 index 0000000..f99523d --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/review/service/query/ReviewQueryServiceImpl.java @@ -0,0 +1,84 @@ +package com.example.umc9th.domain.review.service.query; + +import com.example.umc9th.domain.review.converter.ReviewConverter; +import com.example.umc9th.domain.review.dto.ReviewResDTO; +import com.example.umc9th.domain.review.entity.QReview; +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.exception.StoreException; +import com.example.umc9th.domain.store.exception.code.StoreErrorCode; +import com.example.umc9th.domain.store.repository.StoreRepository; +import com.querydsl.core.BooleanBuilder; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ReviewQueryServiceImpl implements ReviewQueryService{ + + private final ReviewRepository reviewRepository; + private final StoreRepository storeRepository; + + @Override + public ReviewResDTO.ReviewPreViewListDTO findMyReviews( + Long memberId, + String storeName, + Integer star, + Integer page + ) { + PageRequest pageRequest = PageRequest.of(page - 1, 10); + + QReview review = QReview.review; + BooleanBuilder builder = new BooleanBuilder(); + + // 필수: memberId + builder.and(review.member.id.eq(memberId)); + + // optional: storeName + if (storeName != null && !storeName.isEmpty()) { + builder.and(review.store.name.containsIgnoreCase(storeName)); + } + + // optional: star + if (star != null) { + if (star == 5) { + builder.and(review.star.eq(5.0f)); + } else { + float min = star.floatValue(); + float max = star + 0.9f; + builder.and(review.star.between(min, max)); + } + } + + // 삭제된 리뷰 제외 + builder.and(review.deletedAt.isNull()); + + // 검색 수행 + Page result = reviewRepository.searchReviews(builder, pageRequest); + + // DTO 변환 + return ReviewConverter.toReviewPreviewListDTO(result); + } + + + @Override + public ReviewResDTO.ReviewPreViewListDTO findReview( + String storeName, + Integer page + ){ + // - 가게를 가져온다 (가게 존재 여부 검증) + Store store = storeRepository.findByName(storeName) + // - 없으면 예외 터뜨린다 + .orElseThrow(() -> new StoreException(StoreErrorCode.NOT_FOUND)); + + //- 가게에 맞는 리뷰를 가져온다 (Offset 페이징) + PageRequest pageRequest = PageRequest.of(page -1, 10); + Page result = reviewRepository.findAllByStoreAndDeletedAtIsNull(store, pageRequest); + + //- 결과를 응답 DTO로 변환한다 (컨버터 이용) + return ReviewConverter.toReviewPreviewListDTO(result); + } +} diff --git a/src/main/java/com/example/umc9th/global/annotation/ValidPage.java b/src/main/java/com/example/umc9th/global/annotation/ValidPage.java new file mode 100644 index 0000000..ca7f67a --- /dev/null +++ b/src/main/java/com/example/umc9th/global/annotation/ValidPage.java @@ -0,0 +1,17 @@ +package com.example.umc9th.global.annotation; + +import com.example.umc9th.global.validator.ValidPageValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = ValidPageValidator.class) +@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ValidPage { + String message() default "유효하지 않은 페이지 번호입니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} 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 index 541ea44..6222e7f 100644 --- a/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java +++ b/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java @@ -25,8 +25,10 @@ public enum GeneralErrorCode implements BaseErrorCode { "예기치 않은 서버 에러가 발생했습니다."), VALID_FAIL(HttpStatus.BAD_REQUEST, "COMMON400_2", - "유효성 검사에 실패했습니다."), - ; + "유효성 검사에 실패했습니다."), + INVALID_REQUEST(HttpStatus.BAD_REQUEST, + "COMMON400_3", + "잘못된 페이지 번호 요청입니다."); private final HttpStatus status; private final String code; diff --git a/src/main/java/com/example/umc9th/global/apiPayload/exception/PageNumberException.java b/src/main/java/com/example/umc9th/global/apiPayload/exception/PageNumberException.java new file mode 100644 index 0000000..87d0119 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/apiPayload/exception/PageNumberException.java @@ -0,0 +1,8 @@ +package com.example.umc9th.global.apiPayload.exception; + +public class PageNumberException extends RuntimeException { + + public PageNumberException(String message) { + super(message); + } +} \ No newline at end of file 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 621ada6..77fa459 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 @@ -4,6 +4,7 @@ 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 com.example.umc9th.global.apiPayload.exception.PageNumberException; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -47,4 +48,13 @@ protected ResponseEntity>> handleMethodArgumentN // 에러 코드, 메시지와 함께 errors를 반환 return ResponseEntity.status(code.getStatus()).body(errorResponse); } + + // 페이지 번호 검증 예외 처리 + @ExceptionHandler(PageNumberException.class) + public ResponseEntity> handlePageNumberException(PageNumberException ex) { + GeneralErrorCode code = GeneralErrorCode.INVALID_REQUEST; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure(code, ex.getMessage())); + } + } diff --git a/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java b/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java index 0e3abbf..b476509 100644 --- a/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java +++ b/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java @@ -22,7 +22,6 @@ public boolean isValid(List values, ConstraintValidatorContext context) { .allMatch(foodRepository::existsById); if (!isValid) { - // 이 부분에서 아까 디폴트 메시지를 초기화 시키고, 새로운 메시지로 덮어씌우게 됩니다. context.disableDefaultConstraintViolation(); context.buildConstraintViolationWithTemplate(FoodErrorCode.NOT_FOUND.getMessage()).addConstraintViolation(); } diff --git a/src/main/java/com/example/umc9th/global/validator/ValidPageValidator.java b/src/main/java/com/example/umc9th/global/validator/ValidPageValidator.java new file mode 100644 index 0000000..9b29554 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/validator/ValidPageValidator.java @@ -0,0 +1,25 @@ +package com.example.umc9th.global.validator; + +import com.example.umc9th.global.annotation.ValidPage; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.springframework.stereotype.Component; + +@Component +public class ValidPageValidator implements ConstraintValidator { + + @Override + public boolean isValid(Integer value, ConstraintValidatorContext context) { + boolean isValid = value != null && value >= 1; + + if (!isValid) { + // 디폴트 메시지 비활성화 + context.disableDefaultConstraintViolation(); + // 새로운 메시지로 덮어쓰기 + context.buildConstraintViolationWithTemplate("페이지 번호는 1 이상이어야 합니다.") + .addConstraintViolation(); + } + + return isValid; + } +} \ No newline at end of file From 08ab5cad5a555c6fff36e11ad7c4bb0011a8d1f2 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Sat, 29 Nov 2025 23:33:01 +0900 Subject: [PATCH 12/14] =?UTF-8?q?Feat:=20=ED=8A=B9=EC=A0=95=20=EA=B0=80?= =?UTF-8?q?=EA=B2=8C=EC=9D=98=20=EB=AF=B8=EC=85=98=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/controller/MissionController.java | 40 +++++++++++++++++++ .../controller/MissionControllerDocs.java | 24 +++++++++++ .../mission/converter/MissionConverter.java | 34 ++++++++++++++++ .../domain/mission/dto/MissionResDTO.java | 31 ++++++++++++++ .../exception/code/MissionSuccessCode.java | 3 +- .../mission/repository/MissionRepository.java | 5 +++ .../service/query/MissionQueryService.java | 8 ++++ .../query/MissionQueryServiceImpl.java | 30 ++++++++++++++ .../store/exception/StoreException.java | 10 +++++ .../store/exception/code/StoreErrorCode.java | 19 +++++++++ .../exception/code/StoreSuccessCode.java | 19 +++++++++ .../store/repository/StoreRepository.java | 5 +++ 12 files changed, 227 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/controller/MissionControllerDocs.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/dto/MissionResDTO.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryService.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryServiceImpl.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 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..1eeef77 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java @@ -0,0 +1,40 @@ +package com.example.umc9th.domain.mission.controller; + +import com.example.umc9th.domain.mission.dto.MissionResDTO; +import com.example.umc9th.domain.mission.exception.code.MissionSuccessCode; +import com.example.umc9th.domain.mission.service.query.MissionQueryService; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.domain.store.repository.StoreRepository; +import com.example.umc9th.domain.store.exception.StoreException; +import com.example.umc9th.domain.store.exception.code.StoreErrorCode; +import com.example.umc9th.global.annotation.ValidPage; +import com.example.umc9th.global.apiPayload.ApiResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +public class MissionController implements MissionControllerDocs { + + private final MissionQueryService missionQueryService; + private final StoreRepository storeRepository; + + @GetMapping("/missions") + public ApiResponse getMissionsByStore( + @RequestParam String storeName, + @RequestParam @ValidPage Integer page + ) { + // store 존재 여부 확인 + Store store = storeRepository.findByName(storeName) + .orElseThrow(() -> new StoreException(StoreErrorCode.NOT_FOUND)); + + // DTO 변환 + 성공 코드 포함 + return ApiResponse.onSuccess( + MissionSuccessCode.MISSION_LIST_OK, + missionQueryService.findMissionsByStore(store, page) + ); + } +} + diff --git a/src/main/java/com/example/umc9th/domain/mission/controller/MissionControllerDocs.java b/src/main/java/com/example/umc9th/domain/mission/controller/MissionControllerDocs.java new file mode 100644 index 0000000..c7e7222 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/controller/MissionControllerDocs.java @@ -0,0 +1,24 @@ +package com.example.umc9th.domain.mission.controller; + +import com.example.umc9th.domain.mission.dto.MissionResDTO; +import com.example.umc9th.global.annotation.ValidPage; +import com.example.umc9th.global.apiPayload.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import org.springframework.web.bind.annotation.RequestParam; + +public interface MissionControllerDocs { + + @Operation( + summary = "특정 가게 미션 목록 조회", + description = "특정 가게에 속한 미션 목록을 페이지네이션으로 조회합니다." + ) + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") + }) + ApiResponse getMissionsByStore( + @RequestParam String storeName, + @RequestParam @ValidPage Integer page + ); +} diff --git a/src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java b/src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java new file mode 100644 index 0000000..fe23a29 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java @@ -0,0 +1,34 @@ +package com.example.umc9th.domain.mission.converter; + +import com.example.umc9th.domain.mission.dto.MissionResDTO; +import com.example.umc9th.domain.mission.entity.Mission; +import org.springframework.data.domain.Page; + +public class MissionConverter { + + public static MissionResDTO.MissionPreviewListDTO toMissionPreviewListDTO(Page page) { + return MissionResDTO.MissionPreviewListDTO.builder() + .missionList( + page.getContent().stream() + .map(MissionConverter::toMissionPreviewDTO) + .toList() + ) + .listSize(page.getSize()) + .totalPage(page.getTotalPages()) + .totalElements(page.getTotalElements()) + .isFirst(page.isFirst()) + .isLast(page.isLast()) + .build(); + } + + public static MissionResDTO.MissionPreviewDTO toMissionPreviewDTO(Mission mission) { + return MissionResDTO.MissionPreviewDTO.builder() + .missionId(mission.getId()) + .storeName(mission.getStore().getName()) + .conditional(mission.getConditional()) + .point(mission.getPoint()) + .deadline(mission.getDeadline()) + .build(); + } +} + diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/MissionResDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/MissionResDTO.java new file mode 100644 index 0000000..77e5486 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/dto/MissionResDTO.java @@ -0,0 +1,31 @@ +package com.example.umc9th.domain.mission.dto; + +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; +import java.util.List; + +public class MissionResDTO { + + @Getter + @Builder + public static class MissionPreviewDTO { + private Long missionId; + private String storeName; + private String conditional; + private Integer point; + private LocalDateTime deadline; + } + + @Getter + @Builder + public static class MissionPreviewListDTO { + private List missionList; + private int listSize; + private int totalPage; + private long totalElements; + private boolean isFirst; + private boolean isLast; + } +} \ No newline at end of file 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 index cf0004f..9493b7b 100644 --- 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 @@ -9,9 +9,10 @@ @AllArgsConstructor public enum MissionSuccessCode implements BaseSuccessCode { + MISSION_LIST_OK(HttpStatus.OK, "MISSION200_1", "가게 미션 목록 조회 성공"), CHALLENGED(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/MissionRepository.java b/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java index 3addc8b..cdc7b83 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 @@ -2,6 +2,7 @@ import com.example.umc9th.domain.member.enums.Address; import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.domain.store.entity.Store; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.EntityGraph; @@ -46,4 +47,8 @@ Page findAvailableMissionsByLocationExcludingMemberCompleted( @Param("now") LocalDateTime now, Pageable pageable ); + + @EntityGraph(attributePaths = {"store"}) + Page findAllByStore(Store store, Pageable pageable); + } diff --git a/src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryService.java b/src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryService.java new file mode 100644 index 0000000..be5f8fe --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryService.java @@ -0,0 +1,8 @@ +package com.example.umc9th.domain.mission.service.query; + +import com.example.umc9th.domain.mission.dto.MissionResDTO; +import com.example.umc9th.domain.store.entity.Store; + +public interface MissionQueryService { + MissionResDTO.MissionPreviewListDTO findMissionsByStore(Store store, int page); +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryServiceImpl.java new file mode 100644 index 0000000..21c0608 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/service/query/MissionQueryServiceImpl.java @@ -0,0 +1,30 @@ +package com.example.umc9th.domain.mission.service.query; + +import com.example.umc9th.domain.mission.converter.MissionConverter; +import com.example.umc9th.domain.mission.dto.MissionResDTO; +import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.domain.mission.repository.MissionRepository; +import com.example.umc9th.domain.store.entity.Store; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MissionQueryServiceImpl implements MissionQueryService { + + private final MissionRepository missionRepository; + + @Override + public MissionResDTO.MissionPreviewListDTO findMissionsByStore(Store store, int page) { + // page 1 이상 보장, 한 페이지 10개 + PageRequest pageRequest = PageRequest.of(page - 1, 10); + + // Mission 목록 조회 + Page result = missionRepository.findAllByStore(store, pageRequest); + + // DTO 변환 + return MissionConverter.toMissionPreviewListDTO(result); + } +} 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..13de034 --- /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..4ef4c78 --- /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.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +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..b7df137 --- /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.BaseSuccessCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum StoreSuccessCode implements BaseSuccessCode { + + STORE_FOUND(HttpStatus.OK, + "STORE200_1", + "가게 정보 조회 성공."); + + private final HttpStatus status; + private final String code; + private final String message; +} 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 index 5bda511..c447562 100644 --- a/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java +++ b/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java @@ -4,6 +4,11 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository public interface StoreRepository extends JpaRepository { + + // 가게 존재 여부 확인 + Optional findByName(String name); } From acd7bd984d311ce9a676fef4b4e7b043ca747549 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Sat, 29 Nov 2025 23:35:01 +0900 Subject: [PATCH 13/14] =?UTF-8?q?Feat:=20=EB=82=B4=EA=B0=80=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=20=EC=A4=91=EC=9D=B8=20=EB=AF=B8=EC=85=98=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MemberMissionController.java | 19 +++++++++++++- .../MemberMissionControllerDocs.java | 25 +++++++++++++++++++ .../converter/MemberMissionConverter.java | 16 ++++++++++++ .../mission/dto/MemberMissionResDTO.java | 11 ++++++++ .../repository/MemberMissionRepository.java | 6 ++--- .../query/MemberMissionQueryService.java | 10 ++++++++ .../query/MemberMissionQueryServiceImpl.java | 22 ++++++++++++++++ 7 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionControllerDocs.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryService.java create mode 100644 src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryServiceImpl.java diff --git a/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java b/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java index c7ff4a1..5a2b7d2 100644 --- a/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java +++ b/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionController.java @@ -4,6 +4,8 @@ import com.example.umc9th.domain.mission.dto.MemberMissionResDTO; import com.example.umc9th.domain.mission.entity.mapping.MemberMission; import com.example.umc9th.domain.mission.service.command.MemberMissionCommandService; +import com.example.umc9th.domain.mission.service.query.MemberMissionQueryService; +import com.example.umc9th.global.annotation.ValidPage; import com.example.umc9th.global.apiPayload.ApiResponse; import com.example.umc9th.domain.mission.exception.code.MissionSuccessCode; import lombok.RequiredArgsConstructor; @@ -11,9 +13,10 @@ @RestController @RequiredArgsConstructor -public class MemberMissionController { +public class MemberMissionController implements MemberMissionControllerDocs{ private final MemberMissionCommandService memberMissionCommandService; + private final MemberMissionQueryService memberMissionQueryService; @PostMapping("/members/{memberId}/missions/{missionId}") public ApiResponse challengeMission( @@ -28,4 +31,18 @@ public ApiResponse challengeMission( MemberMissionConverter.toChallengeDTO(memberMission) ); } + + // 진행 중인 미션 목록 조회 API + @GetMapping("/members/{memberId}/missions/ongoing") + public ApiResponse getOngoingMissions( + @PathVariable Long memberId, + @RequestParam @ValidPage Integer page + ) { + return ApiResponse.onSuccess( + MissionSuccessCode.MISSION_LIST_OK, + MemberMissionConverter.toChallengeListDTO( + memberMissionQueryService.findOngoingMissions(memberId, page) + ) + ); + } } diff --git a/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionControllerDocs.java b/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionControllerDocs.java new file mode 100644 index 0000000..3262600 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/controller/MemberMissionControllerDocs.java @@ -0,0 +1,25 @@ +package com.example.umc9th.domain.mission.controller; + +import com.example.umc9th.domain.mission.dto.MemberMissionResDTO; +import com.example.umc9th.global.annotation.ValidPage; +import com.example.umc9th.global.apiPayload.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; + +public interface MemberMissionControllerDocs { + + @Operation( + summary = "진행중인 미션 목록 조회", + description = "회원이 진행 중인 미션을 페이지네이션으로 조회합니다." + ) + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") + }) + ApiResponse getOngoingMissions( + @PathVariable Long memberId, + @RequestParam @ValidPage Integer page + ); +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java b/src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java index 36c41b8..0bda5c4 100644 --- a/src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java +++ b/src/main/java/com/example/umc9th/domain/mission/converter/MemberMissionConverter.java @@ -2,6 +2,9 @@ import com.example.umc9th.domain.mission.dto.MemberMissionResDTO; import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import org.springframework.data.domain.Page; + +import java.util.stream.Collectors; public class MemberMissionConverter { @@ -19,4 +22,17 @@ public static MemberMissionResDTO.ChallengeDTO toChallengeDTO(MemberMission memb .build(); } + // 진행중 미션 목록 DTO 변환 + public static MemberMissionResDTO.ChallengeListDTO toChallengeListDTO(Page page) { + return MemberMissionResDTO.ChallengeListDTO.builder() + .missionList(page.getContent().stream() + .map(MemberMissionConverter::toChallengeDTO) + .collect(Collectors.toList())) + .listSize(page.getSize()) + .totalPage(page.getTotalPages()) + .totalElements(page.getTotalElements()) + .isFirst(page.isFirst()) + .isLast(page.isLast()) + .build(); + } } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java b/src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java index 4f0681a..9e8bb5e 100644 --- a/src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java +++ b/src/main/java/com/example/umc9th/domain/mission/dto/MemberMissionResDTO.java @@ -5,6 +5,7 @@ import lombok.Getter; import java.time.LocalDateTime; +import java.util.List; public class MemberMissionResDTO { @@ -24,4 +25,14 @@ public static class ChallengeDTO { private LocalDateTime createdAt; } + @Builder + @Getter + public static class ChallengeListDTO { + private List missionList; + private int listSize; + private int totalPage; + private long totalElements; + private boolean isFirst; + private boolean isLast; + } } \ 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 e622f12..f70fa5d 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 @@ -11,15 +11,15 @@ public interface MemberMissionRepository extends JpaRepository findByMember_IdAndStatusOrderByMission_DeadlineDesc(Long memberId, Status status, Pageable pageable); + Page findByMember_IdAndStatusOrderByMission_DeadlineAsc(Long memberId, Status status, Pageable pageable); // 진행중(ONGOING) / 완료(COMPLETED) 조회 default Page findOngoingMissionsByMemberId(Long memberId, Pageable pageable) { - return findByMember_IdAndStatusOrderByMission_DeadlineDesc(memberId, Status.ONGOING, pageable); + return findByMember_IdAndStatusOrderByMission_DeadlineAsc(memberId, Status.ONGOING, pageable); } default Page findCompletedMissionsByMemberId(Long memberId, Pageable pageable) { - return findByMember_IdAndStatusOrderByMission_DeadlineDesc(memberId, Status.COMPLETED, pageable); + return findByMember_IdAndStatusOrderByMission_DeadlineAsc(memberId, Status.COMPLETED, pageable); } // 이미 도전했는지 확인용 메서드 diff --git a/src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryService.java b/src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryService.java new file mode 100644 index 0000000..f9d7647 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryService.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.mission.service.query; + +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import org.springframework.data.domain.Page; + +public interface MemberMissionQueryService { + + // 진행중인 미션 조회 + Page findOngoingMissions(Long memberId, Integer page); +} diff --git a/src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryServiceImpl.java new file mode 100644 index 0000000..4d46c69 --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/mission/service/query/MemberMissionQueryServiceImpl.java @@ -0,0 +1,22 @@ +package com.example.umc9th.domain.mission.service.query; + +import com.example.umc9th.domain.mission.entity.mapping.MemberMission; +import com.example.umc9th.domain.mission.repository.MemberMissionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberMissionQueryServiceImpl implements MemberMissionQueryService { + + private final MemberMissionRepository memberMissionRepository; + + @Override + public Page findOngoingMissions(Long memberId, Integer page) { + PageRequest pageRequest = PageRequest.of(page - 1, 10); + return memberMissionRepository.findOngoingMissionsByMemberId(memberId, pageRequest); + } + +} \ No newline at end of file From 2e6b15e751f9d7bcc075e145da6100eaac6db6d4 Mon Sep 17 00:00:00 2001 From: EunBi Ko Date: Wed, 24 Dec 2025 14:19:11 +0900 Subject: [PATCH 14/14] =?UTF-8?q?Feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EB=B0=8F=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 ++ .../member/controller/MemberController.java | 10 ++ .../member/converter/MemberConverter.java | 18 +++- .../domain/member/dto/MemberReqDTO.java | 8 ++ .../domain/member/dto/MemberResDTO.java | 7 ++ .../umc9th/domain/member/entity/Member.java | 15 +-- .../umc9th/domain/member/enums/Role.java | 5 + .../exception/code/MemberErrorCode.java | 13 ++- .../command/MemberCommandServiceImpl.java | 14 ++- .../service/query/MemberQueryService.java | 4 + .../service/query/MemberQueryServiceImpl.java | 48 +++++++++- .../global/config/SecurityConfigJwt.java | 76 +++++++++++++++ .../global/config/SecurityConfigSession.java | 49 ++++++++++ .../umc9th/global/jwt/JwtAuthFilter.java | 58 ++++++++++++ .../example/umc9th/global/jwt/JwtUtil.java | 93 +++++++++++++++++++ .../AuthenticationEntryPointImpl.java | 33 +++++++ .../global/security/CustomUserDetails.java | 30 ++++++ .../security/CustomUserDetailsService.java | 30 ++++++ src/main/resources/application.yml | 8 +- 19 files changed, 512 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/example/umc9th/domain/member/enums/Role.java create mode 100644 src/main/java/com/example/umc9th/global/config/SecurityConfigJwt.java create mode 100644 src/main/java/com/example/umc9th/global/config/SecurityConfigSession.java create mode 100644 src/main/java/com/example/umc9th/global/jwt/JwtAuthFilter.java create mode 100644 src/main/java/com/example/umc9th/global/jwt/JwtUtil.java create mode 100644 src/main/java/com/example/umc9th/global/security/AuthenticationEntryPointImpl.java create mode 100644 src/main/java/com/example/umc9th/global/security/CustomUserDetails.java create mode 100644 src/main/java/com/example/umc9th/global/security/CustomUserDetailsService.java diff --git a/build.gradle b/build.gradle index c351deb..264ce8a 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 0e41e6a..15d8824 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 @@ -4,6 +4,7 @@ import com.example.umc9th.domain.member.dto.MemberResDTO; import com.example.umc9th.domain.member.exception.code.MemberSuccessCode; import com.example.umc9th.domain.member.service.command.MemberCommandService; +import com.example.umc9th.domain.member.service.query.MemberQueryService; import com.example.umc9th.global.apiPayload.ApiResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -16,6 +17,7 @@ public class MemberController { private final MemberCommandService memberCommandService; + private final MemberQueryService memberQueryService; // 회원가입 @PostMapping("/sign-up") @@ -24,4 +26,12 @@ public ApiResponse signUp( ){ return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberCommandService.signup(dto)); } + + // 로그인 + @PostMapping("/login") + public ApiResponse login( + @RequestBody @Valid MemberReqDTO.LoginDTO dto + ){ + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberQueryService.login(dto)); + } } 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 916750d..50c04af 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,8 @@ import com.example.umc9th.domain.member.dto.MemberReqDTO; import com.example.umc9th.domain.member.dto.MemberResDTO; import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.enums.Role; +import com.example.umc9th.domain.member.enums.Status; public class MemberConverter { @@ -15,10 +17,12 @@ public static MemberResDTO.JoinDTO toJoinDTO(Member member) { } // DTO → Entity - public static Member toMember(MemberReqDTO.JoinDTO dto) { + public static Member toMember(MemberReqDTO.JoinDTO dto, String password, Role role) { return Member.builder() .name(dto.name()) .email(dto.email()) + .password(password) + .role(role) .nickname(dto.nickname()) .gender(dto.gender()) .birthday(dto.birthday()) @@ -26,9 +30,19 @@ public static Member toMember(MemberReqDTO.JoinDTO dto) { .detailAddress(dto.specAddress()) .phoneNum(dto.phoneNum()) .point(0) - .status(null) + .status(Status.active) .social_uid(null) .social_type(null) .build(); } + + public static MemberResDTO.LoginDTO toLoginDTO( + Member member, + String accessToken + ) { + return MemberResDTO.LoginDTO.builder() + .memberId(member.getId()) + .accessToken(accessToken) + .build(); + } } diff --git a/src/main/java/com/example/umc9th/domain/member/dto/MemberReqDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/MemberReqDTO.java index 831660d..e201d57 100644 --- a/src/main/java/com/example/umc9th/domain/member/dto/MemberReqDTO.java +++ b/src/main/java/com/example/umc9th/domain/member/dto/MemberReqDTO.java @@ -47,4 +47,12 @@ public record JoinDTO( List preferCategory ) {} + + // 로그인 + public record LoginDTO( + @NotBlank + String email, + @NotBlank + String password + ){} } \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.java b/src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.java index 1d545af..4a3d1d4 100644 --- a/src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.java +++ b/src/main/java/com/example/umc9th/domain/member/dto/MemberResDTO.java @@ -11,4 +11,11 @@ public record JoinDTO( Long memberId, LocalDateTime createdAt ){} + + // 로그인 + @Builder + public record LoginDTO( + Long memberId, + String accessToken + ){} } 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 b4921cc..3cbde0a 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 @@ -1,10 +1,7 @@ package com.example.umc9th.domain.member.entity; 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.SocialType; -import com.example.umc9th.domain.member.enums.Status; +import com.example.umc9th.domain.member.enums.*; import com.example.umc9th.domain.mission.entity.mapping.MemberMission; import com.example.umc9th.global.entity.BaseEntity; import jakarta.persistence.*; @@ -27,12 +24,18 @@ public class Member extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "name", length = 3, nullable = false) + @Column(name = "name", length = 20, nullable = false) private String name; - @Column(name = "email", length = 255, nullable = false) + @Column(name = "email", length = 255, nullable = false, unique = true) private String email; + @Column(nullable = false) + private String password; + + @Enumerated(EnumType.STRING) + private Role role; + @Column(name = "nickname", length = 20, nullable = false, unique = true) private String nickname; diff --git a/src/main/java/com/example/umc9th/domain/member/enums/Role.java b/src/main/java/com/example/umc9th/domain/member/enums/Role.java new file mode 100644 index 0000000..672d4db --- /dev/null +++ b/src/main/java/com/example/umc9th/domain/member/enums/Role.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.member.enums; + +public enum Role { + ROLE_ADMIN, ROLE_USER +} 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 4db0b94..bc90613 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 @@ -9,10 +9,17 @@ @AllArgsConstructor public enum MemberErrorCode implements BaseErrorCode { - MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, + MEMBER_NOT_FOUND( + HttpStatus.NOT_FOUND, "MEMBER404_1", - "회원을 찾을 수 없습니다."), - ; + "회원을 찾을 수 없습니다." + ), + + INVALID( + HttpStatus.UNAUTHORIZED, + "MEMBER401_1", + "이메일 또는 비밀번호가 올바르지 않습니다." + ); private final HttpStatus status; private final String code; diff --git a/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java index 4512b30..361435d 100644 --- a/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java +++ b/src/main/java/com/example/umc9th/domain/member/service/command/MemberCommandServiceImpl.java @@ -6,12 +6,14 @@ 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.enums.Role; 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.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,6 +27,7 @@ public class MemberCommandServiceImpl implements MemberCommandService { private final MemberRepository memberRepository; private final MemberFoodRepository memberFoodRepository; private final FoodRepository foodRepository; + private final PasswordEncoder passwordEncoder; // 회원가입 @Override @@ -32,9 +35,14 @@ public class MemberCommandServiceImpl implements MemberCommandService { public MemberResDTO.JoinDTO signup( MemberReqDTO.JoinDTO dto ){ - // 사용자 생성 - Member member = MemberConverter.toMember(dto); - // DB 적용 + + // 솔트된 비밀번호 생성 + String salt = passwordEncoder.encode(dto.password()); + + // 사용자 생성: 유저 / 관리자는 따로 API 만들어서 관리 + Member member = MemberConverter.toMember(dto, salt, Role.ROLE_USER); + + // 회원 저장 memberRepository.save(member); // 선호 음식 존재 여부 확인 diff --git a/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java index eaa74bc..36e06ad 100644 --- a/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java +++ b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryService.java @@ -1,4 +1,8 @@ package com.example.umc9th.domain.member.service.query; +import com.example.umc9th.domain.member.dto.MemberReqDTO; +import com.example.umc9th.domain.member.dto.MemberResDTO; + public interface MemberQueryService { + MemberResDTO.LoginDTO login(MemberReqDTO.LoginDTO dto); } diff --git a/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.java b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.java index 7ce41c8..29f2f63 100644 --- a/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.java +++ b/src/main/java/com/example/umc9th/domain/member/service/query/MemberQueryServiceImpl.java @@ -1,4 +1,48 @@ package com.example.umc9th.domain.member.service.query; -public class MemberQueryServiceImpl { -} + +import com.example.umc9th.domain.member.converter.MemberConverter; +import com.example.umc9th.domain.member.dto.MemberReqDTO; +import com.example.umc9th.domain.member.dto.MemberResDTO; +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.jwt.JwtUtil; +import com.example.umc9th.global.security.CustomUserDetails; +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. LoginDTO dto + ) { + + // Member 조회 + Member member = memberRepository.findByEmailAndDeletedAtIsNull(dto.email()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + // 비밀번호 검증 + if (!encoder.matches(dto.password(), member.getPassword())){ + throw new MemberException(MemberErrorCode.INVALID); + } + + // JWT 토큰 발급용 UserDetails + CustomUserDetails userDetails = new CustomUserDetails(member); + + // 엑세스 토큰 발급 + String accessToken = jwtUtil.createAccessToken(userDetails); + + // DTO 조립 + return MemberConverter.toLoginDTO(member, accessToken); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/global/config/SecurityConfigJwt.java b/src/main/java/com/example/umc9th/global/config/SecurityConfigJwt.java new file mode 100644 index 0000000..7d626aa --- /dev/null +++ b/src/main/java/com/example/umc9th/global/config/SecurityConfigJwt.java @@ -0,0 +1,76 @@ +package com.example.umc9th.global.config; + +import com.example.umc9th.global.jwt.JwtAuthFilter; +import com.example.umc9th.global.jwt.JwtUtil; +import com.example.umc9th.global.security.AuthenticationEntryPointImpl; +import com.example.umc9th.global.security.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 SecurityConfigJwt { + + private final JwtUtil jwtUtil; + private final CustomUserDetailsService customUserDetailsService; + + private final String[] allowUris = { + "/login", + "/sign-up", + "/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) + // JwtAuthFilter를 UsernamePasswordAuthenticationFilter + .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(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/global/config/SecurityConfigSession.java b/src/main/java/com/example/umc9th/global/config/SecurityConfigSession.java new file mode 100644 index 0000000..7c920d6 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/config/SecurityConfigSession.java @@ -0,0 +1,49 @@ +package com.example.umc9th.global.config; + +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.SecurityFilterChain; + +@EnableWebSecurity +//@Configuration +public class SecurityConfigSession { + + private final String[] allowUris = { + "/sign-up", + "/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(form -> form + .defaultSuccessUrl("/swagger-ui/index.html", true) + .permitAll() + ) + .csrf(AbstractHttpConfigurer::disable) + .logout(logout -> logout + .logoutUrl("/logout") + .logoutSuccessUrl("/login?logout") + .permitAll() + ); + + return http.build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/global/jwt/JwtAuthFilter.java b/src/main/java/com/example/umc9th/global/jwt/JwtAuthFilter.java new file mode 100644 index 0000000..495e1a1 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/jwt/JwtAuthFilter.java @@ -0,0 +1,58 @@ +package com.example.umc9th.global.jwt; + +import com.example.umc9th.global.security.CustomUserDetailsService; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.lang.NonNull; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.context.SecurityContextHolder; +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"); + // token이 없거나 Bearer가 아니면 넘기기 + if (token == null || !token.startsWith("Bearer ")) { + filterChain.doFilter(request, response); + return; + } + // Bearer이면 추출 + token = token.replace("Bearer ", ""); + // AccessToken 검증하기: 올바른 토큰이면 + if (jwtUtil.isValid(token)) { + // 토큰에서 이메일 추출 + String email = jwtUtil.getEmail(token); + // 인증 객체 생성: 이메일로 찾아온 뒤, 인증 객체 생성 + UserDetails user = customUserDetailsService.loadUserByUsername(email); + Authentication auth = new UsernamePasswordAuthenticationToken( + user, + null, + user.getAuthorities() + ); + // 인증 완료 후 SecurityContextHolder에 넣기 + SecurityContextHolder.getContext().setAuthentication(auth); + } + filterChain.doFilter(request, response); + + + } +} \ No newline at end of file diff --git a/src/main/java/com/example/umc9th/global/jwt/JwtUtil.java b/src/main/java/com/example/umc9th/global/jwt/JwtUtil.java new file mode 100644 index 0000000..f5e6b1b --- /dev/null +++ b/src/main/java/com/example/umc9th/global/jwt/JwtUtil.java @@ -0,0 +1,93 @@ +package com.example.umc9th.global.jwt; + +import com.example.umc9th.global.security.CustomUserDetails; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.io.Decoders; +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.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(Decoders.BASE64.decode(secret)); + this.accessExpiration = Duration.ofMillis(accessExpiration); + } + + // AccessToken 생성 + public String createAccessToken(CustomUserDetails user) { + return createToken(user, accessExpiration); + } + + /** 토큰에서 이메일 가져오기 + * + * @param token 유저 정보를 추출할 토큰 + * @return 유저 이메일을 토큰에서 추출합니다 + */ + public String getEmail(String token) { + try { + return getClaims(token).getPayload().getSubject(); // Parsing해서 Subject 가져오기 + } catch (JwtException e) { + return null; + } + } + + /** 토큰 유효성 확인 + * + * @param token 유효한지 확인할 토큰 + * @return True, False 반환합니다 + */ + 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()) // User 이메일을 Subject로 + .claim("role", authorities) + .claim("email", user.getUsername()) + .issuedAt(Date.from(now)) // 언제 발급한지 + .expiration(Date.from(now.plus(expiration))) // 언제까지 유효한지 + .signWith(secretKey) // sign할 Key + .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/security/AuthenticationEntryPointImpl.java b/src/main/java/com/example/umc9th/global/security/AuthenticationEntryPointImpl.java new file mode 100644 index 0000000..a58922e --- /dev/null +++ b/src/main/java/com/example/umc9th/global/security/AuthenticationEntryPointImpl.java @@ -0,0 +1,33 @@ +package com.example.umc9th.global.security; + +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; +import com.fasterxml.jackson.databind.ObjectMapper; +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 { + 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/security/CustomUserDetails.java b/src/main/java/com/example/umc9th/global/security/CustomUserDetails.java new file mode 100644 index 0000000..fd1a4bb --- /dev/null +++ b/src/main/java/com/example/umc9th/global/security/CustomUserDetails.java @@ -0,0 +1,30 @@ +package com.example.umc9th.global.security; + +import com.example.umc9th.domain.member.entity.Member; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +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(() -> 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/security/CustomUserDetailsService.java b/src/main/java/com/example/umc9th/global/security/CustomUserDetailsService.java new file mode 100644 index 0000000..fe3e123 --- /dev/null +++ b/src/main/java/com/example/umc9th/global/security/CustomUserDetailsService.java @@ -0,0 +1,30 @@ +package com.example.umc9th.global.security; + +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 member = memberRepository.findByEmailAndDeletedAtIsNull(username) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + // CustomUserDetails 반환 + return new CustomUserDetails(member); + } +} + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e32e115..e70228c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -16,4 +16,10 @@ spring: ddl-auto: update # 애플리케이션 실행 시 데이터베이스 스키마의 상태를 설정 properties: hibernate: - format_sql: true # 출력되는 SQL 쿼리를 보기 좋게 포맷팅 \ No newline at end of file + format_sql: true # 출력되는 SQL 쿼리를 보기 좋게 포맷팅 + +jwt: + token: + secretKey: ZGh3YWlkc2F2ZXdhZXZ3b2EgMTM5ZXUgMDMxdWMyIHEyMiBAIDAgKTJFVio= + expiration: + access: 14400000