From 16a278fe56e42b6cba34b7a4004417fed1d02572 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 18:15:17 +0900 Subject: [PATCH 01/22] fix: restructure project under kaka/ --- .gitignore | 8 + kaka/.gitattributes | 3 + kaka/HELP.md | 28 ++ kaka/build.gradle | 40 +++ kaka/gradle/wrapper/gradle-wrapper.properties | 7 + kaka/gradlew | 248 ++++++++++++++++++ kaka/gradlew.bat | 93 +++++++ kaka/settings.gradle | 1 + .../umc/umc10th/kaka/Umc10thApplication.java | 13 + .../umc10th/kaka/config/SwaggerConfig.java | 36 +++ .../home/controller/HomeController.java | 35 +++ .../domain/home/converter/HomeConverter.java | 44 ++++ .../domain/home/dto/HomeMyDataReqDTO.java | 10 + .../domain/home/dto/HomeMyDataResDTO.java | 17 ++ .../home/dto/HomeRegionMissionReqDTO.java | 11 + .../home/dto/HomeRegionMissionResDTO.java | 27 ++ .../domain/home/exception/HomeException.java | 10 + .../home/exception/code/HomeErrorCode.java | 17 ++ .../home/exception/code/HomeSuccessCode.java | 16 ++ .../home/repository/HomeRepository.java | 4 + .../kaka/domain/home/service/HomeService.java | 38 +++ .../member/controller/MemberController.java | 71 +++++ .../member/converter/MemberConverter.java | 38 +++ .../kaka/domain/member/dto/MemberReqDTO.java | 20 ++ .../kaka/domain/member/dto/MemberResDTO.java | 23 ++ .../kaka/domain/member/dto/SignUpReqDTO.java | 21 ++ .../kaka/domain/member/dto/SignUpResDTO.java | 14 + .../kaka/domain/member/entity/Food.java | 4 + .../kaka/domain/member/entity/Member.java | 62 +++++ .../kaka/domain/member/entity/Term.java | 4 + .../member/entity/mapping/MemberFood.java | 4 + .../member/entity/mapping/MemberTerm.java | 4 + .../kaka/domain/member/enums/Gender.java | 4 + .../kaka/domain/member/enums/SocialType.java | 4 + .../kaka/domain/member/enums/Term.java | 4 + .../member/exception/MemberException.java | 14 + .../exception/code/MemberErrorCode.java | 17 ++ .../exception/code/MemberSuccessCode.java | 20 ++ .../member/repository/MemberRepository.java | 8 + .../domain/member/service/MemberService.java | 84 ++++++ .../mission/controller/MissionController.java | 36 +++ .../mission/converter/MissionConverter.java | 39 +++ .../domain/mission/dto/MissionReqDTO.java | 11 + .../domain/mission/dto/MissionResDTO.java | 35 +++ .../kaka/domain/mission/entity/Location.java | 25 ++ .../kaka/domain/mission/entity/Mission.java | 50 ++++ .../kaka/domain/mission/entity/Store.java | 27 ++ .../mission/entity/mapping/MemberMission.java | 4 + .../kaka/domain/mission/enums/Address.java | 5 + .../mission/exception/MissionException.java | 10 + .../exception/code/MissionErrorCode.java | 17 ++ .../exception/code/MissionSuccessCode.java | 16 ++ .../mission/repository/MissionRepository.java | 10 + .../mission/service/MissionService.java | 41 +++ .../review/controller/ReviewController.java | 30 +++ .../review/converter/ReviewConverter.java | 22 ++ .../kaka/domain/review/dto/ReviewReqDTO.java | 14 + .../kaka/domain/review/dto/ReviewResDTO.java | 13 + .../kaka/domain/review/entity/Review.java | 32 +++ .../review/exception/ReviewException.java | 12 + .../exception/code/ReviewErrorCode.java | 16 ++ .../exception/code/ReviewSuccessCode.java | 16 ++ .../review/repository/ReviewRepository.java | 7 + .../domain/review/service/ReviewService.java | 26 ++ .../kaka/global/apiPayLoad/ApiResponse.java | 34 +++ .../global/apiPayLoad/code/BaseErrorCode.java | 11 + .../apiPayLoad/code/BaseSuccessCode.java | 13 + .../apiPayLoad/code/GeneralErrorCode.java | 30 +++ .../apiPayLoad/code/GeneralSuccessCode.java | 19 ++ .../exception/ProjectException.java | 11 + .../handler/GeneralExceptionAdvice.java | 31 +++ kaka/src/main/resources/application.yml | 19 ++ .../umc/umc10th/Umc10thApplicationTests.java | 13 + 73 files changed, 1821 insertions(+) create mode 100644 kaka/.gitattributes create mode 100644 kaka/HELP.md create mode 100644 kaka/build.gradle create mode 100644 kaka/gradle/wrapper/gradle-wrapper.properties create mode 100644 kaka/gradlew create mode 100644 kaka/gradlew.bat create mode 100644 kaka/settings.gradle create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/Umc10thApplication.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/config/SwaggerConfig.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/HomeException.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeErrorCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeSuccessCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/repository/HomeRepository.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/MemberException.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberErrorCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberSuccessCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/repository/MemberRepository.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Location.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/MissionException.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/ReviewException.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/ApiResponse.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseErrorCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseSuccessCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralErrorCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralSuccessCode.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/exception/ProjectException.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java create mode 100644 kaka/src/main/resources/application.yml create mode 100644 kaka/src/test/java/com/umc/umc10th/Umc10thApplicationTests.java diff --git a/.gitignore b/.gitignore index 524f096..8993b9a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,14 @@ *.tar.gz *.rar +# Gradle +.gradle/ +build/ + +# IntelliJ +.idea/ +*.iml + # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* replay_pid* diff --git a/kaka/.gitattributes b/kaka/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/kaka/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/kaka/HELP.md b/kaka/HELP.md new file mode 100644 index 0000000..9035108 --- /dev/null +++ b/kaka/HELP.md @@ -0,0 +1,28 @@ +# Getting Started + +### Reference Documentation + +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/4.0.5/gradle-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/4.0.5/gradle-plugin/packaging-oci-image.html) +* [Spring Data JPA](https://docs.spring.io/spring-boot/4.0.5/reference/data/sql.html#data.sql.jpa-and-spring-data) +* [Spring Web](https://docs.spring.io/spring-boot/4.0.5/reference/web/servlet.html) + +### Guides + +The following guides illustrate how to use some features concretely: + +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) +* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) + +### Additional Links + +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + diff --git a/kaka/build.gradle b/kaka/build.gradle new file mode 100644 index 0000000..6111458 --- /dev/null +++ b/kaka/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '4.0.5' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.umc' +version = '0.0.1-SNAPSHOT' +description = 'umc10th' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-webmvc' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test' + testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test' + testCompileOnly 'org.projectlombok:lombok' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testAnnotationProcessor 'org.projectlombok:lombok' + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:3.0.1' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/kaka/gradle/wrapper/gradle-wrapper.properties b/kaka/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c61a118 --- /dev/null +++ b/kaka/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/kaka/gradlew b/kaka/gradlew new file mode 100644 index 0000000..739907d --- /dev/null +++ b/kaka/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\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 + + + +# 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" ) + + 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" \ + -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/kaka/gradlew.bat b/kaka/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/kaka/gradlew.bat @@ -0,0 +1,93 @@ +@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 + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -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/kaka/settings.gradle b/kaka/settings.gradle new file mode 100644 index 0000000..67a1b8e --- /dev/null +++ b/kaka/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'umc10th' diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/Umc10thApplication.java b/kaka/src/main/java/com/umc/umc10th/kaka/Umc10thApplication.java new file mode 100644 index 0000000..fe3f905 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/Umc10thApplication.java @@ -0,0 +1,13 @@ +package com.umc.umc10th.kaka; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Umc10thApplication { + + public static void main(String[] args) { + SpringApplication.run(Umc10thApplication.class, args); + } + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/config/SwaggerConfig.java b/kaka/src/main/java/com/umc/umc10th/kaka/config/SwaggerConfig.java new file mode 100644 index 0000000..3cd4ec5 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/config/SwaggerConfig.java @@ -0,0 +1,36 @@ +package com.umc.umc10th.kaka.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("UMC10th").description("10기 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); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java new file mode 100644 index 0000000..d1bc22e --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java @@ -0,0 +1,35 @@ +package com.umc.umc10th.kaka.domain.home.controller; + +import com.umc.umc10th.kaka.domain.home.dto.HomeMyDataResDTO; +import com.umc.umc10th.kaka.domain.home.dto.HomeRegionMissionResDTO; +import com.umc.umc10th.kaka.domain.home.exception.code.HomeSuccessCode; +import com.umc.umc10th.kaka.domain.home.service.HomeService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/home") +public class HomeController { + + private final HomeService homeService; + + @GetMapping("/v1/missions") + public ApiResponse getRegionMissions( + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size + ) { + BaseSuccessCode code = HomeSuccessCode.OK; + return ApiResponse.onSuccess(code, homeService.getRegionMissions(page, size)); + } + + @GetMapping("/v1/mydata") + public ApiResponse getMyData( + @RequestHeader("Authorization") String token + ) { + BaseSuccessCode code = HomeSuccessCode.OK; + return ApiResponse.onSuccess(code, homeService.getMyData(token)); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java new file mode 100644 index 0000000..a9357ea --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java @@ -0,0 +1,44 @@ +package com.umc.umc10th.kaka.domain.home.converter; + +import com.umc.umc10th.kaka.domain.home.dto.HomeMyDataResDTO; +import com.umc.umc10th.kaka.domain.home.dto.HomeRegionMissionResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; + +import java.util.List; +import java.util.stream.Collectors; + +public class HomeConverter { + + public static HomeRegionMissionResDTO.MissionListClass toRegionMissionList(Mission mission) { + return HomeRegionMissionResDTO.MissionListClass.builder() + .missionId(mission.getId()) + .marketName(mission.getStore().getName()) + .point(mission.getPoint()) + .content(mission.getConditional()) + .build(); + } + + public static HomeRegionMissionResDTO.MissionPageClass toRegionMissionPage( + List missions, int page, int size, boolean hasNext + ) { + return HomeRegionMissionResDTO.MissionPageClass.builder() + .content(missions.stream() + .map(HomeConverter::toRegionMissionList) + .collect(Collectors.toList())) + .page(page) + .size(size) + .hasNext(hasNext) + .build(); + } + + public static HomeMyDataResDTO.MyDataResClass toMyData(Member member) { + return HomeMyDataResDTO.MyDataResClass.builder() + .nickname(member.getName()) + .email(member.getEmail()) + .phoneNumber(member.getPhoneNumber()) + .phoneNumberStatus(member.getPhoneNumberStatus()) + .userPoint(member.getPoint()) + .build(); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java new file mode 100644 index 0000000..d0632fb --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.home.dto; + +import lombok.Getter; + +public class HomeMyDataReqDTO { + @Getter + public static class MyDataReqClass { + private String token; // 임시 (나중에 JWT) + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java new file mode 100644 index 0000000..f18acaf --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.home.dto; + +import lombok.Builder; +import lombok.Getter; + +public class HomeMyDataResDTO { + + @Getter + @Builder + public static class MyDataResClass { + private String nickname; + private String email; + private String phoneNumber; + private Integer phoneNumberStatus; + private Integer userPoint; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java new file mode 100644 index 0000000..a9ece2e --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java @@ -0,0 +1,11 @@ +package com.umc.umc10th.kaka.domain.home.dto; + +import lombok.Getter; + +public class HomeRegionMissionReqDTO { + + @Getter + public static class RegionMissionReqClass { + private String token; // 임시 (나중에 JWT) + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java new file mode 100644 index 0000000..99b7563 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java @@ -0,0 +1,27 @@ +package com.umc.umc10th.kaka.domain.home.dto; + +import lombok.Builder; +import lombok.Getter; + +import java.util.List; + +public class HomeRegionMissionResDTO { + + @Getter + @Builder + public static class MissionListClass { + private Long missionId; + private String marketName; + private Integer point; + private String content; + } + + @Getter + @Builder + public static class MissionPageClass { + private List content; + private int page; + private int size; + private boolean hasNext; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/HomeException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/HomeException.java new file mode 100644 index 0000000..07de20c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/HomeException.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.home.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; + +public class HomeException extends ProjectException { + public HomeException(BaseErrorCode errorCode) { + super(errorCode); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeErrorCode.java new file mode 100644 index 0000000..8d49b76 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeErrorCode.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.home.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum HomeErrorCode implements BaseErrorCode { + HOME_NOT_FOUND(HttpStatus.NOT_FOUND, "HOME404_1", "홈 데이터를 찾을 수 없습니다."); + + private final HttpStatus status; + private final String code; + private final String message; + +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeSuccessCode.java new file mode 100644 index 0000000..7bcd4aa --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeSuccessCode.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.domain.home.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum HomeSuccessCode implements BaseSuccessCode { + OK(HttpStatus.OK, "HOME200_1", "성공"); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/repository/HomeRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/repository/HomeRepository.java new file mode 100644 index 0000000..747f238 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/repository/HomeRepository.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.home.repository; + +public class HomeRepository { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java new file mode 100644 index 0000000..c759658 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java @@ -0,0 +1,38 @@ +package com.umc.umc10th.kaka.domain.home.service; + +import com.umc.umc10th.kaka.domain.home.converter.HomeConverter; +import com.umc.umc10th.kaka.domain.home.dto.HomeMyDataResDTO; +import com.umc.umc10th.kaka.domain.home.dto.HomeRegionMissionResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.repository.MemberRepository; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class HomeService { + + private final MissionRepository missionRepository; + private final MemberRepository memberRepository; + + // 해당 지역 미션 목록 조회 + public HomeRegionMissionResDTO.MissionPageClass getRegionMissions( + int page, int size + ) { + List missions = missionRepository.findAll(); // 임시 (나중에 지역 필터) + boolean hasNext = missions.size() > (long) (page + 1) * size; + return HomeConverter.toRegionMissionPage(missions, page, size, hasNext); + } + + // 마이데이터 조회 + public HomeMyDataResDTO.MyDataResClass getMyData(String token) { + Long memberId = Long.parseLong(token); // 임시 (나중에 JWT) + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new RuntimeException("멤버 없음")); // TODO: MemberException으로 교체 + return HomeConverter.toMyData(member); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java new file mode 100644 index 0000000..f6b32d8 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java @@ -0,0 +1,71 @@ +package com.umc.umc10th.kaka.domain.member.controller; + +import com.umc.umc10th.kaka.domain.member.dto.MemberReqDTO; +import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; +import com.umc.umc10th.kaka.domain.member.exception.code.MemberSuccessCode; +import com.umc.umc10th.kaka.domain.member.service.MemberService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/auth") +public class MemberController { + + private final MemberService memberService; + + @GetMapping("/test") + public String test() { + return "test"; + } + + @PostMapping("/query-paramter") + public String exception( + @RequestParam String queryParameter + ) { + return memberService.singleParameter(queryParameter); + } + + @PostMapping("/request-body") + public MemberResDTO.RequestBody requestBody( + @RequestBody MemberResDTO.RequestBody dto + ) { + return memberService.requestBody(dto); + } + + @PostMapping("/{pathVariable}") + public String pathVariable( + @PathVariable String pathVariable + ) { + return memberService.singleParameter(pathVariable); + } + + @PostMapping("/header") + public String header( + @RequestHeader("test") String test + ) { + return memberService.singleParameter(test); + } + + //마이페이지 + @PostMapping("/v1/users/me") + public ApiResponse getIngo( + @RequestBody MemberReqDTO.GetInfoClass dto + ) { + BaseSuccessCode code = MemberSuccessCode.OK; + return ApiResponse.onSuccess(code, memberService.getInfo(dto)); + } + + @PostMapping("/v1/signup") + public ApiResponse getSignUp( + @RequestBody SignUpReqDTO.SignUpReqBodyClass dto + ) { + BaseSuccessCode code = MemberSuccessCode.OK; + return ApiResponse.onSuccess(code, memberService.getSignUp(dto)); + } + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java new file mode 100644 index 0000000..f3f38ce --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java @@ -0,0 +1,38 @@ +package com.umc.umc10th.kaka.domain.member.converter; + +import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; + +public class MemberConverter { + + public static MemberResDTO.RequestBody toRequestBody( + String stringTest, + Long longTest + ) { + return MemberResDTO.RequestBody.builder() + .stringTest(stringTest) + .longTest(longTest) + .build(); + } + + public static MemberResDTO.GetInfo toGetInfo( + Member member + ) { + return MemberResDTO.GetInfo.builder() + .email(member.getEmail()) + .name(member.getName()) + .profileUrl(member.getProfileUrl()) + .point(member.getPoint()) + .phoneNumber(member.getPhoneNumber()) + .build(); + } + + // 회원가입 + public static SignUpResDTO.SignUpResBodyClass toSignUp(Member member) { + return SignUpResDTO.SignUpResBodyClass.builder() + .id(member.getId()) + .refreshToken(member.getToken()) + .build(); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java new file mode 100644 index 0000000..35c7ac3 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java @@ -0,0 +1,20 @@ +package com.umc.umc10th.kaka.domain.member.dto; + +import lombok.Getter; + + +public class MemberReqDTO { + + @Getter + public static class RequestBodyClass { + private String stringTest; + private String longTest; + } + + @Getter + public static class GetInfoClass { + private Long id; + } +} + + diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java new file mode 100644 index 0000000..6e6cd3b --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java @@ -0,0 +1,23 @@ +package com.umc.umc10th.kaka.domain.member.dto; + +import lombok.Builder; + +public class MemberResDTO { + + @Builder + public record RequestBody( + String stringTest, + Long longTest + ) { + } + + @Builder + public record GetInfo( + String name, + String profileUrl, + String email, + String phoneNumber, + Integer point + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java new file mode 100644 index 0000000..ed51db1 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java @@ -0,0 +1,21 @@ +package com.umc.umc10th.kaka.domain.member.dto; + +import lombok.Builder; +import lombok.Getter; + +public class SignUpReqDTO { + + @Getter + @Builder + public static class SignUpReqBodyClass { + private String name; + private String email; + private String password; + private String phoneNumber; + private String gender; + private String birth; + private String address; + private Integer agreedId; + + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java new file mode 100644 index 0000000..db4dfac --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java @@ -0,0 +1,14 @@ +package com.umc.umc10th.kaka.domain.member.dto; + +import lombok.Builder; +import lombok.Getter; + +public class SignUpResDTO { + + @Getter + @Builder + public static class SignUpResBodyClass { + private Long id; + private String refreshToken; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java new file mode 100644 index 0000000..8920a9a --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.member.entity; + +public class Food { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java new file mode 100644 index 0000000..1e21cbc --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java @@ -0,0 +1,62 @@ +package com.umc.umc10th.kaka.domain.member.entity; + +import com.umc.umc10th.kaka.domain.member.enums.Gender; +import com.umc.umc10th.kaka.domain.mission.enums.Address; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "member") +public class Member { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + + @Column(name = "name") + private String name; + + @Column(name = "gender") + @Enumerated(EnumType.STRING) + private Gender gender; + + @Column(name = "birth") + private LocalDate birth; + + @Column(name = "address") + @Enumerated(EnumType.STRING) + private Address address; + + @Column(name = "email") + private String email; + + @Column(name = "profile_url") + private String profileUrl; + + @Column(name = "point") + private Integer point; + + @Column(name = "phone_number") + private String phoneNumber; + + @Column(name = "password") + private String password; + + @Column(name = "agree_id") + private Integer agreedId; + + @Column(name = "token") + private String token; + + @Column(name = "phone_number_status") + private Integer phoneNumberStatus; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java new file mode 100644 index 0000000..0c670f9 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.member.entity; + +public class Term { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java new file mode 100644 index 0000000..4617a0d --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.member.entity.mapping; + +public class MemberFood { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java new file mode 100644 index 0000000..6d3d3d4 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.member.entity.mapping; + +public class MemberTerm { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java new file mode 100644 index 0000000..e1770de --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum Gender { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java new file mode 100644 index 0000000..c7598f0 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum SocialType { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java new file mode 100644 index 0000000..8073599 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum Term { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/MemberException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/MemberException.java new file mode 100644 index 0000000..9a81e65 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/MemberException.java @@ -0,0 +1,14 @@ +package com.umc.umc10th.kaka.domain.member.exception; + +import com.umc.umc10th.kaka.domain.member.exception.code.MemberErrorCode; +import lombok.Getter; + +@Getter +public class MemberException extends RuntimeException { + private final MemberErrorCode errorCode; + + public MemberException(MemberErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberErrorCode.java new file mode 100644 index 0000000..7c030f8 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberErrorCode.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.member.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum MemberErrorCode implements BaseErrorCode { // implements 필수! + + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER404_1", "해당 사용자를 찾을 수 없습니다."); + + private final HttpStatus status; // status로! + private final String code; + private final String message; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberSuccessCode.java new file mode 100644 index 0000000..8dccd01 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberSuccessCode.java @@ -0,0 +1,20 @@ +package com.umc.umc10th.kaka.domain.member.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MemberSuccessCode implements BaseSuccessCode { + + OK(HttpStatus.OK, + "COMMON200_1", + "성종적으로 요청을 처리했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/repository/MemberRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..8180dbb --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/repository/MemberRepository.java @@ -0,0 +1,8 @@ +package com.umc.umc10th.kaka.domain.member.repository; + +import com.umc.umc10th.kaka.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberRepository extends JpaRepository { + void deleteByName(String name); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java new file mode 100644 index 0000000..1676b6e --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java @@ -0,0 +1,84 @@ +package com.umc.umc10th.kaka.domain.member.service; + +import com.umc.umc10th.kaka.domain.member.converter.MemberConverter; +import com.umc.umc10th.kaka.domain.member.dto.MemberReqDTO; +import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.enums.Gender; +import com.umc.umc10th.kaka.domain.member.exception.MemberException; +import com.umc.umc10th.kaka.domain.member.exception.code.MemberErrorCode; +import com.umc.umc10th.kaka.domain.member.repository.MemberRepository; +import com.umc.umc10th.kaka.domain.mission.enums.Address; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; + + public MemberResDTO.GetInfo getInfo( + MemberReqDTO.GetInfoClass dto + ) { + Long memberId = dto.getId(); + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + return MemberConverter.toGetInfo(member); + } + + @Transactional // 나중에 DB 연결 + public SignUpResDTO.SignUpResBodyClass getSignUp( + SignUpReqDTO.SignUpReqBodyClass dto + ) { + Member member = Member.builder() + .name(dto.getName()) + .email(dto.getEmail()) + .password(dto.getPassword()) + .phoneNumber(dto.getPhoneNumber()) + .agreedId(dto.getAgreedId()) + .gender(Gender.valueOf(dto.getGender())) + .birth(LocalDate.parse(dto.getBirth())) + .address(Address.valueOf(dto.getAddress())) + .build(); + memberRepository.save(member); + return MemberConverter.toSignUp(member); + } + + public String singleParameter( + String singleParameter + ) { + return singleParameter; + } + + public MemberResDTO.RequestBody requestBody( + MemberResDTO.RequestBody dto + ) { + return MemberConverter.toRequestBody(dto.stringTest(), dto.longTest()); + } + + + @Transactional + public String createUser( + + ) { + Member member = Member.builder() + .name("test") + .build(); + memberRepository.save(member); + return "OK"; + } + + @Transactional + public String deleteUser( + + ) { + memberRepository.deleteByName("test"); + return "OK"; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java new file mode 100644 index 0000000..9a88695 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java @@ -0,0 +1,36 @@ +package com.umc.umc10th.kaka.domain.mission.controller; + +import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; +import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; +import com.umc.umc10th.kaka.domain.mission.exception.code.MissionSuccessCode; +import com.umc.umc10th.kaka.domain.mission.service.MissionService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/mission") +public class MissionController { + + private final MissionService missionService; + + @GetMapping("/v1/missions") + public ApiResponse getMissions( + @RequestHeader("Authorization") String token, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size + ) { + BaseSuccessCode code = MissionSuccessCode.OK; + return ApiResponse.onSuccess(code, missionService.getMissions(token, page, size)); + } + + @PostMapping("/completed") + public ApiResponse completeMission( + @RequestBody MissionReqDTO.CompleteMissionReqClass dto + ) { + BaseSuccessCode code = MissionSuccessCode.OK; + return ApiResponse.onSuccess(code, missionService.completeMission(dto)); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java new file mode 100644 index 0000000..42549fb --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -0,0 +1,39 @@ +package com.umc.umc10th.kaka.domain.mission.converter; + +import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; + +import java.util.List; +import java.util.stream.Collectors; + +public class MissionConverter { + + public static MissionResDTO.MissionListClass toMissionList(Mission mission) { + return MissionResDTO.MissionListClass.builder() + .missionId(mission.getId()) + .marketName(mission.getStore().getName()) + .point(mission.getPoint()) + .status(mission.getStatus()) + .build(); + } + + public static MissionResDTO.MissionPageClass toMissionPage( + List missions, int page, int size, boolean hasNext + ) { + return MissionResDTO.MissionPageClass.builder() + .content(missions.stream() + .map(MissionConverter::toMissionList) + .collect(Collectors.toList())) + .page(page) + .size(size) + .hasNext(hasNext) + .build(); + } + + public static MissionResDTO.CompleteMissionResClass toCompleteMission(Mission mission) { + return MissionResDTO.CompleteMissionResClass.builder() + .missionId(mission.getId()) + .message("미션이 정상적으로 완료되었습니다.") + .build(); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java new file mode 100644 index 0000000..fd00449 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java @@ -0,0 +1,11 @@ +package com.umc.umc10th.kaka.domain.mission.dto; + +import lombok.Getter; + +public class MissionReqDTO { + + @Getter + public static class CompleteMissionReqClass { + private Long missionId; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java new file mode 100644 index 0000000..810aed3 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java @@ -0,0 +1,35 @@ +package com.umc.umc10th.kaka.domain.mission.dto; + +import lombok.Builder; +import lombok.Getter; + +import java.util.List; + +public class MissionResDTO { + @Getter + @Builder + public static class MissionListClass { + private Long missionId; + private String marketName; + private Integer point; + private String status; + } + + // 미션 목록 페이지 + @Getter + @Builder + public static class MissionPageClass { + private List content; + private int page; + private int size; + private boolean hasNext; + } + + // 미션 완료 + @Getter + @Builder + public static class CompleteMissionResClass { + private Long missionId; + private String message; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Location.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Location.java new file mode 100644 index 0000000..f31c5f3 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Location.java @@ -0,0 +1,25 @@ +package com.umc.umc10th.kaka.domain.mission.entity; + +import com.umc.umc10th.kaka.domain.mission.enums.Address; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "location") +public class Location { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "address") + @Enumerated(EnumType.STRING) + private Address address; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java new file mode 100644 index 0000000..4e04522 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java @@ -0,0 +1,50 @@ +package com.umc.umc10th.kaka.domain.mission.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "mission") +public class Mission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "deadline") + private LocalDateTime deadline; + + @Column(name = "conditional") + private String conditional; + + @Column(name = "point") + private Integer point; + + @Column(name = "created_at") + private LocalDateTime createdAt; + + @Column(name = "updated_at") + private LocalDateTime updatedAt; + + @Column(name = "deleted_at") + private LocalDateTime deletedAt; + + @Column(name = "status") + private String status; + + @Column(name = "member_id") + private Long memberId; + + @ManyToOne + @JoinColumn(name = "store_id") + private Store store; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java new file mode 100644 index 0000000..b7a777a --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java @@ -0,0 +1,27 @@ +package com.umc.umc10th.kaka.domain.mission.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "store") +public class Store { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name") + private String name; + + @ManyToOne + @JoinColumn(name = "location_id") + private Location location; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java new file mode 100644 index 0000000..ec1f8b4 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.mission.entity.mapping; + +public class MemberMission { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java new file mode 100644 index 0000000..c689a69 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java @@ -0,0 +1,5 @@ +package com.umc.umc10th.kaka.domain.mission.enums; + +public enum Address { + SEOUL //일단 연습이니 서룰만 +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/MissionException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/MissionException.java new file mode 100644 index 0000000..557e341 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/MissionException.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.mission.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; + +public class MissionException extends ProjectException { + public MissionException(BaseErrorCode errorCode) { // BaseErrorCode 받음! + super(errorCode); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..940aa30 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.mission.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum MissionErrorCode implements BaseErrorCode { + MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION404_1", "미션을 찾을 수 없습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} + diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java new file mode 100644 index 0000000..d24f359 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.domain.mission.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum MissionSuccessCode implements BaseSuccessCode { + OK(HttpStatus.OK, "MISSION200_1", "성공"); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java new file mode 100644 index 0000000..0017e2f --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.mission.repository; + +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface MissionRepository extends JpaRepository { + List findByMemberId(Long memberId); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java new file mode 100644 index 0000000..89f0949 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -0,0 +1,41 @@ +package com.umc.umc10th.kaka.domain.mission.service; + +import com.umc.umc10th.kaka.domain.mission.converter.MissionConverter; +import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; +import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.exception.MissionException; +import com.umc.umc10th.kaka.domain.mission.exception.code.MissionErrorCode; +import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class MissionService { + + private final MissionRepository missionRepository; + + // 미션 목록 조회 + public MissionResDTO.MissionPageClass getMissions( + String token, int page, int size + ) { + Long memberId = Long.parseLong(token); // 임시(나중에 JWT) + List missions = missionRepository.findByMemberId(memberId); + boolean hasNext = missions.size() > (page + 1) * size; + return MissionConverter.toMissionPage(missions, page, size, hasNext); + } + + // 미션 완료 + @Transactional //나중에 DB 연결 + public MissionResDTO.CompleteMissionResClass completeMission( + MissionReqDTO.CompleteMissionReqClass dto + ) { + Mission mission = missionRepository.findById(dto.getMissionId()) + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); + return MissionConverter.toCompleteMission(mission); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java new file mode 100644 index 0000000..6bf87fc --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java @@ -0,0 +1,30 @@ +package com.umc.umc10th.kaka.domain.review.controller; // ← 세미콜론! + +import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; +import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; +import com.umc.umc10th.kaka.domain.review.exception.code.ReviewSuccessCode; +import com.umc.umc10th.kaka.domain.review.service.ReviewService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@RequiredArgsConstructor +@RequestMapping("/review") +public class ReviewController { + + private final ReviewService reviewService; + + @PostMapping("/v1/create") + public ApiResponse getCreateReview( + @RequestBody ReviewReqDTO.CreateReviewReqClass dto + ) { + BaseSuccessCode code = ReviewSuccessCode.OK; + return ApiResponse.onSuccess(code, reviewService.createReview(dto)); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java new file mode 100644 index 0000000..ebde1a3 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -0,0 +1,22 @@ +package com.umc.umc10th.kaka.domain.review.converter; + +import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; +import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; +import com.umc.umc10th.kaka.domain.review.entity.Review; + +public class ReviewConverter { + + public static Review toReview(ReviewReqDTO.CreateReviewReqClass dto) { + return Review.builder() + .marketId(dto.getMarketId()) + .regionId(dto.getRegionId()) + .stars(dto.getStars()) + .content(dto.getContent()) + .build(); + } + + public static ReviewResDTO.CreateReviewResClass toCreateReview(Review review) { + return ReviewResDTO.CreateReviewResClass.builder() + .build(); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java new file mode 100644 index 0000000..4b86271 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java @@ -0,0 +1,14 @@ +package com.umc.umc10th.kaka.domain.review.dto; + +import lombok.Getter; + +public class ReviewReqDTO { + + @Getter + public static class CreateReviewReqClass { + private Integer marketId; + private Integer regionId; + private Float stars; + private String content; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java new file mode 100644 index 0000000..386c807 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java @@ -0,0 +1,13 @@ +package com.umc.umc10th.kaka.domain.review.dto; + +import lombok.Builder; +import lombok.Getter; + +public class ReviewResDTO { + + @Getter + @Builder + public static class CreateReviewResClass { + + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java new file mode 100644 index 0000000..18893b7 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -0,0 +1,32 @@ +package com.umc.umc10th.kaka.domain.review.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "review") +public class Review { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + + @Column(name = "market_id") + private Integer marketId; + + @Column(name = "region_id") + private Integer regionId; + + @Column(name = "stars") + private Float stars; + + @Column(name = "content") + private String content; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/ReviewException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/ReviewException.java new file mode 100644 index 0000000..a78d799 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/ReviewException.java @@ -0,0 +1,12 @@ +package com.umc.umc10th.kaka.domain.review.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; +import lombok.Getter; + +@Getter +public class ReviewException extends ProjectException { + public ReviewException(BaseErrorCode errorCode) { + super(errorCode); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java new file mode 100644 index 0000000..7032a14 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.domain.review.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ReviewErrorCode implements BaseErrorCode { + REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_1", "리뷰를 찾을 수 없습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java new file mode 100644 index 0000000..6c3ca07 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.domain.review.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ReviewSuccessCode implements BaseSuccessCode { + OK(HttpStatus.OK, "REVIEW200_1", "성공"); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java new file mode 100644 index 0000000..7087093 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java @@ -0,0 +1,7 @@ +package com.umc.umc10th.kaka.domain.review.repository; + +import com.umc.umc10th.kaka.domain.review.entity.Review; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReviewRepository extends JpaRepository { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java new file mode 100644 index 0000000..f637abe --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -0,0 +1,26 @@ +package com.umc.umc10th.kaka.domain.review.service; + +import com.umc.umc10th.kaka.domain.review.converter.ReviewConverter; +import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; +import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; +import com.umc.umc10th.kaka.domain.review.entity.Review; +import com.umc.umc10th.kaka.domain.review.repository.ReviewRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ReviewService { + + private final ReviewRepository reviewRepository; + + @Transactional + public ReviewResDTO.CreateReviewResClass createReview( + ReviewReqDTO.CreateReviewReqClass dto + ) { + Review review = ReviewConverter.toReview(dto); + reviewRepository.save(review); + return ReviewConverter.toCreateReview(review); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/ApiResponse.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/ApiResponse.java new file mode 100644 index 0000000..49c7471 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/ApiResponse.java @@ -0,0 +1,34 @@ +package com.umc.umc10th.kaka.global.apiPayLoad; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + + @JsonProperty("code") + private final String code; + + @JsonProperty("message") + private final String message; + + @JsonProperty("result") + private T result; + + public static ApiResponse onFailure(BaseErrorCode code, T result) { + return new ApiResponse<>(false, code.getCode(), code.getMessage(), result); + } + + public static ApiResponse onSuccess(BaseSuccessCode code, T result) { + return new ApiResponse<>(true, code.getCode(), code.getMessage(), result); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseErrorCode.java new file mode 100644 index 0000000..7544b66 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseErrorCode.java @@ -0,0 +1,11 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +public interface BaseErrorCode { + HttpStatus getStatus(); + + String getCode(); + + String getMessage(); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseSuccessCode.java new file mode 100644 index 0000000..ebf11cb --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseSuccessCode.java @@ -0,0 +1,13 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +public interface BaseSuccessCode { + HttpStatus getStatus(); + + String getCode(); + + String getMessage(); +} + + diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralErrorCode.java new file mode 100644 index 0000000..136ab82 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralErrorCode.java @@ -0,0 +1,30 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum GeneralErrorCode implements BaseErrorCode { + + BAD_REQUEST(HttpStatus.BAD_REQUEST, + "COMMON400_1", + "잘못된 요청입니다." + ), + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, + "COMMMON401_1", + "인증되지 않은 사용자입니다."), + FORBIDDEN(HttpStatus.FORBIDDEN, + "COMMMON403_1", + "권한이 없습니다."), + NOT_FOUND(HttpStatus.NOT_FOUND, + "COMMMON404_1", + "요청한 페이지를 찾을 수 없습니다."), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, + "COMMON500_1", + "서버 에러가 발생했습니다."); + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralSuccessCode.java new file mode 100644 index 0000000..db34fba --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralSuccessCode.java @@ -0,0 +1,19 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +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/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/exception/ProjectException.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/exception/ProjectException.java new file mode 100644 index 0000000..edf96c9 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/exception/ProjectException.java @@ -0,0 +1,11 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public class ProjectException extends RuntimeException { + private final BaseErrorCode errorCode; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java new file mode 100644 index 0000000..c15d62b --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java @@ -0,0 +1,31 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.handler; + +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.code.GeneralErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GeneralExceptionAdvice { + + @ExceptionHandler(ProjectException.class) + public ResponseEntity> handlerMemberException( + ProjectException e + ) { + BaseErrorCode errorCode = e.getErrorCode(); + return ResponseEntity.status(errorCode.getStatus()) + .body(ApiResponse.onFailure(errorCode, null)); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity> handleException( + Exception ex + ) { + BaseErrorCode code = GeneralErrorCode.INTERNAL_SERVER_ERROR; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure(code, ex.getMessage())); + } +} diff --git a/kaka/src/main/resources/application.yml b/kaka/src/main/resources/application.yml new file mode 100644 index 0000000..f7681ea --- /dev/null +++ b/kaka/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + application: + name: "umc10th" # "umc10th" + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver # MySQL JDBC ???? ??? ?? + url: ${DB_URL} # jdbc:mysql://localhost:3306/{???????} + username: ${DB_USER} # MySQL ?? ?? + password: ${DB_PW} # MySQL ???? + + jpa: + database: mysql # ??? ?????? ?? ?? (MySQL) + database-platform: org.hibernate.dialect.MySQLDialect # Hibernate?? ??? MySQL ??(dialect) ?? + show-sql: true # ??? SQL ??? ??? ???? ?? ?? + hibernate: + ddl-auto: update # ?????? ?? ? ?????? ???? ??? ?? + properties: + hibernate: + format_sql: true # ???? SQL ??? ?? ?? ??? \ No newline at end of file diff --git a/kaka/src/test/java/com/umc/umc10th/Umc10thApplicationTests.java b/kaka/src/test/java/com/umc/umc10th/Umc10thApplicationTests.java new file mode 100644 index 0000000..785e1ab --- /dev/null +++ b/kaka/src/test/java/com/umc/umc10th/Umc10thApplicationTests.java @@ -0,0 +1,13 @@ +package com.umc.umc10th; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Umc10thApplicationTests { + + @Test + void contextLoads() { + } + +} From 80c7bdc11d5a115c4af4645e1a74d8a6a9c742ea Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 18:49:11 +0900 Subject: [PATCH 02/22] =?UTF-8?q?```text=20refactor:=20DTO=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EB=A5=BC=20record=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=ED=99=98=20=EB=B0=8F=20Enum=20?= =?UTF-8?q?=EC=83=81=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Home, Mission, Member, Review 도메인의 DTO 클래스(@Getter, @Builder)를 Java record로 리팩토링 - DTO 내부 클래스의 불필요한 'Class' 접미사 제거 (예: MyDataReqClass -> MyDataReq) - Controller, Service, Converter 계층에 record 타입 변경 사항(생성자 및 접근자) 반영 - Gender, Term, SocialType Enum에 필요한 상수(MALE, FEMALE, REQUIRED, OPTIONAL 등) 추가 ``` --- .../home/controller/HomeController.java | 4 +- .../domain/home/converter/HomeConverter.java | 46 +++++++++---------- .../domain/home/dto/HomeMyDataReqDTO.java | 8 ++-- .../domain/home/dto/HomeMyDataResDTO.java | 18 +++----- .../home/dto/HomeRegionMissionReqDTO.java | 7 ++- .../home/dto/HomeRegionMissionResDTO.java | 31 +++++-------- .../kaka/domain/home/service/HomeService.java | 4 +- .../member/controller/MemberController.java | 6 +-- .../member/converter/MemberConverter.java | 29 ++++++------ .../kaka/domain/member/dto/MemberReqDTO.java | 14 ++---- .../kaka/domain/member/dto/MemberResDTO.java | 3 -- .../kaka/domain/member/dto/SignUpReqDTO.java | 25 ++++------ .../kaka/domain/member/dto/SignUpResDTO.java | 13 ++---- .../kaka/domain/member/enums/Gender.java | 1 + .../kaka/domain/member/enums/SocialType.java | 1 + .../kaka/domain/member/enums/Term.java | 1 + .../domain/member/service/MemberService.java | 24 +++++----- .../mission/controller/MissionController.java | 6 +-- .../mission/converter/MissionConverter.java | 40 ++++++++-------- .../domain/mission/dto/MissionReqDTO.java | 9 ++-- .../domain/mission/dto/MissionResDTO.java | 44 +++++++----------- .../mission/service/MissionService.java | 8 ++-- .../review/controller/ReviewController.java | 4 +- .../review/converter/ReviewConverter.java | 15 +++--- .../kaka/domain/review/dto/ReviewReqDTO.java | 13 +++--- .../kaka/domain/review/dto/ReviewResDTO.java | 10 +--- .../domain/review/service/ReviewService.java | 4 +- 27 files changed, 166 insertions(+), 222 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java index d1bc22e..2cafa38 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java @@ -17,7 +17,7 @@ public class HomeController { private final HomeService homeService; @GetMapping("/v1/missions") - public ApiResponse getRegionMissions( + public ApiResponse getRegionMissions( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size ) { @@ -26,7 +26,7 @@ public ApiResponse getRegionMissions( } @GetMapping("/v1/mydata") - public ApiResponse getMyData( + public ApiResponse getMyData( @RequestHeader("Authorization") String token ) { BaseSuccessCode code = HomeSuccessCode.OK; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java index a9357ea..558f890 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java @@ -10,35 +10,35 @@ public class HomeConverter { - public static HomeRegionMissionResDTO.MissionListClass toRegionMissionList(Mission mission) { - return HomeRegionMissionResDTO.MissionListClass.builder() - .missionId(mission.getId()) - .marketName(mission.getStore().getName()) - .point(mission.getPoint()) - .content(mission.getConditional()) - .build(); + public static HomeRegionMissionResDTO.MissionList toRegionMissionList(Mission mission) { + return new HomeRegionMissionResDTO.MissionList( + mission.getId(), + mission.getStore().getName(), + mission.getPoint(), + mission.getConditional() + ); } - public static HomeRegionMissionResDTO.MissionPageClass toRegionMissionPage( + public static HomeRegionMissionResDTO.MissionPage toRegionMissionPage( List missions, int page, int size, boolean hasNext ) { - return HomeRegionMissionResDTO.MissionPageClass.builder() - .content(missions.stream() + return new HomeRegionMissionResDTO.MissionPage( + missions.stream() .map(HomeConverter::toRegionMissionList) - .collect(Collectors.toList())) - .page(page) - .size(size) - .hasNext(hasNext) - .build(); + .collect(Collectors.toList()), + page, + size, + hasNext + ); } - public static HomeMyDataResDTO.MyDataResClass toMyData(Member member) { - return HomeMyDataResDTO.MyDataResClass.builder() - .nickname(member.getName()) - .email(member.getEmail()) - .phoneNumber(member.getPhoneNumber()) - .phoneNumberStatus(member.getPhoneNumberStatus()) - .userPoint(member.getPoint()) - .build(); + public static HomeMyDataResDTO.MyDataRes toMyData(Member member) { + return new HomeMyDataResDTO.MyDataRes( + member.getName(), + member.getEmail(), + member.getPhoneNumber(), + member.getPhoneNumberStatus(), + member.getPoint() + ); } } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java index d0632fb..21c80a9 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java @@ -1,10 +1,8 @@ package com.umc.umc10th.kaka.domain.home.dto; -import lombok.Getter; public class HomeMyDataReqDTO { - @Getter - public static class MyDataReqClass { - private String token; // 임시 (나중에 JWT) - } + public record MyDataReq( + String token + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java index f18acaf..7dcdcba 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java @@ -1,17 +1,13 @@ package com.umc.umc10th.kaka.domain.home.dto; -import lombok.Builder; -import lombok.Getter; public class HomeMyDataResDTO { - @Getter - @Builder - public static class MyDataResClass { - private String nickname; - private String email; - private String phoneNumber; - private Integer phoneNumberStatus; - private Integer userPoint; - } + public record MyDataRes( + String nickname, + String email, + String phoneNumber, + Integer phoneNumberStatus, + Integer userPoint + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java index a9ece2e..c2c9eb5 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java @@ -4,8 +4,7 @@ public class HomeRegionMissionReqDTO { - @Getter - public static class RegionMissionReqClass { - private String token; // 임시 (나중에 JWT) - } + public record RegionMissionReq( + String token + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java index 99b7563..a062e28 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java @@ -1,27 +1,20 @@ package com.umc.umc10th.kaka.domain.home.dto; -import lombok.Builder; -import lombok.Getter; - import java.util.List; public class HomeRegionMissionResDTO { - @Getter - @Builder - public static class MissionListClass { - private Long missionId; - private String marketName; - private Integer point; - private String content; - } + public record MissionList( + Long missionId, + String marketName, + Integer point, + String content + ) {} - @Getter - @Builder - public static class MissionPageClass { - private List content; - private int page; - private int size; - private boolean hasNext; - } + public record MissionPage( + List content, + int page, + int size, + boolean hasNext + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java index c759658..4a6269a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java @@ -20,7 +20,7 @@ public class HomeService { private final MemberRepository memberRepository; // 해당 지역 미션 목록 조회 - public HomeRegionMissionResDTO.MissionPageClass getRegionMissions( + public HomeRegionMissionResDTO.MissionPage getRegionMissions( int page, int size ) { List missions = missionRepository.findAll(); // 임시 (나중에 지역 필터) @@ -29,7 +29,7 @@ public HomeRegionMissionResDTO.MissionPageClass getRegionMissions( } // 마이데이터 조회 - public HomeMyDataResDTO.MyDataResClass getMyData(String token) { + public HomeMyDataResDTO.MyDataRes getMyData(String token) { Long memberId = Long.parseLong(token); // 임시 (나중에 JWT) Member member = memberRepository.findById(memberId) .orElseThrow(() -> new RuntimeException("멤버 없음")); // TODO: MemberException으로 교체 diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java index f6b32d8..21d1b8f 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java @@ -54,15 +54,15 @@ public String header( //마이페이지 @PostMapping("/v1/users/me") public ApiResponse getIngo( - @RequestBody MemberReqDTO.GetInfoClass dto + @RequestBody MemberReqDTO.GetInfo dto ) { BaseSuccessCode code = MemberSuccessCode.OK; return ApiResponse.onSuccess(code, memberService.getInfo(dto)); } @PostMapping("/v1/signup") - public ApiResponse getSignUp( - @RequestBody SignUpReqDTO.SignUpReqBodyClass dto + public ApiResponse getSignUp( + @RequestBody SignUpReqDTO.SignUpReqBody dto ) { BaseSuccessCode code = MemberSuccessCode.OK; return ApiResponse.onSuccess(code, memberService.getSignUp(dto)); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java index f3f38ce..1b4fc6e 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java @@ -10,29 +10,26 @@ public static MemberResDTO.RequestBody toRequestBody( String stringTest, Long longTest ) { - return MemberResDTO.RequestBody.builder() - .stringTest(stringTest) - .longTest(longTest) - .build(); + return new MemberResDTO.RequestBody(stringTest, longTest); } public static MemberResDTO.GetInfo toGetInfo( Member member ) { - return MemberResDTO.GetInfo.builder() - .email(member.getEmail()) - .name(member.getName()) - .profileUrl(member.getProfileUrl()) - .point(member.getPoint()) - .phoneNumber(member.getPhoneNumber()) - .build(); + return new MemberResDTO.GetInfo( + member.getName(), + member.getProfileUrl(), + member.getEmail(), + member.getPhoneNumber(), + member.getPoint() + ); } // 회원가입 - public static SignUpResDTO.SignUpResBodyClass toSignUp(Member member) { - return SignUpResDTO.SignUpResBodyClass.builder() - .id(member.getId()) - .refreshToken(member.getToken()) - .build(); + public static SignUpResDTO.SignUpResBody toSignUp(Member member) { + return new SignUpResDTO.SignUpResBody( + member.getId(), + member.getToken() + ); } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java index 35c7ac3..b168c5b 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java @@ -1,20 +1,12 @@ package com.umc.umc10th.kaka.domain.member.dto; -import lombok.Getter; -public class MemberReqDTO { - @Getter - public static class RequestBodyClass { - private String stringTest; - private String longTest; - } +public class MemberReqDTO { - @Getter - public static class GetInfoClass { - private Long id; - } + public record RequestBody(String stringTest, String longTest) {} + public record GetInfo(Long id) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java index 6e6cd3b..caa6522 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java @@ -1,17 +1,14 @@ package com.umc.umc10th.kaka.domain.member.dto; -import lombok.Builder; public class MemberResDTO { - @Builder public record RequestBody( String stringTest, Long longTest ) { } - @Builder public record GetInfo( String name, String profileUrl, diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java index ed51db1..7311c65 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java @@ -1,21 +1,16 @@ package com.umc.umc10th.kaka.domain.member.dto; -import lombok.Builder; -import lombok.Getter; public class SignUpReqDTO { - @Getter - @Builder - public static class SignUpReqBodyClass { - private String name; - private String email; - private String password; - private String phoneNumber; - private String gender; - private String birth; - private String address; - private Integer agreedId; - - } + public record SignUpReqBody( + String name, + String email, + String password, + String phoneNumber, + String gender, + String birth, + String address, + Integer agreedId + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java index db4dfac..609acf0 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java @@ -1,14 +1,9 @@ package com.umc.umc10th.kaka.domain.member.dto; -import lombok.Builder; -import lombok.Getter; - public class SignUpResDTO { - @Getter - @Builder - public static class SignUpResBodyClass { - private Long id; - private String refreshToken; - } + public record SignUpResBody( + Long id, + String refreshToken + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java index e1770de..c778722 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java @@ -1,4 +1,5 @@ package com.umc.umc10th.kaka.domain.member.enums; public enum Gender { + MALE, FEMALE } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java index c7598f0..84577a1 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java @@ -1,4 +1,5 @@ package com.umc.umc10th.kaka.domain.member.enums; public enum SocialType { + KAKAO, GOOGLE, EMAIL, NAVER } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java index 8073599..cf4bf4f 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java @@ -1,4 +1,5 @@ package com.umc.umc10th.kaka.domain.member.enums; public enum Term { + REQUIRED, OPTIONAL } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java index 1676b6e..ccdbc21 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java @@ -24,27 +24,27 @@ public class MemberService { private final MemberRepository memberRepository; public MemberResDTO.GetInfo getInfo( - MemberReqDTO.GetInfoClass dto + MemberReqDTO.GetInfo dto ) { - Long memberId = dto.getId(); + Long memberId = dto.id(); Member member = memberRepository.findById(memberId) .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); return MemberConverter.toGetInfo(member); } @Transactional // 나중에 DB 연결 - public SignUpResDTO.SignUpResBodyClass getSignUp( - SignUpReqDTO.SignUpReqBodyClass dto + public SignUpResDTO.SignUpResBody getSignUp( + SignUpReqDTO.SignUpReqBody dto ) { Member member = Member.builder() - .name(dto.getName()) - .email(dto.getEmail()) - .password(dto.getPassword()) - .phoneNumber(dto.getPhoneNumber()) - .agreedId(dto.getAgreedId()) - .gender(Gender.valueOf(dto.getGender())) - .birth(LocalDate.parse(dto.getBirth())) - .address(Address.valueOf(dto.getAddress())) + .name(dto.name()) + .email(dto.email()) + .password(dto.password()) + .phoneNumber(dto.phoneNumber()) + .agreedId(dto.agreedId()) + .gender(Gender.valueOf(dto.gender())) + .birth(LocalDate.parse(dto.birth())) + .address(Address.valueOf(dto.address())) .build(); memberRepository.save(member); return MemberConverter.toSignUp(member); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java index 9a88695..87cac6f 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java @@ -17,7 +17,7 @@ public class MissionController { private final MissionService missionService; @GetMapping("/v1/missions") - public ApiResponse getMissions( + public ApiResponse getMissions( @RequestHeader("Authorization") String token, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size @@ -27,8 +27,8 @@ public ApiResponse getMissions( } @PostMapping("/completed") - public ApiResponse completeMission( - @RequestBody MissionReqDTO.CompleteMissionReqClass dto + public ApiResponse completeMission( + @RequestBody MissionReqDTO.CompleteMissionReq dto ) { BaseSuccessCode code = MissionSuccessCode.OK; return ApiResponse.onSuccess(code, missionService.completeMission(dto)); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java index 42549fb..0c53e39 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -8,32 +8,32 @@ public class MissionConverter { - public static MissionResDTO.MissionListClass toMissionList(Mission mission) { - return MissionResDTO.MissionListClass.builder() - .missionId(mission.getId()) - .marketName(mission.getStore().getName()) - .point(mission.getPoint()) - .status(mission.getStatus()) - .build(); + public static MissionResDTO.MissionList toMissionList(Mission mission) { + return new MissionResDTO.MissionList( + mission.getId(), + mission.getStore().getName(), + mission.getPoint(), + mission.getStatus() + ); } - public static MissionResDTO.MissionPageClass toMissionPage( + public static MissionResDTO.MissionPage toMissionPage( List missions, int page, int size, boolean hasNext ) { - return MissionResDTO.MissionPageClass.builder() - .content(missions.stream() + return new MissionResDTO.MissionPage( + missions.stream() .map(MissionConverter::toMissionList) - .collect(Collectors.toList())) - .page(page) - .size(size) - .hasNext(hasNext) - .build(); + .collect(Collectors.toList()), + page, + size, + hasNext + ); } - public static MissionResDTO.CompleteMissionResClass toCompleteMission(Mission mission) { - return MissionResDTO.CompleteMissionResClass.builder() - .missionId(mission.getId()) - .message("미션이 정상적으로 완료되었습니다.") - .build(); + public static MissionResDTO.CompleteMissionRes toCompleteMission(Mission mission) { + return new MissionResDTO.CompleteMissionRes( + mission.getId(), + "미션이 정상적으로 완료되었습니다." + ); } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java index fd00449..86a58b5 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java @@ -1,11 +1,8 @@ package com.umc.umc10th.kaka.domain.mission.dto; -import lombok.Getter; - public class MissionReqDTO { - @Getter - public static class CompleteMissionReqClass { - private Long missionId; - } + public record CompleteMissionReq( + Long missionId + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java index 810aed3..30ea0a7 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java @@ -1,35 +1,25 @@ package com.umc.umc10th.kaka.domain.mission.dto; -import lombok.Builder; -import lombok.Getter; - import java.util.List; public class MissionResDTO { - @Getter - @Builder - public static class MissionListClass { - private Long missionId; - private String marketName; - private Integer point; - private String status; - } - // 미션 목록 페이지 - @Getter - @Builder - public static class MissionPageClass { - private List content; - private int page; - private int size; - private boolean hasNext; - } + public record MissionList( + Long missionId, + String marketName, + Integer point, + String status + ) {} + + public record MissionPage( + List content, + int page, + int size, + boolean hasNext + ) {} - // 미션 완료 - @Getter - @Builder - public static class CompleteMissionResClass { - private Long missionId; - private String message; - } + public record CompleteMissionRes( + Long missionId, + String message + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index 89f0949..be4f5cc 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -20,7 +20,7 @@ public class MissionService { private final MissionRepository missionRepository; // 미션 목록 조회 - public MissionResDTO.MissionPageClass getMissions( + public MissionResDTO.MissionPage getMissions( String token, int page, int size ) { Long memberId = Long.parseLong(token); // 임시(나중에 JWT) @@ -31,10 +31,10 @@ public MissionResDTO.MissionPageClass getMissions( // 미션 완료 @Transactional //나중에 DB 연결 - public MissionResDTO.CompleteMissionResClass completeMission( - MissionReqDTO.CompleteMissionReqClass dto + public MissionResDTO.CompleteMissionRes completeMission( + MissionReqDTO.CompleteMissionReq dto ) { - Mission mission = missionRepository.findById(dto.getMissionId()) + Mission mission = missionRepository.findById(dto.missionId()) .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); return MissionConverter.toCompleteMission(mission); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java index 6bf87fc..906a0e1 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java @@ -21,8 +21,8 @@ public class ReviewController { private final ReviewService reviewService; @PostMapping("/v1/create") - public ApiResponse getCreateReview( - @RequestBody ReviewReqDTO.CreateReviewReqClass dto + public ApiResponse getCreateReview( + @RequestBody ReviewReqDTO.CreateReviewReq dto ) { BaseSuccessCode code = ReviewSuccessCode.OK; return ApiResponse.onSuccess(code, reviewService.createReview(dto)); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java index ebde1a3..e08a47d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -6,17 +6,16 @@ public class ReviewConverter { - public static Review toReview(ReviewReqDTO.CreateReviewReqClass dto) { + public static Review toReview(ReviewReqDTO.CreateReviewReq dto) { return Review.builder() - .marketId(dto.getMarketId()) - .regionId(dto.getRegionId()) - .stars(dto.getStars()) - .content(dto.getContent()) + .marketId(dto.marketId()) + .regionId(dto.regionId()) + .stars(dto.stars()) + .content(dto.content()) .build(); } - public static ReviewResDTO.CreateReviewResClass toCreateReview(Review review) { - return ReviewResDTO.CreateReviewResClass.builder() - .build(); + public static ReviewResDTO.CreateReviewRes toCreateReview(Review review) { + return new ReviewResDTO.CreateReviewRes(); } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java index 4b86271..631dcc8 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java @@ -4,11 +4,10 @@ public class ReviewReqDTO { - @Getter - public static class CreateReviewReqClass { - private Integer marketId; - private Integer regionId; - private Float stars; - private String content; - } + public record CreateReviewReq( + Integer marketId, + Integer regionId, + Float stars, + String content + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java index 386c807..323c1d8 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java @@ -1,13 +1,7 @@ package com.umc.umc10th.kaka.domain.review.dto; -import lombok.Builder; -import lombok.Getter; public class ReviewResDTO { - @Getter - @Builder - public static class CreateReviewResClass { - - } -} + public record CreateReviewRes() {} +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java index f637abe..260ef7b 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -16,8 +16,8 @@ public class ReviewService { private final ReviewRepository reviewRepository; @Transactional - public ReviewResDTO.CreateReviewResClass createReview( - ReviewReqDTO.CreateReviewReqClass dto + public ReviewResDTO.CreateReviewRes createReview( + ReviewReqDTO.CreateReviewReq dto ) { Review review = ReviewConverter.toReview(dto); reviewRepository.save(review); From 2a7dc430a03d51721653fd49732fb43e8de26425 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 19:01:29 +0900 Subject: [PATCH 03/22] Here is a concise commit message summarizing the changes: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ```text refactor: 리뷰 생성 API 수정 (marketId PathVariable 적용 및 ID 타입 Long 변경) ``` **Breakdown of the changes covered:** * **Controller**: Updated the review creation endpoint to accept `marketId` as a `@PathVariable` (`/v1/create/{marketId}`). * **DTO**: Removed `marketId` and `regionId` from `CreateReviewReq` since `marketId` is now handled via the URL path. * **Entity**: Changed the data types of `marketId` and `regionId` in the `Review` entity from `Integer` to `Long`. * **Service & Converter**: Updated methods to pass `marketId` from the controller down to the entity builder. --- .../domain/review/controller/ReviewController.java | 10 ++++------ .../kaka/domain/review/converter/ReviewConverter.java | 5 ++--- .../umc10th/kaka/domain/review/dto/ReviewReqDTO.java | 4 ---- .../umc/umc10th/kaka/domain/review/entity/Review.java | 4 ++-- .../kaka/domain/review/service/ReviewService.java | 3 ++- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java index 906a0e1..24b59a7 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java @@ -7,10 +7,7 @@ import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @@ -20,11 +17,12 @@ public class ReviewController { private final ReviewService reviewService; - @PostMapping("/v1/create") + @PostMapping("/v1/create/{marketId}") public ApiResponse getCreateReview( + @PathVariable Long marketId, @RequestBody ReviewReqDTO.CreateReviewReq dto ) { BaseSuccessCode code = ReviewSuccessCode.OK; - return ApiResponse.onSuccess(code, reviewService.createReview(dto)); + return ApiResponse.onSuccess(code, reviewService.createReview(marketId, dto)); } } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java index e08a47d..333eb09 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -6,10 +6,9 @@ public class ReviewConverter { - public static Review toReview(ReviewReqDTO.CreateReviewReq dto) { + public static Review toReview(Long marketId, ReviewReqDTO.CreateReviewReq dto) { return Review.builder() - .marketId(dto.marketId()) - .regionId(dto.regionId()) + .marketId(marketId) .stars(dto.stars()) .content(dto.content()) .build(); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java index 631dcc8..708214d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java @@ -1,12 +1,8 @@ package com.umc.umc10th.kaka.domain.review.dto; -import lombok.Getter; - public class ReviewReqDTO { public record CreateReviewReq( - Integer marketId, - Integer regionId, Float stars, String content ) {} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java index 18893b7..6ee38c6 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -19,10 +19,10 @@ public class Review { private Long id; @Column(name = "market_id") - private Integer marketId; + private Long marketId; @Column(name = "region_id") - private Integer regionId; + private Long regionId; @Column(name = "stars") private Float stars; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java index 260ef7b..2892a29 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -17,9 +17,10 @@ public class ReviewService { @Transactional public ReviewResDTO.CreateReviewRes createReview( + Long marketId, ReviewReqDTO.CreateReviewReq dto ) { - Review review = ReviewConverter.toReview(dto); + Review review = ReviewConverter.toReview(marketId,dto); reviewRepository.save(review); return ReviewConverter.toCreateReview(review); } From a9dc2b22e2587714f41884fb08cb9c7ff35250be Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 19:06:25 +0900 Subject: [PATCH 04/22] Here is a concise commit message that follows the conventional style based on your examples: ```text feat: update CreateReviewRes DTO and ReviewConverter, remove regionId from Review entity ``` **Here is a quick breakdown of the specific changes mapped in this commit:** * **`Review.java`**: Removed the `regionId` field and its corresponding column mapping. * **`ReviewResDTO.java`**: Populated the `CreateReviewRes` record with `reviewId`, `stars`, and `content` fields (previously an empty record). * **`ReviewConverter.java`**: Updated the `toCreateReview` method to properly map the `Review` entity data to the newly updated `CreateReviewRes` DTO instead of returning an empty object. --- .../kaka/domain/review/converter/ReviewConverter.java | 6 +++++- .../umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java | 6 +++++- .../com/umc/umc10th/kaka/domain/review/entity/Review.java | 3 --- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java index 333eb09..fa0110f 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -15,6 +15,10 @@ public static Review toReview(Long marketId, ReviewReqDTO.CreateReviewReq dto) { } public static ReviewResDTO.CreateReviewRes toCreateReview(Review review) { - return new ReviewResDTO.CreateReviewRes(); + return new ReviewResDTO.CreateReviewRes( + review.getId(), + review.getStars(), + review.getContent() + ); } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java index 323c1d8..6356b22 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java @@ -3,5 +3,9 @@ public class ReviewResDTO { - public record CreateReviewRes() {} + public record CreateReviewRes( + Long reviewId, + Float stars, + String content + ) {} } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java index 6ee38c6..387250c 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -21,9 +21,6 @@ public class Review { @Column(name = "market_id") private Long marketId; - @Column(name = "region_id") - private Long regionId; - @Column(name = "stars") private Float stars; From bbeb9dceb9fae54c6cb1ff47102406c926825590 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 21:26:57 +0900 Subject: [PATCH 05/22] Here is a concise commit message summarizing the changes: ```text feat: enhance domain entities, introduce BaseEntity, and configure JPA mappings ``` **Breakdown of the specific changes covered in this commit:** * **Global**: * Introduced an abstract `BaseEntity` class with JPA auditing (`createdAt`, `updateAt`, `deleatedAt`) to unify and automate timestamp management across the application. * **Member Domain**: * Updated the `Member` entity to extend `BaseEntity` and added new fields for `detailAddress`, `socialUid`, and `socialType`. * Configured `Food` and `Term` entities, along with `MemberFood` and `MemberTerm` mapping entities to establish many-to-many relationships with the user. * Created the `FoodName` enum and updated the `Term` enum with new constants (AGE, SERVICE, PRIVACY, LOCATION, MARKETING). * **Review Domain**: * Created a new `Reply` entity (extending `BaseEntity`). * Updated the `Review` entity to include a `@OneToOne` relationship with `Reply` and changed its ID generation strategy to `IDENTITY`. * **Mission Domain**: * Refactored the `Mission` entity to extend `BaseEntity`, stripping out redundant explicitly defined timestamp and status fields. * Created the `MemberMission` mapping entity to manage the many-to-many relationship between users and missions, accompanied by a new `MissionStatus` enum (`IDLE`, `CHALLENGING`, `COMPLETE`). --- .../kaka/domain/member/entity/Food.java | 26 ++++++++++++++++ .../kaka/domain/member/entity/Member.java | 31 ++++++++++++++++--- .../kaka/domain/member/entity/Term.java | 18 +++++++++++ .../member/entity/mapping/MemberFood.java | 26 ++++++++++++++++ .../member/entity/mapping/MemberTerm.java | 25 +++++++++++++++ .../kaka/domain/member/enums/FoodName.java | 10 ++++++ .../kaka/domain/member/enums/Term.java | 6 +++- .../kaka/domain/mission/entity/Mission.java | 29 +++++------------ .../mission/entity/mapping/MemberMission.java | 28 +++++++++++++++++ .../domain/mission/enums/MissionStatus.java | 7 +++++ .../kaka/domain/review/entity/Reply.java | 24 ++++++++++++++ .../kaka/domain/review/entity/Review.java | 8 ++++- .../global/apiPayLoad/common/BaseEntity.java | 28 +++++++++++++++++ 13 files changed, 238 insertions(+), 28 deletions(-) create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/FoodName.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/MissionStatus.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Reply.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/common/BaseEntity.java diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java index 8920a9a..9d89e0e 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java @@ -1,4 +1,30 @@ package com.umc.umc10th.kaka.domain.member.entity; +import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberFood; +import com.umc.umc10th.kaka.domain.member.enums.FoodName; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "food") public class Food { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name") + @Enumerated(EnumType.STRING) + private FoodName name; + + @OneToMany(mappedBy = "food") + private List memberFoodList = new ArrayList<>(); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java index 1e21cbc..bb43580 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java @@ -1,7 +1,10 @@ package com.umc.umc10th.kaka.domain.member.entity; +import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberFood; +import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberTerm; import com.umc.umc10th.kaka.domain.member.enums.Gender; import com.umc.umc10th.kaka.domain.mission.enums.Address; +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,6 +12,8 @@ import lombok.NoArgsConstructor; import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; @Entity @Getter @@ -16,26 +21,36 @@ @AllArgsConstructor @NoArgsConstructor @Table(name = "member") -public class Member { +public class Member extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) private Long id; - @Column(name = "name") + @Column(name = "name", nullable = false) private String name; - @Column(name = "gender") + @Column(name = "gender", nullable = false) @Enumerated(EnumType.STRING) private Gender gender; - @Column(name = "birth") + @Column(name = "birth", nullable = false) private LocalDate birth; - @Column(name = "address") + @Column(name = "address", nullable = false) @Enumerated(EnumType.STRING) private Address address; + @Column(name = "detail_address", nullable = false) + private String detailAddress; + + @Column(name = "social_uid") + private String socialUid; + + @Column(name = "social_type") + @Enumerated(EnumType.STRING) + private String socialType; + @Column(name = "email") private String email; @@ -59,4 +74,10 @@ public class Member { @Column(name = "phone_number_status") private Integer phoneNumberStatus; + + @OneToMany(mappedBy = "member") + private List memberFoodList = new ArrayList<>(); + + @OneToMany(mappedBy = "member") + private List memberTermList = new ArrayList<>(); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java index 0c670f9..4eb829e 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java @@ -1,4 +1,22 @@ package com.umc.umc10th.kaka.domain.member.entity; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "term") public class Term { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name") + @Enumerated(EnumType.STRING) + private Term name; } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java index 4617a0d..c8c2868 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java @@ -1,4 +1,30 @@ package com.umc.umc10th.kaka.domain.member.entity.mapping; +import com.umc.umc10th.kaka.domain.member.entity.Food; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "member_food") public class MemberFood { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food food; + } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java index 6d3d3d4..4f8f61d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java @@ -1,4 +1,29 @@ package com.umc.umc10th.kaka.domain.member.entity.mapping; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.entity.Term; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "member_term") public class MemberTerm { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "term_id") + private Term term; } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/FoodName.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/FoodName.java new file mode 100644 index 0000000..e2e371c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/FoodName.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum FoodName { + NONE, + KOREAN, + JAPANESE, + CHINESE, + Italian + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java index cf4bf4f..12da694 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java @@ -1,5 +1,9 @@ package com.umc.umc10th.kaka.domain.member.enums; public enum Term { - REQUIRED, OPTIONAL + AGE, + SERVICE, + PRIVACY, + LOCATION, + MARKETING } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java index 4e04522..c71dc4a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java @@ -1,5 +1,6 @@ package com.umc.umc10th.kaka.domain.mission.entity; +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; @@ -14,37 +15,23 @@ @AllArgsConstructor @NoArgsConstructor @Table(name = "mission") -public class Mission { +public class Mission extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "deadline") + @Column(name = "deadline", nullable = false) private LocalDateTime deadline; - @Column(name = "conditional") + @Column(name = "conditional", nullable = false) private String conditional; - @Column(name = "point") + @Column(name = "point", nullable = false) private Integer point; - @Column(name = "created_at") - private LocalDateTime createdAt; - - @Column(name = "updated_at") - private LocalDateTime updatedAt; - - @Column(name = "deleted_at") - private LocalDateTime deletedAt; - - @Column(name = "status") - private String status; - - @Column(name = "member_id") - private Long memberId; - - @ManyToOne - @JoinColumn(name = "store_id") + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) private Store store; + } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java index ec1f8b4..7ed23cc 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java @@ -1,4 +1,32 @@ package com.umc.umc10th.kaka.domain.mission.entity.mapping; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "user_mission") public class MemberMission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Column(name = "user_mission_status", nullable = false) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id", nullable = false) + private Mission mission; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/MissionStatus.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/MissionStatus.java new file mode 100644 index 0000000..f241b04 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/MissionStatus.java @@ -0,0 +1,7 @@ +package com.umc.umc10th.kaka.domain.mission.enums; + +public enum MissionStatus { + IDLE, + CHALLENGING, + COMPLETE +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Reply.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Reply.java new file mode 100644 index 0000000..3f26657 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Reply.java @@ -0,0 +1,24 @@ +package com.umc.umc10th.kaka.domain.review.entity; + +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "reply") +public class Reply extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "content", nullable = false, columnDefinition = "TEXT") + private String content; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java index 387250c..950bb76 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -6,6 +6,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; + @Entity @Getter @Builder @@ -15,9 +16,14 @@ public class Review { @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "reply_id") + private Reply reply; + + @Column(name = "market_id") private Long marketId; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/common/BaseEntity.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/common/BaseEntity.java new file mode 100644 index 0000000..2933478 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/common/BaseEntity.java @@ -0,0 +1,28 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.common; + +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 abstract class BaseEntity { + + @CreatedDate + @Column(name = "created_at", nullable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at", nullable = false) + private LocalDateTime updateAt; + + @Column(name = "deleted_at") + private LocalDateTime deleatedAt; +} From f82642c917277c78cd79d96d64ec52bffa0fdd29 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 21:47:01 +0900 Subject: [PATCH 06/22] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(domain):=20?= =?UTF-8?q?Review-Store=20=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20=EB=A7=A4?= =?UTF-8?q?=ED=95=91=20=EB=B0=8F=20MemberMission=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EB=AF=B8=EC=85=98=20=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `Review.java`: 불필요한 `marketId` 필드를 삭제하고 `Store` 엔티티와의 `@ManyToOne` 연관관계 추가 - `StoreRepository.java`, `MemberMissionRepository.java`: 엔티티 조회를 위한 JpaRepository 인터페이스 신규 추가 - `ReviewService.java`, `ReviewConverter.java`: 리뷰 생성 시 전달받은 `storeId`로 `Store` 엔티티를 직접 조회하여 객체에 매핑하도록 로직 수정 - `MissionService.java`, `MissionConverter.java`: 사용자 미션 목록 조회 기준을 `Mission` 엔티티에서 `MemberMission` 매핑 엔티티로 변경 - `MissionResDTO.java`: `MissionList` DTO 내 `status` 필드 타입을 `String`에서 `MissionStatus` Enum 클래스로 변경 ``` --- .../domain/mission/converter/MissionConverter.java | 10 ++++++---- .../umc10th/kaka/domain/mission/dto/MissionResDTO.java | 4 +++- .../mission/repository/MemberMissionRepository.java | 9 +++++++++ .../domain/mission/repository/StoreRepository.java | 7 +++++++ .../kaka/domain/mission/service/MissionService.java | 5 ++++- .../kaka/domain/review/converter/ReviewConverter.java | 5 +++-- .../umc/umc10th/kaka/domain/review/entity/Review.java | 7 ++++--- .../kaka/domain/review/service/ReviewService.java | 8 ++++++-- 8 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/StoreRepository.java diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java index 0c53e39..bb4beee 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -2,26 +2,28 @@ import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; import java.util.List; import java.util.stream.Collectors; public class MissionConverter { - public static MissionResDTO.MissionList toMissionList(Mission mission) { + public static MissionResDTO.MissionList toMissionList(MemberMission memberMission) { + Mission mission = memberMission.getMission(); return new MissionResDTO.MissionList( mission.getId(), mission.getStore().getName(), mission.getPoint(), - mission.getStatus() + memberMission.getStatus() ); } public static MissionResDTO.MissionPage toMissionPage( - List missions, int page, int size, boolean hasNext + List memberMissions, int page, int size, boolean hasNext ) { return new MissionResDTO.MissionPage( - missions.stream() + memberMissions.stream() .map(MissionConverter::toMissionList) .collect(Collectors.toList()), page, diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java index 30ea0a7..68020a7 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java @@ -1,5 +1,7 @@ package com.umc.umc10th.kaka.domain.mission.dto; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; + import java.util.List; public class MissionResDTO { @@ -8,7 +10,7 @@ public record MissionList( Long missionId, String marketName, Integer point, - String status + MissionStatus status ) {} public record MissionPage( diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java new file mode 100644 index 0000000..5a95292 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java @@ -0,0 +1,9 @@ +package com.umc.umc10th.kaka.domain.mission.repository; + +import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + +public interface MemberMissionRepository extends JpaRepository { + List findByMemberId(Long memberId); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/StoreRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/StoreRepository.java new file mode 100644 index 0000000..66e5fb2 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/StoreRepository.java @@ -0,0 +1,7 @@ +package com.umc.umc10th.kaka.domain.mission.repository; + +import com.umc.umc10th.kaka.domain.mission.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreRepository extends JpaRepository { +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index be4f5cc..f6e5ef6 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -4,8 +4,10 @@ import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; import com.umc.umc10th.kaka.domain.mission.exception.MissionException; import com.umc.umc10th.kaka.domain.mission.exception.code.MissionErrorCode; +import com.umc.umc10th.kaka.domain.mission.repository.MemberMissionRepository; import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,13 +20,14 @@ public class MissionService { private final MissionRepository missionRepository; + private final MemberMissionRepository memberMissionRepository; // 미션 목록 조회 public MissionResDTO.MissionPage getMissions( String token, int page, int size ) { Long memberId = Long.parseLong(token); // 임시(나중에 JWT) - List missions = missionRepository.findByMemberId(memberId); + List missions = memberMissionRepository.findByMemberId(memberId); boolean hasNext = missions.size() > (page + 1) * size; return MissionConverter.toMissionPage(missions, page, size, hasNext); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java index fa0110f..afeb3d0 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -1,14 +1,15 @@ package com.umc.umc10th.kaka.domain.review.converter; +import com.umc.umc10th.kaka.domain.mission.entity.Store; import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; import com.umc.umc10th.kaka.domain.review.entity.Review; public class ReviewConverter { - public static Review toReview(Long marketId, ReviewReqDTO.CreateReviewReq dto) { + public static Review toReview(Store store, ReviewReqDTO.CreateReviewReq dto) { return Review.builder() - .marketId(marketId) + .store(store) .stars(dto.stars()) .content(dto.content()) .build(); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java index 950bb76..dc9cac6 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -1,5 +1,6 @@ package com.umc.umc10th.kaka.domain.review.entity; +import com.umc.umc10th.kaka.domain.mission.entity.Store; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; @@ -23,9 +24,9 @@ public class Review { @JoinColumn(name = "reply_id") private Reply reply; - - @Column(name = "market_id") - private Long marketId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) + private Store store; @Column(name = "stars") private Float stars; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java index 2892a29..ad570c7 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -1,5 +1,7 @@ package com.umc.umc10th.kaka.domain.review.service; +import com.umc.umc10th.kaka.domain.mission.entity.Store; +import com.umc.umc10th.kaka.domain.mission.repository.StoreRepository; import com.umc.umc10th.kaka.domain.review.converter.ReviewConverter; import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; @@ -14,13 +16,15 @@ public class ReviewService { private final ReviewRepository reviewRepository; + private final StoreRepository storeRepository; @Transactional public ReviewResDTO.CreateReviewRes createReview( - Long marketId, + Long storeId, ReviewReqDTO.CreateReviewReq dto ) { - Review review = ReviewConverter.toReview(marketId,dto); + Store store = storeRepository.findById(storeId).get(); //추후 에러 핸들러 연결 현재는 단순 값 꺼내기 + Review review = ReviewConverter.toReview(store,dto); reviewRepository.save(review); return ReviewConverter.toCreateReview(review); } From 9ee350d87765162439a4447862b4f4ef93e6f987 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 22:01:05 +0900 Subject: [PATCH 07/22] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(controller,?= =?UTF-8?q?=20entity):=20=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=20=ED=95=84=EB=93=9C=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MemberController: 마이페이지 조회 API(`/v1/users/me`)의 HTTP 메서드를 POST에서 GET으로 변경하고, @RequestBody(DTO) 대신 @RequestParam으로 `id`를 받도록 수정 - MemberService: `getInfo` 메서드 파라미터를 `MemberReqDTO.GetInfo` 객체에서 `Long memberId`로 변경 - Member Entity: `socialType` 필드 타입을 String에서 `SocialType` Enum으로 변경 - Term Entity 및 Enum: 기존 `Term` Enum 클래스명을 `TermName`으로 변경하고 엔티티의 `name` 필드 타입에 반영 - MemberTerm, MemberFood Entity: 잘못 임포트된 Spring Data의 `@Id` 어노테이션을 JPA(`jakarta.persistence.Id`)로 수정 및 불필요한 import 제거 - MissionRepository: 사용하지 않는 `findByMemberId` 메서드 삭제 ``` --- .../kaka/domain/member/controller/MemberController.java | 6 +++--- .../com/umc/umc10th/kaka/domain/member/entity/Member.java | 3 ++- .../com/umc/umc10th/kaka/domain/member/entity/Term.java | 3 ++- .../kaka/domain/member/entity/mapping/MemberFood.java | 2 +- .../kaka/domain/member/entity/mapping/MemberTerm.java | 2 +- .../kaka/domain/member/enums/{Term.java => TermName.java} | 2 +- .../umc10th/kaka/domain/member/service/MemberService.java | 5 +---- .../kaka/domain/mission/repository/MissionRepository.java | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) rename kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/{Term.java => TermName.java} (83%) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java index 21d1b8f..79e2131 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java @@ -52,12 +52,12 @@ public String header( } //마이페이지 - @PostMapping("/v1/users/me") + @GetMapping("/v1/users/me") public ApiResponse getIngo( - @RequestBody MemberReqDTO.GetInfo dto + @RequestParam Long id ) { BaseSuccessCode code = MemberSuccessCode.OK; - return ApiResponse.onSuccess(code, memberService.getInfo(dto)); + return ApiResponse.onSuccess(code, memberService.getInfo(id)); } @PostMapping("/v1/signup") diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java index bb43580..50acf75 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java @@ -3,6 +3,7 @@ import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberFood; import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberTerm; import com.umc.umc10th.kaka.domain.member.enums.Gender; +import com.umc.umc10th.kaka.domain.member.enums.SocialType; import com.umc.umc10th.kaka.domain.mission.enums.Address; import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; import jakarta.persistence.*; @@ -49,7 +50,7 @@ public class Member extends BaseEntity { @Column(name = "social_type") @Enumerated(EnumType.STRING) - private String socialType; + private SocialType socialType; @Column(name = "email") private String email; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java index 4eb829e..89f5c0f 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java @@ -1,5 +1,6 @@ package com.umc.umc10th.kaka.domain.member.entity; +import com.umc.umc10th.kaka.domain.member.enums.TermName; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; @@ -18,5 +19,5 @@ public class Term { @Column(name = "name") @Enumerated(EnumType.STRING) - private Term name; + private TermName name; } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java index c8c2868..5a409fd 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java @@ -6,7 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.data.annotation.Id; + @Entity @Getter diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java index 4f8f61d..cec9ffc 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java @@ -6,7 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.data.annotation.Id; +import jakarta.persistence.Id; @Entity @Getter diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/TermName.java similarity index 83% rename from kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java rename to kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/TermName.java index 12da694..aa71e47 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Term.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/TermName.java @@ -1,6 +1,6 @@ package com.umc.umc10th.kaka.domain.member.enums; -public enum Term { +public enum TermName { AGE, SERVICE, PRIVACY, diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java index ccdbc21..689fe8d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java @@ -23,10 +23,7 @@ public class MemberService { private final MemberRepository memberRepository; - public MemberResDTO.GetInfo getInfo( - MemberReqDTO.GetInfo dto - ) { - Long memberId = dto.id(); + public MemberResDTO.GetInfo getInfo(Long memberId) { Member member = memberRepository.findById(memberId) .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); return MemberConverter.toGetInfo(member); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java index 0017e2f..9f3a928 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java @@ -6,5 +6,5 @@ import java.util.List; public interface MissionRepository extends JpaRepository { - List findByMemberId(Long memberId); + } From 899f58bf37b5617328d94145d5763a22458719cc Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 22:08:50 +0900 Subject: [PATCH 08/22] =?UTF-8?q?=E2=9C=A8=20feat(repository,=20service):?= =?UTF-8?q?=20=EB=AF=B8=EC=85=98=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F?= =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=ED=95=84=ED=84=B0=EB=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `MemberMissionRepository`에 `@Query`를 사용한 `findByMemberIdAndStatusIn` 커스텀 쿼리 메서드 추가 - N+1 문제를 방지하기 위해 `Mission`과 `Store` 엔티티를 `JOIN FETCH`로 함께 조회하도록 쿼리 작성 - `MissionService.getMissions()` 메서드에서 진행 중(`CHALLENGING`)이거나 완료(`COMPLETE`)된 미션만 조회하도록 상태 조건 필터링 추가 - `PageRequest` 객체를 사용해 데이터베이스 단에서 페이징 처리가 이루어지도록 로직을 개선하고, `hasNext` 판별 로직 수정 ``` --- .../repository/MemberMissionRepository.java | 17 ++++++++++++- .../mission/service/MissionService.java | 24 +++++++++++++------ 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java index 5a95292..bf5f02a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java @@ -1,9 +1,24 @@ package com.umc.umc10th.kaka.domain.mission.repository; import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.data.domain.Pageable; import java.util.List; public interface MemberMissionRepository extends JpaRepository { - List findByMemberId(Long memberId); + + @Query("SELECT mm FROM MemberMission mm " + + "JOIN FETCH mm.mission m " + + "JOIN FETCH m.store s " + + "WHERE mm.member.id = :memberId " + + "AND mm.status IN :statuses " + + "ORDER BY mm.id DESC") + List findByMemberIdAndStatusIn( + @Param("memberId") Long memberId, + @Param("statuses") List statuses, + Pageable pageable + ); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index f6e5ef6..206b457 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -5,6 +5,7 @@ import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; import com.umc.umc10th.kaka.domain.mission.exception.MissionException; import com.umc.umc10th.kaka.domain.mission.exception.code.MissionErrorCode; import com.umc.umc10th.kaka.domain.mission.repository.MemberMissionRepository; @@ -12,7 +13,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import java.util.List; @Service @@ -23,12 +25,20 @@ public class MissionService { private final MemberMissionRepository memberMissionRepository; // 미션 목록 조회 - public MissionResDTO.MissionPage getMissions( - String token, int page, int size - ) { - Long memberId = Long.parseLong(token); // 임시(나중에 JWT) - List missions = memberMissionRepository.findByMemberId(memberId); - boolean hasNext = missions.size() > (page + 1) * size; + public MissionResDTO.MissionPage getMissions(String token, int page, int size) { + Long memberId = Long.parseLong(token); + + // 진행중, 진행완료만 조회 + List statuses = List.of( + MissionStatus.CHALLENGING, + MissionStatus.COMPLETE + ); + + Pageable pageable = PageRequest.of(page, size); + List missions = memberMissionRepository + .findByMemberIdAndStatusIn(memberId, statuses, pageable); + + boolean hasNext = missions.size() == size; return MissionConverter.toMissionPage(missions, page, size, hasNext); } From faeb6461b345f0b7a541aa14caa2beddf3990faf Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Tue, 5 May 2026 22:15:03 +0900 Subject: [PATCH 09/22] =?UTF-8?q?=E2=9C=A8=20feat(controller,=20service,?= =?UTF-8?q?=20repository):=20=EC=A7=80=EC=97=AD=20ID(locationId)=20?= =?UTF-8?q?=EA=B8=B0=EB=B0=98=20=EB=AF=B8=EC=85=98=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - HomeController: 미션 목록 조회 API(`/v1/missions`)에 특정 지역 필터링을 위한 `@RequestParam Long locationId` 파라미터 추가 - HomeService: 기존 전체 조회(findAll) 임시 로직을 제거하고, `Pageable`과 `locationId`를 활용해 해당 지역의 미션만 조회하도록 로직 변경 - HomeService: 다음 페이지 존재 여부(hasNext) 판단 기준을 `missions.size() == size`로 수정하여 페이지네이션 로직 개선 - MissionRepository: 스토어(store)와 위치(location) 정보를 페치 조인(JOIN FETCH)하여, 전달받은 `locationId`와 일치하는 미션 목록을 최신순(ORDER BY m.id DESC)으로 반환하는 `findByLocationId` 쿼리 메서드 추가 ``` --- .../domain/home/controller/HomeController.java | 3 ++- .../kaka/domain/home/service/HomeService.java | 9 ++++++--- .../mission/repository/MissionRepository.java | 14 +++++++++++++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java index 2cafa38..4fdb2c5 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java @@ -18,11 +18,12 @@ public class HomeController { @GetMapping("/v1/missions") public ApiResponse getRegionMissions( + @RequestParam Long locationId, @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size ) { BaseSuccessCode code = HomeSuccessCode.OK; - return ApiResponse.onSuccess(code, homeService.getRegionMissions(page, size)); + return ApiResponse.onSuccess(code, homeService.getRegionMissions(locationId,page, size)); } @GetMapping("/v1/mydata") diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java index 4a6269a..67fee96 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java @@ -8,9 +8,11 @@ import com.umc.umc10th.kaka.domain.mission.entity.Mission; import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import java.util.List; +import org.springframework.data.domain.Pageable; @Service @RequiredArgsConstructor @@ -21,10 +23,11 @@ public class HomeService { // 해당 지역 미션 목록 조회 public HomeRegionMissionResDTO.MissionPage getRegionMissions( - int page, int size + Long locationId, int page, int size ) { - List missions = missionRepository.findAll(); // 임시 (나중에 지역 필터) - boolean hasNext = missions.size() > (long) (page + 1) * size; + Pageable pageable = PageRequest.of(page, size); + List missions = missionRepository.findByLocationId(locationId, pageable); + boolean hasNext = missions.size() == size; return HomeConverter.toRegionMissionPage(missions, page, size, hasNext); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java index 9f3a928..74f4c9d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java @@ -2,9 +2,21 @@ import com.umc.umc10th.kaka.domain.mission.entity.Mission; import org.springframework.data.jpa.repository.JpaRepository; - +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import java.util.List; +import org.springframework.data.domain.Pageable; public interface MissionRepository extends JpaRepository { + //현재 선택 지역 -> 도전 가능한 미션 목록 + @Query("SELECT m FROM Mission m " + + "JOIN FETCH m.store s " + + "JOIN FETCH s.location l " + + "WHERE l.id = :locationId " + + "ORDER BY m.id DESC") + List findByLocationId( + @Param("locationId") Long locationId, + Pageable pageable + ); } From 4e8b23393b8c365187e1cf2b00c0feb305d7e0bb Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 16:50:44 +0900 Subject: [PATCH 10/22] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(repository,?= =?UTF-8?q?=20service):=20=EC=A7=80=EC=97=AD=EB=B3=84=20=EB=AF=B8=EC=85=98?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EB=B0=98=ED=99=98=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=EC=9D=84=20Slice=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MissionRepository의 findByLocationId 메서드 반환 타입을 List에서 Slice로 변경 - HomeService의 getMissions 메서드에서 리스트 크기로 다음 페이지 존재 여부를 수동 계산하던 방식을 Slice의 hasNext() 메서드를 활용하도록 수정 ``` --- .../kaka/domain/home/service/HomeService.java | 14 +++++++++----- .../mission/repository/MissionRepository.java | 4 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java index 67fee96..95f1ff9 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java @@ -9,9 +9,8 @@ import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; - -import java.util.List; import org.springframework.data.domain.Pageable; @Service @@ -26,9 +25,14 @@ public HomeRegionMissionResDTO.MissionPage getRegionMissions( Long locationId, int page, int size ) { Pageable pageable = PageRequest.of(page, size); - List missions = missionRepository.findByLocationId(locationId, pageable); - boolean hasNext = missions.size() == size; - return HomeConverter.toRegionMissionPage(missions, page, size, hasNext); + Slice missionSlice = missionRepository.findByLocationId(locationId, pageable); + + return HomeConverter.toRegionMissionPage( + missionSlice.getContent(), + page, + size, + missionSlice.hasNext() + ); } // 마이데이터 조회 diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java index 74f4c9d..ac4c2a4 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java @@ -1,10 +1,10 @@ package com.umc.umc10th.kaka.domain.mission.repository; import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import org.springframework.data.domain.Slice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; import org.springframework.data.domain.Pageable; public interface MissionRepository extends JpaRepository { @@ -15,7 +15,7 @@ public interface MissionRepository extends JpaRepository { "JOIN FETCH s.location l " + "WHERE l.id = :locationId " + "ORDER BY m.id DESC") - List findByLocationId( + Slice findByLocationId( @Param("locationId") Long locationId, Pageable pageable ); From 8369e37ac76b5f03c67614297008dea23969f123 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 16:54:17 +0900 Subject: [PATCH 11/22] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(service):?= =?UTF-8?q?=20=EB=A9=A4=EB=B2=84=20=EC=A1=B0=ED=9A=8C=20=EC=98=88=EC=99=B8?= =?UTF-8?q?=EB=A5=BC=20MemberException=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - HomeService의 getMyData 메서드 내 임시로 사용하던 RuntimeException("멤버 없음")을 커스텀 예외인 MemberException으로 교체 - 예외 발생 시 MemberErrorCode.MEMBER_NOT_FOUND 에러 코드를 사용하도록 수정 ``` --- .../com/umc/umc10th/kaka/domain/home/service/HomeService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java index 95f1ff9..5a2c8b5 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java @@ -4,6 +4,8 @@ import com.umc.umc10th.kaka.domain.home.dto.HomeMyDataResDTO; import com.umc.umc10th.kaka.domain.home.dto.HomeRegionMissionResDTO; import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.exception.MemberException; +import com.umc.umc10th.kaka.domain.member.exception.code.MemberErrorCode; import com.umc.umc10th.kaka.domain.member.repository.MemberRepository; import com.umc.umc10th.kaka.domain.mission.entity.Mission; import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; @@ -39,7 +41,7 @@ public HomeRegionMissionResDTO.MissionPage getRegionMissions( public HomeMyDataResDTO.MyDataRes getMyData(String token) { Long memberId = Long.parseLong(token); // 임시 (나중에 JWT) Member member = memberRepository.findById(memberId) - .orElseThrow(() -> new RuntimeException("멤버 없음")); // TODO: MemberException으로 교체 + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); return HomeConverter.toMyData(member); } } \ No newline at end of file From 6a623b79c3b9148274d8821ae2fcd24e65bdc06f Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 17:11:59 +0900 Subject: [PATCH 12/22] =?UTF-8?q?=E2=9C=A8=20feat(dto,=20converter):=20?= =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20DTO=20=EC=9C=A0=ED=9A=A8?= =?UTF-8?q?=EC=84=B1=20=EA=B2=80=EC=82=AC=20=EC=B6=94=EA=B0=80=20=EB=B0=8F?= =?UTF-8?q?=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EB=B3=80=ED=99=98=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SignUpReqDTO의 SignUpReqBody 레코드 내 필드에 @NotBlank, @Email, @Pattern, @NotNull 등 유효성 검증 어노테이션 추가 - MemberController의 getSignUp 엔드포인트에서 요청 객체를 검증하도록 @Valid 어노테이션 적용 - MemberService에 있던 Member 엔티티 빌더 생성 로직을 MemberConverter.toMember()로 이동하여 계층 역할 분리 - MissionConverter.toCompleteMission() 응답 시 하드코딩된 완료 메시지를 Service 단에서 파라미터로 전달받도록 메서드 시그니처 수정 ``` --- .../member/controller/MemberController.java | 3 ++- .../member/converter/MemberConverter.java | 18 +++++++++++++++ .../kaka/domain/member/dto/SignUpReqDTO.java | 23 +++++++++++++++++++ .../domain/member/service/MemberService.java | 11 +-------- .../mission/converter/MissionConverter.java | 6 ++--- .../mission/service/MissionService.java | 2 +- 6 files changed, 48 insertions(+), 15 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java index 79e2131..c4431dd 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java @@ -8,6 +8,7 @@ import com.umc.umc10th.kaka.domain.member.service.MemberService; import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -62,7 +63,7 @@ public ApiResponse getIngo( @PostMapping("/v1/signup") public ApiResponse getSignUp( - @RequestBody SignUpReqDTO.SignUpReqBody dto + @RequestBody @Valid SignUpReqDTO.SignUpReqBody dto ) { BaseSuccessCode code = MemberSuccessCode.OK; return ApiResponse.onSuccess(code, memberService.getSignUp(dto)); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java index 1b4fc6e..89197e1 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java @@ -1,8 +1,13 @@ package com.umc.umc10th.kaka.domain.member.converter; import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.enums.Gender; +import com.umc.umc10th.kaka.domain.mission.enums.Address; + +import java.time.LocalDate; public class MemberConverter { @@ -32,4 +37,17 @@ public static SignUpResDTO.SignUpResBody toSignUp(Member member) { member.getToken() ); } + + public static Member toMember(SignUpReqDTO.SignUpReqBody dto) { + return Member.builder() + .name(dto.name()) + .email(dto.email()) + .password(dto.password()) + .phoneNumber(dto.phoneNumber()) + .agreedId(dto.agreedId()) + .gender(Gender.valueOf(dto.gender())) + .birth(LocalDate.parse(dto.birth())) + .address(Address.valueOf(dto.address())) + .build(); + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java index 7311c65..6658a80 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java @@ -1,16 +1,39 @@ package com.umc.umc10th.kaka.domain.member.dto; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; public class SignUpReqDTO { public record SignUpReqBody( + @NotBlank String name, + + @NotBlank + @Email String email, + + @NotBlank String password, + + @NotBlank String phoneNumber, + + @NotBlank + @Pattern(regexp = "MALE|FEMALE") String gender, + + @NotBlank + @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}") String birth, + + @NotBlank + @Pattern(regexp = "SEOUL") String address, + + @NotNull Integer agreedId ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java index 689fe8d..f080fe5 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java @@ -33,16 +33,7 @@ public MemberResDTO.GetInfo getInfo(Long memberId) { public SignUpResDTO.SignUpResBody getSignUp( SignUpReqDTO.SignUpReqBody dto ) { - Member member = Member.builder() - .name(dto.name()) - .email(dto.email()) - .password(dto.password()) - .phoneNumber(dto.phoneNumber()) - .agreedId(dto.agreedId()) - .gender(Gender.valueOf(dto.gender())) - .birth(LocalDate.parse(dto.birth())) - .address(Address.valueOf(dto.address())) - .build(); + Member member = MemberConverter.toMember(dto); memberRepository.save(member); return MemberConverter.toSignUp(member); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java index bb4beee..aa9b28e 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -3,7 +3,6 @@ import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; - import java.util.List; import java.util.stream.Collectors; @@ -32,10 +31,11 @@ public static MissionResDTO.MissionPage toMissionPage( ); } - public static MissionResDTO.CompleteMissionRes toCompleteMission(Mission mission) { + public static MissionResDTO.CompleteMissionRes toCompleteMission(Mission mission, String message) { return new MissionResDTO.CompleteMissionRes( mission.getId(), - "미션이 정상적으로 완료되었습니다." + message ); } + } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index 206b457..eb00db7 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -49,6 +49,6 @@ public MissionResDTO.CompleteMissionRes completeMission( ) { Mission mission = missionRepository.findById(dto.missionId()) .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); - return MissionConverter.toCompleteMission(mission); + return MissionConverter.toCompleteMission(mission, "미션이 정상적으로 완료되었습니다."); } } \ No newline at end of file From 1c5f0990d077d4693786bc3c4e9aed5432c3a5f6 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 17:23:02 +0900 Subject: [PATCH 13/22] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(service):?= =?UTF-8?q?=20=EB=AF=B8=EC=85=98=20=EC=A1=B0=ED=9A=8C=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=95=20Slice=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20=EB=AF=B8?= =?UTF-8?q?=EC=85=98=20=EC=99=84=EB=A3=8C=20=EC=A0=80=EC=9E=A5=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MemberMissionRepository: findByMemberIdAndStatusIn 메서드 반환 타입을 List에서 Slice로 변경 - MissionService: Slice 객체의 hasNext()를 활용하도록 페이징 처리 로직 수정 - MissionService: completeMission() 수행 시 완료 상태(COMPLETE)의 MemberMission을 DB에 저장하는 로직 추가 - MissionService: 하드코딩된 성공 응답 메시지를 MissionSuccessCode.OK 상수 값으로 대체 - MissionConverter: Mission 엔티티를 MemberMission으로 변환하는 toMemberMission() 메서드 추가 - Store: location 필드의 @ManyToOne 연관관계에 지연 로딩(FetchType.LAZY) 속성 적용 ``` --- .../mission/converter/MissionConverter.java | 9 ++++++++ .../kaka/domain/mission/entity/Store.java | 2 +- .../repository/MemberMissionRepository.java | 3 ++- .../mission/service/MissionService.java | 22 ++++++++++++++----- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java index aa9b28e..251a69c 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -3,6 +3,8 @@ import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; + import java.util.List; import java.util.stream.Collectors; @@ -38,4 +40,11 @@ public static MissionResDTO.CompleteMissionRes toCompleteMission(Mission mission ); } + public static MemberMission toMemberMission(Mission mission) { + return MemberMission.builder() + .mission(mission) + .status(MissionStatus.COMPLETE) + .build(); + } + } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java index b7a777a..3be49d3 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java @@ -21,7 +21,7 @@ public class Store { @Column(name = "name") private String name; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "location_id") private Location location; } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java index bf5f02a..ef5469b 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; import java.util.List; public interface MemberMissionRepository extends JpaRepository { @@ -16,7 +17,7 @@ public interface MemberMissionRepository extends JpaRepository findByMemberIdAndStatusIn( + Slice findByMemberIdAndStatusIn( @Param("memberId") Long memberId, @Param("statuses") List statuses, Pageable pageable diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index eb00db7..47bd114 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -8,9 +8,11 @@ import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; import com.umc.umc10th.kaka.domain.mission.exception.MissionException; import com.umc.umc10th.kaka.domain.mission.exception.code.MissionErrorCode; +import com.umc.umc10th.kaka.domain.mission.exception.code.MissionSuccessCode; import com.umc.umc10th.kaka.domain.mission.repository.MemberMissionRepository; import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.PageRequest; @@ -35,20 +37,30 @@ public MissionResDTO.MissionPage getMissions(String token, int page, int size) { ); Pageable pageable = PageRequest.of(page, size); - List missions = memberMissionRepository + Slice missions = memberMissionRepository .findByMemberIdAndStatusIn(memberId, statuses, pageable); - boolean hasNext = missions.size() == size; - return MissionConverter.toMissionPage(missions, page, size, hasNext); + return MissionConverter.toMissionPage( + missions.getContent(), + page, + size, + missions.hasNext() + ); } // 미션 완료 - @Transactional //나중에 DB 연결 + @Transactional public MissionResDTO.CompleteMissionRes completeMission( MissionReqDTO.CompleteMissionReq dto ) { Mission mission = missionRepository.findById(dto.missionId()) .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); - return MissionConverter.toCompleteMission(mission, "미션이 정상적으로 완료되었습니다."); + + memberMissionRepository.save(MissionConverter.toMemberMission(mission)); // ✅ 저장 추가 + + return MissionConverter.toCompleteMission( + mission, + MissionSuccessCode.OK.getMessage() + ); } } \ No newline at end of file From 97ee395d096cefdedb7eeefb6507038b23121b90 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 17:47:23 +0900 Subject: [PATCH 14/22] =?UTF-8?q?=E2=9C=A8=20feat:=20Store=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=8F=20Review=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81,=20=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - mission 패키지에 위치하던 Store 관련 클래스(Store, Location, StoreRepository)를 store 패키지로 이동 및 관련 import 구문 수정 - ReviewReqDTO.CreateReviewReq DTO에 커스텀 별점 검증(@ValidStars) 및 내용 글자 수 검증(@NotBlank, @Size) 어노테이션 추가 - 별점 입력을 0.5 단위, 0.5~5.0 범위로 검증하는 커스텀 어노테이션(@ValidStars) 및 검증 로직(ValidStarsValidator) 추가 - Review 엔티티에 Member 엔티티와의 @ManyToOne 연관관계(member_id) 매핑 추가 - Store 전용 커스텀 예외(StoreException) 및 에러 코드(StoreErrorCode)를 추가하고, ReviewService의 Store 조회 로직에 적용 ``` --- .../kaka/domain/mission/entity/Mission.java | 1 + .../domain/review/converter/ReviewConverter.java | 2 +- .../kaka/domain/review/dto/ReviewReqDTO.java | 9 +++++++++ .../kaka/domain/review/entity/Review.java | 7 ++++++- .../domain/review/service/ReviewService.java | 9 ++++++--- .../{mission => store}/entity/Location.java | 2 +- .../domain/{mission => store}/entity/Store.java | 2 +- .../domain/store/exception/StoreException.java | 10 ++++++++++ .../store/exception/code/StoreErrorCode.java | 16 ++++++++++++++++ .../repository/StoreRepository.java | 4 ++-- .../global/validation/annotation/ValidStars.java | 16 ++++++++++++++++ .../validator/ValidStarsValidator.java | 16 ++++++++++++++++ 12 files changed, 85 insertions(+), 9 deletions(-) rename kaka/src/main/java/com/umc/umc10th/kaka/domain/{mission => store}/entity/Location.java (90%) rename kaka/src/main/java/com/umc/umc10th/kaka/domain/{mission => store}/entity/Store.java (90%) create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/StoreException.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java rename kaka/src/main/java/com/umc/umc10th/kaka/domain/{mission => store}/repository/StoreRepository.java (54%) create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java create mode 100644 kaka/src/main/java/com/umc/umc10th/kaka/global/validation/validator/ValidStarsValidator.java diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java index c71dc4a..405d89c 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java @@ -1,5 +1,6 @@ package com.umc.umc10th.kaka.domain.mission.entity; +import com.umc.umc10th.kaka.domain.store.entity.Store; import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java index afeb3d0..e2763fd 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -1,6 +1,6 @@ package com.umc.umc10th.kaka.domain.review.converter; -import com.umc.umc10th.kaka.domain.mission.entity.Store; +import com.umc.umc10th.kaka.domain.store.entity.Store; import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; import com.umc.umc10th.kaka.domain.review.entity.Review; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java index 708214d..e958a1a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java @@ -1,9 +1,18 @@ package com.umc.umc10th.kaka.domain.review.dto; +import com.umc.umc10th.kaka.global.validation.annotation.ValidStars; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + public class ReviewReqDTO { public record CreateReviewReq( + + @ValidStars Float stars, + + @NotBlank + @Size(min = 30, max = 300) String content ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java index dc9cac6..533063d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -1,6 +1,7 @@ package com.umc.umc10th.kaka.domain.review.entity; -import com.umc.umc10th.kaka.domain.mission.entity.Store; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.store.entity.Store; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; @@ -20,6 +21,10 @@ public class Review { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + @OneToOne(fetch = FetchType.LAZY) @JoinColumn(name = "reply_id") private Reply reply; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java index ad570c7..c978613 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -1,7 +1,9 @@ package com.umc.umc10th.kaka.domain.review.service; -import com.umc.umc10th.kaka.domain.mission.entity.Store; -import com.umc.umc10th.kaka.domain.mission.repository.StoreRepository; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.domain.store.exception.StoreException; +import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; +import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; import com.umc.umc10th.kaka.domain.review.converter.ReviewConverter; import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; @@ -23,7 +25,8 @@ public ReviewResDTO.CreateReviewRes createReview( Long storeId, ReviewReqDTO.CreateReviewReq dto ) { - Store store = storeRepository.findById(storeId).get(); //추후 에러 핸들러 연결 현재는 단순 값 꺼내기 + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); Review review = ReviewConverter.toReview(store,dto); reviewRepository.save(review); return ReviewConverter.toCreateReview(review); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Location.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java similarity index 90% rename from kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Location.java rename to kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java index f31c5f3..a83393a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Location.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java @@ -1,4 +1,4 @@ -package com.umc.umc10th.kaka.domain.mission.entity; +package com.umc.umc10th.kaka.domain.store.entity; import com.umc.umc10th.kaka.domain.mission.enums.Address; import jakarta.persistence.*; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java similarity index 90% rename from kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java rename to kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java index 3be49d3..8116514 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Store.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java @@ -1,4 +1,4 @@ -package com.umc.umc10th.kaka.domain.mission.entity; +package com.umc.umc10th.kaka.domain.store.entity; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/StoreException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/StoreException.java new file mode 100644 index 0000000..6237653 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/StoreException.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.store.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; + +public class StoreException extends ProjectException { + public StoreException(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java new file mode 100644 index 0000000..d1590c8 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.domain.store.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum StoreErrorCode implements BaseErrorCode { + STORE_NOT_FOUND(HttpStatus.NOT_FOUND, "STORE404_1", "가게를 찾을 수 없습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/StoreRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/repository/StoreRepository.java similarity index 54% rename from kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/StoreRepository.java rename to kaka/src/main/java/com/umc/umc10th/kaka/domain/store/repository/StoreRepository.java index 66e5fb2..10514c6 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/StoreRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/repository/StoreRepository.java @@ -1,6 +1,6 @@ -package com.umc.umc10th.kaka.domain.mission.repository; +package com.umc.umc10th.kaka.domain.store.repository; -import com.umc.umc10th.kaka.domain.mission.entity.Store; +import com.umc.umc10th.kaka.domain.store.entity.Store; import org.springframework.data.jpa.repository.JpaRepository; public interface StoreRepository extends JpaRepository { diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java new file mode 100644 index 0000000..6af287c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.global.validation.annotation; + +import com.umc.umc10th.kaka.global.validation.validator.ValidStarsValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = ValidStarsValidator.class) +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ValidStars { + String message() default "별점은 0.5 단위로 0.5 ~ 5.0 사이여야 합니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/validator/ValidStarsValidator.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/validator/ValidStarsValidator.java new file mode 100644 index 0000000..a1d4432 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/validator/ValidStarsValidator.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.global.validation.validator; + +import com.umc.umc10th.kaka.global.validation.annotation.ValidStars; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class ValidStarsValidator implements ConstraintValidator { + + @Override + public boolean isValid(Float value, ConstraintValidatorContext context) { + if (value == null) return false; + if (value < 0.5f || value > 5.0f) return false; + // 0.5 단위 체크 + return (value * 10) % 5 == 0; + } +} \ No newline at end of file From 748c72842cd1eb8cca6b06711b7d1e05a33a4d9e Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 17:58:02 +0900 Subject: [PATCH 15/22] =?UTF-8?q?=F0=9F=97=84=EF=B8=8F=20db(entity):=20Sto?= =?UTF-8?q?re=20=EB=B0=8F=20Location=20=EC=97=94=ED=8B=B0=ED=8B=B0=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20Address?= =?UTF-8?q?=20Enum=20=ED=99=95=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `Address` Enum에 특별시/광역시 및 서울 주요 구 지역 상수 추가 - `SignUpReqDTO`의 `address` 필드 검증용 `@Pattern` 정규식에 추가된 `Address` 상수 목록 반영 - `Location` 엔티티의 식별자 컬럼명을 `location_id`로 명시하고, 주소 매핑 컬럼명을 `address`에서 `name`으로 변경 및 `nullable = false` 제약조건 추가 - `Store` 엔티티의 식별자 컬럼명을 `store_id`로 명시하고, `managerNumber` 및 `detailAddress` 필드 추가 - `Store` 엔티티의 `name`, `managerNumber`, `detailAddress`, `location_id`(연관관계) 컬럼에 `nullable = false` 제약조건 적용 --- .../kaka/domain/member/dto/SignUpReqDTO.java | 2 +- .../kaka/domain/mission/enums/Address.java | 21 ++++++++++++++++++- .../kaka/domain/store/entity/Location.java | 3 ++- .../kaka/domain/store/entity/Store.java | 11 ++++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java index 6658a80..f3a34d8 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java @@ -30,7 +30,7 @@ public record SignUpReqBody( String birth, @NotBlank - @Pattern(regexp = "SEOUL") + @Pattern(regexp = "SEOUL|INCHEON|BUSAN|DAEGU|DAEJEON|GWANGJU|ULSAN|GANGNAM|SEOCHO|MAPO|HONGDAE|JONGNO|YONGSAN|SEONGDONG|SONGPA|YEONGDEUNGPO") String address, @NotNull diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java index c689a69..4775e8c 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java @@ -1,5 +1,24 @@ package com.umc.umc10th.kaka.domain.mission.enums; public enum Address { - SEOUL //일단 연습이니 서룰만 + + // 특별시/광역시 + SEOUL, // 서울 + INCHEON, // 인천 + BUSAN, // 부산 + DAEGU, // 대구 + DAEJEON, // 대전 + GWANGJU, // 광주 + ULSAN, // 울산 + + // 서울 주요 구(연습이여서 서울만 추가함.) + GANGNAM, // 강남구 + SEOCHO, // 서초구 + MAPO, // 마포구 + HONGDAE, // 홍대 (마포구) + JONGNO, // 종로구 + YONGSAN, // 용산구 + SEONGDONG, // 성동구 + SONGPA, // 송파구 + YEONGDEUNGPO // 영등포구 } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java index a83393a..43df251 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java @@ -17,9 +17,10 @@ public class Location { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "location_id") private Long id; - @Column(name = "address") + @Column(name = "name", nullable = false) @Enumerated(EnumType.STRING) private Address address; } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java index 8116514..62978c3 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java @@ -16,12 +16,19 @@ public class Store { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "store_id") private Long id; - @Column(name = "name") + @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") + @JoinColumn(name = "location_id", nullable = false) private Location location; } From ec4f12bb1a55d62374c720aa49b8a2300c90f906 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 19:44:25 +0900 Subject: [PATCH 16/22] =?UTF-8?q?=E2=9C=A8=20feat(controller,=20service):?= =?UTF-8?q?=20=EA=B0=80=EA=B2=8C=20=EB=AF=B8=EC=85=98=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=20=EB=B0=8F=20=EC=BB=A4=EC=84=9C=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MissionController의 기본 URL을 `/api/v1`으로 변경하고, 가게 미션 생성(`POST /stores/{storeId}/missions`) 및 커서 기반 조회(`GET /stores/{storeId}/missions`) API 추가 - MissionService에 `StoreRepository`를 연동하여 새로운 미션을 생성하는 로직과 커서(Cursor) 기반 페이지네이션을 적용한 미션 조회 로직 구현 - MissionRepository에 가게 ID와 커서(ID 내림차순)를 조건으로 미션을 조회하는 메서드(`findMissionsByStore_IdAndIdLessThanOrderByIdDesc` 등) 추가 - MissionReqDTO에 미션 생성 요청용 `CreateMission` record를 추가하고 데이터 유효성 검증(Validation) 어노테이션 적용 - MissionResDTO에 응답용 `GetMissionRes`와 커서 페이징 데이터 처리를 위한 공통 포맷인 `Pagination` record 추가 - MissionConverter에 신규 DTO와 Entity 간의 데이터 변환을 처리하는 매핑 메서드(`toMission`, `toGetMission`, `toPagination` 등) 추가 - MissionErrorCode에 잘못된 쿼리 요청을 처리하는 `QUERY_NOT_VALID` 예외 코드를 추가하고, MissionSuccessCode에 `CREATED` 성공 코드 추가 --- .../mission/controller/MissionController.java | 28 +++++-- .../mission/converter/MissionConverter.java | 50 +++++++++++ .../domain/mission/dto/MissionReqDTO.java | 21 +++++ .../domain/mission/dto/MissionResDTO.java | 24 ++++++ .../exception/code/MissionErrorCode.java | 3 +- .../exception/code/MissionSuccessCode.java | 7 +- .../mission/repository/MissionRepository.java | 15 ++++ .../mission/service/MissionService.java | 82 ++++++++++++++----- .../store/exception/code/StoreErrorCode.java | 5 +- 9 files changed, 206 insertions(+), 29 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java index 87cac6f..317f415 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java @@ -9,21 +9,35 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequiredArgsConstructor -@RequestMapping("/mission") +@RequestMapping("/api/v1") public class MissionController { private final MissionService missionService; - @GetMapping("/v1/missions") - public ApiResponse getMissions( - @RequestHeader("Authorization") String token, - @RequestParam(defaultValue = "0") int page, - @RequestParam(defaultValue = "10") int size + // 가계 미션 생성 + @PostMapping("/stores/{storeId}/missions") + public ApiResponse createMission( + @PathVariable Long storeId, + @RequestBody MissionReqDTO.CreateMission dto + ){ + BaseSuccessCode code = MissionSuccessCode.CREATED; + return ApiResponse.onSuccess(code, missionService.createMission(storeId, dto)); + } + + // 가게 내 미션들 조회 + @GetMapping("/stores/{storeId}/missions") + public ApiResponse> getMissions( + @PathVariable Long storeId, + @RequestParam Integer pageSize, + @RequestParam String cursor, + @RequestParam String query ) { BaseSuccessCode code = MissionSuccessCode.OK; - return ApiResponse.onSuccess(code, missionService.getMissions(token, page, size)); + return ApiResponse.onSuccess(code, missionService.getMissions(storeId, pageSize, cursor, query)); } @PostMapping("/completed") diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java index 251a69c..93264eb 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -1,9 +1,11 @@ package com.umc.umc10th.kaka.domain.mission.converter; +import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import com.umc.umc10th.kaka.domain.store.entity.Store; import java.util.List; import java.util.stream.Collectors; @@ -47,4 +49,52 @@ public static MemberMission toMemberMission(Mission mission) { .build(); } + public static MissionResDTO.StoreMissionList toStoreMissionList(Mission mission) { + return new MissionResDTO.StoreMissionList( + mission.getId(), + mission.getPoint(), + mission.getConditional() + ); + } + + // 가게 미션 생성 + public static Mission toMission( + Store store, + MissionReqDTO.CreateMission dto + ){ + return Mission.builder() + .store(store) + .conditional(dto.conditional()) + .point(dto.point()) + .deadline(dto.deadline().atStartOfDay()) + .build(); + } + + // 가게 내 미션들 조회 + public static MissionResDTO.GetMissionRes toGetMission( + Mission mission + ){ + return MissionResDTO.GetMissionRes.builder() + .conditional(mission.getConditional()) + .point(mission.getPoint()) + .missionId(mission.getId()) + .build(); + } + + // 페이지네이션 틀 생성 + public static MissionResDTO.Pagination toPagination( + List data, + Boolean hasNext, + String nextCursor, + Integer pageSize + + ){ + return MissionResDTO.Pagination.builder() + .data(data) + .hasNext(hasNext) + .nextCursor(nextCursor) + .pageSize(pageSize) + .build(); + } + } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java index 86a58b5..cce7246 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java @@ -1,8 +1,29 @@ package com.umc.umc10th.kaka.domain.mission.dto; +import jakarta.validation.constraints.*; + +import java.time.LocalDate; + public class MissionReqDTO { public record CompleteMissionReq( + @NotNull Long missionId ) {} + + public record CreateMission( + + @NotNull + @Future + LocalDate deadline, + + @NotNull + @Min(value = 1) + @Max(value=100000) + Integer point, + + @NotBlank + @Size(max = 255) + String conditional + ){} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java index 68020a7..7d9cf87 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java @@ -1,6 +1,7 @@ package com.umc.umc10th.kaka.domain.mission.dto; import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import lombok.Builder; import java.util.List; @@ -24,4 +25,27 @@ public record CompleteMissionRes( Long missionId, String message ) {} + + @Builder + public record GetMissionRes( + Long missionId, + Integer point, + String conditional + + ) {} + + @Builder + public record Pagination( + List data, + Boolean hasNext, + String nextCursor, + Integer pageSize + ){} + + // 가게 미션 조회용 추가 + public record StoreMissionList( + Long missionId, + Integer point, + String conditional + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java index 940aa30..5fb780a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java @@ -8,7 +8,8 @@ @Getter @RequiredArgsConstructor public enum MissionErrorCode implements BaseErrorCode { - MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION404_1", "미션을 찾을 수 없습니다."); + MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION404_1", "미션을 찾을 수 없습니다."), + QUERY_NOT_VALID(HttpStatus.BAD_REQUEST, "MISSION400_1", "유효하지 않은 정렬 기준입니다."); private final HttpStatus status; private final String code; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java index d24f359..c587113 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java @@ -8,7 +8,12 @@ @Getter @RequiredArgsConstructor public enum MissionSuccessCode implements BaseSuccessCode { - OK(HttpStatus.OK, "MISSION200_1", "성공"); + + CREATED(HttpStatus.OK, "MISSION200_1", + "성공적으로 미션을 생성했습니다."), + OK(HttpStatus.OK, + "MISSION200_1", + "성공적으로 미션을 조회했습니다."); private final HttpStatus status; private final String code; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java index ac4c2a4..abe2498 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java @@ -1,12 +1,15 @@ package com.umc.umc10th.kaka.domain.mission.repository; import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import org.springframework.data.domain.Page; import org.springframework.data.domain.Slice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.data.domain.Pageable; +import java.util.List; + public interface MissionRepository extends JpaRepository { //현재 선택 지역 -> 도전 가능한 미션 목록 @@ -19,4 +22,16 @@ Slice findByLocationId( @Param("locationId") Long locationId, Pageable pageable ); + + Page findAllByStore_Id(Long storeId, Pageable pageable); + + // 커서 있을 때 + Slice findMissionsByStore_IdAndIdLessThanOrderByIdDesc( + Long storeId, Long idCursor, Pageable pageable + ); + + // 커서 없을 때 + Slice findMissionsByStore_IdOrderByIdDesc( + Long storeId, Pageable pageable + ); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index 47bd114..d947264 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -11,12 +11,15 @@ import com.umc.umc10th.kaka.domain.mission.exception.code.MissionSuccessCode; import com.umc.umc10th.kaka.domain.mission.repository.MemberMissionRepository; import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.domain.store.exception.StoreException; +import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; +import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Slice; +import org.springframework.data.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; + import java.util.List; @Service @@ -26,25 +29,66 @@ public class MissionService { private final MissionRepository missionRepository; private final MemberMissionRepository memberMissionRepository; - // 미션 목록 조회 - public MissionResDTO.MissionPage getMissions(String token, int page, int size) { - Long memberId = Long.parseLong(token); + private final StoreRepository storeRepository; - // 진행중, 진행완료만 조회 - List statuses = List.of( - MissionStatus.CHALLENGING, - MissionStatus.COMPLETE - ); + // 가게 미션 생성 + @Transactional + public Void createMission( + Long storeId, + MissionReqDTO.CreateMission dto + ){ + // 가게 찾기 + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); + + // 미션 생성 + Mission mission = MissionConverter.toMission(store, dto); + + // 미션 DB 저장 + missionRepository.save(mission); + return null; + } + + + // 가게 내 미션 목록 조회 + public MissionResDTO.Pagination getMissions( + Long storeId, + Integer pageSize, + String cursor, + String query + ) { + PageRequest pageRequest = PageRequest.of(0, pageSize); + + long idCursor; + Slice missionList; + String nextCursor; + + if (!cursor.equals("-1")) { + String[] cursorSplit = cursor.split(":"); + switch (query.toLowerCase()) { + case "id": + idCursor = Long.parseLong(cursorSplit[1]); + missionList = missionRepository + .findMissionsByStore_IdAndIdLessThanOrderByIdDesc( + storeId, idCursor, pageRequest + ); + break; + default: + throw new MissionException(MissionErrorCode.QUERY_NOT_VALID); + } + } else { + missionList = missionRepository + .findMissionsByStore_IdOrderByIdDesc(storeId, pageRequest); + } - Pageable pageable = PageRequest.of(page, size); - Slice missions = memberMissionRepository - .findByMemberIdAndStatusIn(memberId, statuses, pageable); + nextCursor = missionList.getContent().getLast().getId() + ":" + + missionList.getContent().getLast().getId(); - return MissionConverter.toMissionPage( - missions.getContent(), - page, - size, - missions.hasNext() + return MissionConverter.toPagination( + missionList.map(MissionConverter::toGetMission).toList(), + missionList.hasNext(), + nextCursor, + missionList.getSize() ); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java index d1590c8..a14dfb2 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java @@ -8,7 +8,10 @@ @Getter @RequiredArgsConstructor public enum StoreErrorCode implements BaseErrorCode { - STORE_NOT_FOUND(HttpStatus.NOT_FOUND, "STORE404_1", "가게를 찾을 수 없습니다."); + + STORE_NOT_FOUND(HttpStatus.NOT_FOUND, + "STORE404_1", + "해당 가게가 존재하지 않습니다."); private final HttpStatus status; private final String code; From 8f5f85d13e5a0a041682ebc44d6cf48265f075fb Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 19:53:58 +0900 Subject: [PATCH 17/22] =?UTF-8?q?=E2=9C=A8=20feat(global):=20DTO=20?= =?UTF-8?q?=EC=9C=A0=ED=9A=A8=EC=84=B1=20=EA=B2=80=EC=A6=9D=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B8=EB=93=A4=EB=9F=AC=20=EB=B0=8F=20=EC=BB=A4?= =?UTF-8?q?=EC=8A=A4=ED=85=80=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `GeneralExceptionAdvice`에 `MethodArgumentNotValidException` 핸들러를 추가하여 필드별 유효성 검증 에러 메시지 반환 로직 구현 - `SignUpReqDTO`, `MissionReqDTO`, `ReviewReqDTO`의 검증 어노테이션(@NotBlank, @Pattern, @Size, @NotNull 등)에 구체적인 `message` 속성 추가 - `MissionController`의 가게 미션 조회 API(`getMissions`) 반환 타입을 `List`에서 `Pagination` 구조로 변경 - 프로젝트 전반에 걸쳐 record 기반 DTO 클래스의 빈 중괄호 포맷팅 수정 - 다수의 Controller, Service, Repository, Entity 계층에서 사용하지 않는 불필요한 import 문 제거 및 와일드카드 import(`lombok.*`)를 명시적 선언으로 변경 --- .../home/controller/HomeController.java | 2 +- .../domain/home/dto/HomeMyDataReqDTO.java | 3 +- .../domain/home/dto/HomeMyDataResDTO.java | 3 +- .../home/dto/HomeRegionMissionReqDTO.java | 5 ++-- .../home/dto/HomeRegionMissionResDTO.java | 6 ++-- .../kaka/domain/home/service/HomeService.java | 2 +- .../member/controller/MemberController.java | 1 - .../kaka/domain/member/dto/MemberReqDTO.java | 9 +++--- .../kaka/domain/member/dto/SignUpReqDTO.java | 30 +++++++++++-------- .../kaka/domain/member/dto/SignUpResDTO.java | 3 +- .../member/entity/mapping/MemberTerm.java | 1 - .../domain/member/service/MemberService.java | 5 ---- .../mission/controller/MissionController.java | 6 ++-- .../mission/converter/MissionConverter.java | 6 ++-- .../domain/mission/dto/MissionReqDTO.java | 22 +++++++------- .../domain/mission/dto/MissionResDTO.java | 18 +++++++---- .../mission/entity/mapping/MemberMission.java | 5 +++- .../repository/MemberMissionRepository.java | 5 ++-- .../mission/repository/MissionRepository.java | 4 +-- .../mission/service/MissionService.java | 9 ++---- .../review/converter/ReviewConverter.java | 2 +- .../kaka/domain/review/dto/ReviewReqDTO.java | 9 +++--- .../kaka/domain/review/dto/ReviewResDTO.java | 3 +- .../domain/review/service/ReviewService.java | 10 +++---- .../handler/GeneralExceptionAdvice.java | 18 +++++++++++ .../validation/annotation/ValidStars.java | 3 ++ 26 files changed, 110 insertions(+), 80 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java index 4fdb2c5..9420e2a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java @@ -23,7 +23,7 @@ public ApiResponse getRegionMissions( @RequestParam(defaultValue = "10") int size ) { BaseSuccessCode code = HomeSuccessCode.OK; - return ApiResponse.onSuccess(code, homeService.getRegionMissions(locationId,page, size)); + return ApiResponse.onSuccess(code, homeService.getRegionMissions(locationId, page, size)); } @GetMapping("/v1/mydata") diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java index 21c80a9..ec27762 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java @@ -4,5 +4,6 @@ public class HomeMyDataReqDTO { public record MyDataReq( String token - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java index 7dcdcba..feb9171 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java @@ -9,5 +9,6 @@ public record MyDataRes( String phoneNumber, Integer phoneNumberStatus, Integer userPoint - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java index c2c9eb5..4be7a20 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java @@ -1,10 +1,9 @@ package com.umc.umc10th.kaka.domain.home.dto; -import lombok.Getter; - public class HomeRegionMissionReqDTO { public record RegionMissionReq( String token - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java index a062e28..9e93e0a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java @@ -9,12 +9,14 @@ public record MissionList( String marketName, Integer point, String content - ) {} + ) { + } public record MissionPage( List content, int page, int size, boolean hasNext - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java index 5a2c8b5..59a22f3 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java @@ -11,9 +11,9 @@ import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; -import org.springframework.data.domain.Pageable; @Service @RequiredArgsConstructor diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java index c4431dd..0faf1a1 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java @@ -1,6 +1,5 @@ package com.umc.umc10th.kaka.domain.member.controller; -import com.umc.umc10th.kaka.domain.member.dto.MemberReqDTO; import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java index b168c5b..16967c3 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java @@ -1,12 +1,13 @@ package com.umc.umc10th.kaka.domain.member.dto; - - public class MemberReqDTO { - public record RequestBody(String stringTest, String longTest) {} - public record GetInfo(Long id) {} + public record RequestBody(String stringTest, String longTest) { + } + + public record GetInfo(Long id) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java index f3a34d8..033db62 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java @@ -8,32 +8,36 @@ public class SignUpReqDTO { public record SignUpReqBody( - @NotBlank + @NotBlank(message = "이름은 필수입니다.") String name, - @NotBlank - @Email + @NotBlank(message = "이메일은 필수입니다.") + @Email(message = "이메일 형식이 올바르지 않습니다.") String email, - @NotBlank + @NotBlank(message = "비밀번호는 필수입니다.") String password, - @NotBlank + @NotBlank(message = "전화번호는 필수입니다.") String phoneNumber, - @NotBlank - @Pattern(regexp = "MALE|FEMALE") + @NotBlank(message = "성별은 필수입니다.") + @Pattern(regexp = "MALE|FEMALE", message = "성별은 MALE 또는 FEMALE이어야 합니다.") String gender, - @NotBlank - @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}") + @NotBlank(message = "생년월일은 필수입니다.") + @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}", message = "생년월일은 YYYY-MM-DD 형식이어야 합니다.") String birth, - @NotBlank - @Pattern(regexp = "SEOUL|INCHEON|BUSAN|DAEGU|DAEJEON|GWANGJU|ULSAN|GANGNAM|SEOCHO|MAPO|HONGDAE|JONGNO|YONGSAN|SEONGDONG|SONGPA|YEONGDEUNGPO") + @NotBlank(message = "지역은 필수입니다.") + @Pattern( + regexp = "SEOUL|INCHEON|BUSAN|DAEGU|DAEJEON|GWANGJU|ULSAN|GANGNAM|SEOCHO|MAPO|HONGDAE|JONGNO|YONGSAN|SEONGDONG|SONGPA|YEONGDEUNGPO", + message = "유효하지 않은 지역입니다." + ) String address, - @NotNull + @NotNull(message = "약관 동의 ID는 필수입니다.") Integer agreedId - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java index 609acf0..3cb2caa 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java @@ -5,5 +5,6 @@ public class SignUpResDTO { public record SignUpResBody( Long id, String refreshToken - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java index cec9ffc..28e9a5c 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java @@ -6,7 +6,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import jakarta.persistence.Id; @Entity @Getter diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java index f080fe5..246e1e6 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java @@ -1,22 +1,17 @@ package com.umc.umc10th.kaka.domain.member.service; import com.umc.umc10th.kaka.domain.member.converter.MemberConverter; -import com.umc.umc10th.kaka.domain.member.dto.MemberReqDTO; import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; import com.umc.umc10th.kaka.domain.member.entity.Member; -import com.umc.umc10th.kaka.domain.member.enums.Gender; import com.umc.umc10th.kaka.domain.member.exception.MemberException; import com.umc.umc10th.kaka.domain.member.exception.code.MemberErrorCode; import com.umc.umc10th.kaka.domain.member.repository.MemberRepository; -import com.umc.umc10th.kaka.domain.mission.enums.Address; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.time.LocalDate; - @Service @RequiredArgsConstructor public class MemberService { diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java index 317f415..d1d357d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java @@ -9,8 +9,6 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequiredArgsConstructor @RequestMapping("/api/v1") @@ -23,14 +21,14 @@ public class MissionController { public ApiResponse createMission( @PathVariable Long storeId, @RequestBody MissionReqDTO.CreateMission dto - ){ + ) { BaseSuccessCode code = MissionSuccessCode.CREATED; return ApiResponse.onSuccess(code, missionService.createMission(storeId, dto)); } // 가게 내 미션들 조회 @GetMapping("/stores/{storeId}/missions") - public ApiResponse> getMissions( + public ApiResponse> getMissions( @PathVariable Long storeId, @RequestParam Integer pageSize, @RequestParam String cursor, diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java index 93264eb..1ad731a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -61,7 +61,7 @@ public static MissionResDTO.StoreMissionList toStoreMissionList(Mission mission) public static Mission toMission( Store store, MissionReqDTO.CreateMission dto - ){ + ) { return Mission.builder() .store(store) .conditional(dto.conditional()) @@ -73,7 +73,7 @@ public static Mission toMission( // 가게 내 미션들 조회 public static MissionResDTO.GetMissionRes toGetMission( Mission mission - ){ + ) { return MissionResDTO.GetMissionRes.builder() .conditional(mission.getConditional()) .point(mission.getPoint()) @@ -88,7 +88,7 @@ public static MissionResDTO.Pagination toPagination( String nextCursor, Integer pageSize - ){ + ) { return MissionResDTO.Pagination.builder() .data(data) .hasNext(hasNext) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java index cce7246..e7f15be 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java @@ -7,23 +7,25 @@ public class MissionReqDTO { public record CompleteMissionReq( - @NotNull + @NotNull(message = "미션 ID는 필수입니다.") Long missionId - ) {} + ) { + } public record CreateMission( - @NotNull - @Future + @NotNull(message = "마감일은 필수입니다.") + @Future(message = "마감일은 오늘 이후여야 합니다.") LocalDate deadline, - @NotNull - @Min(value = 1) - @Max(value=100000) + @NotNull(message = "포인트는 필수입니다.") + @Min(value = 1, message = "포인트는 최소 1 이상이어야 합니다.") + @Max(value = 100000, message = "포인트는 최대 100,000 이하여야 합니다.") Integer point, - @NotBlank - @Size(max = 255) + @NotBlank(message = "미션 조건은 필수입니다.") + @Size(max = 255, message = "미션 조건은 255자 이하여야 합니다.") String conditional - ){} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java index 7d9cf87..4645abc 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java @@ -12,19 +12,22 @@ public record MissionList( String marketName, Integer point, MissionStatus status - ) {} + ) { + } public record MissionPage( List content, int page, int size, boolean hasNext - ) {} + ) { + } public record CompleteMissionRes( Long missionId, String message - ) {} + ) { + } @Builder public record GetMissionRes( @@ -32,7 +35,8 @@ public record GetMissionRes( Integer point, String conditional - ) {} + ) { + } @Builder public record Pagination( @@ -40,12 +44,14 @@ public record Pagination( Boolean hasNext, String nextCursor, Integer pageSize - ){} + ) { + } // 가게 미션 조회용 추가 public record StoreMissionList( Long missionId, Integer point, String conditional - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java index 7ed23cc..d3df698 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java @@ -4,7 +4,10 @@ import com.umc.umc10th.kaka.domain.mission.entity.Mission; import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; import jakarta.persistence.*; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; @Entity @Getter diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java index ef5469b..0743cac 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java @@ -2,11 +2,12 @@ import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Slice; + import java.util.List; public interface MemberMissionRepository extends JpaRepository { diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java index abe2498..202a1f9 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java @@ -2,13 +2,11 @@ import com.umc.umc10th.kaka.domain.mission.entity.Mission; import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import org.springframework.data.domain.Pageable; - -import java.util.List; public interface MissionRepository extends JpaRepository { diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index d947264..8276401 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -4,8 +4,6 @@ import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; -import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; -import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; import com.umc.umc10th.kaka.domain.mission.exception.MissionException; import com.umc.umc10th.kaka.domain.mission.exception.code.MissionErrorCode; import com.umc.umc10th.kaka.domain.mission.exception.code.MissionSuccessCode; @@ -16,12 +14,11 @@ import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.*; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - @Service @RequiredArgsConstructor public class MissionService { @@ -36,7 +33,7 @@ public class MissionService { public Void createMission( Long storeId, MissionReqDTO.CreateMission dto - ){ + ) { // 가게 찾기 Store store = storeRepository.findById(storeId) .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java index e2763fd..2e4df24 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -1,9 +1,9 @@ package com.umc.umc10th.kaka.domain.review.converter; -import com.umc.umc10th.kaka.domain.store.entity.Store; import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; import com.umc.umc10th.kaka.domain.review.entity.Review; +import com.umc.umc10th.kaka.domain.store.entity.Store; public class ReviewConverter { diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java index e958a1a..c920375 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java @@ -8,11 +8,12 @@ public class ReviewReqDTO { public record CreateReviewReq( - @ValidStars + @ValidStars(message = "별점은 0.5 단위로 0.5~5.0 사이여야 합니다.") Float stars, - @NotBlank - @Size(min = 30, max = 300) + @NotBlank(message = "리뷰 내용은 필수입니다.") + @Size(min = 30, max = 300, message = "리뷰 내용은 30자 이상 300자 이하여야 합니다.") String content - ) {} + ) { + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java index 6356b22..4c07109 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java @@ -7,5 +7,6 @@ public record CreateReviewRes( Long reviewId, Float stars, String content - ) {} + ) { + } } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java index c978613..fb7f73a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -1,14 +1,14 @@ package com.umc.umc10th.kaka.domain.review.service; -import com.umc.umc10th.kaka.domain.store.entity.Store; -import com.umc.umc10th.kaka.domain.store.exception.StoreException; -import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; -import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; import com.umc.umc10th.kaka.domain.review.converter.ReviewConverter; import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; import com.umc.umc10th.kaka.domain.review.entity.Review; import com.umc.umc10th.kaka.domain.review.repository.ReviewRepository; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.domain.store.exception.StoreException; +import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; +import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +27,7 @@ public ReviewResDTO.CreateReviewRes createReview( ) { Store store = storeRepository.findById(storeId) .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); - Review review = ReviewConverter.toReview(store,dto); + Review review = ReviewConverter.toReview(store, dto); reviewRepository.save(review); return ReviewConverter.toCreateReview(review); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java index c15d62b..fe49e17 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java @@ -5,9 +5,13 @@ import com.umc.umc10th.kaka.global.apiPayLoad.code.GeneralErrorCode; import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import java.util.HashMap; +import java.util.Map; + @RestControllerAdvice public class GeneralExceptionAdvice { @@ -20,6 +24,20 @@ public ResponseEntity> handlerMemberException( .body(ApiResponse.onFailure(errorCode, null)); } + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity>> handleMethodArgumentNotValidException( + MethodArgumentNotValidException e + ) { + Map errors = new HashMap<>(); + e.getBindingResult().getFieldErrors().forEach(error -> + errors.put(error.getField(), error.getDefaultMessage()) + ); + + BaseErrorCode code = GeneralErrorCode.BAD_REQUEST; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure(code, errors)); + } + @ExceptionHandler(Exception.class) public ResponseEntity> handleException( Exception ex diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java index 6af287c..88896cb 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java @@ -3,6 +3,7 @@ import com.umc.umc10th.kaka.global.validation.validator.ValidStarsValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; + import java.lang.annotation.*; @Documented @@ -11,6 +12,8 @@ @Retention(RetentionPolicy.RUNTIME) public @interface ValidStars { String message() default "별점은 0.5 단위로 0.5 ~ 5.0 사이여야 합니다."; + Class[] groups() default {}; + Class[] payload() default {}; } From 794482fda11548ef32a9e038e47a698c6da29239 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 20:20:04 +0900 Subject: [PATCH 18/22] =?UTF-8?q?=E2=9C=A8=20feat(controller):=20=EB=82=B4?= =?UTF-8?q?=EA=B0=80=20=EC=A7=84=ED=96=89=EC=A4=91=EC=9D=B8=20=EB=AF=B8?= =?UTF-8?q?=EC=85=98=20=EC=A1=B0=ED=9A=8C=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `MissionController`에 내가 진행중인 미션 조회 엔드포인트(`/missions/my`) 추가 - `MissionReqDTO`에 회원 ID 및 페이지네이션 정보를 받는 `GetMyMissionsReq` DTO 추가 - `MissionResDTO`에 미션 목록 응답을 처리하는 `MyMissionList`, `MyMissionPage` DTO 추가 - `MissionService`에 `CHALLENGING`, `COMPLETE` 상태의 미션을 페이징하여 반환하는 `getMyMissions` 비즈니스 로직 구현 ``` --- ```text ♻️ refactor(converter): 미션 응답 Converter 파라미터 및 메서드명 수정 - `MissionConverter`의 변환 메서드명을 `toMissionList` -> `toMyMissionList`, `toMissionPage` -> `toMyMissionPage`로 각각 변경 - 응답 변환 로직에서 `List` 대신 `Slice`을 직접 파라미터로 받도록 개선하여 불필요한 `hasNext` 인자 제거 - 데이터 리스트 변환 시 `Collectors.toList()` 호출을 `toList()`로 간소화 ``` --- ```text 🗄️ db(entity): Store 엔티티 식별자 매핑 컬럼명 변경 - `Store` 엔티티의 기본키 컬럼 매핑을 `@Column(name = "store_id")`에서 `@Column(name = "id")`로 변경 ``` --- .../mission/controller/MissionController.java | 10 +++++++++ .../mission/converter/MissionConverter.java | 22 +++++++++---------- .../domain/mission/dto/MissionReqDTO.java | 15 +++++++++++-- .../domain/mission/dto/MissionResDTO.java | 15 +++++++++++++ .../mission/service/MissionService.java | 19 ++++++++++++++++ .../kaka/domain/store/entity/Store.java | 2 +- 6 files changed, 69 insertions(+), 14 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java index d1d357d..1557240 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java @@ -6,6 +6,7 @@ import com.umc.umc10th.kaka.domain.mission.service.MissionService; import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -45,4 +46,13 @@ public ApiResponse completeMission( BaseSuccessCode code = MissionSuccessCode.OK; return ApiResponse.onSuccess(code, missionService.completeMission(dto)); } + + // 내가 진행중인 미션 조회 + @PostMapping("/missions/my") + public ApiResponse getMyMissions( + @RequestBody @Valid MissionReqDTO.GetMyMissionsReq req + ) { + BaseSuccessCode code = MissionSuccessCode.OK; + return ApiResponse.onSuccess(code, missionService.getMyMissions(req)); + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java index 1ad731a..13a4313 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -6,15 +6,15 @@ import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; import com.umc.umc10th.kaka.domain.store.entity.Store; - +import org.springframework.data.domain.Slice; import java.util.List; -import java.util.stream.Collectors; + public class MissionConverter { - public static MissionResDTO.MissionList toMissionList(MemberMission memberMission) { + public static MissionResDTO.MyMissionList toMyMissionList(MemberMission memberMission) { Mission mission = memberMission.getMission(); - return new MissionResDTO.MissionList( + return new MissionResDTO.MyMissionList( mission.getId(), mission.getStore().getName(), mission.getPoint(), @@ -22,16 +22,16 @@ public static MissionResDTO.MissionList toMissionList(MemberMission memberMissio ); } - public static MissionResDTO.MissionPage toMissionPage( - List memberMissions, int page, int size, boolean hasNext + public static MissionResDTO.MyMissionPage toMyMissionPage( + Slice slice, int page, int size ) { - return new MissionResDTO.MissionPage( - memberMissions.stream() - .map(MissionConverter::toMissionList) - .collect(Collectors.toList()), + return new MissionResDTO.MyMissionPage( + slice.getContent().stream() + .map(MissionConverter::toMyMissionList) + .toList(), page, size, - hasNext + slice.hasNext() ); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java index e7f15be..c743d14 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java @@ -26,6 +26,17 @@ public record CreateMission( @NotBlank(message = "미션 조건은 필수입니다.") @Size(max = 255, message = "미션 조건은 255자 이하여야 합니다.") String conditional - ) { - } + ) { } + + // 사용자 ID 받는 dto + public record GetMyMissionsReq( + @NotNull(message = "사용자 ID는 필수입니다.") + Long memberId, + + @NotNull(message = "페이지 번호는 필수입니다.") + Integer page, + + @NotNull(message = "페이지 사이즈는 필수입니다.") + Integer size + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java index 4645abc..cb6c989 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java @@ -54,4 +54,19 @@ public record StoreMissionList( String conditional ) { } + + // 진행중 미션 응답 DTO 추가 + public record MyMissionList( + Long missionId, + String storeName, + Integer point, + MissionStatus status + ) {} + + public record MyMissionPage( + List content, + int page, + int size, + boolean hasNext + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index 8276401..5f7b6a4 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -4,6 +4,8 @@ import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; import com.umc.umc10th.kaka.domain.mission.exception.MissionException; import com.umc.umc10th.kaka.domain.mission.exception.code.MissionErrorCode; import com.umc.umc10th.kaka.domain.mission.exception.code.MissionSuccessCode; @@ -15,10 +17,13 @@ import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @RequiredArgsConstructor public class MissionService { @@ -104,4 +109,18 @@ public MissionResDTO.CompleteMissionRes completeMission( MissionSuccessCode.OK.getMessage() ); } + + // 내가 진행중인 미션 조회 + public MissionResDTO.MyMissionPage getMyMissions(MissionReqDTO.GetMyMissionsReq req) { + List statuses = List.of( + MissionStatus.CHALLENGING, + MissionStatus.COMPLETE + ); + + Pageable pageable = PageRequest.of(req.page(), req.size()); + Slice result = memberMissionRepository + .findByMemberIdAndStatusIn(req.memberId(), statuses, pageable); + + return MissionConverter.toMyMissionPage(result, req.page(), req.size()); + } } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java index 62978c3..06a0da3 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java @@ -16,7 +16,7 @@ public class Store { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "store_id") + @Column(name = "id") private Long id; @Column(name = "name", nullable = false) From 00f5a1e7ec736de652a881506b7dee315487f605 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 13 May 2026 20:46:51 +0900 Subject: [PATCH 19/22] =?UTF-8?q?=EB=82=B4=EA=B0=80=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=ED=95=9C=20=EB=A6=AC=EB=B7=B0=EB=93=A4=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=ED=95=98=EA=B8=B0=20api=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ReviewController.java | 10 ++++ .../review/converter/ReviewConverter.java | 31 +++++++++++- .../kaka/domain/review/dto/ReviewReqDTO.java | 15 ++++++ .../kaka/domain/review/dto/ReviewResDTO.java | 26 +++++++++- .../kaka/domain/review/entity/Review.java | 3 +- .../exception/code/ReviewSuccessCode.java | 3 +- .../review/repository/ReviewRepository.java | 50 +++++++++++++++++++ .../domain/review/service/ReviewService.java | 35 +++++++++++++ 8 files changed, 169 insertions(+), 4 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java index 24b59a7..e075e65 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java @@ -6,6 +6,7 @@ import com.umc.umc10th.kaka.domain.review.service.ReviewService; import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -25,4 +26,13 @@ public ApiResponse getCreateReview( BaseSuccessCode code = ReviewSuccessCode.OK; return ApiResponse.onSuccess(code, reviewService.createReview(marketId, dto)); } + + // 내가 작성한 리뷰 조회 + @PostMapping("/reviews/my") + public ApiResponse getMyReviews( + @RequestBody @Valid ReviewReqDTO.GetMyReviewsReq req + ) { + BaseSuccessCode code = ReviewSuccessCode.OK; + return ApiResponse.onSuccess(code, reviewService.getMyReviews(req)); + } } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java index 2e4df24..c3da2f5 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -4,6 +4,7 @@ import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; import com.umc.umc10th.kaka.domain.review.entity.Review; import com.umc.umc10th.kaka.domain.store.entity.Store; +import org.springframework.data.domain.Slice; public class ReviewConverter { @@ -19,7 +20,35 @@ public static ReviewResDTO.CreateReviewRes toCreateReview(Review review) { return new ReviewResDTO.CreateReviewRes( review.getId(), review.getStars(), - review.getContent() + review.getContent(), + review.getReply() != null ? review.getReply().getContent() : null, + review.getCreatedAt().toString() ); } + + public static ReviewResDTO.ReviewItem toReviewItem(Review review) { + return ReviewResDTO.ReviewItem.builder() + .reviewId(review.getId()) + .memberName(review.getMember().getName()) + .stars(review.getStars()) + .content(review.getContent()) + .replyContent(review.getReply() != null ? review.getReply().getContent() : null) + .createdAt(review.getCreatedAt().toString()) + .build(); + } + + public static ReviewResDTO.ReviewPage toReviewPage( + Slice slice, + String nextCursor, + Integer pageSize + ) { + return ReviewResDTO.ReviewPage.builder() + .content(slice.getContent().stream() + .map(ReviewConverter::toReviewItem) + .toList()) + .nextCursor(nextCursor) + .pageSize(pageSize) + .hasNext(slice.hasNext()) + .build(); + } } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java index c920375..014930e 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java @@ -2,6 +2,7 @@ import com.umc.umc10th.kaka.global.validation.annotation.ValidStars; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; public class ReviewReqDTO { @@ -16,4 +17,18 @@ public record CreateReviewReq( String content ) { } + + // 내가 작성한 리뷰 조회 요청 + public record GetMyReviewsReq( + @NotNull(message = "사용자 ID는 필수입니다.") + Long memberId, + + @NotNull(message = "페이지 사이즈는 필수입니다.") + Integer pageSize, + + String cursor, + + @NotNull(message = "정렬 기준은 필수입니다.") + String query + ) {} } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java index 4c07109..3283961 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java @@ -1,12 +1,36 @@ package com.umc.umc10th.kaka.domain.review.dto; +import lombok.Builder; + +import java.util.List; + public class ReviewResDTO { public record CreateReviewRes( Long reviewId, Float stars, - String content + String content, + String replyContent, + String createdAt ) { } + + @Builder + public record ReviewItem( + Long reviewId, + String memberName, + Float stars, + String content, + String replyContent, + String createdAt + ) {} + + @Builder + public record ReviewPage( + List content, + String nextCursor, + Integer pageSize, + Boolean hasNext + ) {} } \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java index 533063d..2b48fe0 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -2,6 +2,7 @@ import com.umc.umc10th.kaka.domain.member.entity.Member; import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,7 +16,7 @@ @AllArgsConstructor @NoArgsConstructor @Table(name = "review") -public class Review { +public class Review extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java index 6c3ca07..50df417 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java @@ -8,7 +8,8 @@ @Getter @RequiredArgsConstructor public enum ReviewSuccessCode implements BaseSuccessCode { - OK(HttpStatus.OK, "REVIEW200_1", "성공"); + OK(HttpStatus.OK, "REVIEW200_1", "성공"), + CREATED(HttpStatus.CREATED, "REVIEW201_1", "리뷰 생성에 성공했습니다."); private final HttpStatus status; private final String code; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java index 7087093..fd48ff3 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java @@ -1,7 +1,57 @@ package com.umc.umc10th.kaka.domain.review.repository; import com.umc.umc10th.kaka.domain.review.entity.Review; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ReviewRepository extends JpaRepository { + + // ID 순 커서 기반 + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "AND r.id < :cursor " + + "ORDER BY r.id DESC") + Slice findByMemberIdAndIdLessThan( + @Param("memberId") Long memberId, + @Param("cursor") Long cursor, + Pageable pageable + ); + + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "ORDER BY r.id DESC") + Slice findByMemberIdOrderById( + @Param("memberId") Long memberId, + Pageable pageable + ); + + // 별점 순 커서 기반 + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "AND r.stars < :cursor " + + "ORDER BY r.stars DESC") + Slice findByMemberIdAndStarsLessThan( + @Param("memberId") Long memberId, + @Param("cursor") Float cursor, + Pageable pageable + ); + + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "ORDER BY r.stars DESC") + Slice findByMemberIdOrderByStars( + @Param("memberId") Long memberId, + Pageable pageable + ); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java index fb7f73a..03e9bbb 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -10,6 +10,8 @@ import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,4 +33,37 @@ public ReviewResDTO.CreateReviewRes createReview( reviewRepository.save(review); return ReviewConverter.toCreateReview(review); } + + public ReviewResDTO.ReviewPage getMyReviews(ReviewReqDTO.GetMyReviewsReq req) { + PageRequest pageRequest = PageRequest.of(0, req.pageSize()); + + Slice reviews; + String nextCursor; + + boolean isFirst = req.cursor().equals("-1"); + + switch (req.query().toLowerCase()) { + case "id" -> { + reviews = isFirst + ? reviewRepository.findByMemberIdOrderById(req.memberId(), pageRequest) + : reviewRepository.findByMemberIdAndIdLessThan( + req.memberId(), Long.parseLong(req.cursor()), pageRequest); + nextCursor = reviews.hasNext() + ? String.valueOf(reviews.getContent().getLast().getId()) + : null; + } + case "stars" -> { + reviews = isFirst + ? reviewRepository.findByMemberIdOrderByStars(req.memberId(), pageRequest) + : reviewRepository.findByMemberIdAndStarsLessThan( + req.memberId(), Float.parseFloat(req.cursor()), pageRequest); + nextCursor = reviews.hasNext() + ? String.valueOf(reviews.getContent().getLast().getStars()) + : null; + } + default -> throw new RuntimeException("유효하지 않은 정렬 기준입니다."); + } + + return ReviewConverter.toReviewPage(reviews, nextCursor, req.pageSize()); + } } From b25635f0cbdc735b7a3d7a7c7c0b02209e546f4e Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 20 May 2026 19:10:26 +0900 Subject: [PATCH 20/22] =?UTF-8?q?=E2=9C=A8=20feat(dto):=20MissionReqDTO=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=EC=97=90=20=EC=B5=9C=EC=86=8C=EA=B0=92=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - page 파라미터에 `@Min(value = 0)` 어노테이션을 추가하여 0 이상 값만 허용하도록 설정 - size 파라미터에 `@Min(value = 1)` 어노테이션을 추가하여 1 이상 값만 허용하도록 설정 --- .../com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java index c743d14..bb7917e 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java @@ -34,9 +34,11 @@ public record GetMyMissionsReq( Long memberId, @NotNull(message = "페이지 번호는 필수입니다.") + @Min(value = 0, message = "페이지 번호는 0 이상이어야 합니다.") Integer page, @NotNull(message = "페이지 사이즈는 필수입니다.") + @Min(value = 1, message = "페이지 사이즈는 1 이상이어야 합니다.") Integer size ) {} } From 9633e10de98d1f359de002d2566af3e6d1e5fa6e Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 20 May 2026 19:14:54 +0900 Subject: [PATCH 21/22] =?UTF-8?q?=F0=9F=90=9B=20fix(service):=20=EB=AF=B8?= =?UTF-8?q?=EC=85=98=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EB=B9=88=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=20=EC=B2=98=EB=A6=AC=20=EB=B0=8F=20=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=20=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - `nextCursor` 변수의 초기값을 "-1"로 할당 - `missionList`의 결과가 비어있지 않은 경우에만 `getLast()`를 호출하여 `nextCursor`를 업데이트하도록 조건문 추가 (빈 리스트 접근으로 인한 예외 방지) - `query` 파라미터 검증 로직의 불필요한 `switch` 문을 `equalsIgnoreCase`를 활용한 `if` 문으로 단순화하여 가독성 개선 --- .../mission/service/MissionService.java | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java index 5f7b6a4..b7b846d 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -63,28 +63,26 @@ public MissionResDTO.Pagination getMissions( long idCursor; Slice missionList; - String nextCursor; + String nextCursor = "-1"; + if (!cursor.equals("-1")) { String[] cursorSplit = cursor.split(":"); - switch (query.toLowerCase()) { - case "id": - idCursor = Long.parseLong(cursorSplit[1]); - missionList = missionRepository - .findMissionsByStore_IdAndIdLessThanOrderByIdDesc( - storeId, idCursor, pageRequest - ); - break; - default: - throw new MissionException(MissionErrorCode.QUERY_NOT_VALID); + if (!query.equalsIgnoreCase("id")) { + throw new MissionException(MissionErrorCode.QUERY_NOT_VALID); } + idCursor = Long.parseLong(cursorSplit[1]); + missionList = missionRepository + .findMissionsByStore_IdAndIdLessThanOrderByIdDesc(storeId, idCursor, pageRequest); } else { missionList = missionRepository .findMissionsByStore_IdOrderByIdDesc(storeId, pageRequest); } - nextCursor = missionList.getContent().getLast().getId() + ":" - + missionList.getContent().getLast().getId(); + if (!missionList.getContent().isEmpty()) { + nextCursor = missionList.getContent().getLast().getId() + ":" + + missionList.getContent().getLast().getId(); + } return MissionConverter.toPagination( missionList.map(MissionConverter::toGetMission).toList(), From d563713f5ed601075aa7c1b49da4a39e5370a127 Mon Sep 17 00:00:00 2001 From: Chea-yunzi Date: Wed, 20 May 2026 19:26:48 +0900 Subject: [PATCH 22/22] =?UTF-8?q?=F0=9F=90=9B=20fix(service):=20Review=20?= =?UTF-8?q?=EB=B3=84=EC=A0=90=20=EC=88=9C=20=EC=A0=95=EB=A0=AC=20=EC=BB=A4?= =?UTF-8?q?=EC=84=9C=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=98=88=EC=99=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ReviewService의 별점 순 정렬 시 커서를 `stars:id` 형태로 파싱하여 동일 별점 데이터도 정상적으로 페이징되도록 로직 수정 - ReviewRepository에 별점 및 ID 복합 조건을 처리하는 `findByMemberIdAndStarsLessThanOrStarsAndIdLessThan` 커스텀 쿼리 메서드 추가 - 유효하지 않은 정렬 기준 요청 시 사용할 `QUERY_NOT_VALID` 에러 코드를 ReviewErrorCode에 추가 - ReviewService에서 잘못된 정렬 기준 처리 시 기존 RuntimeException 대신 추가된 커스텀 예외(ReviewException)를 던지도록 변경 --- .../exception/code/ReviewErrorCode.java | 3 ++- .../review/repository/ReviewRepository.java | 11 ++++++++++ .../domain/review/service/ReviewService.java | 20 +++++++++++++------ 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java index 7032a14..0be2a78 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java @@ -8,7 +8,8 @@ @Getter @RequiredArgsConstructor public enum ReviewErrorCode implements BaseErrorCode { - REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_1", "리뷰를 찾을 수 없습니다."); + REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_1", "리뷰를 찾을 수 없습니다."), + QUERY_NOT_VALID(HttpStatus.BAD_REQUEST, "REVIEW400_1", "유효하지 않은 정렬 기준입니다."); private final HttpStatus status; private final String code; diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java index fd48ff3..0dc89b1 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java @@ -54,4 +54,15 @@ Slice findByMemberIdOrderByStars( @Param("memberId") Long memberId, Pageable pageable ); + + @Query("SELECT r FROM Review r WHERE r.member.id = :memberId " + + "AND (r.stars < :stars OR (r.stars = :stars AND r.id < :id)) " + + "ORDER BY r.stars DESC, r.id DESC") + Slice findByMemberIdAndStarsLessThanOrStarsAndIdLessThan( + @Param("memberId") Long memberId, + @Param("stars") float stars, + @Param("stars") float starsEq, // 같은 별점일 때 id로 비교 + @Param("id") long id, + Pageable pageable + ); } diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java index 03e9bbb..46bb79a 100644 --- a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -4,6 +4,8 @@ import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; import com.umc.umc10th.kaka.domain.review.entity.Review; +import com.umc.umc10th.kaka.domain.review.exception.ReviewException; +import com.umc.umc10th.kaka.domain.review.exception.code.ReviewErrorCode; import com.umc.umc10th.kaka.domain.review.repository.ReviewRepository; import com.umc.umc10th.kaka.domain.store.entity.Store; import com.umc.umc10th.kaka.domain.store.exception.StoreException; @@ -53,15 +55,21 @@ public ReviewResDTO.ReviewPage getMyReviews(ReviewReqDTO.GetMyReviewsReq req) { : null; } case "stars" -> { - reviews = isFirst - ? reviewRepository.findByMemberIdOrderByStars(req.memberId(), pageRequest) - : reviewRepository.findByMemberIdAndStarsLessThan( - req.memberId(), Float.parseFloat(req.cursor()), pageRequest); + if (isFirst) { + reviews = reviewRepository.findByMemberIdOrderByStars(req.memberId(), pageRequest); + } else { + String[] parts = req.cursor().split(":"); + float starsCursor = Float.parseFloat(parts[0]); + long idCursor = Long.parseLong(parts[1]); + reviews = reviewRepository.findByMemberIdAndStarsLessThanOrStarsAndIdLessThan( + req.memberId(), starsCursor, starsCursor, idCursor, pageRequest); + } nextCursor = reviews.hasNext() - ? String.valueOf(reviews.getContent().getLast().getStars()) + ? reviews.getContent().getLast().getStars() + ":" + + reviews.getContent().getLast().getId() : null; } - default -> throw new RuntimeException("유효하지 않은 정렬 기준입니다."); + default -> throw new ReviewException(ReviewErrorCode.QUERY_NOT_VALID); } return ReviewConverter.toReviewPage(reviews, nextCursor, req.pageSize());