From a1312ebac9bff88bfa2b6125f49e079d158d75fe Mon Sep 17 00:00:00 2001 From: kjh015 Date: Wed, 26 Nov 2025 23:36:15 +0900 Subject: [PATCH 01/10] =?UTF-8?q?Rename:=20week09/code=20->=20week10/code?= =?UTF-8?q?=20=ED=8F=B4=EB=8D=94=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- week10/code/.gitattributes | 3 + week10/code/.gitignore | 37 +++ week10/code/build.gradle | 72 +++++ week10/code/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + week10/code/gradlew | 251 ++++++++++++++++++ week10/code/gradlew.bat | 94 +++++++ week10/code/settings.gradle | 1 + .../com/example/umc9th/Umc9thApplication.java | 15 ++ .../member/controller/MemberController.java | 35 +++ .../member/converter/MemberConverter.java | 33 +++ .../domain/member/dto/req/MemberReqDTO.java | 27 ++ .../domain/member/dto/res/MemberResDTO.java | 23 ++ .../umc9th/domain/member/entity/Food.java | 30 +++ .../umc9th/domain/member/entity/Member.java | 78 ++++++ .../umc9th/domain/member/entity/Term.java | 30 +++ .../member/entity/mapping/MemberFood.java | 44 +++ .../member/entity/mapping/MemberMission.java | 48 ++++ .../member/entity/mapping/MemberTerm.java | 45 ++++ .../umc9th/domain/member/enums/Address.java | 30 +++ .../umc9th/domain/member/enums/FoodName.java | 17 ++ .../umc9th/domain/member/enums/Gender.java | 5 + .../umc9th/domain/member/enums/TermName.java | 5 + .../member/exception/FoodException.java | 10 + .../member/exception/MemberException.java | 10 + .../member/exception/code/FoodErrorCode.java | 16 ++ .../exception/code/MemberErrorCode.java | 17 ++ .../exception/code/MemberSuccessCode.java | 20 ++ .../member/repository/FoodRepository.java | 7 + .../repository/MemberFoodRepository.java | 16 ++ .../repository/MemberMissionRepository.java | 36 +++ .../member/repository/MemberRepository.java | 13 + .../repository/MemberTermRepository.java | 15 ++ .../member/repository/TermRepository.java | 7 + .../domain/member/service/MemberService.java | 77 ++++++ .../mission/controller/MissionController.java | 75 ++++++ .../mission/converter/MissionConverter.java | 42 +++ .../domain/mission/dto/req/MissionReqDTO.java | 26 ++ .../domain/mission/dto/res/MissionResDTO.java | 38 +++ .../umc9th/domain/mission/entity/Mission.java | 52 ++++ .../mission/exception/MissionException.java | 11 + .../exception/code/MissionErrorCode.java | 18 ++ .../exception/code/MissionSuccessCode.java | 20 ++ .../mission/repository/MissionRepository.java | 43 +++ .../mission/service/MissionService.java | 77 ++++++ .../review/controller/ReviewController.java | 95 +++++++ .../review/converter/ReviewConverter.java | 64 +++++ .../domain/review/dto/req/ReviewReqDTO.java | 21 ++ .../domain/review/dto/res/ReviewResDTO.java | 50 ++++ .../umc9th/domain/review/entity/Reply.java | 25 ++ .../umc9th/domain/review/entity/Review.java | 53 ++++ .../review/exception/ReviewException.java | 10 + .../exception/code/ReviewErrorCode.java | 20 ++ .../exception/code/ReviewSuccessCode.java | 20 ++ .../review/repository/ReplyRepository.java | 17 ++ .../review/repository/ReviewRepository.java | 29 ++ .../repository/querydsl/ReviewQueryDSL.java | 12 + .../querydsl/ReviewQueryDSLImpl.java | 56 ++++ .../review/service/ReviewQueryService.java | 93 +++++++ .../domain/review/service/ReviewService.java | 68 +++++ .../store/controller/LocationController.java | 30 +++ .../store/controller/StoreController.java | 49 ++++ .../store/converter/LocationConverter.java | 13 + .../store/converter/StoreConverter.java | 35 +++ .../domain/store/dto/req/LocationReqDTO.java | 10 + .../domain/store/dto/req/StoreReqDTO.java | 14 + .../domain/store/dto/res/LocationResDTO.java | 13 + .../domain/store/dto/res/StoreResDTO.java | 26 ++ .../umc9th/domain/store/entity/Location.java | 26 ++ .../umc9th/domain/store/entity/Store.java | 81 ++++++ .../store/exception/LocationException.java | 10 + .../store/exception/StoreException.java | 10 + .../exception/code/LocationErrorCode.java | 18 ++ .../store/exception/code/StoreErrorCode.java | 26 ++ .../store/repository/LocationRepository.java | 7 + .../store/repository/StoreQueryDSL.java | 10 + .../store/repository/StoreQueryDSLImpl.java | 69 +++++ .../store/repository/StoreRepository.java | 12 + .../domain/store/service/LocationService.java | 25 ++ .../domain/store/service/StoreService.java | 73 +++++ .../test/controller/TestController.java | 45 ++++ .../domain/test/converter/TestConverter.java | 18 ++ .../domain/test/dto/req/TestReqDTO.java | 6 + .../domain/test/dto/res/TestResDTO.java | 18 ++ .../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 | 6 + .../service/query/TestQueryServiceImpl.java | 18 ++ .../umc9th/global/annotation/ExistFoods.java | 18 ++ .../umc9th/global/annotation/ValidPage.java | 19 ++ .../umc9th/global/apiPayload/ApiResponse.java | 37 +++ .../global/apiPayload/code/BaseErrorCode.java | 9 + .../apiPayload/code/BaseSuccessCode.java | 9 + .../apiPayload/code/GeneralErrorCode.java | 28 ++ .../apiPayload/code/GeneralSuccessCode.java | 16 ++ .../exception/GeneralException.java | 11 + .../handler/GeneralExceptionAdvice.java | 69 +++++ .../umc9th/global/config/SwaggerConfig.java | 37 +++ .../example/umc9th/global/dto/PageDTO.java | 65 +++++ .../umc9th/global/entity/BaseEntity.java | 25 ++ .../global/service/DiscordWebhookService.java | 73 +++++ .../global/validator/FoodExistValidator.java | 33 +++ .../global/validator/PageValidator.java | 30 +++ .../src/main/resources/application-dev.yml | 3 + .../src/main/resources/application-local.yml | 3 + .../code/src/main/resources/application.yml | 24 ++ .../umc9th/Umc9thApplicationTests.java | 13 + 109 files changed, 3435 insertions(+) create mode 100644 week10/code/.gitattributes create mode 100644 week10/code/.gitignore create mode 100644 week10/code/build.gradle create mode 100644 week10/code/gradle/wrapper/gradle-wrapper.jar create mode 100644 week10/code/gradle/wrapper/gradle-wrapper.properties create mode 100644 week10/code/gradlew create mode 100644 week10/code/gradlew.bat create mode 100644 week10/code/settings.gradle create mode 100644 week10/code/src/main/java/com/example/umc9th/Umc9thApplication.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/entity/Food.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/entity/Term.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberMission.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberTerm.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/enums/Address.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/enums/Gender.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/enums/TermName.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/exception/FoodException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/exception/MemberException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberTermRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/repository/TermRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/dto/req/MissionReqDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/dto/res/MissionResDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/dto/req/ReviewReqDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/dto/res/ReviewResDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/entity/Reply.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/entity/Review.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/exception/ReviewException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReplyRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDSL.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDSLImpl.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/controller/LocationController.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/controller/StoreController.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/converter/LocationConverter.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/converter/StoreConverter.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/LocationReqDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/StoreReqDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/LocationResDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/StoreResDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/entity/Location.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/entity/Store.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/exception/LocationException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/exception/StoreException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/LocationErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/repository/LocationRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSL.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSLImpl.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/service/LocationService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/store/service/StoreService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/controller/TestController.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/exception/TestException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandServiceImpl.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryServiceImpl.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/annotation/ExistFoods.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/annotation/ValidPage.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/config/SwaggerConfig.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/dto/PageDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/entity/BaseEntity.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/service/DiscordWebhookService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/validator/PageValidator.java create mode 100644 week10/code/src/main/resources/application-dev.yml create mode 100644 week10/code/src/main/resources/application-local.yml create mode 100644 week10/code/src/main/resources/application.yml create mode 100644 week10/code/src/test/java/com/example/umc9th/Umc9thApplicationTests.java diff --git a/week10/code/.gitattributes b/week10/code/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/week10/code/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/week10/code/.gitignore b/week10/code/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/week10/code/.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/week10/code/build.gradle b/week10/code/build.gradle new file mode 100644 index 0000000..0395963 --- /dev/null +++ b/week10/code/build.gradle @@ -0,0 +1,72 @@ +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 = 'UMC9th' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // 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" + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.13' + + // Validation + implementation 'org.springframework.boot:spring-boot-starter-validation' +} + +tasks.named('test') { + useJUnitPlatform() +} + +// QueryDSL 관련 설정 +// generated/querydsl 폴더 생성 & 삽입 +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +// 소스 세트에 생성 경로 추가 (구체적인 경로 지정) +sourceSets { + main.java.srcDirs += [ querydslDir ] +} + +// 컴파일 시 생성 경로 지정 +tasks.withType(JavaCompile).configureEach { + options.generatedSourceOutputDirectory.set(querydslDir) +} + +// clean 태스크에 생성 폴더 삭제 로직 추가 +clean.doLast { + file(querydslDir).deleteDir() +} \ No newline at end of file diff --git a/week10/code/gradle/wrapper/gradle-wrapper.jar b/week10/code/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/week10/code/gradlew.bat b/week10/code/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/week10/code/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/week10/code/settings.gradle b/week10/code/settings.gradle new file mode 100644 index 0000000..457950e --- /dev/null +++ b/week10/code/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'UMC9th' diff --git a/week10/code/src/main/java/com/example/umc9th/Umc9thApplication.java b/week10/code/src/main/java/com/example/umc9th/Umc9thApplication.java new file mode 100644 index 0000000..bc54005 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/Umc9thApplication.java @@ -0,0 +1,15 @@ +package com.example.umc9th; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class Umc9thApplication { + + public static void main(String[] args) { + SpringApplication.run(Umc9thApplication.class, args); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java new file mode 100644 index 0000000..9d6dcc0 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -0,0 +1,35 @@ +package com.example.umc9th.domain.member.controller; + +import com.example.umc9th.domain.member.converter.MemberConverter; +import com.example.umc9th.domain.member.dto.req.MemberReqDTO; +import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.domain.member.exception.code.MemberSuccessCode; +import com.example.umc9th.domain.member.service.MemberService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/auth") +public class MemberController { + private final MemberService memberService; + + @DeleteMapping("/member/{memberId}") + public ApiResponse deleteMember(@PathVariable Long memberId) { + memberService.withdraw(memberId); + + MemberResDTO.Delete resultDTO = MemberConverter.toDeleteDTO(memberId); + GeneralSuccessCode code = GeneralSuccessCode.OK; + return ApiResponse.onSuccess(code, resultDTO); + } + + // 회원가입 + @PostMapping("/sign-up") + public ApiResponse signUp(@RequestBody @Valid MemberReqDTO.JoinDTO dto){ + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberService.signup(dto)); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java new file mode 100644 index 0000000..10b384e --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java @@ -0,0 +1,33 @@ +package com.example.umc9th.domain.member.converter; + +import com.example.umc9th.domain.member.dto.req.MemberReqDTO; +import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.domain.member.entity.Member; + +public class MemberConverter { + + public static MemberResDTO.Delete toDeleteDTO(Long memeberId){ + return MemberResDTO.Delete.builder() + .memeberId(memeberId) + .build(); + } + + // Entity -> DTO + public static MemberResDTO.JoinDTO toJoinDTO(Member member){ + return MemberResDTO.JoinDTO.builder() + .memberId(member.getId()) + .createAt(member.getCreatedAt()) + .build(); + } + + // DTO -> Entity + public static Member toMember(MemberReqDTO.JoinDTO dto){ + return Member.builder() + .name(dto.name()) + .birth(dto.birth()) + .address(dto.address()) + .detailAddress(dto.specAddress()) + .gender(dto.gender()) + .build(); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java new file mode 100644 index 0000000..9a6f22b --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java @@ -0,0 +1,27 @@ +package com.example.umc9th.domain.member.dto.req; + +import com.example.umc9th.domain.member.enums.Address; +import com.example.umc9th.domain.member.enums.Gender; +import com.example.umc9th.global.annotation.ExistFoods; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +import java.time.LocalDate; +import java.util.List; + +public class MemberReqDTO { + public record JoinDTO( + @NotBlank + String name, + @NotNull + Gender gender, + @NotNull + LocalDate birth, + @NotNull + Address address, + @NotNull + String specAddress, + @ExistFoods + List preferCategory + ){} +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java new file mode 100644 index 0000000..b3623a4 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java @@ -0,0 +1,23 @@ +package com.example.umc9th.domain.member.dto.res; + +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +public class MemberResDTO { + + @Getter + @Builder + public static class Delete{ + private Long memeberId; + + } + + @Builder + public record JoinDTO( + Long memberId, + LocalDateTime createAt + ){} + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Food.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Food.java new file mode 100644 index 0000000..d30739d --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Food.java @@ -0,0 +1,30 @@ +package com.example.umc9th.domain.member.entity; + +import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import com.example.umc9th.domain.member.enums.FoodName; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.HashSet; +import java.util.Set; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "food") +public class Food extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name="name") + @Enumerated(EnumType.STRING) + @Builder.Default + private FoodName name = FoodName.NONE; + + @OneToMany(mappedBy = "food") + private Set memberFoodList = new HashSet<>(); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java new file mode 100644 index 0000000..451a285 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -0,0 +1,78 @@ +package com.example.umc9th.domain.member.entity; + +import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import com.example.umc9th.domain.member.entity.mapping.MemberTerm; +import com.example.umc9th.domain.member.enums.Address; +import com.example.umc9th.domain.member.enums.Gender; +import com.example.umc9th.domain.member.entity.mapping.MemberMission; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.HashSet; +import java.util.Set; + +@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="gender", nullable = false) + @Enumerated(EnumType.STRING) + @Builder.Default + private Gender gender = Gender.NONE; + + @Column(name="birth", nullable = false) + private LocalDate birth; + + @Column(name="password", nullable = false) + private String password; + + @Column(name="address", nullable = false) + @Enumerated(EnumType.STRING) + @Builder.Default + private Address address = Address.NONE; + + @Column(name="detail_address") + private String detailAddress; + + @Column(name="point", nullable = false) + @Builder.Default + private Integer point = 0; + + @Column(name="email", nullable = false) + private String email; + + @Column(name="phone_number") + private String phoneNumber; + + @Column(name = "delete_at") + private LocalDateTime deletedAt; + + @OneToMany(mappedBy = "member", orphanRemoval = true) + private Set memberFoodList = new HashSet<>(); + + @OneToMany(mappedBy = "member", orphanRemoval = true) + private Set memberTermList = new HashSet<>(); + + @OneToMany(mappedBy = "member", orphanRemoval = true) + private Set memberMissionList = new HashSet<>(); + + @OneToMany(mappedBy = "member") + private Set memberReviewList = new HashSet<>(); + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Term.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Term.java new file mode 100644 index 0000000..d4ea835 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Term.java @@ -0,0 +1,30 @@ +package com.example.umc9th.domain.member.entity; + +import com.example.umc9th.domain.member.entity.mapping.MemberTerm; +import com.example.umc9th.domain.member.enums.TermName; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.HashSet; +import java.util.Set; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "term") +public class Term extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name="name") + @Enumerated(EnumType.STRING) + @Builder.Default + private TermName name = TermName.NONE; + + @OneToMany(mappedBy = "term") + private Set memberTermList = new HashSet<>(); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java new file mode 100644 index 0000000..9617dc8 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberFood.java @@ -0,0 +1,44 @@ +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.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.Objects; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_food") +public class MemberFood extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) + @JoinColumn(name = "food_id") + private Food food; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MemberFood)) return false; + MemberFood that = (MemberFood) o; + return Objects.equals(getMember(), that.getMember()) && + Objects.equals(getFood(), that.getFood()); + } + + @Override + public int hashCode() { + return Objects.hash(getMember(), getFood()); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberMission.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberMission.java new file mode 100644 index 0000000..dd77e33 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberMission.java @@ -0,0 +1,48 @@ +package com.example.umc9th.domain.member.entity.mapping; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.Objects; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_mission") +public class MemberMission extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name="is_completed", nullable = false) + private Boolean isCompleted; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MemberMission)) return false; + MemberMission that = (MemberMission) o; + return Objects.equals(getMember(), that.getMember()) && + Objects.equals(getMission(), that.getMission()); + } + + @Override + public int hashCode() { + return Objects.hash(getMember(), getMission()); + } + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberTerm.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberTerm.java new file mode 100644 index 0000000..9944fa5 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/mapping/MemberTerm.java @@ -0,0 +1,45 @@ +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 com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.Objects; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_term") +public class MemberTerm extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE) + @JoinColumn(name = "term_id") + private Term term; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof MemberTerm)) return false; + MemberTerm that = (MemberTerm) o; + return Objects.equals(getMember(), that.getMember()) && + Objects.equals(getTerm(), that.getTerm()); + } + + @Override + public int hashCode() { + return Objects.hash(getMember(), getTerm()); + } + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/enums/Address.java b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/Address.java new file mode 100644 index 0000000..c21742d --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/Address.java @@ -0,0 +1,30 @@ +package com.example.umc9th.domain.member.enums; + +public enum Address { + DOBONG, + DONGDAEMUN, + DONGJAK, + EUNPYEONG, + GANGBUK, + GANGDONG, + GANGNAM, + GANGSEO, + GEUMCHEON, + GURO, + GWANAK, + GWANGJIN, + JONGNO, + JUNG, + JUNGNANG, + MAPO, + NOWON, + SEOCHO, + SEODAEMUN, + SEONGBUK, + SEONGDONG, + SONGPA, + YANGCHEON, + YEONGDEUNGPO, + YONGSAN, + NONE; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java new file mode 100644 index 0000000..2bc4dd5 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/FoodName.java @@ -0,0 +1,17 @@ +package com.example.umc9th.domain.member.enums; + +public enum FoodName { + KOREAN, + JAPANESE, + CHINESE, + WESTERN, //양식 + CHICKEN, + SNACK, //분식 + MEAT_GRILL, // '고기/구이'를 의미 + LUNCH_BOX, // 도시락 + NIGHT_SNACK, //야식 + FAST_FOOD, + DESSERT, + ASIAN, + NONE; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/enums/Gender.java b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/Gender.java new file mode 100644 index 0000000..076166f --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/member/enums/TermName.java b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/TermName.java new file mode 100644 index 0000000..8007406 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/TermName.java @@ -0,0 +1,5 @@ +package com.example.umc9th.domain.member.enums; + +public enum TermName { + AGE, SERVICE, PRIVACY, LOCATION, MARKETING, NONE; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/FoodException.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/FoodException.java new file mode 100644 index 0000000..71f7432 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/member/exception/MemberException.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/MemberException.java new file mode 100644 index 0000000..1e4d7a1 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java new file mode 100644 index 0000000..09591b5 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/FoodErrorCode.java @@ -0,0 +1,16 @@ +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.BAD_REQUEST, "FOOD400_1", "존재하지 않는 음식입니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java new file mode 100644 index 0000000..c4ba600 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java @@ -0,0 +1,17 @@ +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 { + + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER400_1", "존재하지 않는 회원입니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java new file mode 100644 index 0000000..beb41b3 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java new file mode 100644 index 0000000..8407493 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/FoodRepository.java @@ -0,0 +1,7 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.Food; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FoodRepository extends JpaRepository { +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java new file mode 100644 index 0000000..c66810d --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberFoodRepository.java @@ -0,0 +1,16 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.mapping.MemberFood; +import jakarta.transaction.Transactional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface MemberFoodRepository extends JpaRepository { + @Transactional + @Modifying(clearAutomatically = true) + @Query("DELETE FROM MemberFood mf WHERE mf.member.id = :memberId") + void deleteAllByMemberIdInBatch(@Param("memberId") Long memberId); + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java new file mode 100644 index 0000000..abc42fc --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberMissionRepository.java @@ -0,0 +1,36 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.mapping.MemberMission; +import com.example.umc9th.domain.mission.entity.Mission; +import jakarta.transaction.Transactional; +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.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface MemberMissionRepository extends JpaRepository { + @Transactional + @Modifying(clearAutomatically = true) + @Query("DELETE FROM MemberMission mm WHERE mm.member.id = :memberId") + void deleteAllByMemberIdInBatch(@Param("memberId") Long memberId); + + //3. 진행 중, 진행 완료 미션 + @Query(value = "SELECT mm FROM MemberMission mm " + + "JOIN FETCH mm.mission m " + + "JOIN FETCH m.store " + + "WHERE mm.member.id = :memberId ", + countQuery = "SELECT count(mm) FROM MemberMission mm WHERE mm.member.id = :memberId") //countQuery 분리(페이징) + Page findMemberMissionsByMemberIdWithDetails(Long memberId, Pageable pageable); + + //4-1. 홈 화면 - 해당 지역 달성 미션 개수 + @Query("SELECT COUNT(mm) FROM MemberMission mm " + + "WHERE mm.member.id = :memberId AND mm.mission.store.location.id = :locationId") + Long countCompletedMissionsInLocation(Long memberId, Long locationId); + + + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..40f11af --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java @@ -0,0 +1,13 @@ +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 { + + //2. 마이 페이지 + Optional findById(Long memberId); + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberTermRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberTermRepository.java new file mode 100644 index 0000000..c50ba16 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberTermRepository.java @@ -0,0 +1,15 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.mapping.MemberTerm; +import jakarta.transaction.Transactional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface MemberTermRepository extends JpaRepository { + @Transactional + @Modifying(clearAutomatically = true) + @Query("DELETE FROM MemberTerm mt WHERE mt.member.id = :memberId") + void deleteAllByMemberIdInBatch(@Param("memberId") Long memberId); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/TermRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/TermRepository.java new file mode 100644 index 0000000..41eacc9 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/TermRepository.java @@ -0,0 +1,7 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.Term; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface TermRepository extends JpaRepository { +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java new file mode 100644 index 0000000..a72f220 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -0,0 +1,77 @@ +package com.example.umc9th.domain.member.service; + +import com.example.umc9th.domain.member.converter.MemberConverter; +import com.example.umc9th.domain.member.dto.req.MemberReqDTO; +import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.domain.member.entity.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.MemberException; +import com.example.umc9th.domain.member.exception.code.FoodErrorCode; +import com.example.umc9th.domain.member.exception.code.MemberErrorCode; +import com.example.umc9th.domain.member.repository.*; +import com.example.umc9th.domain.review.repository.ReplyRepository; +import com.example.umc9th.domain.review.repository.ReviewRepository; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class MemberService { + private final MemberTermRepository memberTermRepository; + private final MemberRepository memberRepository; + private final MemberFoodRepository memberFoodRepository; + private final MemberMissionRepository memberMissionRepository; + private final ReviewRepository reviewRepository; + private final ReplyRepository replyRepository; + private final FoodRepository foodRepository; + + @Transactional + public void withdraw(Long memberId) { + if(!memberRepository.existsById(memberId)) { + throw new MemberException(MemberErrorCode.MEMBER_NOT_FOUND); + } + memberTermRepository.deleteAllByMemberIdInBatch(memberId); + memberFoodRepository.deleteAllByMemberIdInBatch(memberId); + memberMissionRepository.deleteAllByMemberIdInBatch(memberId); + + List reviewIds = reviewRepository.findAllIdsByMemberId(memberId); + if(reviewIds == null || reviewIds.isEmpty()) { + replyRepository.deleteAllByReviewIdsInBatch(reviewIds); + reviewRepository.deleteAllByIdsInBatch(reviewIds); + } + memberRepository.deleteById(memberId); + + } + + @Transactional + public MemberResDTO.JoinDTO signup(MemberReqDTO.JoinDTO dto){ + // 사용자 생성 + Member member = MemberConverter.toMember(dto); + // DB 적용 + memberRepository.save(member); + + // 선호 음식 존재 여부 확인 + if (dto.preferCategory().size() > 1){ + List memberFood = dto.preferCategory().stream() + .map(id -> MemberFood.builder() + .member(member) + .food(foodRepository.findById(id) + .orElseThrow(() -> new FoodException(FoodErrorCode.NOT_FOUND))) + .build() + ) + .collect(Collectors.toList()); + + memberFoodRepository.saveAll(memberFood); + } + + + // 응답 DTO 생성 + return MemberConverter.toJoinDTO(member); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java new file mode 100644 index 0000000..70d15e6 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/controller/MissionController.java @@ -0,0 +1,75 @@ +package com.example.umc9th.domain.mission.controller; + + +import com.example.umc9th.domain.mission.dto.req.MissionReqDTO; +import com.example.umc9th.domain.mission.dto.res.MissionResDTO; +import com.example.umc9th.domain.mission.exception.code.MissionSuccessCode; +import com.example.umc9th.domain.mission.service.MissionService; +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.PageDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.*; + + + +@RestController +@RequiredArgsConstructor +public class MissionController { + private final MissionService missionService; + + // 미션 추가 API + @PostMapping("/missions") + public ApiResponse addMission(@RequestBody @Valid MissionReqDTO.AddDTO dto){ + MissionResDTO.AddDTO result = missionService.addMission(dto); + MissionSuccessCode code = MissionSuccessCode.ADD_OK; + return ApiResponse.onSuccess(code, result); + } + + // 미션 도전 API + @PostMapping("/missions/challenge") + public ApiResponse challengeMission(@RequestBody @Valid MissionReqDTO.ChallengeDTO dto){ + MissionResDTO.ChallengeDTO result = missionService.challengeMission(dto); + MissionSuccessCode code = MissionSuccessCode.CHALLENGE_OK; + return ApiResponse.onSuccess(code, result); + } + + // 특정 가게의 미션 목록 (11.25) + @Operation( + summary = "특정 가게의 미션 목록 조회 API (11.25)", + description = "특정 가게의 미션 목록을 모두 조회합니다. 페이지네이션으로 제공합니다." + ) + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") + }) + @GetMapping("/missions/{storeId}") + public ApiResponse> getMissions(@PathVariable Long storeId, @Valid @ValidPage Pageable pageable){ + PageDTO result = missionService.getMissions(storeId, pageable); + return ApiResponse.onSuccess(GeneralSuccessCode.OK, result); + } + + // 내가 진행중인 미션 목록 (11.25) + @Operation( + summary = "내가 진행중인 미션 목록 조회 API (11.25)", + description = "내가 진행중인 미션 목록을 모두 조회합니다. 페이지네이션으로 제공합니다." + ) + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") + }) + @GetMapping("/missions/{memberId}/me") + public ApiResponse> getMyMissions(@PathVariable Long memberId, @RequestParam Boolean isCompleted, @Valid @ValidPage Pageable pageable){ + PageDTO result = missionService.getMyMissions(memberId, isCompleted, pageable); + return ApiResponse.onSuccess(GeneralSuccessCode.OK, result); + } + + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java new file mode 100644 index 0000000..0a11609 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/converter/MissionConverter.java @@ -0,0 +1,42 @@ +package com.example.umc9th.domain.mission.converter; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.entity.mapping.MemberMission; +import com.example.umc9th.domain.mission.dto.req.MissionReqDTO; +import com.example.umc9th.domain.mission.dto.res.MissionResDTO; +import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.domain.store.entity.Store; + +public class MissionConverter { + + public static Mission toAddEntity(MissionReqDTO.AddDTO dto, Store store){ + return Mission.builder() + .deadline(dto.deadline()) + .missionCondition(dto.missionCondition()) + .point(dto.point()) + .store(store) + .build(); + } + + public static MissionResDTO.AddDTO toAddDTO(Mission mission){ + return MissionResDTO.AddDTO.builder() + .missionId(mission.getId()) + .createAt(mission.getCreatedAt()) + .build(); + } + + public static MemberMission toChallengeEntity(Mission mission, Member member){ + return MemberMission.builder() + .isCompleted(false) + .mission(mission) + .member(member) + .build(); + } + + public static MissionResDTO.ChallengeDTO toChallengeDTO(MemberMission memberMission){ + return MissionResDTO.ChallengeDTO.builder() + .memberMissionId(memberMission.getId()) + .createAt(memberMission.getCreatedAt()) + .build(); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/dto/req/MissionReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/dto/req/MissionReqDTO.java new file mode 100644 index 0000000..7a6a919 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/dto/req/MissionReqDTO.java @@ -0,0 +1,26 @@ +package com.example.umc9th.domain.mission.dto.req; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +import java.time.LocalDate; + +public class MissionReqDTO { + public record AddDTO( + @NotNull + LocalDate deadline, + @NotBlank + String missionCondition, + @NotNull + Integer point, + @NotNull + Long storeId + ){} + + public record ChallengeDTO( + @NotNull + Long memberId, + @NotNull + Long missionId + ){} +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/dto/res/MissionResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/dto/res/MissionResDTO.java new file mode 100644 index 0000000..305b383 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/dto/res/MissionResDTO.java @@ -0,0 +1,38 @@ +package com.example.umc9th.domain.mission.dto.res; + +import com.example.umc9th.domain.mission.entity.Mission; +import lombok.Builder; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +public class MissionResDTO { + @Builder + public record AddDTO( + Long missionId, + LocalDateTime createAt + ){} + + @Builder + public record ChallengeDTO( + Long memberMissionId, + LocalDateTime createAt + ){} + + @Builder + public record MissionDTO( + Long missionId, + LocalDate deadline, + String missionCondition, + Integer point + ){ + public static MissionDTO of(Mission mission) { + return MissionDTO.builder() + .missionId(mission.getId()) + .deadline(mission.getDeadline()) + .missionCondition(mission.getMissionCondition()) + .point(mission.getPoint()) + .build(); + } + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java new file mode 100644 index 0000000..8c4b06a --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/entity/Mission.java @@ -0,0 +1,52 @@ +package com.example.umc9th.domain.mission.entity; + +import com.example.umc9th.domain.member.entity.mapping.MemberMission; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDate; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +@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; + + @Column(name="deadline", nullable = false) + private LocalDate deadline; + + @Column(name="mission_condition", nullable = false) + private String missionCondition; + + @Column(name="point", nullable = false) + private Integer point; + + @OneToMany(mappedBy = "mission") + private Set memberMissionList = new HashSet<>(); + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Mission)) return false; + Mission mission = (Mission) o; + return Objects.equals(getStore(), mission.getStore()); + } + @Override + public int hashCode() { + return Objects.hash(getStore()); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java new file mode 100644 index 0000000..df838a8 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/MissionException.java @@ -0,0 +1,11 @@ +package com.example.umc9th.domain.mission.exception; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.exception.GeneralException; + + +public class MissionException extends GeneralException { + public MissionException(BaseErrorCode code) { + super(code); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..20643ad --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,18 @@ +package com.example.umc9th.domain.mission.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MissionErrorCode implements BaseErrorCode { + + NOT_FOUND(HttpStatus.BAD_REQUEST, "MISSION400_1", "존재하지 않는 미션입니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java new file mode 100644 index 0000000..b29f819 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/exception/code/MissionSuccessCode.java @@ -0,0 +1,20 @@ +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 { + + ADD_OK(HttpStatus.OK, "MISSION200_1", "미션이 정상적으로 추가되었습니다."), + CHALLENGE_OK(HttpStatus.OK, "MISSION200_2", "미션 도전이 정상적으로 처리되었습니다."), + + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java new file mode 100644 index 0000000..70bbe92 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/repository/MissionRepository.java @@ -0,0 +1,43 @@ +package com.example.umc9th.domain.mission.repository; + +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; + +public interface MissionRepository extends JpaRepository { + + //4-2. 홈화면 - 도전 가능 미션 목록 + @Query(value = "SELECT m FROM Mission m " + + "JOIN FETCH m.store s " + + "WHERE m.store.location.id = :locationId AND " + + "NOT EXISTS (" + + " SELECT 1 FROM MemberMission mm " + + " WHERE mm.member.id = :memberId AND mm.mission = m" + + ")", + countQuery = "SELECT count(m) FROM Mission m " + //countQuery 분리(페이징) + "WHERE m.store.location.id = :locationId AND " + + "NOT EXISTS (" + + " SELECT 1 FROM MemberMission mm " + + " WHERE mm.member.id = :memberId AND mm.mission = m" + + ")") + Page findAvailableMissions(Long locationId, Long memberId, Pageable pageable); + + Page findByStoreId(Long storeId, Pageable pageable); + + @Query(value = "SELECT m FROM MemberMission mm " + + "JOIN mm.mission m " + // 1. FETCH 제거 (일반 JOIN 사용) + "WHERE mm.member.id = :memberId AND mm.isCompleted = :isCompleted", + + countQuery = "SELECT count(mm) FROM MemberMission mm " + // 2. countQuery 명시 + "WHERE mm.member.id = :memberId AND mm.isCompleted = :isCompleted") + Page findByMemberIdAndIsCompleted(@Param("memberId") Long memberId, + @Param("isCompleted") Boolean isCompleted, + Pageable pageable); + + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java b/week10/code/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java new file mode 100644 index 0000000..3160eb3 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/mission/service/MissionService.java @@ -0,0 +1,77 @@ +package com.example.umc9th.domain.mission.service; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.entity.mapping.MemberMission; +import com.example.umc9th.domain.member.exception.MemberException; +import com.example.umc9th.domain.member.exception.code.MemberErrorCode; +import com.example.umc9th.domain.member.repository.MemberMissionRepository; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.domain.mission.converter.MissionConverter; +import com.example.umc9th.domain.mission.dto.req.MissionReqDTO; +import com.example.umc9th.domain.mission.dto.res.MissionResDTO; +import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.domain.mission.exception.MissionException; +import com.example.umc9th.domain.mission.exception.code.MissionErrorCode; +import com.example.umc9th.domain.mission.repository.MissionRepository; +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.example.umc9th.global.dto.PageDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class MissionService { + private final MissionRepository missionRepository; + private final StoreRepository storeRepository; + private final MemberRepository memberRepository; + private final MemberMissionRepository memberMissionRepository; + + @Transactional + public MissionResDTO.AddDTO addMission(MissionReqDTO.AddDTO dto){ + Store store = storeRepository.findById(dto.storeId()) + .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); + Mission mission = MissionConverter.toAddEntity(dto, store); + + Mission savedMission = missionRepository.save(mission); + + return MissionConverter.toAddDTO(savedMission); + } + + @Transactional + public MissionResDTO.ChallengeDTO challengeMission(MissionReqDTO.ChallengeDTO dto){ + Mission mission = missionRepository.findById(dto.missionId()) + .orElseThrow(() -> new MissionException(MissionErrorCode.NOT_FOUND)); + Member member = memberRepository.findById(dto.memberId()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + MemberMission savedMemberMission = memberMissionRepository.save(MissionConverter.toChallengeEntity(mission, member)); + + return MissionConverter.toChallengeDTO(savedMemberMission); + + } + + @Transactional(readOnly = true) + public PageDTO getMissions(Long storeId, Pageable pageable){ + Pageable unsortedPageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize()); + Page missions = missionRepository.findByStoreId(storeId, unsortedPageable); + + return PageDTO.of(missions, MissionResDTO.MissionDTO::of); + } + + @Transactional(readOnly = true) + public PageDTO getMyMissions(Long memberId, Boolean isCompleted,Pageable pageable){ + Pageable unsortedPageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize()); + Page missions = missionRepository.findByMemberIdAndIsCompleted(memberId, isCompleted, unsortedPageable); + return PageDTO.of(missions, MissionResDTO.MissionDTO::of); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java b/week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java new file mode 100644 index 0000000..e3ee7b8 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java @@ -0,0 +1,95 @@ +package com.example.umc9th.domain.review.controller; + +import com.example.umc9th.domain.review.converter.ReviewConverter; +import com.example.umc9th.domain.review.dto.req.ReviewReqDTO; +import com.example.umc9th.domain.review.dto.res.ReviewResDTO; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.review.exception.code.ReviewSuccessCode; +import com.example.umc9th.domain.review.service.ReviewQueryService; +import com.example.umc9th.domain.review.service.ReviewService; +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.PageDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +public class ReviewController { + private final ReviewQueryService reviewQueryService; + private final ReviewService reviewService; + + @GetMapping("/reviews/search") // 리뷰 검색 + public ApiResponse> searchReview(@RequestParam String query, @RequestParam String type) { + List result = reviewQueryService.searchReview(query, type); + + List resultDTO = result.stream().map(ReviewConverter::toSearchDTO).toList(); + GeneralSuccessCode code = GeneralSuccessCode.OK; + + return ApiResponse.onSuccess(code, resultDTO); + } + + @GetMapping("/reviews/members/{memberId}") // 회원 리뷰 검색 + public ApiResponse> memberReviews(@PathVariable String memberId, @RequestParam String query, @RequestParam String type) { + List result = reviewQueryService.memberReviews(Long.parseLong(memberId), query, type); + + List resultDTO = result.stream().map(ReviewConverter::toSearchDTO).toList(); + GeneralSuccessCode code = GeneralSuccessCode.OK; + + return ApiResponse.onSuccess(code, resultDTO); + + } + + // 리뷰 추가 API + @PostMapping("/reviews") + public ApiResponse addReview(@RequestBody ReviewReqDTO.AddDTO dto) { + ReviewResDTO.AddDTO result = reviewService.addReview(dto); + + ReviewSuccessCode code = ReviewSuccessCode.OK; + return ApiResponse.onSuccess(code, result); + } + + // 가게의 리뷰 목록 조회 + @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 = "실패") + }) + @GetMapping("/reviews") + public ApiResponse getReviews(@RequestParam String storeName, @RequestParam(defaultValue = "1") Integer page) { + + ReviewSuccessCode code = ReviewSuccessCode.FOUND; + return ApiResponse.onSuccess(code, reviewService.findReview(storeName, page)); + } + + // 내가 작성한 리뷰 목록 (11.25) + @Operation( + summary = "내가 작성한 리뷰 목록 조회 API (11.25)", + description = "내가 작성한 리뷰를 모두 조회합니다. 페이지네이션으로 제공합니다." + ) + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") + }) + @GetMapping("/reviews/members/{memberId}/me") + public ApiResponse> getMyReviews(@PathVariable Long memberId, @Valid @ValidPage Pageable pageable) { + PageDTO result = reviewService.getMyReviews(memberId, pageable); + return ApiResponse.onSuccess(GeneralSuccessCode.OK, result); + } + + + + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java new file mode 100644 index 0000000..2a62499 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/converter/ReviewConverter.java @@ -0,0 +1,64 @@ +package com.example.umc9th.domain.review.converter; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.review.dto.req.ReviewReqDTO; +import com.example.umc9th.domain.review.dto.res.ReviewResDTO; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.domain.store.entity.Store; +import org.springframework.data.domain.Page; + +import java.time.LocalDate; + +public class ReviewConverter { + + public static ReviewResDTO.Search toSearchDTO(Review review){ + return ReviewResDTO.Search.builder() + .reviewId(review.getId()) + .content(review.getContent()) + .star(review.getStar()) + .memberId(review.getMember().getId()) + .replyId(review.getReply().getId()) + .storeId(review.getStore().getId()) + .build(); + } + + public static Review toAddEntity(ReviewReqDTO.AddDTO dto, Member member, Store store){ + return Review.builder() + .content(dto.content()) + .star(dto.star()) + .member(member) + .store(store) + .build(); + } + + public static ReviewResDTO.AddDTO toAddDTO(Review review){ + return ReviewResDTO.AddDTO.builder() + .reviewId(review.getId()) + .createAt(review.getCreatedAt()) + .build(); + } + + // result -> DTO + public static ReviewResDTO.ReviewPreViewListDTO toReviewPreviewListDTO(Page result){ + return ReviewResDTO.ReviewPreViewListDTO.builder() + .reviewList(result.getContent().stream() + .map(ReviewConverter::toReviewPreviewDTO) + .toList() + ) + .listSize(result.getSize()) + .totalPage(result.getTotalPages()) + .totalElements(result.getTotalElements()) + .isFirst(result.isFirst()) + .isLast(result.isLast()) + .build(); + } + + public static ReviewResDTO.ReviewPreViewDTO toReviewPreviewDTO(Review review){ + return ReviewResDTO.ReviewPreViewDTO.builder() + .ownerNickname(review.getMember().getName()) + .score(review.getStar()) + .body(review.getContent()) + .createdAt(LocalDate.from(review.getCreatedAt())) + .build(); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/dto/req/ReviewReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/review/dto/req/ReviewReqDTO.java new file mode 100644 index 0000000..88760e5 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/dto/req/ReviewReqDTO.java @@ -0,0 +1,21 @@ +package com.example.umc9th.domain.review.dto.req; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public class ReviewReqDTO { + + public record AddDTO( + @NotBlank + @Size(min = 1, max = 1000) + String content, + @NotNull + @Size(min = 1, max = 5) + Float star, + @NotNull + Long memberId, + @NotNull + Long storeId + ){} +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/dto/res/ReviewResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/review/dto/res/ReviewResDTO.java new file mode 100644 index 0000000..b7fcbd4 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/dto/res/ReviewResDTO.java @@ -0,0 +1,50 @@ +package com.example.umc9th.domain.review.dto.res; + +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +public class ReviewResDTO { + + @Getter + @Builder + public static class Search{ + private Long reviewId; + private String content; + private Float star; + private Long memberId; + private Long storeId; + private Long replyId; + } + + @Builder + public record AddDTO( + Long reviewId, + LocalDateTime createAt + ){} + + @Builder + public record ReviewPreViewListDTO( + List reviewList, + Integer listSize, + Integer totalPage, + Long totalElements, + Boolean isFirst, + Boolean isLast + ){} + + @Builder + public record ReviewPreViewDTO( + String ownerNickname, + Float score, + String body, + LocalDate createdAt + ){} + + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/entity/Reply.java b/week10/code/src/main/java/com/example/umc9th/domain/review/entity/Reply.java new file mode 100644 index 0000000..1df4b7d --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/entity/Reply.java @@ -0,0 +1,25 @@ +package com.example.umc9th.domain.review.entity; + +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "reply") +public class Reply extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "content", nullable = false) + @Lob + private String content; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/entity/Review.java b/week10/code/src/main/java/com/example/umc9th/domain/review/entity/Review.java new file mode 100644 index 0000000..2c25e2b --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/entity/Review.java @@ -0,0 +1,53 @@ +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.Objects; + +@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; + + @Column(name = "content", nullable = false) + @Lob + private String content; + + @Column(name = "star", nullable = false) + private Float star; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToOne(mappedBy = "review", cascade = CascadeType.REMOVE, orphanRemoval = true) + private Reply reply; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Review)) return false; + Review review = (Review) o; + return Objects.equals(getMember(), review.getMember()); + } + + @Override + public int hashCode() { + return Objects.hash(getMember()); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/exception/ReviewException.java b/week10/code/src/main/java/com/example/umc9th/domain/review/exception/ReviewException.java new file mode 100644 index 0000000..afde6b0 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java new file mode 100644 index 0000000..fa2d3d3 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewErrorCode.java @@ -0,0 +1,20 @@ +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 { + + REVIEW_EXCEPTION(HttpStatus.BAD_REQUEST, "REVIEW400_1", "잘못된 요청"), + NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_1", "해당 리뷰를 찾을 수 없습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java b/week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java new file mode 100644 index 0000000..91aded9 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/exception/code/ReviewSuccessCode.java @@ -0,0 +1,20 @@ +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 { + + OK(HttpStatus.OK, "REVIEW200_1", "리뷰가 정상적으로 등록되었습니다."), + FOUND(HttpStatus.OK, "REVIEW200_2", "리뷰가 정상적으로 조회되었습니다.") + + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReplyRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReplyRepository.java new file mode 100644 index 0000000..3640186 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReplyRepository.java @@ -0,0 +1,17 @@ +package com.example.umc9th.domain.review.repository; + +import com.example.umc9th.domain.review.entity.Reply; +import jakarta.transaction.Transactional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface ReplyRepository extends JpaRepository { + @Transactional + @Modifying(clearAutomatically = true) + @Query("DELETE FROM Reply rp WHERE rp.review.id IN :reviewIds") + void deleteAllByReviewIdsInBatch(@Param("reviewIds") List reviewIds); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java new file mode 100644 index 0000000..2c2cc38 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java @@ -0,0 +1,29 @@ +package com.example.umc9th.domain.review.repository; + +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.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import javax.swing.text.html.Option; +import java.util.List; + +public interface ReviewRepository extends JpaRepository, ReviewQueryDSL { + @Query("SELECT r.id FROM Review r WHERE r.member.id = :memberId") + List findAllIdsByMemberId(@Param("memberId") Long memberId); + + @Modifying(clearAutomatically = true) + @Query("DELETE FROM Review r WHERE r.id IN :reviewIds") + void deleteAllByIdsInBatch(@Param("reviewIds") List reviewIds); + + + Page findAllByStore(Store store, PageRequest pageRequest); + + Page findByMemberId(Long memberId, Pageable pageable); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDSL.java b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDSL.java new file mode 100644 index 0000000..dcb9fba --- /dev/null +++ b/week10/code/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 { + List searchReview(Predicate predicate); + List memberReviews(Predicate predicate); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDSLImpl.java b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDSLImpl.java new file mode 100644 index 0000000..33f9700 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/querydsl/ReviewQueryDSLImpl.java @@ -0,0 +1,56 @@ +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.example.umc9th.domain.store.entity.QLocation; +import com.example.umc9th.domain.store.entity.QStore; +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 searchReview(Predicate predicate){ + JPAQueryFactory queryFactory = new JPAQueryFactory(em); + + QReview review = QReview.review; + QStore store = QStore.store; + QLocation location = QLocation.location; + + //join on -> fetchJoin 변경 + return queryFactory + .selectFrom(review) + .join(review.store, store).fetchJoin() + .join(store.location, location).fetchJoin() + .where(predicate) + .fetch(); + } + + @Override + public List memberReviews(Predicate predicate){ + JPAQueryFactory queryFactory = new JPAQueryFactory(em); + + QReview review = QReview.review; + QStore store = QStore.store; + + //join on -> fetchJoin 변경 + return queryFactory + .selectFrom(review) + .join(review.store, store).fetchJoin() + .where(predicate) + .fetch(); + + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java b/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java new file mode 100644 index 0000000..a22daf6 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewQueryService.java @@ -0,0 +1,93 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.exception.MemberException; +import com.example.umc9th.domain.member.exception.code.MemberErrorCode; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.domain.review.converter.ReviewConverter; +import com.example.umc9th.domain.review.dto.req.ReviewReqDTO; +import com.example.umc9th.domain.review.dto.res.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.QLocation; +import com.example.umc9th.domain.store.entity.QStore; +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; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ReviewQueryService { + private final ReviewRepository reviewRepository; + private final MemberRepository memberRepository; + private final StoreRepository storeRepository; + + public List searchReview(String query, String type) { + QReview review = QReview.review; + QLocation location = QLocation.location; + BooleanBuilder builder = new BooleanBuilder(); + + if(type.equals("location")){ + builder.and(location.name.contains(query)); + } + if(type.equals("star")){ + builder.and(review.star.goe(Float.parseFloat(query))); + } + if(type.equals("both")){ + String firstQuery = query.split("&")[0]; + String secondQuery = query.split("&")[1]; + + builder.and(location.name.contains(firstQuery)); + builder.and(review.star.goe(Float.parseFloat(secondQuery))); + } + + List reviewList = reviewRepository.searchReview(builder); + return reviewList; + } + + public List memberReviews(Long memberId, String query, String type) { + QReview review = QReview.review; + QStore store = QStore.store; + + BooleanBuilder builder = new BooleanBuilder(); + + if(type.equals("store")){ + builder.and(store.name.eq(query)); + } + if(type.equals("star")){ + builder.and(review.star.goe(Float.parseFloat(query))); // 4.0 <= star < 5.0 + builder.and(review.star.lt(Float.parseFloat(query) + 1.0)); + } + if(type.equals("both")){ //query=송강루&4 + String firstQuery = query.split("&")[0]; + String secondQuery = query.split("&")[1]; + + builder.and(store.name.eq(firstQuery)); + builder.and(review.star.goe(Float.parseFloat(secondQuery))); + builder.and(review.star.lt(Float.parseFloat(secondQuery) + 1.0)); + + } + + builder.and(review.member.id.eq(memberId)); + + List reviewList = reviewRepository.memberReviews(builder); + return reviewList; + } + + + + + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java b/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java new file mode 100644 index 0000000..fb7c25e --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java @@ -0,0 +1,68 @@ +package com.example.umc9th.domain.review.service; + +import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.exception.MemberException; +import com.example.umc9th.domain.member.exception.code.MemberErrorCode; +import com.example.umc9th.domain.member.repository.MemberRepository; +import com.example.umc9th.domain.review.converter.ReviewConverter; +import com.example.umc9th.domain.review.dto.req.ReviewReqDTO; +import com.example.umc9th.domain.review.dto.res.ReviewResDTO; +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.example.umc9th.global.dto.PageDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ReviewService { + private final ReviewRepository reviewRepository; + private final MemberRepository memberRepository; + private final StoreRepository storeRepository; + + @Transactional + public ReviewResDTO.AddDTO addReview(ReviewReqDTO.AddDTO dto) { + Member member = memberRepository.findById(dto.memberId()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + Store store = storeRepository.findById(dto.storeId()) + .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); + + Review review = ReviewConverter.toAddEntity(dto, member, store); + + Review savedReview = reviewRepository.save(review); + return ReviewConverter.toAddDTO(savedReview); + } + + @Transactional + public ReviewResDTO.ReviewPreViewListDTO findReview(String storeName, Integer page){ + // - 가게를 가져온다 (가게 존재 여부 검증) + Store store = storeRepository.findByName(storeName) + // - 없으면 예외 터뜨린다 + .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); + + //- 가게에 맞는 리뷰를 가져온다 (Offset 페이징) + PageRequest pageRequest = PageRequest.of(page, 5); + Page result = reviewRepository.findAllByStore(store, pageRequest); + + //- 결과를 응답 DTO로 변환한다 (컨버터 이용) + return ReviewConverter.toReviewPreviewListDTO(result); + } + + @Transactional(readOnly = true) + public PageDTO getMyReviews(Long memberId, Pageable pageable){ + //sort값 무시 + Pageable unsortedPageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize()); + Page reviews = reviewRepository.findByMemberId(memberId, unsortedPageable); + + return PageDTO.of(reviews, ReviewConverter::toReviewPreviewDTO); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/controller/LocationController.java b/week10/code/src/main/java/com/example/umc9th/domain/store/controller/LocationController.java new file mode 100644 index 0000000..6b8952e --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/controller/LocationController.java @@ -0,0 +1,30 @@ +package com.example.umc9th.domain.store.controller; + +import com.example.umc9th.domain.store.converter.LocationConverter; +import com.example.umc9th.domain.store.dto.req.LocationReqDTO; +import com.example.umc9th.domain.store.dto.res.LocationResDTO; +import com.example.umc9th.domain.store.entity.Location; +import com.example.umc9th.domain.store.service.LocationService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +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 LocationController { + + private final LocationService locationService; + + @PostMapping("/locations") + public ApiResponse addLocation(@RequestBody LocationReqDTO request) { + Location result = locationService.addLocation(request); + + LocationResDTO.Add resultDTO = LocationConverter.toAddDTO(result); + GeneralSuccessCode code = GeneralSuccessCode.OK; + + return ApiResponse.onSuccess(code, resultDTO); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/controller/StoreController.java b/week10/code/src/main/java/com/example/umc9th/domain/store/controller/StoreController.java new file mode 100644 index 0000000..c7aefdd --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/controller/StoreController.java @@ -0,0 +1,49 @@ +package com.example.umc9th.domain.store.controller; + +import com.example.umc9th.domain.store.converter.StoreConverter; +import com.example.umc9th.domain.store.dto.req.StoreReqDTO; +import com.example.umc9th.domain.store.dto.res.StoreResDTO; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.domain.store.service.StoreService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import com.example.umc9th.global.dto.PageDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +public class StoreController { + private final StoreService storeService; + + @GetMapping("/stores/search") + public ApiResponse> searchStore(@RequestParam List region, + @RequestParam String keyword, + @RequestParam String sort, Pageable pageable) { + //요청URL 예시: /stores/search?region=강남구&keyword=민트 초코&sort=name&page=0&size=10 + //다중검색: ?region=강남구®ion=도봉구®ion=영등포구 + Page result = storeService.searchStores(region, keyword, sort, pageable); + + PageDTO resultDTO = PageDTO.of(result, StoreConverter::toSearchDTO); +// StoreConverter.toPageDTO(result); + GeneralSuccessCode code = GeneralSuccessCode.OK; + + return ApiResponse.onSuccess(code, resultDTO); + } + + //가게 추가 API + @PostMapping("/stores") + public ApiResponse addStore(@RequestBody StoreReqDTO request) { + Store result = storeService.addStore(request); + + StoreResDTO.Add resultDTO = StoreConverter.toAddDTO(result); + GeneralSuccessCode code = GeneralSuccessCode.OK; + + return ApiResponse.onSuccess(code, resultDTO); + + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/converter/LocationConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/store/converter/LocationConverter.java new file mode 100644 index 0000000..7b05372 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/converter/LocationConverter.java @@ -0,0 +1,13 @@ +package com.example.umc9th.domain.store.converter; + +import com.example.umc9th.domain.store.dto.res.LocationResDTO; +import com.example.umc9th.domain.store.entity.Location; + +public class LocationConverter { + + public static LocationResDTO.Add toAddDTO(Location location){ + return LocationResDTO.Add.builder() + .locationId(location.getId()) + .build(); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/converter/StoreConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/store/converter/StoreConverter.java new file mode 100644 index 0000000..614a70a --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/converter/StoreConverter.java @@ -0,0 +1,35 @@ +package com.example.umc9th.domain.store.converter; + +import com.example.umc9th.domain.store.dto.res.StoreResDTO; +import com.example.umc9th.domain.store.entity.Store; + +public class StoreConverter { + + public static StoreResDTO.Search toSearchDTO(Store store){ + return StoreResDTO.Search.builder() + .storeId(store.getId()) + .name(store.getName()) + .managerNumber(store.getManagerNumber()) + .detailAddress(store.getDetailAddress()) + .locationId(store.getLocation().getId()) + .build(); + } + +// public static BaseResDTO.PageDTO toPageDTO(Page page){ +// List content = page.getContent().stream().map(StoreConverter::toSearchDTO).toList(); +// return BaseResDTO.PageDTO.builder() +// .content(content) +// .currentPage(page.getNumber()) +// .totalPages(page.getTotalPages()) +// .totalElements(page.getTotalElements()) +// .isFirst(page.isFirst()) +// .isLast(page.isLast()) +// .build(); +// } + + public static StoreResDTO.Add toAddDTO(Store store){ + return StoreResDTO.Add.builder() + .storeId(store.getId()) + .build(); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/LocationReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/LocationReqDTO.java new file mode 100644 index 0000000..5875799 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/LocationReqDTO.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.store.dto.req; + +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +public class LocationReqDTO { + private String name; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/StoreReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/StoreReqDTO.java new file mode 100644 index 0000000..dbbe910 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/req/StoreReqDTO.java @@ -0,0 +1,14 @@ +package com.example.umc9th.domain.store.dto.req; + +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +public class StoreReqDTO { + private String name; + private Long managerNumber; + private String detailAddress; + private Long locationId; + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/LocationResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/LocationResDTO.java new file mode 100644 index 0000000..3e1eef9 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/LocationResDTO.java @@ -0,0 +1,13 @@ +package com.example.umc9th.domain.store.dto.res; + +import lombok.Builder; +import lombok.Getter; + +public class LocationResDTO { + + @Getter + @Builder + public static class Add{ + private Long locationId; + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/StoreResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/StoreResDTO.java new file mode 100644 index 0000000..3a644ae --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/dto/res/StoreResDTO.java @@ -0,0 +1,26 @@ +package com.example.umc9th.domain.store.dto.res; + +import lombok.Builder; +import lombok.Getter; + +public class StoreResDTO{ + + @Getter + @Builder + public static class Search{ + private Long storeId; + private String name; + private Long managerNumber; + private String detailAddress; + private Long locationId; + } + + @Getter + @Builder + public static class Add{ + private Long storeId; + } + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/entity/Location.java b/week10/code/src/main/java/com/example/umc9th/domain/store/entity/Location.java new file mode 100644 index 0000000..bf2d2e8 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/entity/Location.java @@ -0,0 +1,26 @@ +package com.example.umc9th.domain.store.entity; + +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.HashSet; +import java.util.Set; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "location") +public class Location extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", nullable = false) + private String name; + + @OneToMany(mappedBy = "location") + private Set storeList = new HashSet<>(); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/entity/Store.java b/week10/code/src/main/java/com/example/umc9th/domain/store/entity/Store.java new file mode 100644 index 0000000..043f46b --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/entity/Store.java @@ -0,0 +1,81 @@ +package com.example.umc9th.domain.store.entity; + +import com.example.umc9th.domain.mission.entity.Mission; +import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.BatchSize; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +@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) + private String name; + + @Column(name = "manager_number", nullable = false) + private Long managerNumber; + + @Column(name = "detail_address", nullable = false) + private String detailAddress; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "location_id") + private Location location; + + @OneToMany(mappedBy = "store", cascade = CascadeType.REMOVE, orphanRemoval = true) + @BatchSize(size=10) + private Set missionList = new HashSet<>(); + + @OneToMany(mappedBy = "store") + private Set reviewList = new HashSet<>(); + + @Column(nullable = false) + private String sortKey; + + @PrePersist @PreUpdate + private void syncSortKey() { + this.sortKey = buildSortKey(this.name); + } + public static String buildSortKey(String name) { + if (name == null) return ""; + name = name.trim(); + + StringBuilder sb = new StringBuilder(name.length() * 2); + name.codePoints().forEach(cp -> { + int bucket = + (cp >= 0xAC00 && cp <= 0xD7A3) ? 1 : // 가~힣 (완성형) + (cp >= 'A' && cp <= 'Z') ? 2 : + (cp >= 'a' && cp <= 'z') ? 3 : 4; + sb.append((char) ('0' + bucket)); + // 소문자화(유니코드 안전) + sb.append(new String(Character.toChars(Character.toLowerCase(cp)))); + }); + return sb.toString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Store)) return false; + Store store = (Store) o; + return Objects.equals(getLocation(), store.getLocation()); + } + @Override + public int hashCode() { + return Objects.hash(getLocation()); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/exception/LocationException.java b/week10/code/src/main/java/com/example/umc9th/domain/store/exception/LocationException.java new file mode 100644 index 0000000..acf69a0 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/exception/LocationException.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 LocationException extends GeneralException { + public LocationException(BaseErrorCode code) { + super(code); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/exception/StoreException.java b/week10/code/src/main/java/com/example/umc9th/domain/store/exception/StoreException.java new file mode 100644 index 0000000..a6e94bc --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/LocationErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/LocationErrorCode.java new file mode 100644 index 0000000..5f307aa --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/LocationErrorCode.java @@ -0,0 +1,18 @@ +package com.example.umc9th.domain.store.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum LocationErrorCode implements BaseErrorCode { + + LOCATION_NOT_FOUND(HttpStatus.BAD_REQUEST, "LOCATION400_1", "존재하지 않는 지역입니다.") + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java new file mode 100644 index 0000000..6671d1d --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/exception/code/StoreErrorCode.java @@ -0,0 +1,26 @@ +package com.example.umc9th.domain.store.exception.code; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum StoreErrorCode implements BaseErrorCode { + + REGION_NOT_EXIST(HttpStatus.BAD_REQUEST, "STORE400_1", "잘못된 요청입니다. 지역을 지정해주세요."), + KEYWORD_NOT_EXIST(HttpStatus.BAD_REQUEST, "STORE400_2", "잘못된 요청입니다. 검색어를 입력해주세요."), + SORT_NOT_FOUND(HttpStatus.BAD_REQUEST, "STORE400_3", "잘못된 요청입니다. 해당하는 정렬이 없습니다."), + STORE_NOT_FOUND(HttpStatus.BAD_REQUEST, "STORE400_4", "해당하는 가게를 찾지 못했습니다."), + + + ; + + + + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/repository/LocationRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/LocationRepository.java new file mode 100644 index 0000000..8b319c1 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/LocationRepository.java @@ -0,0 +1,7 @@ +package com.example.umc9th.domain.store.repository; + +import com.example.umc9th.domain.store.entity.Location; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface LocationRepository extends JpaRepository { +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSL.java b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSL.java new file mode 100644 index 0000000..f0c5704 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSL.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.store.repository; + +import com.example.umc9th.domain.store.entity.Store; +import com.querydsl.core.types.Predicate; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface StoreQueryDSL { + Page searchStores(Predicate predicate, String sort, Pageable pageable); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSLImpl.java b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSLImpl.java new file mode 100644 index 0000000..19ece47 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreQueryDSLImpl.java @@ -0,0 +1,69 @@ +package com.example.umc9th.domain.store.repository; + +import com.example.umc9th.domain.store.entity.QLocation; +import com.example.umc9th.domain.store.entity.QStore; +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.querydsl.core.types.OrderSpecifier; +import com.querydsl.core.types.Predicate; +import com.querydsl.jpa.impl.JPAQuery; +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.support.PageableExecutionUtils; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +@RequiredArgsConstructor +public class StoreQueryDSLImpl implements StoreQueryDSL { + + private final EntityManager em; + + @Override + public Page searchStores(Predicate predicate, String sort, Pageable pageable) { + JPAQueryFactory queryFactory = new JPAQueryFactory(em); + + QStore store = QStore.store; + QLocation location = QLocation.location; + + //3. 정렬 - 최신순, 이름순 + OrderSpecifier[] order; + if("latest".equals(sort)){ + order = new OrderSpecifier[] {store.createdAt.desc()}; + } + else if("name".equals(sort)){ + order = new OrderSpecifier[] { + store.sortKey.asc(), + store.createdAt.desc() + }; + } + else{ + throw new StoreException(StoreErrorCode.SORT_NOT_FOUND); //Exception 추가 + } + + // 4-1. 데이터 목록 조회 (OFFSET 페이징) + List results = queryFactory + .selectFrom(store) + .join(store.location, location).fetchJoin() //StoreResDTO의 locationId 응답 위해 fetchJoin + .where(predicate) + .orderBy(order) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .fetch(); + + // 4-2. 전체 개수 조회 (카운트 쿼리) + JPAQuery total = queryFactory + .select(store.count()) + .from(store) + .where(predicate); + + return PageableExecutionUtils.getPage(results, pageable, total::fetchOne); + +// return new PageImpl<>(results, pageable, (total != null) ? total : 0L); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java new file mode 100644 index 0000000..75aa658 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/repository/StoreRepository.java @@ -0,0 +1,12 @@ +package com.example.umc9th.domain.store.repository; + +import com.example.umc9th.domain.store.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface StoreRepository extends JpaRepository, StoreQueryDSL { + + Optional findByName(String name); + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/service/LocationService.java b/week10/code/src/main/java/com/example/umc9th/domain/store/service/LocationService.java new file mode 100644 index 0000000..538127a --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/service/LocationService.java @@ -0,0 +1,25 @@ +package com.example.umc9th.domain.store.service; + +import com.example.umc9th.domain.store.dto.req.LocationReqDTO; +import com.example.umc9th.domain.store.entity.Location; +import com.example.umc9th.domain.store.repository.LocationRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class LocationService { + private final LocationRepository locationRepository; + + @Transactional + public Location addLocation(LocationReqDTO request){ + + Location location = Location.builder() + .name(request.getName()) + .build(); + + return locationRepository.save(location); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/store/service/StoreService.java b/week10/code/src/main/java/com/example/umc9th/domain/store/service/StoreService.java new file mode 100644 index 0000000..6e349f0 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/store/service/StoreService.java @@ -0,0 +1,73 @@ +package com.example.umc9th.domain.store.service; + +import com.example.umc9th.domain.store.dto.req.StoreReqDTO; +import com.example.umc9th.domain.store.entity.Location; +import com.example.umc9th.domain.store.entity.QStore; +import com.example.umc9th.domain.store.entity.Store; +import com.example.umc9th.domain.store.exception.LocationException; +import com.example.umc9th.domain.store.exception.StoreException; +import com.example.umc9th.domain.store.exception.code.LocationErrorCode; +import com.example.umc9th.domain.store.exception.code.StoreErrorCode; +import com.example.umc9th.domain.store.repository.LocationRepository; +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.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class StoreService { + private final StoreRepository storeRepository; + private final LocationRepository locationRepository; + + public Page searchStores(List region, String keyword, String sort, Pageable pageable) { + QStore store = QStore.store; + + BooleanBuilder mainBuilder = new BooleanBuilder(); + + //1. 필터링 - 지역 기반 + if (region != null && !region.isEmpty()) { + BooleanBuilder regionBuilder = new BooleanBuilder(); + for(String rg : region){ + regionBuilder.or(store.detailAddress.contains(rg)); + } + mainBuilder.and(regionBuilder); + } + else{ + throw new StoreException(StoreErrorCode.REGION_NOT_EXIST); //Exception 추가 + } + + //2. 검색 - 공백 기준 + if(StringUtils.hasText(keyword)){ + BooleanBuilder keywordBuilder = new BooleanBuilder(); + String[] words = keyword.split("\\s+"); + for(String word : words){ + keywordBuilder.or(store.name.contains(word)); + } + mainBuilder.and(keywordBuilder); + } + else{ + throw new StoreException(StoreErrorCode.KEYWORD_NOT_EXIST); //Exception 추가 + } + + return storeRepository.searchStores(mainBuilder, sort, pageable); + } + + @Transactional + public Store addStore(StoreReqDTO request){ + Location location = locationRepository.findById(request.getLocationId()).orElseThrow(() -> new LocationException(LocationErrorCode.LOCATION_NOT_FOUND)); + Store store = Store.builder() + .name(request.getName()) + .detailAddress(request.getDetailAddress()) + .managerNumber(request.getManagerNumber()) + .location(location) + .build(); + return storeRepository.save(store); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/test/controller/TestController.java b/week10/code/src/main/java/com/example/umc9th/domain/test/controller/TestController.java new file mode 100644 index 0000000..9def1e9 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/test/controller/TestController.java @@ -0,0 +1,45 @@ +package com.example.umc9th.domain.test.controller; + +import com.example.umc9th.domain.test.converter.TestConverter; +import com.example.umc9th.domain.test.dto.res.TestResDTO; +import com.example.umc9th.domain.test.service.query.TestQueryService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/temp") +public class TestController { + + private final TestQueryService testQueryService; + + @GetMapping("/test") + public ApiResponse test() throws Exception{ + //응답 코드 정의 + 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!")); + } + + @GetMapping("/webhook") + public ApiResponse webhookTest(){ + try{ + throw new Exception(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java new file mode 100644 index 0000000..d0cac28 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/test/converter/TestConverter.java @@ -0,0 +1,18 @@ +package com.example.umc9th.domain.test.converter; + +import com.example.umc9th.domain.test.dto.res.TestResDTO; + +public class TestConverter { + + public static TestResDTO.Testing toTestingDTO(String testing){ + return TestResDTO.Testing.builder() + .testing(testing) + .build(); + } + + public static TestResDTO.Exception toExceptionDTO(String testing){ + return TestResDTO.Exception.builder() + .testString(testing) + .build(); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java new file mode 100644 index 0000000..294a23a --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/test/dto/req/TestReqDTO.java @@ -0,0 +1,6 @@ +package com.example.umc9th.domain.test.dto.req; + +public class TestReqDTO { + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java new file mode 100644 index 0000000..505fedf --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/test/dto/res/TestResDTO.java @@ -0,0 +1,18 @@ +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/week10/code/src/main/java/com/example/umc9th/domain/test/exception/TestException.java b/week10/code/src/main/java/com/example/umc9th/domain/test/exception/TestException.java new file mode 100644 index 0000000..1faf200 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/test/exception/code/TestErrorCode.java new file mode 100644 index 0000000..4b25f0c --- /dev/null +++ b/week10/code/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 { + + TEST_EXCEPTION(HttpStatus.BAD_REQUEST, "TEST400_1", "이거는 테스트"); + + private final HttpStatus status; + private final String code; + private final String message; + +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandService.java b/week10/code/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandService.java new file mode 100644 index 0000000..b1102dd --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandServiceImpl.java b/week10/code/src/main/java/com/example/umc9th/domain/test/service/command/TestCommandServiceImpl.java new file mode 100644 index 0000000..3e5a276 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java b/week10/code/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java new file mode 100644 index 0000000..4b8f749 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryService.java @@ -0,0 +1,6 @@ +package com.example.umc9th.domain.test.service.query; + +public interface TestQueryService { + void checkFlag(Long flag); +// void webhookTest(); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryServiceImpl.java b/week10/code/src/main/java/com/example/umc9th/domain/test/service/query/TestQueryServiceImpl.java new file mode 100644 index 0000000..3e12cf2 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/global/annotation/ExistFoods.java b/week10/code/src/main/java/com/example/umc9th/global/annotation/ExistFoods.java new file mode 100644 index 0000000..b5c8041 --- /dev/null +++ b/week10/code/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/week10/code/src/main/java/com/example/umc9th/global/annotation/ValidPage.java b/week10/code/src/main/java/com/example/umc9th/global/annotation/ValidPage.java new file mode 100644 index 0000000..38e9439 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/annotation/ValidPage.java @@ -0,0 +1,19 @@ +package com.example.umc9th.global.annotation; + + +import com.example.umc9th.global.validator.FoodExistValidator; +import com.example.umc9th.global.validator.PageValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = PageValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ValidPage { + String message() default "page는 1 이상이어야 합니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java new file mode 100644 index 0000000..79bba77 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/ApiResponse.java @@ -0,0 +1,37 @@ +package com.example.umc9th.global.apiPayload; + +import com.example.umc9th.global.apiPayload.code.BaseErrorCode; +import com.example.umc9th.global.apiPayload.code.BaseSuccessCode; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + + @JsonProperty("code") + private final String code; + + @JsonProperty("message") + private final String message; + + @JsonProperty("result") + private final T result; + + // 성공한 경우 (result 포함) + public static ApiResponse onSuccess(BaseSuccessCode code, T result){ + return new ApiResponse<>(true, code.getCode(), code.getMessage(), result); + } + + // 실패한 경우 (result 포함) + public static ApiResponse onFailure(BaseErrorCode code, T result) { + return new ApiResponse<>(false, code.getCode(), code.getMessage(), result); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java new file mode 100644 index 0000000..d1e67b6 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseErrorCode.java @@ -0,0 +1,9 @@ +package com.example.umc9th.global.apiPayload.code; + +import org.springframework.http.HttpStatus; + +public interface BaseErrorCode { + HttpStatus getStatus(); + String getCode(); + String getMessage(); +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java new file mode 100644 index 0000000..19d1b22 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/BaseSuccessCode.java @@ -0,0 +1,9 @@ +package com.example.umc9th.global.apiPayload.code; + +import org.springframework.http.HttpStatus; + +public interface BaseSuccessCode { + HttpStatus getStatus(); + String getCode(); + String getMessage(); +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java new file mode 100644 index 0000000..4dddcf0 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralErrorCode.java @@ -0,0 +1,28 @@ +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","예기치 않은 서버 에러가 발생했습니다."), + VALID_FAIL(HttpStatus.BAD_REQUEST, "COMMON405_1", "유효하지 않은 요청"), + + PAGE_INVALID(HttpStatus.BAD_REQUEST, "PAGE400_1", "유효하지 않은 페이지 범위입니다.") + ; + + private final HttpStatus status; + private final String code; + private final String message; + + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java new file mode 100644 index 0000000..ca5c305 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/code/GeneralSuccessCode.java @@ -0,0 +1,16 @@ +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_1", "요청이 정상적으로 처리되었습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java new file mode 100644 index 0000000..64d2a1b --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/exception/GeneralException.java @@ -0,0 +1,11 @@ +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/week10/code/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java new file mode 100644 index 0000000..5ce92ff --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/apiPayload/handler/GeneralExceptionAdvice.java @@ -0,0 +1,69 @@ +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 com.example.umc9th.global.service.DiscordWebhookService; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +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 +@RequiredArgsConstructor +@Slf4j +public class GeneralExceptionAdvice { + + private final DiscordWebhookService discordWebhookService; + + // 애플리케이션에서 발생하는 커스텀 예외를 처리 + @ExceptionHandler(GeneralException.class) + public ResponseEntity> handleException(GeneralException ex){ + return ResponseEntity.status(ex.getCode().getStatus()) + .body(ApiResponse.onFailure(ex.getCode(), null)); + } + + // 컨트롤러 메서드에서 @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); + } + + // 그 외의 정의되지 않은 모든 예외 처리 + @ExceptionHandler(Exception.class) + public ResponseEntity> handleException(Exception ex, HttpServletRequest request){ + + // 오류난 url과 httpMethod 가져오기 + String url = request.getRequestURI(); + String method = request.getMethod(); + + // 로그 출력 + log.error("[500 ERROR] {} {} - {}", method, url, ex.getMessage(), ex); + + // 웹훅으로 전송 + discordWebhookService.sendErrorToWebhook(ex, url, method); + + + BaseErrorCode code = GeneralErrorCode.INTERNAL_SERVER_ERROR; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure(code, null)); + } + +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/config/SwaggerConfig.java b/week10/code/src/main/java/com/example/umc9th/global/config/SwaggerConfig.java new file mode 100644 index 0000000..60da1a8 --- /dev/null +++ b/week10/code/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.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI swagger() { + Info info = new Info().title("Project").description("Project Swagger").version("0.0.1"); + + // 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/week10/code/src/main/java/com/example/umc9th/global/dto/PageDTO.java b/week10/code/src/main/java/com/example/umc9th/global/dto/PageDTO.java new file mode 100644 index 0000000..1c7e59e --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/dto/PageDTO.java @@ -0,0 +1,65 @@ +package com.example.umc9th.global.dto; + +import org.springframework.data.domain.Page; + +import java.util.List; +import java.util.function.Function; + +public record PageDTO( + List content, + int currentPage, + int size, + long totalElements, + int totalPages, + boolean isFirst, + boolean isLast +){ + + /** + * Page<T>를 PageDTO<T>로 변환합니다. + *

+ * 주로 DTO객체를 페이징하기 위해 사용합니다. + *

+ * + * @param pageData Page 객체 + * @param 데이터의 타입 + * @return 페이징 정보가 담긴 PageDTO + */ + public static PageDTO of(Page pageData) { + return new PageDTO<>( + pageData.getContent(), + pageData.getNumber() + 1, //page 1부터 시작 + pageData.getSize(), + pageData.getTotalElements(), + pageData.getTotalPages(), + pageData.isFirst(), + pageData.isLast() + ); + } + + /** + * Page<Entity>를 PageDTO<DTO>로 변환합니다.

+ * + * Page<Entity>의 내용을 Converter를 통해 DTO 타입으로 바꾼 뒤 PageDTO<DTO>을 생성합니다.

+ * + * @param pageData Page 객체 + * @param converter 리스트 내부의 각 요소를 변환할 함수 (사용 예: DomainConverter::toDto) + * @param (Entity) 원본 데이터 타입 + * @param (Result) 변환 후 반환할 데이터 타입 + * @return 변환된 데이터 리스트와 페이징 정보가 담긴 PageDTO + */ + public static PageDTO of(Page pageData, Function converter) { + //Function converter: Entity -> Converter -> Result + List content = pageData.getContent().stream().map(converter).toList(); + + return new PageDTO<>( + content, + pageData.getNumber() + 1, //page 1부터 시작 + pageData.getSize(), + pageData.getTotalElements(), + pageData.getTotalPages(), + pageData.isFirst(), + pageData.isLast() + ); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/entity/BaseEntity.java b/week10/code/src/main/java/com/example/umc9th/global/entity/BaseEntity.java new file mode 100644 index 0000000..4d47bd7 --- /dev/null +++ b/week10/code/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") + private LocalDateTime updatedAt; +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/service/DiscordWebhookService.java b/week10/code/src/main/java/com/example/umc9th/global/service/DiscordWebhookService.java new file mode 100644 index 0000000..2885656 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/service/DiscordWebhookService.java @@ -0,0 +1,73 @@ +package com.example.umc9th.global.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Map; + +@Service +@RequiredArgsConstructor +@Slf4j +public class DiscordWebhookService { + //Webhook URL을 환경변수에 저장 + @Value("${alert.discord.webhook-url}") + private String webhookUrl; + + //local환경이면 enabled:false, dev환경이면 enabled:true + @Value("${alert.discord.enabled}") + private boolean webhookEnabled; + + //Spring Framework에서 제공하는 동기(Synchronous) 방식의 HTTP 클라이언트 + //다른 서버의 API를 호출할 때 사용 + private final RestTemplate restTemplate = new RestTemplate(); + + public void sendErrorToWebhook(Exception ex, String url, String method) { + try { + if(webhookEnabled){ + String message = buildMessage(ex, url, method); + + //HTTP Header 정의, Content-Type: application/json + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + + // Discord body 형식({content: 내용}) + Map payload = Map.of("content", message); + + //header + body + HttpEntity> entity = new HttpEntity<>(payload, headers); + + //webhookUrl에 entity내용을 post로 전송 + restTemplate.postForEntity(webhookUrl, entity, String.class); + } + + } catch (Exception e) { + log.error("Failed to send webhook: {}", e.getMessage()); + } + } + + // Discord에 보낼 메시지 형식 + private String buildMessage(Exception ex, String url, String method) { + return """ + 🚨 **500 Internal Server Error 발생** + - URL: `%s` + - Method: `%s` + - 예외: `%s` + - 시각: `%s` + """.formatted( + url, + method, + ex.getMessage(), + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + ); + } + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java b/week10/code/src/main/java/com/example/umc9th/global/validator/FoodExistValidator.java new file mode 100644 index 0000000..b82dcab --- /dev/null +++ b/week10/code/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(value -> foodRepository.existsById(value)); + + if (!isValid) { + // 이 부분에서 아까 디폴트 메시지를 초기화 시키고, 새로운 메시지로 덮어씌우게 됩니다. + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(FoodErrorCode.NOT_FOUND.getMessage()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/week10/code/src/main/java/com/example/umc9th/global/validator/PageValidator.java b/week10/code/src/main/java/com/example/umc9th/global/validator/PageValidator.java new file mode 100644 index 0000000..4b10066 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/validator/PageValidator.java @@ -0,0 +1,30 @@ +package com.example.umc9th.global.validator; + +import com.example.umc9th.domain.member.exception.code.FoodErrorCode; +import com.example.umc9th.global.annotation.ExistFoods; +import com.example.umc9th.global.annotation.ValidPage; +import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; + +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Component; + + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class PageValidator implements ConstraintValidator { + @Override + public boolean isValid(Pageable value, ConstraintValidatorContext context) { + boolean isValid = (value.getPageNumber() > 0); + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(GeneralErrorCode.PAGE_INVALID.getMessage()).addConstraintViolation(); + } + return isValid; + + } +} diff --git a/week10/code/src/main/resources/application-dev.yml b/week10/code/src/main/resources/application-dev.yml new file mode 100644 index 0000000..7c6809e --- /dev/null +++ b/week10/code/src/main/resources/application-dev.yml @@ -0,0 +1,3 @@ +alert: + discord: + enabled: true \ No newline at end of file diff --git a/week10/code/src/main/resources/application-local.yml b/week10/code/src/main/resources/application-local.yml new file mode 100644 index 0000000..6b0c581 --- /dev/null +++ b/week10/code/src/main/resources/application-local.yml @@ -0,0 +1,3 @@ +alert: + discord: + enabled: false \ No newline at end of file diff --git a/week10/code/src/main/resources/application.yml b/week10/code/src/main/resources/application.yml new file mode 100644 index 0000000..88b3abd --- /dev/null +++ b/week10/code/src/main/resources/application.yml @@ -0,0 +1,24 @@ +spring: + application: + name: "UMC9th" # "umc9th" + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver # MySQL JDBC ???? ??? ?? + url: ${DB_URL} # jdbc:mysql://localhost:3306/{???????} + username: ${DB_USER} # MySQL ?? ?? + password: ${DB_PW} # MySQL ???? + + jpa: + database: mysql # ??? ?????? ?? ?? (MySQL) + database-platform: org.hibernate.dialect.MySQLDialect # Hibernate?? ??? MySQL ??(dialect) ?? + show-sql: true # ??? SQL ??? ??? ???? ?? ?? + hibernate: + ddl-auto: update # ?????? ?? ? ?????? ???? ??? ?? + properties: + hibernate: + format_sql: true # ???? SQL ??? ?? ?? ??? + +alert: + discord: + webhook-url: ${DISCORD_WEBHOOK_URL} + enabled: false \ No newline at end of file diff --git a/week10/code/src/test/java/com/example/umc9th/Umc9thApplicationTests.java b/week10/code/src/test/java/com/example/umc9th/Umc9thApplicationTests.java new file mode 100644 index 0000000..bbdf1bd --- /dev/null +++ b/week10/code/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 f415406e3184c335dc17f303d90a5823eae41c85 Mon Sep 17 00:00:00 2001 From: kjh015 Date: Thu, 27 Nov 2025 20:25:08 +0900 Subject: [PATCH 02/10] =?UTF-8?q?feat:=20Session=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B0=8F=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- week10/code/build.gradle | 4 ++ .../member/converter/MemberConverter.java | 6 ++- .../domain/member/dto/req/MemberReqDTO.java | 5 ++ .../umc9th/domain/member/entity/Member.java | 6 ++- .../member/repository/MemberRepository.java | 2 + .../domain/member/service/MemberService.java | 7 ++- .../auth/details/CustomUserDetails.java | 31 ++++++++++++ .../details/CustomUserDetailsService.java | 28 +++++++++++ .../umc9th/global/auth/enums/Role.java | 5 ++ .../umc9th/global/config/SecurityConfig.java | 49 +++++++++++++++++++ 10 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetails.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetailsService.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/enums/Role.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java diff --git a/week10/code/build.gradle b/week10/code/build.gradle index 0395963..4e346da 100644 --- a/week10/code/build.gradle +++ b/week10/code/build.gradle @@ -46,6 +46,10 @@ 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' } tasks.named('test') { diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java index 10b384e..93a1464 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java @@ -3,6 +3,7 @@ import com.example.umc9th.domain.member.dto.req.MemberReqDTO; import com.example.umc9th.domain.member.dto.res.MemberResDTO; import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.global.auth.enums.Role; public class MemberConverter { @@ -21,9 +22,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) // 추가된 코드 .birth(dto.birth()) .address(dto.address()) .detailAddress(dto.specAddress()) diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java index 9a6f22b..29132dd 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java @@ -3,6 +3,7 @@ import com.example.umc9th.domain.member.enums.Address; import com.example.umc9th.domain.member.enums.Gender; import com.example.umc9th.global.annotation.ExistFoods; +import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -13,6 +14,10 @@ public class MemberReqDTO { public record JoinDTO( @NotBlank String name, + @Email + String email, // 추가된 속성 + @NotBlank + String password, // 추가된 속성 @NotNull Gender gender, @NotNull diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java index 451a285..a4f3658 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -6,6 +6,7 @@ import com.example.umc9th.domain.member.enums.Gender; import com.example.umc9th.domain.member.entity.mapping.MemberMission; import com.example.umc9th.domain.review.entity.Review; +import com.example.umc9th.global.auth.enums.Role; import com.example.umc9th.global.entity.BaseEntity; import jakarta.persistence.*; import lombok.*; @@ -53,7 +54,7 @@ public class Member extends BaseEntity { @Builder.Default private Integer point = 0; - @Column(name="email", nullable = false) + @Column(name="email", nullable = false, unique = true) private String email; @Column(name="phone_number") @@ -62,6 +63,9 @@ public class Member extends BaseEntity { @Column(name = "delete_at") private LocalDateTime deletedAt; + @Enumerated(EnumType.STRING) + private Role role; + @OneToMany(mappedBy = "member", orphanRemoval = true) private Set memberFoodList = new HashSet<>(); diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java index 40f11af..4703dae 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java @@ -10,4 +10,6 @@ public interface MemberRepository extends JpaRepository { //2. 마이 페이지 Optional findById(Long memberId); + Optional findByEmail(String email); + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java index a72f220..b1eacba 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -12,8 +12,10 @@ import com.example.umc9th.domain.member.repository.*; import com.example.umc9th.domain.review.repository.ReplyRepository; import com.example.umc9th.domain.review.repository.ReviewRepository; +import com.example.umc9th.global.auth.enums.Role; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import java.util.List; @@ -30,6 +32,8 @@ public class MemberService { private final ReplyRepository replyRepository; private final FoodRepository foodRepository; + private final PasswordEncoder passwordEncoder; + @Transactional public void withdraw(Long memberId) { if(!memberRepository.existsById(memberId)) { @@ -50,8 +54,9 @@ public void withdraw(Long memberId) { @Transactional public MemberResDTO.JoinDTO signup(MemberReqDTO.JoinDTO dto){ + String salt = passwordEncoder.encode(dto.password()); // 사용자 생성 - Member member = MemberConverter.toMember(dto); + Member member = MemberConverter.toMember(dto, salt, Role.ROLE_USER); // DB 적용 memberRepository.save(member); diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetails.java b/week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetails.java new file mode 100644 index 0000000..bb720d0 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetails.java @@ -0,0 +1,31 @@ +package com.example.umc9th.global.auth.details; + +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/week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetailsService.java b/week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetailsService.java new file mode 100644 index 0000000..a68bc64 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/details/CustomUserDetailsService.java @@ -0,0 +1,28 @@ +package com.example.umc9th.global.auth.details; + +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.findByEmail(username) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + // CustomUserDetails 반환 + return new CustomUserDetails(member); + } +} + diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/enums/Role.java b/week10/code/src/main/java/com/example/umc9th/global/auth/enums/Role.java new file mode 100644 index 0000000..673e30c --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/enums/Role.java @@ -0,0 +1,5 @@ +package com.example.umc9th.global.auth.enums; + +public enum Role { + ROLE_ADMIN, ROLE_USER +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java b/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java new file mode 100644 index 0000000..c15bdd7 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.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 SecurityConfig { + + 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(); + } +} From 98930cbec2ee67d286f166897f58183db3888af6 Mon Sep 17 00:00:00 2001 From: kjh015 Date: Sun, 30 Nov 2025 19:44:27 +0900 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20JWT=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B0=8F=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- week10/code/build.gradle | 6 ++ .../member/controller/MemberController.java | 8 ++ .../member/converter/MemberConverter.java | 7 ++ .../domain/member/dto/req/MemberReqDTO.java | 8 ++ .../domain/member/dto/res/MemberResDTO.java | 7 ++ .../exception/code/MemberErrorCode.java | 4 +- .../domain/member/service/MemberService.java | 26 ++++++ .../token/AuthenticationEntryPointImpl.java | 33 +++++++ .../global/auth/token/JwtAuthFilter.java | 62 +++++++++++++ .../umc9th/global/auth/token/JwtUtil.java | 93 +++++++++++++++++++ .../umc9th/global/config/SecurityConfig.java | 37 ++++++-- .../code/src/main/resources/application.yml | 8 +- 12 files changed, 291 insertions(+), 8 deletions(-) create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/token/AuthenticationEntryPointImpl.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtAuthFilter.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java diff --git a/week10/code/build.gradle b/week10/code/build.gradle index 4e346da..738886a 100644 --- a/week10/code/build.gradle +++ b/week10/code/build.gradle @@ -50,6 +50,12 @@ dependencies { // 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/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index 9d6dcc0..73525cf 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -32,4 +32,12 @@ public ApiResponse signUp(@RequestBody @Valid MemberReqDTO return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberService.signup(dto)); } + // 로그인 + @PostMapping("/login") + public ApiResponse login( + @RequestBody @Valid MemberReqDTO.LoginDTO dto + ){ + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberService.login(dto)); + } + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java index 93a1464..0759a37 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java @@ -34,4 +34,11 @@ public static Member toMember(MemberReqDTO.JoinDTO dto, String password, Role ro .gender(dto.gender()) .build(); } + + public static MemberResDTO.LoginDTO toLoginDTO(Member member, String accessToken) { + return MemberResDTO.LoginDTO.builder() + .memberId(member.getId()) + .accessToken(accessToken) + .build(); + } } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java index 29132dd..598f361 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/req/MemberReqDTO.java @@ -29,4 +29,12 @@ public record JoinDTO( @ExistFoods List preferCategory ){} + + // 로그인 + public record LoginDTO( + @NotBlank + String email, + @NotBlank + String password + ){} } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java index b3623a4..6e31044 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java @@ -20,4 +20,11 @@ public record JoinDTO( LocalDateTime createAt ){} + // 로그인 + @Builder + public record LoginDTO( + Long memberId, + String accessToken + ){} + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java index c4ba600..ca5ee1b 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java @@ -9,7 +9,9 @@ @AllArgsConstructor public enum MemberErrorCode implements BaseErrorCode { - MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER400_1", "존재하지 않는 회원입니다."); + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER400_1", "존재하지 않는 회원입니다."), + INVALID(HttpStatus.BAD_REQUEST, "MEMBER400_2", "유효하지 않은 정보"); + private final HttpStatus status; private final String code; diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java index b1eacba..b9d2430 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -12,8 +12,11 @@ import com.example.umc9th.domain.member.repository.*; import com.example.umc9th.domain.review.repository.ReplyRepository; import com.example.umc9th.domain.review.repository.ReviewRepository; +import com.example.umc9th.global.auth.details.CustomUserDetails; import com.example.umc9th.global.auth.enums.Role; +import com.example.umc9th.global.auth.token.JwtUtil; import jakarta.transaction.Transactional; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -33,6 +36,7 @@ public class MemberService { private final FoodRepository foodRepository; private final PasswordEncoder passwordEncoder; + private final JwtUtil jwtUtil; @Transactional public void withdraw(Long memberId) { @@ -79,4 +83,26 @@ public MemberResDTO.JoinDTO signup(MemberReqDTO.JoinDTO dto){ return MemberConverter.toJoinDTO(member); } + public MemberResDTO.LoginDTO login( + MemberReqDTO.@Valid LoginDTO dto + ) { + + // Member 조회 + Member member = memberRepository.findByEmail(dto.email()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + // 비밀번호 검증 + if (!passwordEncoder.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); + } } diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/token/AuthenticationEntryPointImpl.java b/week10/code/src/main/java/com/example/umc9th/global/auth/token/AuthenticationEntryPointImpl.java new file mode 100644 index 0000000..21b81f0 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/token/AuthenticationEntryPointImpl.java @@ -0,0 +1,33 @@ +package com.example.umc9th.global.auth.token; + +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/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtAuthFilter.java b/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtAuthFilter.java new file mode 100644 index 0000000..d296038 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtAuthFilter.java @@ -0,0 +1,62 @@ +package com.example.umc9th.global.auth.token; + +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.apiPayload.code.GeneralErrorCode; +import com.example.umc9th.global.auth.details.CustomUserDetailsService; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + + +@RequiredArgsConstructor +public class JwtAuthFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + private final CustomUserDetailsService customUserDetailsService; + + @Override + protected void doFilterInternal( + @NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain + ) throws ServletException, IOException { + + // 토큰 가져오기 + String token = request.getHeader("Authorization"); + // 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); + + + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java b/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java new file mode 100644 index 0000000..b220ed7 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java @@ -0,0 +1,93 @@ +package com.example.umc9th.global.auth.token; + +import com.example.umc9th.global.auth.details.CustomUserDetails; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.time.Instant; +import java.util.Date; +import java.util.stream.Collectors; + +@Component +public class JwtUtil { + + private final SecretKey secretKey; + private final Duration accessExpiration; + + public JwtUtil( + @Value("${jwt.token.secretKey}") String secret, + @Value("${jwt.token.expiration.access}") Long accessExpiration + ) { + this.secretKey = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8)); + this.accessExpiration = Duration.ofMillis(accessExpiration); + } + + // 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/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java b/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java index c15bdd7..5b25bc5 100644 --- a/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java +++ b/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java @@ -1,5 +1,10 @@ package com.example.umc9th.global.config; +import com.example.umc9th.global.auth.details.CustomUserDetailsService; +import com.example.umc9th.global.auth.token.AuthenticationEntryPointImpl; +import com.example.umc9th.global.auth.token.JwtAuthFilter; +import com.example.umc9th.global.auth.token.JwtUtil; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -7,14 +12,21 @@ import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @EnableWebSecurity @Configuration +@RequiredArgsConstructor public class SecurityConfig { + private final JwtUtil jwtUtil; + private final CustomUserDetailsService customUserDetailsService; + private final String[] allowUris = { - "/sign-up", + "/api/auth/login", + "/api/auth/sign-up", "/swagger-ui/**", "/swagger-resources/**", "/v3/api-docs/**", @@ -28,22 +40,35 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .requestMatchers("/admin/**").hasRole("ADMIN") .anyRequest().authenticated() ) - .formLogin(form -> form - .defaultSuccessUrl("/swagger-ui/index.html", true) - .permitAll() - ) + // 폼로그인 비활성화 + .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(); + } } diff --git a/week10/code/src/main/resources/application.yml b/week10/code/src/main/resources/application.yml index 88b3abd..06e00ff 100644 --- a/week10/code/src/main/resources/application.yml +++ b/week10/code/src/main/resources/application.yml @@ -21,4 +21,10 @@ spring: alert: discord: webhook-url: ${DISCORD_WEBHOOK_URL} - enabled: false \ No newline at end of file + enabled: false + +jwt: + token: + secretKey: ZGh3YWlkc2F2ZXdhZXZ3b2EgMTM5ZXUgMDMxdWMyIHEyMiBAIDAgKTJFVio= + expiration: + access: 14400000 \ No newline at end of file From cf71fa8a8523c85215937d0ca737a5214d11debc Mon Sep 17 00:00:00 2001 From: kjh015 Date: Sun, 30 Nov 2025 22:24:20 +0900 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20Kakao=20=EC=86=8C=EC=85=9C=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 4 +- .../umc9th/domain/member/entity/Member.java | 21 +++-- .../domain/member/enums/SocialType.java | 5 + .../member/repository/MemberRepository.java | 2 + .../domain/member/service/MemberService.java | 33 ++++++- .../auth/controller/AuthController.java | 40 ++++++++ .../umc9th/global/auth/dto/KakaoResDTO.java | 49 ++++++++++ .../global/auth/service/KakaoService.java | 94 +++++++++++++++++++ .../umc9th/global/config/SecurityConfig.java | 5 +- .../code/src/main/resources/application.yml | 8 +- 10 files changed, 249 insertions(+), 12 deletions(-) create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/dto/KakaoResDTO.java create mode 100644 week10/code/src/main/java/com/example/umc9th/global/auth/service/KakaoService.java diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index 73525cf..63ff451 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -13,11 +13,11 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/api/auth") +@RequestMapping("/api/member") public class MemberController { private final MemberService memberService; - @DeleteMapping("/member/{memberId}") + @DeleteMapping("/{memberId}") public ApiResponse deleteMember(@PathVariable Long memberId) { memberService.withdraw(memberId); diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java index a4f3658..c814e71 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -5,6 +5,7 @@ import com.example.umc9th.domain.member.enums.Address; import com.example.umc9th.domain.member.enums.Gender; import com.example.umc9th.domain.member.entity.mapping.MemberMission; +import com.example.umc9th.domain.member.enums.SocialType; import com.example.umc9th.domain.review.entity.Review; import com.example.umc9th.global.auth.enums.Role; import com.example.umc9th.global.entity.BaseEntity; @@ -28,21 +29,21 @@ public class Member extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name="name", length = 3, nullable = false) + @Column(name="name", length = 3) private String name; - @Column(name="gender", nullable = false) + @Column(name="gender") @Enumerated(EnumType.STRING) @Builder.Default private Gender gender = Gender.NONE; - @Column(name="birth", nullable = false) + @Column(name="birth") private LocalDate birth; - @Column(name="password", nullable = false) + @Column(name="password") private String password; - @Column(name="address", nullable = false) + @Column(name="address") @Enumerated(EnumType.STRING) @Builder.Default private Address address = Address.NONE; @@ -50,13 +51,21 @@ public class Member extends BaseEntity { @Column(name="detail_address") private String detailAddress; - @Column(name="point", nullable = false) + @Column(name="point") @Builder.Default private Integer point = 0; @Column(name="email", nullable = false, unique = true) private String email; + //소셜 로그인 + @Column(unique = true) + private Long socialUid; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + // + @Column(name="phone_number") private String phoneNumber; diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java b/week10/code/src/main/java/com/example/umc9th/domain/member/enums/SocialType.java new file mode 100644 index 0000000..2df39f0 --- /dev/null +++ b/week10/code/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 { + KAKAO +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java index 4703dae..e5385c1 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/MemberRepository.java @@ -12,4 +12,6 @@ public interface MemberRepository extends JpaRepository { Optional findByEmail(String email); + Optional findBySocialUid(Long socialUid); + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java index b9d2430..cb7d7db 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -13,13 +13,15 @@ import com.example.umc9th.domain.review.repository.ReplyRepository; import com.example.umc9th.domain.review.repository.ReviewRepository; import com.example.umc9th.global.auth.details.CustomUserDetails; +import com.example.umc9th.global.auth.dto.KakaoResDTO; import com.example.umc9th.global.auth.enums.Role; import com.example.umc9th.global.auth.token.JwtUtil; -import jakarta.transaction.Transactional; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.User; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.stream.Collectors; @@ -83,6 +85,7 @@ public MemberResDTO.JoinDTO signup(MemberReqDTO.JoinDTO dto){ return MemberConverter.toJoinDTO(member); } + @Transactional public MemberResDTO.LoginDTO login( MemberReqDTO.@Valid LoginDTO dto ) { @@ -105,4 +108,32 @@ public MemberResDTO.LoginDTO login( // DTO 조립 return MemberConverter.toLoginDTO(member, accessToken); } + + @Transactional + public MemberResDTO.LoginDTO loginOrSignup(KakaoResDTO.UserInfoDTO kakaoUserInfo) { + + Long kakaoId = kakaoUserInfo.id(); + String email = kakaoUserInfo.kakaoAccount().email(); + + // 1. DB에서 카카오 ID로 회원 조회, 없으면 새로 생성 + Member member = memberRepository.findBySocialUid(kakaoId) + .orElseGet(() -> { + // 신규 회원가입 + Member newMember = Member.builder() + .socialUid(kakaoId) + .email(email) + .role(Role.ROLE_USER) + .build(); + return memberRepository.save(newMember); + }); + + + // 2. 우리 서비스의 JWT 토큰 발급 + CustomUserDetails userDetails = new CustomUserDetails(member); + String accessToken = jwtUtil.createAccessToken(userDetails); +// String refreshToken = jwtUtil.createRefreshToken(member.getId()); + + // 3. 결과 반환 + return MemberConverter.toLoginDTO(member, accessToken); + } } diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java b/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java new file mode 100644 index 0000000..a1f572a --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java @@ -0,0 +1,40 @@ +package com.example.umc9th.global.auth.controller; + +import com.example.umc9th.domain.member.dto.res.MemberResDTO; +import com.example.umc9th.domain.member.exception.code.MemberSuccessCode; +import com.example.umc9th.domain.member.service.MemberService; +import com.example.umc9th.global.apiPayload.ApiResponse; +import com.example.umc9th.global.auth.dto.KakaoResDTO; +import com.example.umc9th.global.auth.service.KakaoService; +import io.swagger.v3.oas.annotations.Operation; +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; +import org.springframework.web.client.RestTemplate; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/auth") +public class AuthController { + private final KakaoService kakaoService; + private final MemberService memberService; + + + @Operation( + summary = "카카오 소셜 로그인 API", + description = "https://kauth.kakao.com/oauth/authorize?client_id=fc96b5b695d36b6cd576b67c9fdf0085&redirect_uri=http://localhost:8080/api/auth/kakao/callback&response_type=code." + ) + @GetMapping("/kakao/callback") + public ApiResponse kakaoLogin(@RequestParam("code") String code){ + // 1. 인가 코드로 카카오 액세스 토큰 발급 + String accessToken = kakaoService.getAccessToken(code); + + // 2. 카카오 액세스 토큰으로 사용자 정보 조회 + KakaoResDTO.UserInfoDTO kakaoUserInfo = kakaoService.getUserInfo(accessToken); + + // 3. 우리 서비스 로그인/회원가입 후 AccessToken 발급 + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberService.loginOrSignup(kakaoUserInfo)); + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/dto/KakaoResDTO.java b/week10/code/src/main/java/com/example/umc9th/global/auth/dto/KakaoResDTO.java new file mode 100644 index 0000000..6df8509 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/dto/KakaoResDTO.java @@ -0,0 +1,49 @@ +package com.example.umc9th.global.auth.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class KakaoResDTO { + + // 액세스 토큰 응답 DTO + public record TokenDTO( + @JsonProperty("access_token") + String accessToken, + + @JsonProperty("refresh_token") + String refreshToken, + + @JsonProperty("expires_in") + Integer expiresIn, + + @JsonProperty("refresh_token_expires_in") + Integer refreshTokenExpiresIn, + + @JsonProperty("token_type") + String tokenType, + + @JsonProperty("scope") + String scope + ) {} + + // 사용자 정보 응답 DTO + public record UserInfoDTO( + Long id, // 카카오 회원 번호 + + @JsonProperty("connected_at") + String connectedAt, + + @JsonProperty("kakao_account") + KakaoAccount kakaoAccount + ) { + + public record KakaoAccount( + @JsonProperty("email_needs_agreement") + Boolean emailNeedsAgreement, + + @JsonProperty("has_email") + Boolean hasEmail, + + String email + ) {} + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/service/KakaoService.java b/week10/code/src/main/java/com/example/umc9th/global/auth/service/KakaoService.java new file mode 100644 index 0000000..52621f4 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/service/KakaoService.java @@ -0,0 +1,94 @@ +package com.example.umc9th.global.auth.service; + +import com.example.umc9th.global.auth.dto.KakaoResDTO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.userdetails.User; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; + +@Slf4j +@Service +@RequiredArgsConstructor +public class KakaoService { + + @Value("${kakao.client-id}") + private String clientId; + + @Value("${kakao.redirect-uri}") + private String redirectUri; + + @Value("${kakao.token-uri}") + private String tokenUri; + + @Value("${kakao.user-info-uri}") + private String userInfoUri; + + private final RestTemplate restTemplate = new RestTemplate(); + + // 1. 인가 코드로 액세스 토큰 요청 (Step 2) + public String getAccessToken(String code) { + // HTTP Header 생성 + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-type", "application/x-www-form-urlencoded;charset=utf-8"); + + // HTTP Body 생성 + MultiValueMap body = new LinkedMultiValueMap<>(); + body.add("grant_type", "authorization_code"); + body.add("client_id", clientId); + body.add("redirect_uri", redirectUri); + body.add("code", code); // 프론트에서 받은 인가 코드 + + // HTTP 요청 보내기 + HttpEntity> kakaoTokenRequest = new HttpEntity<>(body, headers); + + try { + ResponseEntity response = restTemplate.exchange( + tokenUri, + HttpMethod.POST, + kakaoTokenRequest, + KakaoResDTO.TokenDTO.class + ); + + return response.getBody().accessToken(); + } catch (Exception e) { + log.error("카카오 토큰 발급 실패", e); + throw new RuntimeException("카카오 액세스 토큰을 가져오는데 실패했습니다."); + } + } + + // 2. 액세스 토큰으로 사용자 정보 조회 (Step 3) + public KakaoResDTO.UserInfoDTO getUserInfo(String accessToken) { + // HTTP Header 생성 + HttpHeaders headers = new HttpHeaders(); + headers.add("Authorization", "Bearer " + accessToken); + headers.add("Content-type", "application/x-www-form-urlencoded;charset=utf-8"); + + // HTTP 요청 보내기 + HttpEntity> kakaoUserInfoRequest = new HttpEntity<>(headers); + + try { + ResponseEntity response = restTemplate.exchange( + userInfoUri, + HttpMethod.GET, // or POST + kakaoUserInfoRequest, + KakaoResDTO.UserInfoDTO.class + ); + + return response.getBody(); + } catch (Exception e) { + log.error("카카오 사용자 정보 조회 실패", e); + throw new RuntimeException("카카오 사용자 정보를 가져오는데 실패했습니다."); + } + } + + +} diff --git a/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java b/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java index 5b25bc5..c14b965 100644 --- a/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java +++ b/week10/code/src/main/java/com/example/umc9th/global/config/SecurityConfig.java @@ -25,8 +25,9 @@ public class SecurityConfig { private final CustomUserDetailsService customUserDetailsService; private final String[] allowUris = { - "/api/auth/login", - "/api/auth/sign-up", + "/api/member/login", + "/api/member/sign-up", + "/api/auth/kakao/callback", "/swagger-ui/**", "/swagger-resources/**", "/v3/api-docs/**", diff --git a/week10/code/src/main/resources/application.yml b/week10/code/src/main/resources/application.yml index 06e00ff..cc975c4 100644 --- a/week10/code/src/main/resources/application.yml +++ b/week10/code/src/main/resources/application.yml @@ -27,4 +27,10 @@ jwt: token: secretKey: ZGh3YWlkc2F2ZXdhZXZ3b2EgMTM5ZXUgMDMxdWMyIHEyMiBAIDAgKTJFVio= expiration: - access: 14400000 \ No newline at end of file + access: 14400000 + +kakao: + client-id: "fc96b5b695d36b6cd576b67c9fdf0085" + redirect-uri: "http://localhost:8080/api/auth/kakao/callback" + token-uri: "https://kauth.kakao.com/oauth/token" + user-info-uri: "https://kapi.kakao.com/v2/user/me" \ No newline at end of file From ea3cb176da7592e5019f65daae8b4468367db5e2 Mon Sep 17 00:00:00 2001 From: kjh015 Date: Mon, 1 Dec 2025 00:10:14 +0900 Subject: [PATCH 05/10] =?UTF-8?q?feat:=20RefreshToken=20=EB=B0=9C=EA=B8=89?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 21 ++++++++++-- .../member/converter/MemberConverter.java | 3 +- .../domain/member/dto/res/MemberResDTO.java | 3 +- .../umc9th/domain/member/entity/Member.java | 4 +++ .../domain/member/entity/RefreshToken.java | 33 ++++++++++++++++++ .../repository/RefreshTokenRepository.java | 10 ++++++ .../domain/member/service/MemberService.java | 34 +++++++++++++++++-- .../auth/controller/AuthController.java | 20 +++++++++-- .../umc9th/global/auth/token/JwtUtil.java | 10 +++++- .../code/src/main/resources/application.yml | 1 + 10 files changed, 129 insertions(+), 10 deletions(-) create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/entity/RefreshToken.java create mode 100644 week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index 63ff451..b87bc31 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -7,10 +7,15 @@ import com.example.umc9th.domain.member.service.MemberService; import com.example.umc9th.global.apiPayload.ApiResponse; import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; import org.springframework.web.bind.annotation.*; +import java.time.Duration; + @RestController @RequiredArgsConstructor @RequestMapping("/api/member") @@ -35,9 +40,21 @@ public ApiResponse signUp(@RequestBody @Valid MemberReqDTO // 로그인 @PostMapping("/login") public ApiResponse login( - @RequestBody @Valid MemberReqDTO.LoginDTO dto + @RequestBody @Valid MemberReqDTO.LoginDTO dto, + HttpServletResponse response ){ - return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberService.login(dto)); + MemberResDTO.LoginDTO result = memberService.login(dto); + + // RefreshToken을 HttpOnly 쿠키로 설정 + ResponseCookie cookie = ResponseCookie.from("refreshToken", result.refreshToken()) + .httpOnly(true) + .secure(false) // HTTPS만 허용할 경우 true + .path("/") + .maxAge(Duration.ofDays(7)) + .build(); + response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString()); + + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, result); } } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java index 0759a37..5a374ea 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/converter/MemberConverter.java @@ -35,10 +35,11 @@ public static Member toMember(MemberReqDTO.JoinDTO dto, String password, Role ro .build(); } - public static MemberResDTO.LoginDTO toLoginDTO(Member member, String accessToken) { + public static MemberResDTO.LoginDTO toLoginDTO(Member member, String accessToken, String refreshToken) { return MemberResDTO.LoginDTO.builder() .memberId(member.getId()) .accessToken(accessToken) + .refreshToken(refreshToken) .build(); } } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java index 6e31044..cf1511f 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java @@ -24,7 +24,8 @@ public record JoinDTO( @Builder public record LoginDTO( Long memberId, - String accessToken + String accessToken, + String refreshToken ){} } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java index c814e71..3d6eef1 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/Member.java @@ -6,6 +6,7 @@ import com.example.umc9th.domain.member.enums.Gender; import com.example.umc9th.domain.member.entity.mapping.MemberMission; import com.example.umc9th.domain.member.enums.SocialType; +import com.example.umc9th.domain.review.entity.Reply; import com.example.umc9th.domain.review.entity.Review; import com.example.umc9th.global.auth.enums.Role; import com.example.umc9th.global.entity.BaseEntity; @@ -87,5 +88,8 @@ public class Member extends BaseEntity { @OneToMany(mappedBy = "member") private Set memberReviewList = new HashSet<>(); + @OneToOne(mappedBy = "member", cascade = CascadeType.REMOVE, orphanRemoval = true) + private RefreshToken refreshToken; + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/entity/RefreshToken.java b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/RefreshToken.java new file mode 100644 index 0000000..e792adb --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/entity/RefreshToken.java @@ -0,0 +1,33 @@ +package com.example.umc9th.domain.member.entity; + +import com.example.umc9th.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDateTime; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +public class RefreshToken extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @Column(nullable = false) + private String refreshToken; + + @Column(nullable = false) + private LocalDateTime expiryDate; + + public void update(String refreshToken, LocalDateTime expiryDate) { + this.refreshToken = refreshToken; + this.expiryDate = expiryDate; + } +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java new file mode 100644 index 0000000..eb06988 --- /dev/null +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java @@ -0,0 +1,10 @@ +package com.example.umc9th.domain.member.repository; + +import com.example.umc9th.domain.member.entity.RefreshToken; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface RefreshTokenRepository extends JpaRepository { + Optional findByMemberId(Long id); +} diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java index cb7d7db..27c5355 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -4,6 +4,7 @@ import com.example.umc9th.domain.member.dto.req.MemberReqDTO; import com.example.umc9th.domain.member.dto.res.MemberResDTO; import com.example.umc9th.domain.member.entity.Member; +import com.example.umc9th.domain.member.entity.RefreshToken; import com.example.umc9th.domain.member.entity.mapping.MemberFood; import com.example.umc9th.domain.member.exception.FoodException; import com.example.umc9th.domain.member.exception.MemberException; @@ -23,7 +24,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.swing.text.html.Option; +import java.time.LocalDateTime; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; @Service @@ -36,6 +40,7 @@ public class MemberService { private final ReviewRepository reviewRepository; private final ReplyRepository replyRepository; private final FoodRepository foodRepository; + private final RefreshTokenRepository refreshTokenRepository; private final PasswordEncoder passwordEncoder; private final JwtUtil jwtUtil; @@ -104,9 +109,12 @@ public MemberResDTO.LoginDTO login( // 엑세스 토큰 발급 String accessToken = jwtUtil.createAccessToken(userDetails); + String refreshToken = jwtUtil.createRefreshToken(userDetails); + + saveOrUpdateRefreshToken(member, refreshToken); // DTO 조립 - return MemberConverter.toLoginDTO(member, accessToken); + return MemberConverter.toLoginDTO(member, accessToken, refreshToken); } @Transactional @@ -131,9 +139,29 @@ public MemberResDTO.LoginDTO loginOrSignup(KakaoResDTO.UserInfoDTO kakaoUserInfo // 2. 우리 서비스의 JWT 토큰 발급 CustomUserDetails userDetails = new CustomUserDetails(member); String accessToken = jwtUtil.createAccessToken(userDetails); -// String refreshToken = jwtUtil.createRefreshToken(member.getId()); + String refreshToken = jwtUtil.createRefreshToken(userDetails); + + saveOrUpdateRefreshToken(member, refreshToken); + + // 3. 결과 반환 - return MemberConverter.toLoginDTO(member, accessToken); + return MemberConverter.toLoginDTO(member, accessToken, refreshToken); + } + + private void saveOrUpdateRefreshToken(Member member, String refreshToken){ + Optional existingTokenEntity = refreshTokenRepository.findByMemberId(member.getId()); + if(existingTokenEntity.isPresent()) { + existingTokenEntity.get().update(refreshToken, LocalDateTime.now().plusDays(7)); + } + else{ + RefreshToken newTokenEntity = RefreshToken.builder() + .member(member) + .refreshToken(refreshToken) + .expiryDate(LocalDateTime.now().plusDays(7)) + .build(); + refreshTokenRepository.save(newTokenEntity); + } + } } diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java b/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java index a1f572a..4b1e788 100644 --- a/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java @@ -7,13 +7,18 @@ import com.example.umc9th.global.auth.dto.KakaoResDTO; import com.example.umc9th.global.auth.service.KakaoService; import io.swagger.v3.oas.annotations.Operation; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; 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.client.RestTemplate; +import java.time.Duration; + @RestController @RequiredArgsConstructor @RequestMapping("/api/auth") @@ -27,14 +32,25 @@ public class AuthController { description = "https://kauth.kakao.com/oauth/authorize?client_id=fc96b5b695d36b6cd576b67c9fdf0085&redirect_uri=http://localhost:8080/api/auth/kakao/callback&response_type=code." ) @GetMapping("/kakao/callback") - public ApiResponse kakaoLogin(@RequestParam("code") String code){ + public ApiResponse kakaoLogin(@RequestParam("code") String code, HttpServletResponse response){ // 1. 인가 코드로 카카오 액세스 토큰 발급 String accessToken = kakaoService.getAccessToken(code); // 2. 카카오 액세스 토큰으로 사용자 정보 조회 KakaoResDTO.UserInfoDTO kakaoUserInfo = kakaoService.getUserInfo(accessToken); + MemberResDTO.LoginDTO result = memberService.loginOrSignup(kakaoUserInfo); + + // RefreshToken을 HttpOnly 쿠키로 설정 + ResponseCookie cookie = ResponseCookie.from("refreshToken", result.refreshToken()) + .httpOnly(true) + .secure(false) // HTTPS만 허용할 경우 true + .path("/") + .maxAge(Duration.ofDays(7)) + .build(); + response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString()); + // 3. 우리 서비스 로그인/회원가입 후 AccessToken 발급 - return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberService.loginOrSignup(kakaoUserInfo)); + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, result); } } diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java b/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java index b220ed7..8e00402 100644 --- a/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/token/JwtUtil.java @@ -22,13 +22,16 @@ public class JwtUtil { private final SecretKey secretKey; private final Duration accessExpiration; + private final Duration refreshExpiration; public JwtUtil( @Value("${jwt.token.secretKey}") String secret, - @Value("${jwt.token.expiration.access}") Long accessExpiration + @Value("${jwt.token.expiration.access}") Long accessExpiration, + @Value("${jwt.token.expiration.refresh}") Long refreshExpiration ) { this.secretKey = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8)); this.accessExpiration = Duration.ofMillis(accessExpiration); + this.refreshExpiration = Duration.ofMillis(refreshExpiration); } // AccessToken 생성 @@ -36,6 +39,11 @@ public String createAccessToken(CustomUserDetails user) { return createToken(user, accessExpiration); } + // RefreshToken 생성 + public String createRefreshToken(CustomUserDetails user) { + return createToken(user, refreshExpiration); + } + /** 토큰에서 이메일 가져오기 * * @param token 유저 정보를 추출할 토큰 diff --git a/week10/code/src/main/resources/application.yml b/week10/code/src/main/resources/application.yml index cc975c4..47b5dca 100644 --- a/week10/code/src/main/resources/application.yml +++ b/week10/code/src/main/resources/application.yml @@ -28,6 +28,7 @@ jwt: secretKey: ZGh3YWlkc2F2ZXdhZXZ3b2EgMTM5ZXUgMDMxdWMyIHEyMiBAIDAgKTJFVio= expiration: access: 14400000 + refresh: 604800000 # 7일 kakao: client-id: "fc96b5b695d36b6cd576b67c9fdf0085" From 1f9cc6772be393b805384fe7238c4d7c47dec6a5 Mon Sep 17 00:00:00 2001 From: kjh015 Date: Mon, 1 Dec 2025 06:13:42 +0900 Subject: [PATCH 06/10] =?UTF-8?q?feat:=20RefreshToken=20=EC=9E=AC=EB=B0=9C?= =?UTF-8?q?=EA=B8=89=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 13 ++++++++ .../domain/member/dto/res/MemberResDTO.java | 11 +++++++ .../exception/code/MemberErrorCode.java | 5 ++- .../exception/code/MemberSuccessCode.java | 1 + .../repository/RefreshTokenRepository.java | 2 ++ .../domain/member/service/MemberService.java | 32 +++++++++++++++++++ 6 files changed, 63 insertions(+), 1 deletion(-) diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index b87bc31..5644450 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -7,14 +7,17 @@ import com.example.umc9th.domain.member.service.MemberService; import com.example.umc9th.global.apiPayload.ApiResponse; import com.example.umc9th.global.apiPayload.code.GeneralSuccessCode; +import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.time.Duration; +import java.util.Map; @RestController @RequiredArgsConstructor @@ -57,4 +60,14 @@ public ApiResponse login( return ApiResponse.onSuccess(MemberSuccessCode.FOUND, result); } + @PostMapping("/refresh") + public ApiResponse refreshToken(HttpServletRequest request) { + // Cookie에서 refreshToken 조회 + String refreshToken = memberService.getCookieValue(request, "refreshToken"); + + // accessToken 재발급 + MemberResDTO.ReissueDTO token = memberService.reissueToken(refreshToken); + return ApiResponse.onSuccess(GeneralSuccessCode.OK, token); + } + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java index cf1511f..8c72ee7 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java @@ -28,4 +28,15 @@ public record LoginDTO( String refreshToken ){} + @Builder + public record ReissueDTO( + String accessToken + ){ + public static ReissueDTO of(String accessToken){ + return ReissueDTO.builder() + .accessToken(accessToken) + .build(); + } + } + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java index ca5ee1b..f1df8f0 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberErrorCode.java @@ -10,7 +10,10 @@ public enum MemberErrorCode implements BaseErrorCode { MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER400_1", "존재하지 않는 회원입니다."), - INVALID(HttpStatus.BAD_REQUEST, "MEMBER400_2", "유효하지 않은 정보"); + INVALID(HttpStatus.BAD_REQUEST, "MEMBER400_2", "유효하지 않은 정보"), + TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "TOKEN401_1", "유효하지 않은 토큰입니다."), + ; + private final HttpStatus status; diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java index beb41b3..5da173c 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/exception/code/MemberSuccessCode.java @@ -12,6 +12,7 @@ public enum MemberSuccessCode implements BaseSuccessCode { FOUND(HttpStatus.OK, "MEMBER200_1", "성공적으로 사용자를 조회했습니다."), + ; private final HttpStatus status; diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java index eb06988..a7cc837 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java @@ -7,4 +7,6 @@ public interface RefreshTokenRepository extends JpaRepository { Optional findByMemberId(Long id); + + Optional findByRefreshToken(String refreshToken); } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java index 27c5355..87c5eda 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -17,6 +17,8 @@ import com.example.umc9th.global.auth.dto.KakaoResDTO; import com.example.umc9th.global.auth.enums.Role; import com.example.umc9th.global.auth.token.JwtUtil; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.User; @@ -27,6 +29,7 @@ import javax.swing.text.html.Option; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -164,4 +167,33 @@ private void saveOrUpdateRefreshToken(Member member, String refreshToken){ } } + + public MemberResDTO.ReissueDTO reissueToken(String refreshToken) { + // 1. 토큰 유효성 검사 (JWT 서명/만료) + if (!jwtUtil.isValid(refreshToken)) { + throw new MemberException(MemberErrorCode.TOKEN_INVALID); + } + + // 2. 토큰 값으로 DB 조회 + RefreshToken savedToken = refreshTokenRepository.findByRefreshToken(refreshToken) + .orElseThrow(() -> new MemberException(MemberErrorCode.TOKEN_INVALID)); + + // 3. Member 조회 + Member member = savedToken.getMember(); + + // 엑세스 토큰 발급 + String accessToken = jwtUtil.createAccessToken(new CustomUserDetails(member)); + + return MemberResDTO.ReissueDTO.of(accessToken); + } + + public String getCookieValue(HttpServletRequest request, String name) { + if (request.getCookies() == null) return null; + for (Cookie cookie : request.getCookies()) { + if (name.equals(cookie.getName())) { + return cookie.getValue(); + } + } + return null; + } } From fafd6790a75dd7bbfccfecf7d5179bdd9c8853d6 Mon Sep 17 00:00:00 2001 From: kjh015 Date: Wed, 3 Dec 2025 05:08:46 +0900 Subject: [PATCH 07/10] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 16 ++++++++++++++++ .../repository/RefreshTokenRepository.java | 2 ++ .../domain/member/service/MemberService.java | 11 +++++++++++ 3 files changed, 29 insertions(+) diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index 5644450..48f4618 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -70,4 +70,20 @@ public ApiResponse refreshToken(HttpServletRequest requ return ApiResponse.onSuccess(GeneralSuccessCode.OK, token); } + @PostMapping("/logout") + public ApiResponse logout(HttpServletRequest request, HttpServletResponse response) { + String refreshToken = memberService.getCookieValue(request, "refreshToken"); + memberService.logout(refreshToken); + + ResponseCookie deleteCookie = ResponseCookie.from("refreshToken", "") + .httpOnly(true) + .secure(false) + .path("/") + .maxAge(0) + .build(); + response.addHeader(HttpHeaders.SET_COOKIE, deleteCookie.toString()); + return ApiResponse.onSuccess(GeneralSuccessCode.OK, null); + } + + } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java index a7cc837..77edb7c 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/repository/RefreshTokenRepository.java @@ -9,4 +9,6 @@ public interface RefreshTokenRepository extends JpaRepository findByMemberId(Long id); Optional findByRefreshToken(String refreshToken); + + void deleteByRefreshToken(String refreshToken); } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java index 87c5eda..1eebf99 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -152,6 +152,7 @@ public MemberResDTO.LoginDTO loginOrSignup(KakaoResDTO.UserInfoDTO kakaoUserInfo return MemberConverter.toLoginDTO(member, accessToken, refreshToken); } + private void saveOrUpdateRefreshToken(Member member, String refreshToken){ Optional existingTokenEntity = refreshTokenRepository.findByMemberId(member.getId()); if(existingTokenEntity.isPresent()) { @@ -168,6 +169,14 @@ private void saveOrUpdateRefreshToken(Member member, String refreshToken){ } + @Transactional + public void logout(String refreshToken) { + if (refreshToken != null && jwtUtil.isValid(refreshToken)) { + refreshTokenRepository.deleteByRefreshToken(refreshToken); + } + } + + @Transactional public MemberResDTO.ReissueDTO reissueToken(String refreshToken) { // 1. 토큰 유효성 검사 (JWT 서명/만료) if (!jwtUtil.isValid(refreshToken)) { @@ -196,4 +205,6 @@ public String getCookieValue(HttpServletRequest request, String name) { } return null; } + + } From fd33ee78611f26a0fd18cd0c1e0301adaa21f3cf Mon Sep 17 00:00:00 2001 From: kjh015 Date: Wed, 3 Dec 2025 23:10:03 +0900 Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20AccessToken=20Header=EC=97=90?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 14 +++++++---- .../domain/member/dto/res/MemberResDTO.java | 24 +++++++++++++++++-- .../domain/member/service/MemberService.java | 8 +++---- .../auth/controller/AuthController.java | 10 +++++--- 4 files changed, 43 insertions(+), 13 deletions(-) diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java index 48f4618..efe6248 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/controller/MemberController.java @@ -46,7 +46,10 @@ public ApiResponse login( @RequestBody @Valid MemberReqDTO.LoginDTO dto, HttpServletResponse response ){ - MemberResDTO.LoginDTO result = memberService.login(dto); + MemberResDTO.LoginTokenDTO result = memberService.login(dto); + + // AccessToken을 Header에 설정 + response.setHeader("Authorization", "Bearer " + result.accessToken()); // RefreshToken을 HttpOnly 쿠키로 설정 ResponseCookie cookie = ResponseCookie.from("refreshToken", result.refreshToken()) @@ -57,17 +60,20 @@ public ApiResponse login( .build(); response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString()); - return ApiResponse.onSuccess(MemberSuccessCode.FOUND, result); + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, MemberResDTO.LoginDTO.of(result.member())); } @PostMapping("/refresh") - public ApiResponse refreshToken(HttpServletRequest request) { + public ApiResponse refreshToken(HttpServletRequest request, HttpServletResponse response) { // Cookie에서 refreshToken 조회 String refreshToken = memberService.getCookieValue(request, "refreshToken"); // accessToken 재발급 MemberResDTO.ReissueDTO token = memberService.reissueToken(refreshToken); - return ApiResponse.onSuccess(GeneralSuccessCode.OK, token); + + // AccessToken을 Header에 설정 + response.setHeader("Authorization", "Bearer " + token.accessToken()); + return ApiResponse.onSuccess(GeneralSuccessCode.OK, null); } @PostMapping("/logout") diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java index 8c72ee7..70c555d 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/dto/res/MemberResDTO.java @@ -1,5 +1,6 @@ package com.example.umc9th.domain.member.dto.res; +import com.example.umc9th.domain.member.entity.Member; import lombok.Builder; import lombok.Getter; @@ -23,10 +24,29 @@ public record JoinDTO( // 로그인 @Builder public record LoginDTO( - Long memberId, + Long memberId + ){ + public static LoginDTO of(Member member) { + return LoginDTO.builder() + .memberId(member.getId()) + .build(); + } + } + + @Builder + public record LoginTokenDTO( + Member member, String accessToken, String refreshToken - ){} + ){ + public static LoginTokenDTO of(Member member, String accessToken, String refreshToken) { + return LoginTokenDTO.builder() + .member(member) + .accessToken(accessToken) + .refreshToken(refreshToken) + .build(); + } + } @Builder public record ReissueDTO( diff --git a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java index 1eebf99..05bbaa8 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/member/service/MemberService.java @@ -94,7 +94,7 @@ public MemberResDTO.JoinDTO signup(MemberReqDTO.JoinDTO dto){ } @Transactional - public MemberResDTO.LoginDTO login( + public MemberResDTO.LoginTokenDTO login( MemberReqDTO.@Valid LoginDTO dto ) { @@ -117,11 +117,11 @@ public MemberResDTO.LoginDTO login( saveOrUpdateRefreshToken(member, refreshToken); // DTO 조립 - return MemberConverter.toLoginDTO(member, accessToken, refreshToken); + return MemberResDTO.LoginTokenDTO.of(member, accessToken, refreshToken); } @Transactional - public MemberResDTO.LoginDTO loginOrSignup(KakaoResDTO.UserInfoDTO kakaoUserInfo) { + public MemberResDTO.LoginTokenDTO loginOrSignup(KakaoResDTO.UserInfoDTO kakaoUserInfo) { Long kakaoId = kakaoUserInfo.id(); String email = kakaoUserInfo.kakaoAccount().email(); @@ -149,7 +149,7 @@ public MemberResDTO.LoginDTO loginOrSignup(KakaoResDTO.UserInfoDTO kakaoUserInfo // 3. 결과 반환 - return MemberConverter.toLoginDTO(member, accessToken, refreshToken); + return MemberResDTO.LoginTokenDTO.of(member, accessToken, refreshToken); } diff --git a/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java b/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java index 4b1e788..d3fc663 100644 --- a/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java +++ b/week10/code/src/main/java/com/example/umc9th/global/auth/controller/AuthController.java @@ -29,7 +29,7 @@ public class AuthController { @Operation( summary = "카카오 소셜 로그인 API", - description = "https://kauth.kakao.com/oauth/authorize?client_id=fc96b5b695d36b6cd576b67c9fdf0085&redirect_uri=http://localhost:8080/api/auth/kakao/callback&response_type=code." + description = "카카오 로그인 URL: https://kauth.kakao.com/oauth/authorize?client_id=fc96b5b695d36b6cd576b67c9fdf0085&redirect_uri=http://localhost:8080/api/auth/kakao/callback&response_type=code" ) @GetMapping("/kakao/callback") public ApiResponse kakaoLogin(@RequestParam("code") String code, HttpServletResponse response){ @@ -39,7 +39,11 @@ public ApiResponse kakaoLogin(@RequestParam("code") Strin // 2. 카카오 액세스 토큰으로 사용자 정보 조회 KakaoResDTO.UserInfoDTO kakaoUserInfo = kakaoService.getUserInfo(accessToken); - MemberResDTO.LoginDTO result = memberService.loginOrSignup(kakaoUserInfo); + // 3. 회원가입 및 로그인 + MemberResDTO.LoginTokenDTO result = memberService.loginOrSignup(kakaoUserInfo); + + // AccessToken을 Header에 설정 + response.setHeader("Authorization", "Bearer " + result.accessToken()); // RefreshToken을 HttpOnly 쿠키로 설정 ResponseCookie cookie = ResponseCookie.from("refreshToken", result.refreshToken()) @@ -51,6 +55,6 @@ public ApiResponse kakaoLogin(@RequestParam("code") Strin response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString()); // 3. 우리 서비스 로그인/회원가입 후 AccessToken 발급 - return ApiResponse.onSuccess(MemberSuccessCode.FOUND, result); + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, MemberResDTO.LoginDTO.of(result.member())); } } From 3583c75bcc36066353e9cd07f9fb3d54b0fd6c04 Mon Sep 17 00:00:00 2001 From: kjh015 Date: Wed, 3 Dec 2025 23:11:04 +0900 Subject: [PATCH 09/10] =?UTF-8?q?[Week10]=20=EC=A1=B4/=EA=B9=80=EC=A2=85?= =?UTF-8?q?=ED=98=81=20=EB=AF=B8=EC=85=98=20=EC=A0=9C=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umc9th/domain/review/controller/ReviewController.java | 4 ++-- .../umc9th/domain/review/repository/ReviewRepository.java | 2 +- .../umc9th/domain/review/service/ReviewService.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java b/week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java index e3ee7b8..c2fad8c 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/controller/ReviewController.java @@ -66,10 +66,10 @@ public ApiResponse addReview(@RequestBody ReviewReqDTO.AddD @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "실패") }) @GetMapping("/reviews") - public ApiResponse getReviews(@RequestParam String storeName, @RequestParam(defaultValue = "1") Integer page) { + public ApiResponse> getReviews(@RequestParam String storeName, @Valid @ValidPage Pageable pageable) { ReviewSuccessCode code = ReviewSuccessCode.FOUND; - return ApiResponse.onSuccess(code, reviewService.findReview(storeName, page)); + return ApiResponse.onSuccess(code, reviewService.findReview(storeName, pageable)); } // 내가 작성한 리뷰 목록 (11.25) diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java index 2c2cc38..84a178d 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/repository/ReviewRepository.java @@ -23,7 +23,7 @@ public interface ReviewRepository extends JpaRepository, ReviewQue void deleteAllByIdsInBatch(@Param("reviewIds") List reviewIds); - Page findAllByStore(Store store, PageRequest pageRequest); + Page findAllByStore(Store store, Pageable pageable); Page findByMemberId(Long memberId, Pageable pageable); } diff --git a/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java b/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java index fb7c25e..0427410 100644 --- a/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java +++ b/week10/code/src/main/java/com/example/umc9th/domain/review/service/ReviewService.java @@ -43,18 +43,18 @@ public ReviewResDTO.AddDTO addReview(ReviewReqDTO.AddDTO dto) { } @Transactional - public ReviewResDTO.ReviewPreViewListDTO findReview(String storeName, Integer page){ + public PageDTO findReview(String storeName, Pageable pageable){ // - 가게를 가져온다 (가게 존재 여부 검증) Store store = storeRepository.findByName(storeName) // - 없으면 예외 터뜨린다 .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); //- 가게에 맞는 리뷰를 가져온다 (Offset 페이징) - PageRequest pageRequest = PageRequest.of(page, 5); - Page result = reviewRepository.findAllByStore(store, pageRequest); + Pageable unsortedPageable = PageRequest.of(pageable.getPageNumber() - 1, pageable.getPageSize()); + Page result = reviewRepository.findAllByStore(store, unsortedPageable); //- 결과를 응답 DTO로 변환한다 (컨버터 이용) - return ReviewConverter.toReviewPreviewListDTO(result); + return PageDTO.of(result, ReviewConverter::toReviewPreviewDTO); } @Transactional(readOnly = true) From f1c7446fd2544480f04ca228263f65feeb96bdaa Mon Sep 17 00:00:00 2001 From: kjh015 Date: Wed, 3 Dec 2025 23:16:34 +0900 Subject: [PATCH 10/10] =?UTF-8?q?[Week10]=20=EC=A1=B4/=EA=B9=80=EC=A2=85?= =?UTF-8?q?=ED=98=81=20=EC=8B=9C=EB=8B=88=EC=96=B4=EB=AF=B8=EC=85=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=A0=9C=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ... RefreshToken \352\265\254\355\230\204.md" | 268 ++++++++++++++++++ 1 file changed, 268 insertions(+) create mode 100644 "week10/\354\206\214\354\205\234\353\241\234\352\267\270\354\235\270, RefreshToken \352\265\254\355\230\204.md" diff --git "a/week10/\354\206\214\354\205\234\353\241\234\352\267\270\354\235\270, RefreshToken \352\265\254\355\230\204.md" "b/week10/\354\206\214\354\205\234\353\241\234\352\267\270\354\235\270, RefreshToken \352\265\254\355\230\204.md" new file mode 100644 index 0000000..a99f99c --- /dev/null +++ "b/week10/\354\206\214\354\205\234\353\241\234\352\267\270\354\235\270, RefreshToken \352\265\254\355\230\204.md" @@ -0,0 +1,268 @@ +# 소셜로그인, RefreshToken 구현 + +# 카카오 소셜로그인 구현 + +--- + +# 순서 + +1. Kakao Developer 앱 생성 +2. Redirect URI 설정, REST API 키 확인 +3. [https://kauth.kakao.com/oauth/authorize?client_id={REST_API_KEY}&redirect_uri={REDIRECT_URI}&response_type=code](https://kauth.kakao.com/oauth/authorize?client_id=%7BREST_API_KEY%7D&redirect_uri=%7BREDIRECT_URI%7D&response_type=code) + + 해당 URL로 code 데이터를 받아온다. + +4. 받아온 code로 카카오 서버의 AccessToken과 RefreshToken을 받아와야 된다. + + ``` + 요청 URL: + https://kauth.kakao.com/oauth/token + + Method: + POST + + Header: + Content-type: application/x-www-form-urlencoded;charset=utf-8 + + Body (Parameter): + grant_type: authorization_code (고정) + client_id: 앱 REST API 키 + redirect_uri: 설정한 Redirect URI + code: 프론트에서 받은 인가 코드 + ``` + + [https://kauth.kakao.com/oauth/token](https://kauth.kakao.com/oauth/token) 이 URL로 필요 정보들을 담아서 POST 요청을 보내면 카카오에서 AccessToken과 RefreshToken을 발급해준다. + +5. 발급받은 AccessToken으로 사용자 정보를 가져온다. + + ``` + 요청 URL: + https://kapi.kakao.com/v2/user/me + + Method: + GET 또는 POST + + Header: + Authorization: Bearer {ACCESS_TOKEN} + Content-type: application/x-www-form-urlencoded;charset=utf-8 + ``` + + [https://kapi.kakao.com/v2/user/me](https://kapi.kakao.com/v2/user/me) 이 URL로 카카오에서 발급받은 AccessToken을 담아 GET/POST 요청을 보내면 사용자의 정보를 받아올 수 있다. (kakaoId(식별자), email 등) + + - 가져올 수 있는 정보 DTO + + ```java + @Getter + @NoArgsConstructor //역직렬화를 위한 기본 생성자 + @JsonIgnoreProperties(ignoreUnknown = true) + public class KakaoUserInfoResponseDto { + + //회원 번호 + @JsonProperty("id") + public Long id; + + //자동 연결 설정을 비활성화한 경우만 존재. + //true : 연결 상태, false : 연결 대기 상태 + @JsonProperty("has_signed_up") + public Boolean hasSignedUp; + + //서비스에 연결 완료된 시각. UTC + @JsonProperty("connected_at") + public Date connectedAt; + + //카카오싱크 간편가입을 통해 로그인한 시각. UTC + @JsonProperty("synched_at") + public Date synchedAt; + + //사용자 프로퍼티 + @JsonProperty("properties") + public HashMap properties; + + //카카오 계정 정보 + @JsonProperty("kakao_account") + public KakaoAccount kakaoAccount; + + //uuid 등 추가 정보 + @JsonProperty("for_partner") + public Partner partner; + + @Getter + @NoArgsConstructor + @JsonIgnoreProperties(ignoreUnknown = true) + public class KakaoAccount { + + //프로필 정보 제공 동의 여부 + @JsonProperty("profile_needs_agreement") + public Boolean isProfileAgree; + + //닉네임 제공 동의 여부 + @JsonProperty("profile_nickname_needs_agreement") + public Boolean isNickNameAgree; + + //프로필 사진 제공 동의 여부 + @JsonProperty("profile_image_needs_agreement") + public Boolean isProfileImageAgree; + + //사용자 프로필 정보 + @JsonProperty("profile") + public Profile profile; + + //이름 제공 동의 여부 + @JsonProperty("name_needs_agreement") + public Boolean isNameAgree; + + //카카오계정 이름 + @JsonProperty("name") + public String name; + + //이메일 제공 동의 여부 + @JsonProperty("email_needs_agreement") + public Boolean isEmailAgree; + + //이메일이 유효 여부 + // true : 유효한 이메일, false : 이메일이 다른 카카오 계정에 사용돼 만료 + @JsonProperty("is_email_valid") + public Boolean isEmailValid; + + //이메일이 인증 여부 + //true : 인증된 이메일, false : 인증되지 않은 이메일 + @JsonProperty("is_email_verified") + public Boolean isEmailVerified; + + //카카오계정 대표 이메일 + @JsonProperty("email") + public String email; + + //연령대 제공 동의 여부 + @JsonProperty("age_range_needs_agreement") + public Boolean isAgeAgree; + + //연령대 + //참고 https://developers.kakao.com/docs/latest/ko/kakaologin/rest-api#req-user-info + @JsonProperty("age_range") + public String ageRange; + + //출생 연도 제공 동의 여부 + @JsonProperty("birthyear_needs_agreement") + public Boolean isBirthYearAgree; + + //출생 연도 (YYYY 형식) + @JsonProperty("birthyear") + public String birthYear; + + //생일 제공 동의 여부 + @JsonProperty("birthday_needs_agreement") + public Boolean isBirthDayAgree; + + //생일 (MMDD 형식) + @JsonProperty("birthday") + public String birthDay; + + //생일 타입 + // SOLAR(양력) 혹은 LUNAR(음력) + @JsonProperty("birthday_type") + public String birthDayType; + + //성별 제공 동의 여부 + @JsonProperty("gender_needs_agreement") + public Boolean isGenderAgree; + + //성별 + @JsonProperty("gender") + public String gender; + + //전화번호 제공 동의 여부 + @JsonProperty("phone_number_needs_agreement") + public Boolean isPhoneNumberAgree; + + //전화번호 + //국내 번호인 경우 +82 00-0000-0000 형식 + @JsonProperty("phone_number") + public String phoneNumber; + + //CI 동의 여부 + @JsonProperty("ci_needs_agreement") + public Boolean isCIAgree; + + //CI, 연계 정보 + @JsonProperty("ci") + public String ci; + + //CI 발급 시각, UTC + @JsonProperty("ci_authenticated_at") + public Date ciCreatedAt; + + @Getter + @NoArgsConstructor + @JsonIgnoreProperties(ignoreUnknown = true) + public class Profile { + + //닉네임 + @JsonProperty("nickname") + public String nickName; + + //프로필 미리보기 이미지 URL + @JsonProperty("thumbnail_image_url") + public String thumbnailImageUrl; + + //프로필 사진 URL + @JsonProperty("profile_image_url") + public String profileImageUrl; + + //프로필 사진 URL 기본 프로필인지 여부 + //true : 기본 프로필, false : 사용자 등록 + @JsonProperty("is_default_image") + public String isDefaultImage; + + //닉네임이 기본 닉네임인지 여부 + //true : 기본 닉네임, false : 사용자 등록 + @JsonProperty("is_default_nickname") + public Boolean isDefaultNickName; + + } + } + + @Getter + @NoArgsConstructor + @JsonIgnoreProperties(ignoreUnknown = true) + public class Partner { + //고유 ID + @JsonProperty("uuid") + public String uuid; + } + + } + ``` + +6. 사용자 정보를 토대로 우리 서비스의 Token을 발급한다. + - 해당 회원이 우리 서비스에 회원가입 되어있는지 확인하고, **기존 회원**이라면 **로그인**, **신규 회원**이라면 **회원가입 후 로그인** + - 로그인이 되었기에 우리 서비스의 `AccessToken`과 `RefreshToken`이 발급된다. + + +현재 코드에선 카카오 서버 API에 RestTemplate을 통해 동기 요청을 보내는데, WebClient를 사용하면 비동기 요청으로 보낼 수 있다. + +## 참고자료 + +[[Spring] REST API 카카오 로그인 구현하기](https://ddonghyeo.tistory.com/16) + +# RefreshToken + +--- + +## 구현 목록 + +로그인 시 AccessToken, RefreshToken 발급 + +RefreshToken 재발급 API + +로그아웃 API + +## 구현 방식 + +웹 기준 로그인 시 프론트에서 + +AccessToken은 메모리(js 변수, LocalStroage 등)에 저장하고, + +RefreshToken은 쿠키에 저장한다고 가정 + +간단한 구현을 위해 RefreshToken을 DB에 저장하여 관리(화이트리스트 방식, Redis로 개선필요) \ No newline at end of file