From 8f984e89654dd29dadd7d5d10507a1e3f1501902 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Mon, 24 Jun 2024 18:59:13 +0900 Subject: [PATCH 01/18] feat : mission_week7, entity mapping --- .idea/.gitignore | 8 + .idea/Spring-B.iml | 14 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + umc.mission/.gitignore | 40 +++ umc.mission/build.gradle | 38 +++ umc.mission/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + umc.mission/gradlew | 249 ++++++++++++++++++ umc.mission/gradlew.bat | 92 +++++++ umc.mission/settings.gradle | 1 + .../com/example/umc/mission/Application.java | 13 + .../umc/mission/domain/AgreeService.java | 29 ++ .../umc/mission/domain/FoodCategory.java | 27 ++ .../example/umc/mission/domain/Member.java | 58 ++++ .../example/umc/mission/domain/Mission.java | 37 +++ .../example/umc/mission/domain/Region.java | 19 ++ .../umc/mission/domain/enums/Gender.java | 5 + .../mission/domain/enums/MemberStatus.java | 5 + .../mission/domain/enums/MissionStatus.java | 5 + .../umc/mission/domain/enums/SocialType.java | 5 + .../umc/mission/domain/mapping/Agreement.java | 26 ++ .../domain/mapping/MembersMission.java | 30 +++ .../domain/mapping/PreferrenceofFood.java | 26 ++ .../example/umc/mission/ApplicationTests.java | 13 + 26 files changed, 767 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/Spring-B.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 umc.mission/.gitignore create mode 100644 umc.mission/build.gradle create mode 100644 umc.mission/gradle/wrapper/gradle-wrapper.jar create mode 100644 umc.mission/gradle/wrapper/gradle-wrapper.properties create mode 100644 umc.mission/gradlew create mode 100644 umc.mission/gradlew.bat create mode 100644 umc.mission/settings.gradle create mode 100644 umc.mission/src/main/java/com/example/umc/mission/Application.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/AgreeService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/FoodCategory.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/Member.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/Region.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/enums/Gender.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/enums/MemberStatus.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/enums/SocialType.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/mapping/Agreement.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java create mode 100644 umc.mission/src/test/java/com/example/umc/mission/ApplicationTests.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/Spring-B.iml b/.idea/Spring-B.iml new file mode 100644 index 0000000..7f098fc --- /dev/null +++ b/.idea/Spring-B.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..9c42d73 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c4e283f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/umc.mission/.gitignore b/umc.mission/.gitignore new file mode 100644 index 0000000..9903923 --- /dev/null +++ b/umc.mission/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### UserSpecific Stuffs ### +resources/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/umc.mission/build.gradle b/umc.mission/build.gradle new file mode 100644 index 0000000..84f5313 --- /dev/null +++ b/umc.mission/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.7' + id 'io.spring.dependency-management' version '1.1.5' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/umc.mission/gradle/wrapper/gradle-wrapper.jar b/umc.mission/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/umc.mission/gradlew.bat b/umc.mission/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/umc.mission/gradlew.bat @@ -0,0 +1,92 @@ +@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 + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/umc.mission/settings.gradle b/umc.mission/settings.gradle new file mode 100644 index 0000000..d21fe13 --- /dev/null +++ b/umc.mission/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'umc.mission' diff --git a/umc.mission/src/main/java/com/example/umc/mission/Application.java b/umc.mission/src/main/java/com/example/umc/mission/Application.java new file mode 100644 index 0000000..6f06d43 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/Application.java @@ -0,0 +1,13 @@ +package com.example.umc.mission; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/AgreeService.java b/umc.mission/src/main/java/com/example/umc/mission/domain/AgreeService.java new file mode 100644 index 0000000..6d0d551 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/AgreeService.java @@ -0,0 +1,29 @@ +package com.example.umc.mission.domain; + +import com.example.umc.mission.domain.mapping.Agreement; +import jakarta.persistence.*; +import lombok.*; + +import javax.swing.table.TableCellEditor; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class AgreeService { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20, unique = true) + private String name; + + @OneToMany(mappedBy = "agreeService", cascade = CascadeType.ALL) + private List agreementList = new ArrayList<>(); + + +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/FoodCategory.java b/umc.mission/src/main/java/com/example/umc/mission/domain/FoodCategory.java new file mode 100644 index 0000000..aa3ee75 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/FoodCategory.java @@ -0,0 +1,27 @@ +package com.example.umc.mission.domain; + +import com.example.umc.mission.domain.mapping.PreferrenceofFood; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class FoodCategory { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20, unique = true) + private String name; + + @OneToMany(mappedBy = "foodCategory", cascade = CascadeType.ALL) + private List preferrenceofFoodList = new ArrayList<>(); + +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java new file mode 100644 index 0000000..8bb213f --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java @@ -0,0 +1,58 @@ +package com.example.umc.mission.domain; + +import com.example.umc.mission.domain.enums.Gender; +import com.example.umc.mission.domain.enums.MemberStatus; +import com.example.umc.mission.domain.enums.SocialType; +import com.example.umc.mission.domain.mapping.Agreement; +import com.example.umc.mission.domain.mapping.MembersMission; +import com.example.umc.mission.domain.mapping.PreferrenceofFood; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Member { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20, unique = true) + private String name; + + @Column(nullable = false, length = 50) + private String address; + + @Enumerated(EnumType.STRING) + private Gender gender; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + + private LocalDate birthDate; + + @Enumerated(EnumType.STRING) + private MemberStatus status; + + private LocalDate inactiveDate; + + private Integer point; + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List agreementList = new ArrayList<>(); + + @OneToMany(mappedBy = "member",cascade = CascadeType.ALL) + private List preferrenceofFoodList = new ArrayList<>(); + + @OneToMany(mappedBy = "member") + private List membersMissionList = new ArrayList<>(); + + +} \ No newline at end of file diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java new file mode 100644 index 0000000..26d5fd9 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java @@ -0,0 +1,37 @@ +package com.example.umc.mission.domain; + +import com.example.umc.mission.domain.mapping.MembersMission; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String name; + + @Column(nullable = false, length = 50) + private String condition; + + @Column(nullable = false) + private Integer reward; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + @OneToMany(mappedBy = "mission") + private List membersMissionList = new ArrayList<>(); + +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java new file mode 100644 index 0000000..5cec67e --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java @@ -0,0 +1,19 @@ +package com.example.umc.mission.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Region { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20, unique = true) + private String name; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/enums/Gender.java b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/Gender.java new file mode 100644 index 0000000..b0e4470 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/Gender.java @@ -0,0 +1,5 @@ +package com.example.umc.mission.domain.enums; + +public enum Gender { + MALE, FEMALE +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MemberStatus.java b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MemberStatus.java new file mode 100644 index 0000000..a51e6b5 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MemberStatus.java @@ -0,0 +1,5 @@ +package com.example.umc.mission.domain.enums; + +public enum MemberStatus { + ACTIVE, INACTIVE +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java new file mode 100644 index 0000000..1114b17 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package com.example.umc.mission.domain.enums; + +public enum MissionStatus { + COMPLETE, INCOMPLETE +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/enums/SocialType.java b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/SocialType.java new file mode 100644 index 0000000..96e416b --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/SocialType.java @@ -0,0 +1,5 @@ +package com.example.umc.mission.domain.enums; + +public enum SocialType { + KAKAO, NAVER, GOOGLE, APPLE +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/Agreement.java b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/Agreement.java new file mode 100644 index 0000000..296d58e --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/Agreement.java @@ -0,0 +1,26 @@ +package com.example.umc.mission.domain.mapping; + +import com.example.umc.mission.domain.AgreeService; +import com.example.umc.mission.domain.Member; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Agreement { + + @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 = "agreeService_id") + private AgreeService agreeService; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java new file mode 100644 index 0000000..b2c0efd --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java @@ -0,0 +1,30 @@ +package com.example.umc.mission.domain.mapping; + +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.enums.MissionStatus; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class MembersMission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java new file mode 100644 index 0000000..f02be74 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java @@ -0,0 +1,26 @@ +package com.example.umc.mission.domain.mapping; + +import com.example.umc.mission.domain.FoodCategory; +import com.example.umc.mission.domain.Member; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class PreferrenceofFood { + + @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 = "foodCategory_id") + private FoodCategory foodCategory; +} diff --git a/umc.mission/src/test/java/com/example/umc/mission/ApplicationTests.java b/umc.mission/src/test/java/com/example/umc/mission/ApplicationTests.java new file mode 100644 index 0000000..8d2c079 --- /dev/null +++ b/umc.mission/src/test/java/com/example/umc/mission/ApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.umc.mission; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApplicationTests { + + @Test + void contextLoads() { + } + +} From bf2cb16ec988af7381249cb1e5c6697909e30420 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 25 Jun 2024 05:08:54 +0900 Subject: [PATCH 02/18] feat : mission8_apiResponse unification --- .../umc/mission/apiPayload/ApiResponse.java | 35 ++++++++++++++ .../umc/mission/apiPayload/code/BaseCode.java | 8 ++++ .../apiPayload/code/BaseErrorCode.java | 8 ++++ .../apiPayload/code/ErrorReasonDTO.java | 19 ++++++++ .../mission/apiPayload/code/ReasonDTO.java | 19 ++++++++ .../apiPayload/code/status/ErrorStatus.java | 46 +++++++++++++++++++ .../apiPayload/code/status/SuccessStatus.java | 39 ++++++++++++++++ .../umc/mission/converter/TempConverter.java | 12 +++++ .../web/controller/TempRestController.java | 21 +++++++++ .../umc/mission/web/dto/TempResponse.java | 17 +++++++ 10 files changed, 224 insertions(+) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/ApiResponse.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseCode.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseErrorCode.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ErrorReasonDTO.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ReasonDTO.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/SuccessStatus.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/ApiResponse.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/ApiResponse.java new file mode 100644 index 0000000..cf9f1a0 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/ApiResponse.java @@ -0,0 +1,35 @@ +package com.example.umc.mission.apiPayload; + +import com.example.umc.mission.apiPayload.code.BaseCode; +import com.example.umc.mission.apiPayload.code.status.SuccessStatus; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + private final String code; + private final String message; + @JsonInclude(JsonInclude.Include.NON_NULL) + private T result; + + public static ApiResponse onSucccess(T result){ + return new ApiResponse<>(true, SuccessStatus._OK.getCode(), SuccessStatus._OK.getMessage(), result); + } + + public static ApiResponse of(BaseCode code, T result){ + return new ApiResponse<>(true, code.getReasonHttpStatus().getCode(), code.getReasonHttpStatus().getMessage(), result); + } + + //실패한 경우 응답 생성 + public static ApiResponse onFailure(String code, String message, T data) { + return new ApiResponse<>(true, code, message, data); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseCode.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseCode.java new file mode 100644 index 0000000..56a8ad9 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseCode.java @@ -0,0 +1,8 @@ +package com.example.umc.mission.apiPayload.code; + +public interface BaseCode { + + public ReasonDTO getReason(); + + public ReasonDTO getReasonHttpStatus(); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseErrorCode.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseErrorCode.java new file mode 100644 index 0000000..bf0b7cf --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/BaseErrorCode.java @@ -0,0 +1,8 @@ +package com.example.umc.mission.apiPayload.code; + +public interface BaseErrorCode { + + public ErrorReasonDTO getReason(); + + public ErrorReasonDTO getReasonHttpStatus(); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ErrorReasonDTO.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ErrorReasonDTO.java new file mode 100644 index 0000000..05127c3 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ErrorReasonDTO.java @@ -0,0 +1,19 @@ +package com.example.umc.mission.apiPayload.code; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.http.HttpStatus; + +@Builder +@Getter +@NoArgsConstructor +@AllArgsConstructor +public class ErrorReasonDTO { + + private String message; + private String code; + private Boolean isSuccess; + private HttpStatus httpStatus; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ReasonDTO.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ReasonDTO.java new file mode 100644 index 0000000..9a5d221 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/ReasonDTO.java @@ -0,0 +1,19 @@ +package com.example.umc.mission.apiPayload.code; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ReasonDTO { + + private String message; + private String code; + private Boolean isSuccess; + private HttpStatus httpStatus; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java new file mode 100644 index 0000000..19cebfa --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -0,0 +1,46 @@ +package com.example.umc.mission.apiPayload.code.status; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.code.ErrorReasonDTO; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ErrorStatus implements BaseErrorCode { + + //가장 일반적인 응답 + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON400", "잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON401", "인증이 필요합니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), + ; + + //멤버 관련 응답 등 + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ErrorReasonDTO getReason(){ + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .build() + ; + } + + @Override + public ErrorReasonDTO getReasonHttpStatus(){ + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/SuccessStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/SuccessStatus.java new file mode 100644 index 0000000..5b54f20 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/SuccessStatus.java @@ -0,0 +1,39 @@ +package com.example.umc.mission.apiPayload.code.status; + +import com.example.umc.mission.apiPayload.code.BaseCode; +import com.example.umc.mission.apiPayload.code.ReasonDTO; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum SuccessStatus implements BaseCode { + //가장 일반적인 응답 + _OK(HttpStatus.OK, "COMMON200", "성공입니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ReasonDTO getReason(){ + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .build() + ; + } + + @Override + public ReasonDTO getReasonHttpStatus(){ + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java new file mode 100644 index 0000000..777ed22 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java @@ -0,0 +1,12 @@ +package com.example.umc.mission.converter; + +import com.example.umc.mission.web.dto.TempResponse; + +public class TempConverter { + + public static TempResponse.TempTestDTO toTempTestDTO() { + return TempResponse.TempTestDTO.builder() + .testString("This is Test!") + .build(); + } +} \ No newline at end of file diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java new file mode 100644 index 0000000..0fe5215 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java @@ -0,0 +1,21 @@ +package com.example.umc.mission.web.controller; + +import com.example.umc.mission.apiPayload.ApiResponse; +import com.example.umc.mission.converter.TempConverter; +import com.example.umc.mission.web.dto.TempResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/temp") +@RequiredArgsConstructor +public class TempRestController { + + @GetMapping("/test") + public ApiResponse testApi(){ + + return ApiResponse.onSucccess(TempConverter.toTempTestDTO()); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java new file mode 100644 index 0000000..8259504 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java @@ -0,0 +1,17 @@ +package com.example.umc.mission.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class TempResponse { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempTestDTO{ + String testString; + } +} From 7e5cdcb4ba94b267b56755387970b901b3f27254 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 25 Jun 2024 06:54:38 +0900 Subject: [PATCH 03/18] feat : mission8_ErrorHandling --- umc.mission/build.gradle | 1 + .../apiPayload/code/status/ErrorStatus.java | 9 +- .../apiPayload/exception/ExceptionAdvice.java | 121 ++++++++++++++++++ .../exception/GeneralException.java | 21 +++ .../exception/handler/TempHandler.java | 11 ++ .../umc/mission/converter/TempConverter.java | 6 + .../mission/service/TempCommandService.java | 4 + .../service/TempCommandServiceImpl.java | 9 ++ .../umc/mission/service/TempQueryService.java | 6 + .../mission/service/TempQueryServiceImpl.java | 17 +++ .../web/controller/TempRestController.java | 10 ++ .../umc/mission/web/dto/TempResponse.java | 8 ++ 12 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/ExceptionAdvice.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/GeneralException.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/TempHandler.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/TempCommandServiceImpl.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/TempQueryService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/TempQueryServiceImpl.java diff --git a/umc.mission/build.gradle b/umc.mission/build.gradle index 84f5313..54dcb39 100644 --- a/umc.mission/build.gradle +++ b/umc.mission/build.gradle @@ -26,6 +26,7 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java index 19cebfa..628f443 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -15,9 +15,16 @@ public enum ErrorStatus implements BaseErrorCode { _BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON400", "잘못된 요청입니다."), _UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON401", "인증이 필요합니다."), _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), - ; //멤버 관련 응답 등 + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 존재하지 않습니다."), + NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수입니다."), + + //미션 에러 + MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION4001", "미션이 존재하지 않습니다."), + + //Test + TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "FOR TEST"); private final HttpStatus httpStatus; private final String code; diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/ExceptionAdvice.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/ExceptionAdvice.java new file mode 100644 index 0000000..8b5194b --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/ExceptionAdvice.java @@ -0,0 +1,121 @@ +package com.example.umc.mission.apiPayload.exception; + +import com.example.umc.mission.apiPayload.ApiResponse; +import com.example.umc.mission.apiPayload.code.ErrorReasonDTO; +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; + +@Slf4j +@RestControllerAdvice(annotations = {RestController.class}) +public class ExceptionAdvice extends ResponseEntityExceptionHandler { + + + @org.springframework.web.bind.annotation.ExceptionHandler + public ResponseEntity validation(ConstraintViolationException e, WebRequest request) { + String errorMessage = e.getConstraintViolations().stream() + .map(constraintViolation -> constraintViolation.getMessage()) + .findFirst() + .orElseThrow(() -> new RuntimeException("ConstraintViolationException 추출 도중 에러 발생")); + + return handleExceptionInternalConstraint(e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY,request); + } + + + @Override + public ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + + Map errors = new LinkedHashMap<>(); + + e.getBindingResult().getFieldErrors().stream() + .forEach(fieldError -> { + String fieldName = fieldError.getField(); + String errorMessage = Optional.ofNullable(fieldError.getDefaultMessage()).orElse(""); + errors.merge(fieldName, errorMessage, (existingErrorMessage, newErrorMessage) -> existingErrorMessage + ", " + newErrorMessage); + }); + + return handleExceptionInternalArgs(e,HttpHeaders.EMPTY,ErrorStatus.valueOf("_BAD_REQUEST"),request,errors); + } + + @org.springframework.web.bind.annotation.ExceptionHandler + public ResponseEntity exception(Exception e, WebRequest request) { + e.printStackTrace(); + + return handleExceptionInternalFalse(e, ErrorStatus._INTERNAL_SERVER_ERROR, HttpHeaders.EMPTY, ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(),request, e.getMessage()); + } + + @ExceptionHandler(value = GeneralException.class) + public ResponseEntity onThrowException(GeneralException generalException, HttpServletRequest request) { + ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); + return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request); + } + + private ResponseEntity handleExceptionInternal(Exception e, ErrorReasonDTO reason, + HttpHeaders headers, HttpServletRequest request) { + + ApiResponse body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null); +// e.printStackTrace(); + + WebRequest webRequest = new ServletWebRequest(request); + return super.handleExceptionInternal( + e, + body, + headers, + reason.getHttpStatus(), + webRequest + ); + } + + private ResponseEntity handleExceptionInternalFalse(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, HttpStatus status, WebRequest request, String errorPoint) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorPoint); + return super.handleExceptionInternal( + e, + body, + headers, + status, + request + ); + } + + private ResponseEntity handleExceptionInternalArgs(Exception e, HttpHeaders headers, ErrorStatus errorCommonStatus, + WebRequest request, Map errorArgs) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorArgs); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } + + private ResponseEntity handleExceptionInternalConstraint(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, WebRequest request) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(), errorCommonStatus.getMessage(), null); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } +} \ No newline at end of file diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/GeneralException.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/GeneralException.java new file mode 100644 index 0000000..d91f314 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/GeneralException.java @@ -0,0 +1,21 @@ +package com.example.umc.mission.apiPayload.exception; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.code.ErrorReasonDTO; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private BaseErrorCode code; + + public ErrorReasonDTO getErrorReason() { + return this.code.getReason(); + } + + public ErrorReasonDTO getErrorReasonHttpStatus(){ + return this.code.getReasonHttpStatus(); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/TempHandler.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/TempHandler.java new file mode 100644 index 0000000..ba8cf26 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/TempHandler.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.apiPayload.exception.handler; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.exception.GeneralException; + +public class TempHandler extends GeneralException { + + public TempHandler(BaseErrorCode errorCode){ + super(errorCode); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java index 777ed22..b383be0 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java @@ -9,4 +9,10 @@ public static TempResponse.TempTestDTO toTempTestDTO() { .testString("This is Test!") .build(); } + + public static TempResponse.TempExceptionDTO toTempExceptionDTO(Integer flag) { + return TempResponse.TempExceptionDTO.builder() + .flag(flag) + .build(); + } } \ No newline at end of file diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java new file mode 100644 index 0000000..c474f58 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java @@ -0,0 +1,4 @@ +package com.example.umc.mission.service; + +public interface TempCommandService { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandServiceImpl.java new file mode 100644 index 0000000..a46228b --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandServiceImpl.java @@ -0,0 +1,9 @@ +package com.example.umc.mission.service; + +public class TempCommandServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag){ + + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryService.java new file mode 100644 index 0000000..05043f9 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryService.java @@ -0,0 +1,6 @@ +package com.example.umc.mission.service; + +public interface TempQueryService { + + void CheckFlag(Integer flag); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryServiceImpl.java new file mode 100644 index 0000000..6a74c3b --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryServiceImpl.java @@ -0,0 +1,17 @@ +package com.example.umc.mission.service; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.TempHandler; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class TempQueryServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag){ + if(flag==1) + throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java index 0fe5215..fe7078f 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java @@ -2,10 +2,12 @@ import com.example.umc.mission.apiPayload.ApiResponse; import com.example.umc.mission.converter.TempConverter; +import com.example.umc.mission.service.TempQueryService; import com.example.umc.mission.web.dto.TempResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -13,9 +15,17 @@ @RequiredArgsConstructor public class TempRestController { + private final TempQueryService tempQueryService; + @GetMapping("/test") public ApiResponse testApi(){ return ApiResponse.onSucccess(TempConverter.toTempTestDTO()); } + + @GetMapping("/exception") + public ApiResponse exceptionAPI(@RequestParam Integer flag){ + tempQueryService.CheckFlag(flag); + return ApiResponse.onSucccess(TempConverter.toTempExceptionDTO(flag)); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java index 8259504..ff399d5 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java @@ -14,4 +14,12 @@ public class TempResponse { public static class TempTestDTO{ String testString; } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempExceptionDTO{ + Integer flag; + } } From 7321495d9c4ea4b62af3cebd5078acaa15ad34c2 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 25 Jun 2024 16:17:11 +0900 Subject: [PATCH 04/18] =?UTF-8?q?feat=20:=20mission9=5FJoin(Simplified)=5F?= =?UTF-8?q?api=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiPayload/code/status/ErrorStatus.java | 3 ++ .../handler/FoodCategoryHandler.java | 11 +++++ .../mission/converter/MemberConverter.java | 38 ++++++++++++++++ .../converter/PreferenceofFoodConverter.java | 20 +++++++++ .../domain/mapping/PreferrenceofFood.java | 12 +++++ .../repository/FoodCategoryRepository.java | 7 +++ .../mission/repository/MemberRepository.java | 7 +++ .../MemberService/MemberCommandService.java | 9 ++++ .../MemberCommandsServiceImpl.java | 45 +++++++++++++++++++ .../MemberService/MemberQueryService.java | 4 ++ .../MemberService/MemberQueryServiceImpl.java | 4 ++ .../mission/service/TempCommandService.java | 4 -- .../TempService/TempCommandService.java | 4 ++ .../TempCommandServiceImpl.java | 2 +- .../{ => TempService}/TempQueryService.java | 2 +- .../TempQueryServiceImpl.java | 5 ++- .../web/controller/MemberRestController.java | 27 +++++++++++ .../web/controller/TempRestController.java | 2 +- .../umc/mission/web/dto/MemberRequestDTO.java | 19 ++++++++ .../mission/web/dto/MemberResponseDTO.java | 20 +++++++++ 20 files changed, 236 insertions(+), 9 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/FoodCategoryHandler.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/converter/PreferenceofFoodConverter.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/FoodCategoryRepository.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/MemberRepository.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java delete mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempCommandService.java rename umc.mission/src/main/java/com/example/umc/mission/service/{ => TempService}/TempCommandServiceImpl.java (71%) rename umc.mission/src/main/java/com/example/umc/mission/service/{ => TempService}/TempQueryService.java (58%) rename umc.mission/src/main/java/com/example/umc/mission/service/{ => TempService}/TempQueryServiceImpl.java (68%) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberResponseDTO.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java index 628f443..51e6a10 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -20,6 +20,9 @@ public enum ErrorStatus implements BaseErrorCode { MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 존재하지 않습니다."), NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수입니다."), + //음식 선호도 에러 + FOOD_CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "FOODCATEGORY4001", "해당하는 음식 카테코리가 존재하지 않습니다."), + //미션 에러 MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION4001", "미션이 존재하지 않습니다."), diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/FoodCategoryHandler.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/FoodCategoryHandler.java new file mode 100644 index 0000000..7eef720 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/FoodCategoryHandler.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.apiPayload.exception.handler; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.exception.GeneralException; + +public class FoodCategoryHandler extends GeneralException { + + public FoodCategoryHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java new file mode 100644 index 0000000..8ff42bb --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java @@ -0,0 +1,38 @@ +package com.example.umc.mission.converter; + +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.enums.Gender; +import com.example.umc.mission.web.dto.MemberRequestDTO; +import com.example.umc.mission.web.dto.MemberResponseDTO; + +import java.util.ArrayList; + +public class MemberConverter { + + public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member){ + return MemberResponseDTO.JoinResultDTO.builder() + .memberId(member.getId()) + .build(); + } + + public static Member toMember(MemberRequestDTO.JoinDTO request){ + + Gender gender=null; + + switch (request.getGender()) { + case 1: + gender = Gender.MALE; + break; + case 2: + gender = Gender.FEMALE; + break; + } + + return Member.builder() + .address(request.getAddress()) + .gender(gender) + .name(request.getName()) + .preferrenceofFoodList(new ArrayList<>()) + .build(); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/PreferenceofFoodConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/PreferenceofFoodConverter.java new file mode 100644 index 0000000..3f5180e --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/PreferenceofFoodConverter.java @@ -0,0 +1,20 @@ +package com.example.umc.mission.converter; + +import com.example.umc.mission.domain.FoodCategory; +import com.example.umc.mission.domain.mapping.PreferrenceofFood; + +import java.util.List; +import java.util.stream.Collectors; + +public class PreferenceofFoodConverter { + + public static List toPreferList(List foodCategoryList){ + + return foodCategoryList.stream() + .map(foodCategory -> + PreferrenceofFood.builder() + .foodCategory(foodCategory) + .build() + ).collect(Collectors.toList()); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java index f02be74..076f50e 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/PreferrenceofFood.java @@ -23,4 +23,16 @@ public class PreferrenceofFood { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "foodCategory_id") private FoodCategory foodCategory; + + public void setMember(Member member){ + if(this.member != null) + member.getPreferrenceofFoodList().remove(this); + this.member = member; + member.getPreferrenceofFoodList().add(this); + } + + public void setFoodCategory(FoodCategory foodCategory){ + this.foodCategory = foodCategory; + } + } diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/FoodCategoryRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/FoodCategoryRepository.java new file mode 100644 index 0000000..49964d6 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/FoodCategoryRepository.java @@ -0,0 +1,7 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.FoodCategory; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FoodCategoryRepository extends JpaRepository { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/MemberRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/MemberRepository.java new file mode 100644 index 0000000..6ec9335 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/MemberRepository.java @@ -0,0 +1,7 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberRepository extends JpaRepository { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java new file mode 100644 index 0000000..fc3f4ec --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java @@ -0,0 +1,9 @@ +package com.example.umc.mission.service.MemberService; + +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.web.dto.MemberRequestDTO; + +public interface MemberCommandService { + + public Member joinMember(MemberRequestDTO.JoinDTO request); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java new file mode 100644 index 0000000..dd28ccf --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java @@ -0,0 +1,45 @@ +package com.example.umc.mission.service.MemberService; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.FoodCategoryHandler; +import com.example.umc.mission.converter.MemberConverter; +import com.example.umc.mission.converter.PreferenceofFoodConverter; +import com.example.umc.mission.domain.FoodCategory; +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.mapping.PreferrenceofFood; +import com.example.umc.mission.repository.FoodCategoryRepository; +import com.example.umc.mission.repository.MemberRepository; +import com.example.umc.mission.web.dto.MemberRequestDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class MemberCommandsServiceImpl implements MemberCommandService{ + + private final MemberRepository memberRepository; + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + @Transactional + public Member joinMember(MemberRequestDTO.JoinDTO request){ + + Member newMember = MemberConverter.toMember(request); + List foodCategoryList = request.getPreferCategory().stream() + .map(category -> { + return foodCategoryRepository.findById(category).orElseThrow(() -> new FoodCategoryHandler(ErrorStatus.FOOD_CATEGORY_NOT_FOUND)); + }).collect(Collectors.toList()); + + List preferrenceofFoodList = PreferenceofFoodConverter.toPreferList(foodCategoryList); + + preferrenceofFoodList.forEach(preferrenceofFood -> {preferrenceofFood.setMember(newMember);}); + + return memberRepository.save(newMember); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java new file mode 100644 index 0000000..04b0129 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java @@ -0,0 +1,4 @@ +package com.example.umc.mission.service.MemberService; + +public interface MemberQueryService { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java new file mode 100644 index 0000000..b5e2fcd --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java @@ -0,0 +1,4 @@ +package com.example.umc.mission.service.MemberService; + +public class MemberQueryServiceImpl { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java deleted file mode 100644 index c474f58..0000000 --- a/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.example.umc.mission.service; - -public interface TempCommandService { -} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempCommandService.java new file mode 100644 index 0000000..691ff4d --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempCommandService.java @@ -0,0 +1,4 @@ +package com.example.umc.mission.service.TempService; + +public interface TempCommandService { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempCommandServiceImpl.java similarity index 71% rename from umc.mission/src/main/java/com/example/umc/mission/service/TempCommandServiceImpl.java rename to umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempCommandServiceImpl.java index a46228b..009a1c9 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/TempCommandServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempCommandServiceImpl.java @@ -1,4 +1,4 @@ -package com.example.umc.mission.service; +package com.example.umc.mission.service.TempService; public class TempCommandServiceImpl implements TempQueryService{ diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempQueryService.java similarity index 58% rename from umc.mission/src/main/java/com/example/umc/mission/service/TempQueryService.java rename to umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempQueryService.java index 05043f9..2c8936a 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempQueryService.java @@ -1,4 +1,4 @@ -package com.example.umc.mission.service; +package com.example.umc.mission.service.TempService; public interface TempQueryService { diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempQueryServiceImpl.java similarity index 68% rename from umc.mission/src/main/java/com/example/umc/mission/service/TempQueryServiceImpl.java rename to umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempQueryServiceImpl.java index 6a74c3b..a42da93 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/TempQueryServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/TempService/TempQueryServiceImpl.java @@ -1,13 +1,14 @@ -package com.example.umc.mission.service; +package com.example.umc.mission.service.TempService; import com.example.umc.mission.apiPayload.code.status.ErrorStatus; import com.example.umc.mission.apiPayload.exception.handler.TempHandler; +import com.example.umc.mission.service.TempService.TempQueryService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @Service @RequiredArgsConstructor -public class TempQueryServiceImpl implements TempQueryService{ +public class TempQueryServiceImpl implements TempQueryService { @Override public void CheckFlag(Integer flag){ diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java new file mode 100644 index 0000000..4c80f04 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java @@ -0,0 +1,27 @@ +package com.example.umc.mission.web.controller; + +import com.example.umc.mission.apiPayload.ApiResponse; +import com.example.umc.mission.converter.MemberConverter; +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.service.MemberService.MemberCommandService; +import com.example.umc.mission.web.dto.MemberRequestDTO; +import com.example.umc.mission.web.dto.MemberResponseDTO; +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("/members") +public class MemberRestController { + + private final MemberCommandService memberCommandService; + + @PostMapping("/") + public ApiResponse join(@RequestBody MemberRequestDTO.JoinDTO request) { + Member member = memberCommandService.joinMember(request); + return ApiResponse.onSucccess(MemberConverter.toJoinResultDTO(member)); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java index fe7078f..89c570e 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java @@ -2,7 +2,7 @@ import com.example.umc.mission.apiPayload.ApiResponse; import com.example.umc.mission.converter.TempConverter; -import com.example.umc.mission.service.TempQueryService; +import com.example.umc.mission.service.TempService.TempQueryService; import com.example.umc.mission.web.dto.TempResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java new file mode 100644 index 0000000..13dabec --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java @@ -0,0 +1,19 @@ +package com.example.umc.mission.web.dto; + +import lombok.Getter; + +import java.util.List; + +public class MemberRequestDTO { + + @Getter + public static class JoinDTO{ + String name; + String address; + Integer gender; + Integer bYear; + Integer bMonth; + Integer bDay; + List preferCategory; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberResponseDTO.java new file mode 100644 index 0000000..14646ec --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberResponseDTO.java @@ -0,0 +1,20 @@ +package com.example.umc.mission.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class MemberResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class JoinResultDTO { + Long memberId; + //LocalDateTime createdAt; + } +} From ece709184a085b2c64896cf1c5c7c15584d6a94f Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 25 Jun 2024 18:03:28 +0900 Subject: [PATCH 05/18] =?UTF-8?q?feat=20:=20mission9=5FSwagger=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- umc.mission/build.gradle | 3 ++ .../umc/mission/config/SwaggerConfig.java | 39 +++++++++++++++++++ .../example/umc/mission/domain/Member.java | 8 ++++ 3 files changed, 50 insertions(+) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/config/SwaggerConfig.java diff --git a/umc.mission/build.gradle b/umc.mission/build.gradle index 54dcb39..4705d4b 100644 --- a/umc.mission/build.gradle +++ b/umc.mission/build.gradle @@ -27,6 +27,9 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + implementation 'io.springfox:springfox-swagger2:2.9.2' + implementation 'io.springfox:springfox-swagger-ui:2.9.2' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' diff --git a/umc.mission/src/main/java/com/example/umc/mission/config/SwaggerConfig.java b/umc.mission/src/main/java/com/example/umc/mission/config/SwaggerConfig.java new file mode 100644 index 0000000..e66ff54 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/config/SwaggerConfig.java @@ -0,0 +1,39 @@ +package com.example.umc.mission.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 UMCstudyAPI() { + Info info = new Info() + .title("UMC Server WorkBook API") + .description("UMC Server WorkBook API 명세서") + .version("1.0.0"); + + String jwtSchemeName = "JWT TOKEN"; + // API 요청헤더에 인증정보 포함 + SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwtSchemeName); + // SecuritySchemes 등록 + Components components = new Components() + .addSecuritySchemes(jwtSchemeName, new SecurityScheme() + .name(jwtSchemeName) + .type(SecurityScheme.Type.HTTP) // HTTP 방식 + .scheme("bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .addServersItem(new Server().url("/")) + .info(info) + .addSecurityItem(securityRequirement) + .components(components); + } +} \ No newline at end of file diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java index 8bb213f..816e079 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java @@ -8,6 +8,9 @@ import com.example.umc.mission.domain.mapping.PreferrenceofFood; import jakarta.persistence.*; import lombok.*; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import java.time.LocalDate; import java.util.ArrayList; @@ -15,6 +18,8 @@ @Entity @Getter +@DynamicUpdate +@DynamicInsert @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor @@ -31,6 +36,7 @@ public class Member { private String address; @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(10)") private Gender gender; @Enumerated(EnumType.STRING) @@ -39,10 +45,12 @@ public class Member { private LocalDate birthDate; @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'ACTIVE'") private MemberStatus status; private LocalDate inactiveDate; + @ColumnDefault("0") private Integer point; @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) From b68accf5eda07fb3a690e6daae0ee6ee9d07307e Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 25 Jun 2024 18:37:30 +0900 Subject: [PATCH 06/18] feat : mission9_Validation --- .../annotation/ExistCategories.java | 18 ++++++++++ .../validator/CategoriesExistValidator.java | 36 +++++++++++++++++++ .../web/controller/MemberRestController.java | 3 +- .../umc/mission/web/dto/MemberRequestDTO.java | 11 ++++++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistCategories.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/validator/CategoriesExistValidator.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistCategories.java b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistCategories.java new file mode 100644 index 0000000..3ce0283 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistCategories.java @@ -0,0 +1,18 @@ +package com.example.umc.mission.validation.annotation; + +import com.example.umc.mission.validation.validator.CategoriesExistValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = CategoriesExistValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistCategories { + + String message() default "해당하는 카테고리가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CategoriesExistValidator.java b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CategoriesExistValidator.java new file mode 100644 index 0000000..18b05f8 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CategoriesExistValidator.java @@ -0,0 +1,36 @@ +package com.example.umc.mission.validation.validator; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.repository.FoodCategoryRepository; +import com.example.umc.mission.validation.annotation.ExistCategories; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class CategoriesExistValidator implements ConstraintValidator> { + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + public void initialize(ExistCategories constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> foodCategoryRepository.existsById(value)); + + if (!isValid){ + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.FOOD_CATEGORY_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java index 4c80f04..af4ef08 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java @@ -6,6 +6,7 @@ import com.example.umc.mission.service.MemberService.MemberCommandService; import com.example.umc.mission.web.dto.MemberRequestDTO; import com.example.umc.mission.web.dto.MemberResponseDTO; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,7 +21,7 @@ public class MemberRestController { private final MemberCommandService memberCommandService; @PostMapping("/") - public ApiResponse join(@RequestBody MemberRequestDTO.JoinDTO request) { + public ApiResponse join(@RequestBody @Valid MemberRequestDTO.JoinDTO request) { Member member = memberCommandService.joinMember(request); return ApiResponse.onSucccess(MemberConverter.toJoinResultDTO(member)); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java index 13dabec..4e84ff2 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java @@ -1,5 +1,9 @@ package com.example.umc.mission.web.dto; +import com.example.umc.mission.validation.annotation.ExistCategories; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Getter; import java.util.List; @@ -8,12 +12,19 @@ public class MemberRequestDTO { @Getter public static class JoinDTO{ + @NotBlank String name; + @Size(min = 5, max = 20) String address; + @NotNull Integer gender; + @NotNull Integer bYear; + @NotNull Integer bMonth; + @NotNull Integer bDay; + @ExistCategories List preferCategory; } } From fe0e1451704cd265919ebf7b27d6859d4b3c40b5 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Fri, 28 Jun 2024 01:49:22 +0900 Subject: [PATCH 07/18] =?UTF-8?q?feat=20:=20=ED=8A=B9=EC=A0=95=20=EC=A7=80?= =?UTF-8?q?=EC=97=AD=EC=97=90=20=EA=B0=80=EA=B2=8C=20=EC=B6=94=EA=B0=80?= =?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 --- .../apiPayload/code/status/ErrorStatus.java | 3 ++ .../exception/handler/RegionHandler.java | 11 +++++ .../mission/converter/MemberConverter.java | 4 +- .../umc/mission/converter/StoreConverter.java | 26 ++++++++++++ .../umc/mission/converter/TempConverter.java | 2 +- .../example/umc/mission/domain/Member.java | 4 +- .../example/umc/mission/domain/Mission.java | 5 +++ .../example/umc/mission/domain/Region.java | 9 ++++ .../example/umc/mission/domain/Review.java | 38 +++++++++++++++++ .../com/example/umc/mission/domain/Store.java | 42 +++++++++++++++++++ .../mission/domain/enums/MissionStatus.java | 2 +- .../mission/domain/mapping/StoresMission.java | 31 ++++++++++++++ .../mission/repository/RegionRepository.java | 11 +++++ .../mission/repository/StoreRepository.java | 7 ++++ .../MemberService/MemberCommandService.java | 2 +- .../MemberCommandsServiceImpl.java | 2 +- .../StoreService/StoreCommandService.java | 9 ++++ .../StoreService/StoreCommandServiceImpl.java | 30 +++++++++++++ .../StoreService/StoreQueryService.java | 4 ++ .../StoreService/StoreQueryServiceImpl.java | 4 ++ .../web/controller/MemberRestController.java | 4 +- .../web/controller/StoreRestController.java | 39 +++++++++++++++++ .../web/controller/TempRestController.java | 2 +- .../dto/{ => request}/MemberRequestDTO.java | 2 +- .../web/dto/request/StoreRequestDTO.java | 32 ++++++++++++++ .../dto/{ => response}/MemberResponseDTO.java | 4 +- .../web/dto/response/StoreResponseDTO.java | 28 +++++++++++++ .../web/dto/{ => response}/TempResponse.java | 2 +- 28 files changed, 344 insertions(+), 15 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/RegionHandler.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/Review.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/Store.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/RegionRepository.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/StoreRepository.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandServiceImpl.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java rename umc.mission/src/main/java/com/example/umc/mission/web/dto/{ => request}/MemberRequestDTO.java (93%) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java rename umc.mission/src/main/java/com/example/umc/mission/web/dto/{ => response}/MemberResponseDTO.java (81%) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java rename umc.mission/src/main/java/com/example/umc/mission/web/dto/{ => response}/TempResponse.java (89%) diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java index 51e6a10..b13cf35 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -23,6 +23,9 @@ public enum ErrorStatus implements BaseErrorCode { //음식 선호도 에러 FOOD_CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "FOODCATEGORY4001", "해당하는 음식 카테코리가 존재하지 않습니다."), + //지역 에러 + REGION_NOT_FOUND(HttpStatus.BAD_REQUEST, "REGION4001" ,"입력한 이름을 가진 지역이 존재하지 않습니다."), + //미션 에러 MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION4001", "미션이 존재하지 않습니다."), diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/RegionHandler.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/RegionHandler.java new file mode 100644 index 0000000..a197b1b --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/RegionHandler.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.apiPayload.exception.handler; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.exception.GeneralException; + +public class RegionHandler extends GeneralException { + + public RegionHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java index 8ff42bb..5830ab7 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java @@ -2,8 +2,8 @@ import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.enums.Gender; -import com.example.umc.mission.web.dto.MemberRequestDTO; -import com.example.umc.mission.web.dto.MemberResponseDTO; +import com.example.umc.mission.web.dto.request.MemberRequestDTO; +import com.example.umc.mission.web.dto.response.MemberResponseDTO; import java.util.ArrayList; diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java new file mode 100644 index 0000000..a1f5195 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java @@ -0,0 +1,26 @@ +package com.example.umc.mission.converter; + +import com.example.umc.mission.domain.Region; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import com.example.umc.mission.web.dto.response.StoreResponseDTO; + +public class StoreConverter { + + public static StoreResponseDTO.addStoreResponseDTO toAddStoreResponseDTO(Store store) { + return StoreResponseDTO.addStoreResponseDTO.builder() + .store_id(store.getId()) + .store_name(store.getName()) + .build(); + } + + public static Store toStore(StoreRequestDTO.addStoreDTO request, Region region){ + return Store.builder() + .name(request.getName()) + .address(request.getAddress()) + .phone(request.getPhone()) + .region(region) + .build(); + + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java index b383be0..78522a1 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/TempConverter.java @@ -1,6 +1,6 @@ package com.example.umc.mission.converter; -import com.example.umc.mission.web.dto.TempResponse; +import com.example.umc.mission.web.dto.response.TempResponse; public class TempConverter { diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java index 816e079..6cd5a10 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Member.java @@ -59,8 +59,10 @@ public class Member { @OneToMany(mappedBy = "member",cascade = CascadeType.ALL) private List preferrenceofFoodList = new ArrayList<>(); - @OneToMany(mappedBy = "member") + @OneToMany(mappedBy = "member",cascade = CascadeType.ALL) private List membersMissionList = new ArrayList<>(); + @OneToMany(mappedBy = "member",cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); } \ No newline at end of file diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java index 26d5fd9..ec100c8 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java @@ -1,6 +1,8 @@ package com.example.umc.mission.domain; +import com.example.umc.mission.domain.enums.MissionStatus; import com.example.umc.mission.domain.mapping.MembersMission; +import com.example.umc.mission.domain.mapping.StoresMission; import jakarta.persistence.*; import lombok.*; @@ -34,4 +36,7 @@ public class Mission { @OneToMany(mappedBy = "mission") private List membersMissionList = new ArrayList<>(); + @OneToMany(mappedBy = "mission") + private List storesMissionList = new ArrayList<>(); + } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java index 5cec67e..c2d2c33 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java @@ -3,6 +3,9 @@ import jakarta.persistence.*; import lombok.*; +import java.util.ArrayList; +import java.util.List; + @Entity @Getter @Builder @@ -16,4 +19,10 @@ public class Region { @Column(nullable = false, length = 20, unique = true) private String name; + + @OneToMany(mappedBy = "region", cascade = CascadeType.ALL) + private List missionList = new ArrayList<>(); + + @OneToMany(mappedBy = "region", cascade = CascadeType.ALL) + private List StoreList = new ArrayList<>(); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java new file mode 100644 index 0000000..4a8914b --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java @@ -0,0 +1,38 @@ +package com.example.umc.mission.domain; + +import jakarta.persistence.*; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import lombok.*; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Review { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(nullable = false, length = 200) + private String content; + + @Column(nullable = false) + @Min(0) + @Max(5) + private Integer starPoint; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Store.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Store.java new file mode 100644 index 0000000..2f2aa55 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Store.java @@ -0,0 +1,42 @@ +package com.example.umc.mission.domain; + +import com.example.umc.mission.domain.mapping.StoresMission; +import jakarta.persistence.*; +import lombok.*; +import org.apache.catalina.LifecycleState; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @Column(nullable = false, length = 50) + private String address; + + @Column(nullable = false, length = 15) + private String phone; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + //review 리스트 + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + //mission 리스트 + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List storesMissionList = new ArrayList<>(); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java index 1114b17..2e4c61b 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/enums/MissionStatus.java @@ -1,5 +1,5 @@ package com.example.umc.mission.domain.enums; public enum MissionStatus { - COMPLETE, INCOMPLETE + COMPLETE, CHALLENGING, INCOMPLETE } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java new file mode 100644 index 0000000..fd0ac2c --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java @@ -0,0 +1,31 @@ +package com.example.umc.mission.domain.mapping; + +import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.domain.enums.MissionStatus; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class StoresMission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'INCOMPLETE'") + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/RegionRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/RegionRepository.java new file mode 100644 index 0000000..30e22a5 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/RegionRepository.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.Region; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface RegionRepository extends JpaRepository { + + Optional findByName(String name); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/StoreRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/StoreRepository.java new file mode 100644 index 0000000..457bfe1 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/StoreRepository.java @@ -0,0 +1,7 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreRepository extends JpaRepository { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java index fc3f4ec..f344fb8 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandService.java @@ -1,7 +1,7 @@ package com.example.umc.mission.service.MemberService; import com.example.umc.mission.domain.Member; -import com.example.umc.mission.web.dto.MemberRequestDTO; +import com.example.umc.mission.web.dto.request.MemberRequestDTO; public interface MemberCommandService { diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java index dd28ccf..9e28e10 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberCommandsServiceImpl.java @@ -9,7 +9,7 @@ import com.example.umc.mission.domain.mapping.PreferrenceofFood; import com.example.umc.mission.repository.FoodCategoryRepository; import com.example.umc.mission.repository.MemberRepository; -import com.example.umc.mission.web.dto.MemberRequestDTO; +import com.example.umc.mission.web.dto.request.MemberRequestDTO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandService.java new file mode 100644 index 0000000..3d4b591 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandService.java @@ -0,0 +1,9 @@ +package com.example.umc.mission.service.StoreService; + +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; + +public interface StoreCommandService { + + public Store saveStore(StoreRequestDTO.addStoreDTO request); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandServiceImpl.java new file mode 100644 index 0000000..4a7132c --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreCommandServiceImpl.java @@ -0,0 +1,30 @@ +package com.example.umc.mission.service.StoreService; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.RegionHandler; +import com.example.umc.mission.converter.StoreConverter; +import com.example.umc.mission.domain.Region; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.repository.RegionRepository; +import com.example.umc.mission.repository.StoreRepository; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class StoreCommandServiceImpl implements StoreCommandService{ + + private final StoreRepository storeRepository; + + private final RegionRepository regionRepository; + + public Store saveStore(StoreRequestDTO.addStoreDTO request){ + + Region region = regionRepository.findByName(request.getRegionName()).orElseThrow(() -> new RegionHandler(ErrorStatus.REGION_NOT_FOUND)); + Store newStore = StoreConverter.toStore(request, region); + + return storeRepository.save(newStore); + + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java new file mode 100644 index 0000000..b89b605 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java @@ -0,0 +1,4 @@ +package com.example.umc.mission.service.StoreService; + +public interface StoreQueryService { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java new file mode 100644 index 0000000..555d670 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java @@ -0,0 +1,4 @@ +package com.example.umc.mission.service.StoreService; + +public class StoreQueryServiceImpl { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java index af4ef08..15fa07f 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java @@ -4,8 +4,8 @@ import com.example.umc.mission.converter.MemberConverter; import com.example.umc.mission.domain.Member; import com.example.umc.mission.service.MemberService.MemberCommandService; -import com.example.umc.mission.web.dto.MemberRequestDTO; -import com.example.umc.mission.web.dto.MemberResponseDTO; +import com.example.umc.mission.web.dto.request.MemberRequestDTO; +import com.example.umc.mission.web.dto.response.MemberResponseDTO; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java new file mode 100644 index 0000000..a344abb --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -0,0 +1,39 @@ +package com.example.umc.mission.web.controller; + +import com.example.umc.mission.apiPayload.ApiResponse; +import com.example.umc.mission.converter.StoreConverter; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.service.StoreService.StoreCommandService; +import com.example.umc.mission.service.StoreService.StoreCommandServiceImpl; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import com.example.umc.mission.web.dto.response.StoreResponseDTO; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/store") +public class StoreRestController { + + private final StoreCommandService storeCommandService; + + //1) 특정 지역에 가게 추가하기 + @PostMapping("/") + public ApiResponse addStore(@RequestBody @Valid StoreRequestDTO.addStoreDTO request){ + Store store = storeCommandService.saveStore(request); + return ApiResponse.onSucccess(StoreConverter.toAddStoreResponseDTO(store)); + } + + //2) 가게에 리뷰 추가하기 + @PostMapping("/review") + public ApiResponse postReview(@RequestBody @Valid StoreRequestDTO.postReviewDTO request){ + return null; + } + + //3) 가게에 미션 추가하기 + //storesmission + + //4) 가게의 미션을 도전 중인 미션에 추가 + //storesmissin의 status 칼럼 enum 값 변경 +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java index 89c570e..62386ce 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/TempRestController.java @@ -3,7 +3,7 @@ import com.example.umc.mission.apiPayload.ApiResponse; import com.example.umc.mission.converter.TempConverter; import com.example.umc.mission.service.TempService.TempQueryService; -import com.example.umc.mission.web.dto.TempResponse; +import com.example.umc.mission.web.dto.response.TempResponse; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MemberRequestDTO.java similarity index 93% rename from umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java rename to umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MemberRequestDTO.java index 4e84ff2..3f9a388 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberRequestDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MemberRequestDTO.java @@ -1,4 +1,4 @@ -package com.example.umc.mission.web.dto; +package com.example.umc.mission.web.dto.request; import com.example.umc.mission.validation.annotation.ExistCategories; import jakarta.validation.constraints.NotBlank; diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java new file mode 100644 index 0000000..118dd8f --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java @@ -0,0 +1,32 @@ +package com.example.umc.mission.web.dto.request; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; + +public class StoreRequestDTO { + + @Getter + public static class addStoreDTO{ + @NotBlank + String name; + @Size(max = 50) + @NotNull + String address; + @Size(max = 15) + @NotNull + String phone; + @NotNull + String regionName; + } + + @Getter + public static class postReviewDTO{ + String title; + String content; + String userId; + + + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java similarity index 81% rename from umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberResponseDTO.java rename to umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java index 14646ec..4874486 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/MemberResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java @@ -1,12 +1,10 @@ -package com.example.umc.mission.web.dto; +package com.example.umc.mission.web.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import java.time.LocalDateTime; - public class MemberResponseDTO { @Builder diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java new file mode 100644 index 0000000..77b3982 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java @@ -0,0 +1,28 @@ +package com.example.umc.mission.web.dto.response; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class StoreResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class addStoreResponseDTO { + Long store_id; + String store_name; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class reviewResponseDTO{ + Long store_id; + Long review_id; + } + +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/TempResponse.java similarity index 89% rename from umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java rename to umc.mission/src/main/java/com/example/umc/mission/web/dto/response/TempResponse.java index ff399d5..faef6ea 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/TempResponse.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/TempResponse.java @@ -1,4 +1,4 @@ -package com.example.umc.mission.web.dto; +package com.example.umc.mission.web.dto.response; import lombok.AllArgsConstructor; import lombok.Builder; From efe567cbb6883617ac308e4715146ddd8b214c01 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Sun, 30 Jun 2024 03:31:17 +0900 Subject: [PATCH 08/18] =?UTF-8?q?feat=20:=20mission9=5Fapi=5F2=20=EA=B0=80?= =?UTF-8?q?=EA=B2=8C=EC=97=90=20=EB=A6=AC=EB=B7=B0=20=EC=B6=94=EA=B0=80?= =?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 --- .../apiPayload/code/status/ErrorStatus.java | 3 ++ .../exception/handler/MemberHandler.java | 11 ++++++ .../exception/handler/StoreHandler.java | 11 ++++++ .../mission/converter/ReviewConverter.java | 28 +++++++++++++++ .../umc/mission/converter/StoreConverter.java | 1 + .../example/umc/mission/domain/Review.java | 1 + .../mission/repository/ReviewRepository.java | 7 ++++ .../ReviewService/ReviewCommandService.java | 9 +++++ .../ReviewCommandServiceImpl.java | 35 +++++++++++++++++++ .../validation/annotation/ExistMember.java | 18 ++++++++++ .../validation/annotation/ExistStore.java | 18 ++++++++++ .../validator/MemberExistValidator.java | 33 +++++++++++++++++ .../validator/StoreExistValidator.java | 34 ++++++++++++++++++ .../web/controller/StoreRestController.java | 9 +++-- .../web/dto/request/MemberRequestDTO.java | 10 ++---- .../web/dto/request/StoreRequestDTO.java | 18 ++++++---- .../web/dto/response/StoreResponseDTO.java | 1 + 17 files changed, 232 insertions(+), 15 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MemberHandler.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/StoreHandler.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistStore.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/validator/MemberExistValidator.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/validator/StoreExistValidator.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java index b13cf35..2e3ca00 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -26,6 +26,9 @@ public enum ErrorStatus implements BaseErrorCode { //지역 에러 REGION_NOT_FOUND(HttpStatus.BAD_REQUEST, "REGION4001" ,"입력한 이름을 가진 지역이 존재하지 않습니다."), + //가게 에러 + STORE_NOT_FOUND(HttpStatus.BAD_REQUEST, "STORE4001", "해당하는 가게가 존재하지 않습니다."), + //미션 에러 MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION4001", "미션이 존재하지 않습니다."), diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MemberHandler.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MemberHandler.java new file mode 100644 index 0000000..f27975d --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MemberHandler.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.apiPayload.exception.handler; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.exception.GeneralException; + +public class MemberHandler extends GeneralException { + + public MemberHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/StoreHandler.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/StoreHandler.java new file mode 100644 index 0000000..58976a4 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/StoreHandler.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.apiPayload.exception.handler; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.exception.GeneralException; + +public class StoreHandler extends GeneralException { + + public StoreHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java new file mode 100644 index 0000000..5c6fe46 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java @@ -0,0 +1,28 @@ +package com.example.umc.mission.converter; + +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import com.example.umc.mission.web.dto.response.StoreResponseDTO; + +public class ReviewConverter { + + public static StoreResponseDTO.reviewResponseDTO toReviewResponseDTO(Review review) { + return StoreResponseDTO.reviewResponseDTO.builder() + .review_id(review.getId()) + .store_id(review.getStore().getId()) + .member_id(review.getMember().getId()) + .build(); + } + + public static Review toReivew(StoreRequestDTO.postReviewDTO request, Store store, Member member){ + return Review.builder() + .title(request.getTitle()) + .content(request.getContent()) + .starPoint(request.getStarPoint()) + .store(store) + .member(member) + .build(); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java index a1f5195..caabf64 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java @@ -1,6 +1,7 @@ package com.example.umc.mission.converter; import com.example.umc.mission.domain.Region; +import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; import com.example.umc.mission.web.dto.request.StoreRequestDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java index 4a8914b..850e80a 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java @@ -35,4 +35,5 @@ public class Review { @JoinColumn(name = "store_id") private Store store; + } diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java new file mode 100644 index 0000000..c4df674 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java @@ -0,0 +1,7 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.Review; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReviewRepository extends JpaRepository { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java new file mode 100644 index 0000000..0883b6d --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java @@ -0,0 +1,9 @@ +package com.example.umc.mission.service.ReviewService; + +import com.example.umc.mission.domain.Review; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; + +public interface ReviewCommandService { + + public Review saveReview(StoreRequestDTO.postReviewDTO request); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java new file mode 100644 index 0000000..de48f62 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java @@ -0,0 +1,35 @@ +package com.example.umc.mission.service.ReviewService; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.MemberHandler; +import com.example.umc.mission.apiPayload.exception.handler.StoreHandler; +import com.example.umc.mission.converter.ReviewConverter; +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.repository.MemberRepository; +import com.example.umc.mission.repository.ReviewRepository; +import com.example.umc.mission.repository.StoreRepository; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ReviewCommandServiceImpl implements ReviewCommandService{ + + private final MemberRepository memberRepository; + + private final ReviewRepository reviewRepository; + + private final StoreRepository storeRepository; + + public Review saveReview(StoreRequestDTO.postReviewDTO request){ + + Store store = storeRepository.findById(request.getStoreId()).orElseThrow(()->new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); + Member member =memberRepository.findById(request.getUserId()).orElseThrow(()->new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); + Review newReview = ReviewConverter.toReivew(request, store, member); + + return reviewRepository.save(newReview); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java new file mode 100644 index 0000000..c7913e4 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java @@ -0,0 +1,18 @@ +package com.example.umc.mission.validation.annotation; + +import com.example.umc.mission.validation.validator.MemberExistValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import net.bytebuddy.build.RepeatedAnnotationPlugin; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = MemberExistValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistMember { + String message() default "해당하는 멤버가 존재하지 않습니다. : 리뷰 작성 불가"; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistStore.java b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistStore.java new file mode 100644 index 0000000..40485dd --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistStore.java @@ -0,0 +1,18 @@ +package com.example.umc.mission.validation.annotation; + +import com.example.umc.mission.validation.validator.StoreExistValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = StoreExistValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistStore { + + String message() default "해당하는 가게가 존재하지 않습니다. : 리뷰 작성 불가"; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/MemberExistValidator.java b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/MemberExistValidator.java new file mode 100644 index 0000000..f219be0 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/MemberExistValidator.java @@ -0,0 +1,33 @@ +package com.example.umc.mission.validation.validator; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.repository.MemberRepository; +import com.example.umc.mission.validation.annotation.ExistMember; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class MemberExistValidator implements ConstraintValidator { + + private final MemberRepository memberRepository; + + @Override + public void initialize(ExistMember constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(Long value, ConstraintValidatorContext context) { + boolean isValid = memberRepository.existsById(value); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.MEMBER_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/StoreExistValidator.java b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/StoreExistValidator.java new file mode 100644 index 0000000..c361f0f --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/StoreExistValidator.java @@ -0,0 +1,34 @@ +package com.example.umc.mission.validation.validator; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.repository.StoreRepository; +import com.example.umc.mission.validation.annotation.ExistStore; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + + +@Component +@RequiredArgsConstructor +public class StoreExistValidator implements ConstraintValidator { + + private final StoreRepository storeRepository; + + @Override + public void initialize(ExistStore constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(Long value, ConstraintValidatorContext context) { + boolean isValid = storeRepository.existsById(value); + + if(!isValid){ + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.STORE_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index a344abb..c85f8fd 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -1,10 +1,12 @@ package com.example.umc.mission.web.controller; import com.example.umc.mission.apiPayload.ApiResponse; +import com.example.umc.mission.converter.ReviewConverter; import com.example.umc.mission.converter.StoreConverter; +import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; +import com.example.umc.mission.service.ReviewService.ReviewCommandService; import com.example.umc.mission.service.StoreService.StoreCommandService; -import com.example.umc.mission.service.StoreService.StoreCommandServiceImpl; import com.example.umc.mission.web.dto.request.StoreRequestDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; import jakarta.validation.Valid; @@ -18,6 +20,8 @@ public class StoreRestController { private final StoreCommandService storeCommandService; + private final ReviewCommandService reviewCommandService; + //1) 특정 지역에 가게 추가하기 @PostMapping("/") public ApiResponse addStore(@RequestBody @Valid StoreRequestDTO.addStoreDTO request){ @@ -28,7 +32,8 @@ public ApiResponse addStore(@RequestBody @ //2) 가게에 리뷰 추가하기 @PostMapping("/review") public ApiResponse postReview(@RequestBody @Valid StoreRequestDTO.postReviewDTO request){ - return null; + Review review = reviewCommandService.saveReview(request); + return ApiResponse.onSucccess(ReviewConverter.toReviewResponseDTO(review)); } //3) 가게에 미션 추가하기 diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MemberRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MemberRequestDTO.java index 3f9a388..b84b227 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MemberRequestDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MemberRequestDTO.java @@ -1,9 +1,7 @@ package com.example.umc.mission.web.dto.request; import com.example.umc.mission.validation.annotation.ExistCategories; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.*; import lombok.Getter; import java.util.List; @@ -16,13 +14,11 @@ public static class JoinDTO{ String name; @Size(min = 5, max = 20) String address; - @NotNull + @Min(1) + @Max(2) Integer gender; - @NotNull Integer bYear; - @NotNull Integer bMonth; - @NotNull Integer bDay; @ExistCategories List preferCategory; diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java index 118dd8f..7cb5c69 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java @@ -1,8 +1,8 @@ package com.example.umc.mission.web.dto.request; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import com.example.umc.mission.validation.annotation.ExistMember; +import com.example.umc.mission.validation.annotation.ExistStore; +import jakarta.validation.constraints.*; import lombok.Getter; public class StoreRequestDTO { @@ -23,10 +23,16 @@ public static class addStoreDTO{ @Getter public static class postReviewDTO{ + @NotBlank String title; + @NotNull String content; - String userId; - - + @Min(0) + @Max(5) + Integer starPoint; + @ExistMember + Long userId; + @ExistStore + Long storeId; } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java index 77b3982..58c553f 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java @@ -22,6 +22,7 @@ public static class addStoreResponseDTO { @AllArgsConstructor public static class reviewResponseDTO{ Long store_id; + Long member_id; Long review_id; } From 59925fd0d67ab331c1f257094739035d1b754a7e Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Sun, 30 Jun 2024 18:54:43 +0900 Subject: [PATCH 09/18] =?UTF-8?q?feat=20:=20mission9=5Fapi=5F3=20=EA=B0=80?= =?UTF-8?q?=EA=B2=8C=EC=97=90=20=EB=AF=B8=EC=85=98=20=EC=B6=94=EA=B0=80?= =?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 --- .../mission/converter/MissionConverter.java | 25 +++++++++++++++ .../example/umc/mission/domain/Mission.java | 20 +++++++----- .../example/umc/mission/domain/Region.java | 3 -- .../com/example/umc/mission/domain/Store.java | 4 +-- .../mission/domain/mapping/StoresMission.java | 31 ------------------- .../mission/repository/MissionRepository.java | 7 +++++ .../MissionService/MissionCommandService.java | 9 ++++++ .../MissionCommandServiceImpl.java | 28 +++++++++++++++++ .../web/controller/StoreRestController.java | 14 ++++++++- .../web/dto/request/MissionRequestDTO.java | 26 ++++++++++++++++ .../web/dto/response/MissionResponseDTO.java | 19 ++++++++++++ 11 files changed, 140 insertions(+), 46 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java delete mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MissionRequestDTO.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java new file mode 100644 index 0000000..2a18afd --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java @@ -0,0 +1,25 @@ +package com.example.umc.mission.converter; + +import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.web.dto.request.MissionRequestDTO; +import com.example.umc.mission.web.dto.response.MissionResponseDTO; + +public class MissionConverter { + + public static MissionResponseDTO.addMissionResponseDTO toAddMissionResponseDTO(Mission mission) { + return MissionResponseDTO.addMissionResponseDTO.builder() + .mission_id(mission.getId()) + .store_id(mission.getStore().getId()) + .build(); + } + + public static Mission toMission(MissionRequestDTO.addMissionDTO request, Store store) { + return Mission.builder() + .store(store) + .name(request.getName()) + .cond(request.getCond()) + .reward(request.getReward()) + .build(); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java index ec100c8..fe2e324 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java @@ -2,16 +2,19 @@ import com.example.umc.mission.domain.enums.MissionStatus; import com.example.umc.mission.domain.mapping.MembersMission; -import com.example.umc.mission.domain.mapping.StoresMission; import jakarta.persistence.*; import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import java.util.ArrayList; import java.util.List; @Entity -@Builder @Getter +@DynamicUpdate +@DynamicInsert +@Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor public class Mission { @@ -24,19 +27,20 @@ public class Mission { private String name; @Column(nullable = false, length = 50) - private String condition; + private String cond; @Column(nullable = false) private Integer reward; + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'INCOMPLETE'") + private MissionStatus status; + @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "region_id") - private Region region; + @JoinColumn(name = "store_id") + private Store store; @OneToMany(mappedBy = "mission") private List membersMissionList = new ArrayList<>(); - @OneToMany(mappedBy = "mission") - private List storesMissionList = new ArrayList<>(); - } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java index c2d2c33..82cd2eb 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Region.java @@ -20,9 +20,6 @@ public class Region { @Column(nullable = false, length = 20, unique = true) private String name; - @OneToMany(mappedBy = "region", cascade = CascadeType.ALL) - private List missionList = new ArrayList<>(); - @OneToMany(mappedBy = "region", cascade = CascadeType.ALL) private List StoreList = new ArrayList<>(); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Store.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Store.java index 2f2aa55..310fd08 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Store.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Store.java @@ -1,9 +1,7 @@ package com.example.umc.mission.domain; -import com.example.umc.mission.domain.mapping.StoresMission; import jakarta.persistence.*; import lombok.*; -import org.apache.catalina.LifecycleState; import java.util.ArrayList; import java.util.List; @@ -38,5 +36,5 @@ public class Store { //mission 리스트 @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) - private List storesMissionList = new ArrayList<>(); + private List missionList = new ArrayList<>(); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java deleted file mode 100644 index fd0ac2c..0000000 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/StoresMission.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.example.umc.mission.domain.mapping; - -import com.example.umc.mission.domain.Mission; -import com.example.umc.mission.domain.Store; -import com.example.umc.mission.domain.enums.MissionStatus; -import jakarta.persistence.*; -import lombok.*; - -@Entity -@Getter -@Builder -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor -public class StoresMission { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Enumerated(EnumType.STRING) - @Column(columnDefinition = "VARCHAR(15) DEFAULT 'INCOMPLETE'") - private MissionStatus status; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "store_id") - private Store store; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "mission_id") - private Mission mission; -} diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java new file mode 100644 index 0000000..c1d89d6 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java @@ -0,0 +1,7 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.Mission; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MissionRepository extends JpaRepository { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java new file mode 100644 index 0000000..7ee82df --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java @@ -0,0 +1,9 @@ +package com.example.umc.mission.service.MissionService; + +import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.web.dto.request.MissionRequestDTO; + +public interface MissionCommandService { + + public Mission saveMission(MissionRequestDTO.addMissionDTO request); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java new file mode 100644 index 0000000..1a1e804 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java @@ -0,0 +1,28 @@ +package com.example.umc.mission.service.MissionService; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.StoreHandler; +import com.example.umc.mission.converter.MissionConverter; +import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.repository.MissionRepository; +import com.example.umc.mission.repository.StoreRepository; +import com.example.umc.mission.web.dto.request.MissionRequestDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MissionCommandServiceImpl implements MissionCommandService { + + private final MissionRepository missionRepository; + + private final StoreRepository storeRepository; + + public Mission saveMission(MissionRequestDTO.addMissionDTO request){ + Store store = storeRepository.findById(request.getStoreId()).orElseThrow(()->new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); + Mission newmission = MissionConverter.toMission(request, store); + + return missionRepository.save(newmission); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index c85f8fd..45c61f7 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -1,14 +1,20 @@ package com.example.umc.mission.web.controller; import com.example.umc.mission.apiPayload.ApiResponse; +import com.example.umc.mission.converter.MissionConverter; import com.example.umc.mission.converter.ReviewConverter; import com.example.umc.mission.converter.StoreConverter; +import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; +import com.example.umc.mission.service.MissionService.MissionCommandService; import com.example.umc.mission.service.ReviewService.ReviewCommandService; import com.example.umc.mission.service.StoreService.StoreCommandService; +import com.example.umc.mission.web.dto.request.MissionRequestDTO; import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import com.example.umc.mission.web.dto.response.MissionResponseDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; +import io.swagger.annotations.Api; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -22,6 +28,8 @@ public class StoreRestController { private final ReviewCommandService reviewCommandService; + private final MissionCommandService missionCommandService; + //1) 특정 지역에 가게 추가하기 @PostMapping("/") public ApiResponse addStore(@RequestBody @Valid StoreRequestDTO.addStoreDTO request){ @@ -37,7 +45,11 @@ public ApiResponse postReview(@RequestBody @ } //3) 가게에 미션 추가하기 - //storesmission + @PostMapping("/mission") + public ApiResponse postMission(@RequestBody @Valid MissionRequestDTO.addMissionDTO request){ + Mission mission = missionCommandService.saveMission(request); + return ApiResponse.onSucccess(MissionConverter.toAddMissionResponseDTO(mission)); + } //4) 가게의 미션을 도전 중인 미션에 추가 //storesmissin의 status 칼럼 enum 값 변경 diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MissionRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MissionRequestDTO.java new file mode 100644 index 0000000..d2912ea --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/MissionRequestDTO.java @@ -0,0 +1,26 @@ +package com.example.umc.mission.web.dto.request; + +import com.example.umc.mission.validation.annotation.ExistStore; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; + +public class MissionRequestDTO { + + @Getter + public static class addMissionDTO{ + @NotNull + String name; + @NotNull + @Size(max = 50) + String cond; + @NotNull + @Min(0) + @Max(50) + Integer reward; + @ExistStore + Long storeId; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java new file mode 100644 index 0000000..127ac07 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java @@ -0,0 +1,19 @@ +package com.example.umc.mission.web.dto.response; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class MissionResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class addMissionResponseDTO { + Long mission_id; + Long store_id; + } +} From 3819dc99c2450ad45eb1dfe1734f77121a65a1fa Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Mon, 1 Jul 2024 04:10:24 +0900 Subject: [PATCH 10/18] =?UTF-8?q?feat=20:=20mission9=5Fapi=5F4=20=EB=AF=B8?= =?UTF-8?q?=EC=85=98=20=EB=8F=84=EC=A0=84=ED=95=98=EA=B8=B0=20api=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiPayload/code/status/ErrorStatus.java | 3 +- .../exception/handler/MissionHandler.java | 11 +++++ .../mission/converter/MissionConverter.java | 7 +++ .../example/umc/mission/domain/Mission.java | 4 ++ .../MissionService/MissionCommandService.java | 7 +++ .../MissionCommandServiceImpl.java | 21 +++++++++ .../annotation/CheckMissionStatus.java | 18 ++++++++ .../CheckMissionStatusValidator.java | 44 +++++++++++++++++++ .../web/controller/StoreRestController.java | 10 ++++- .../web/dto/response/MissionResponseDTO.java | 10 +++++ 10 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MissionHandler.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckMissionStatus.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java index 2e3ca00..7e78c0f 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -30,7 +30,8 @@ public enum ErrorStatus implements BaseErrorCode { STORE_NOT_FOUND(HttpStatus.BAD_REQUEST, "STORE4001", "해당하는 가게가 존재하지 않습니다."), //미션 에러 - MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION4001", "미션이 존재하지 않습니다."), + MISSION_NOT_FOUND(HttpStatus.BAD_REQUEST, "MISSION4001", "미션이 존재하지 않습니다."), + MISSION_IS_CHALLENGING(HttpStatus.BAD_REQUEST, "MISSION4002", "미션이 이미 도전 중입니다."), //Test TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "FOR TEST"); diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MissionHandler.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MissionHandler.java new file mode 100644 index 0000000..ebe1868 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/exception/handler/MissionHandler.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.apiPayload.exception.handler; + +import com.example.umc.mission.apiPayload.code.BaseErrorCode; +import com.example.umc.mission.apiPayload.exception.GeneralException; + +public class MissionHandler extends GeneralException { + + public MissionHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java index 2a18afd..6f2e424 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java @@ -7,6 +7,13 @@ public class MissionConverter { + public static MissionResponseDTO.updateMissionResponseDTO toUpdateMissionResponseDTO(Mission mission) { + return MissionResponseDTO.updateMissionResponseDTO.builder() + .mission_id(mission.getId()) + .status(mission.getStatus()) + .build(); + } + public static MissionResponseDTO.addMissionResponseDTO toAddMissionResponseDTO(Mission mission) { return MissionResponseDTO.addMissionResponseDTO.builder() .mission_id(mission.getId()) diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java index fe2e324..5c58077 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java @@ -43,4 +43,8 @@ public class Mission { @OneToMany(mappedBy = "mission") private List membersMissionList = new ArrayList<>(); + public void changeStatusToChallenging(){ + this.status=MissionStatus.CHALLENGING; + } + } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java index 7ee82df..b7cdfaf 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java @@ -1,9 +1,16 @@ package com.example.umc.mission.service.MissionService; import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.enums.MissionStatus; import com.example.umc.mission.web.dto.request.MissionRequestDTO; public interface MissionCommandService { public Mission saveMission(MissionRequestDTO.addMissionDTO request); + + public Mission changeStatusOfMission(Long missionId); + + public MissionStatus checkStatusOfMission(Long missionId); + + public boolean existOfMission(Long missionId); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java index 1a1e804..2693350 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java @@ -1,10 +1,12 @@ package com.example.umc.mission.service.MissionService; import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.MissionHandler; import com.example.umc.mission.apiPayload.exception.handler.StoreHandler; import com.example.umc.mission.converter.MissionConverter; import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.Store; +import com.example.umc.mission.domain.enums.MissionStatus; import com.example.umc.mission.repository.MissionRepository; import com.example.umc.mission.repository.StoreRepository; import com.example.umc.mission.web.dto.request.MissionRequestDTO; @@ -25,4 +27,23 @@ public Mission saveMission(MissionRequestDTO.addMissionDTO request){ return missionRepository.save(newmission); } + + public Mission changeStatusOfMission(Long missionId){ + Mission changedmission = missionRepository.findById(missionId) + .orElseThrow(()-> new MissionHandler(ErrorStatus.MISSION_NOT_FOUND)); + changedmission.changeStatusToChallenging(); + + return missionRepository.save(changedmission); + } + + public MissionStatus checkStatusOfMission(Long missionId){ + Mission mission = missionRepository.findById(missionId) + .orElseThrow(()-> new MissionHandler(ErrorStatus.MISSION_NOT_FOUND)); + + return mission.getStatus(); + } + + public boolean existOfMission(Long missionId){ + return missionRepository.existsById(missionId); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckMissionStatus.java b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckMissionStatus.java new file mode 100644 index 0000000..1a494a0 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckMissionStatus.java @@ -0,0 +1,18 @@ +package com.example.umc.mission.validation.annotation; + +import com.example.umc.mission.validation.validator.CheckMissionStatusValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = CheckMissionStatusValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface CheckMissionStatus { + + String message() default "해당 미션은 이미 CHALLENGING 상태입니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java new file mode 100644 index 0000000..bc238e3 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java @@ -0,0 +1,44 @@ +package com.example.umc.mission.validation.validator; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.domain.enums.MissionStatus; +import com.example.umc.mission.service.MissionService.MissionCommandService; +import com.example.umc.mission.validation.annotation.CheckMissionStatus; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class CheckMissionStatusValidator implements ConstraintValidator { + + private final MissionCommandService missionCommandService; + + @Override + public void initialize(CheckMissionStatus constraintAnnotation){ + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(Long value, ConstraintValidatorContext context) { + boolean isExist = missionCommandService.existOfMission(value); + + if(isExist){ + boolean isValid = (missionCommandService.checkStatusOfMission(value) != MissionStatus.CHALLENGING); + + if(!isValid){ + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.MISSION_IS_CHALLENGING.toString()).addConstraintViolation(); + } + + return isValid; + } + else{ + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.MISSION_NOT_FOUND.toString()).addConstraintViolation(); + } + + return false; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index 45c61f7..931324a 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -10,17 +10,19 @@ import com.example.umc.mission.service.MissionService.MissionCommandService; import com.example.umc.mission.service.ReviewService.ReviewCommandService; import com.example.umc.mission.service.StoreService.StoreCommandService; +import com.example.umc.mission.validation.annotation.CheckMissionStatus; import com.example.umc.mission.web.dto.request.MissionRequestDTO; import com.example.umc.mission.web.dto.request.StoreRequestDTO; import com.example.umc.mission.web.dto.response.MissionResponseDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; -import io.swagger.annotations.Api; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor +@Validated @RequestMapping("/store") public class StoreRestController { @@ -52,5 +54,9 @@ public ApiResponse postMission(@Reques } //4) 가게의 미션을 도전 중인 미션에 추가 - //storesmissin의 status 칼럼 enum 값 변경 + @PutMapping("/challenge/{missionId}") + public ApiResponse challengeMission(@CheckMissionStatus @PathVariable Long missionId){ + Mission changedMission = missionCommandService.changeStatusOfMission(missionId); + return ApiResponse.onSucccess(MissionConverter.toUpdateMissionResponseDTO(changedMission)); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java index 127ac07..e6653e2 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java @@ -1,6 +1,7 @@ package com.example.umc.mission.web.dto.response; +import com.example.umc.mission.domain.enums.MissionStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -16,4 +17,13 @@ public static class addMissionResponseDTO { Long mission_id; Long store_id; } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class updateMissionResponseDTO { + Long mission_id; + MissionStatus status; + } } From 93e2f1c15e3d72f438b256be8cea1d8a5e285d29 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 2 Jul 2024 02:33:44 +0900 Subject: [PATCH 11/18] =?UTF-8?q?feat=20:=20week10=5F=EA=B0=80=EA=B2=8C=20?= =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EB=AA=A9=EB=A1=9D=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 --- .../mission/converter/ReviewConverter.java | 28 +++++++++++++++ .../mission/repository/ReviewRepository.java | 5 +++ .../StoreService/StoreQueryService.java | 10 ++++++ .../StoreService/StoreQueryServiceImpl.java | 35 ++++++++++++++++++- .../web/controller/StoreRestController.java | 33 +++++++++++++++-- .../web/dto/response/StoreResponseDTO.java | 25 +++++++++++++ 6 files changed, 133 insertions(+), 3 deletions(-) diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java index 5c6fe46..bdb46f2 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java @@ -5,9 +5,37 @@ import com.example.umc.mission.domain.Store; import com.example.umc.mission.web.dto.request.StoreRequestDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; +import org.springframework.data.domain.Page; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; public class ReviewConverter { + public static StoreResponseDTO.ReviewPreViewListDTO toReviewPreViewListDTO(Page reviewList) { + + List reviewPreViewDTOList = reviewList.stream() + .map(ReviewConverter::toReviewPreViewDTO).collect(Collectors.toList()); + + return StoreResponseDTO.ReviewPreViewListDTO.builder() + .isLast(reviewList.isLast()) + .isFirst(reviewList.isFirst()) + .totalPage(reviewList.getTotalPages()) + .totalElements(reviewList.getTotalElements()) + .listSize(reviewPreViewDTOList.size()) + .reviewList(reviewPreViewDTOList) + .build(); + } + + public static StoreResponseDTO.ReviewPreViewDTO toReviewPreViewDTO(Review review){ + return StoreResponseDTO.ReviewPreViewDTO.builder() + .ownerNickname(review.getMember().getName()) + .starPoint(review.getStarPoint()) + .content(review.getContent()) + .build(); + } + public static StoreResponseDTO.reviewResponseDTO toReviewResponseDTO(Review review) { return StoreResponseDTO.reviewResponseDTO.builder() .review_id(review.getId()) diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java index c4df674..54d85fc 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java @@ -1,7 +1,12 @@ package com.example.umc.mission.repository; import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.Store; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; public interface ReviewRepository extends JpaRepository { + + Page findAllByStore(Store store, PageRequest pageRequest); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java index b89b605..15e9cbc 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryService.java @@ -1,4 +1,14 @@ package com.example.umc.mission.service.StoreService; +import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.Store; +import org.springframework.data.domain.Page; + +import java.util.Optional; + public interface StoreQueryService { + + Optional findStore(Long id); + + Page getReviewList(Long StoreId, Integer page); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java index 555d670..d8cd9c0 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java @@ -1,4 +1,37 @@ package com.example.umc.mission.service.StoreService; -public class StoreQueryServiceImpl { +import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.repository.ReviewRepository; +import com.example.umc.mission.repository.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class StoreQueryServiceImpl implements StoreQueryService{ + + private final StoreRepository storeRepository; + + private final ReviewRepository reviewRepository; + + @Override + public Page getReviewList(Long StoreId, Integer page){ + + Store store = storeRepository.findById(StoreId).get(); + + Page StorePage = reviewRepository.findAllByStore(store, PageRequest.of(page, 2)); + return StorePage; + } + + @Override + public Optional findStore(Long id){ + return storeRepository.findById(id); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index 931324a..f01445c 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -10,13 +10,22 @@ import com.example.umc.mission.service.MissionService.MissionCommandService; import com.example.umc.mission.service.ReviewService.ReviewCommandService; import com.example.umc.mission.service.StoreService.StoreCommandService; +import com.example.umc.mission.service.StoreService.StoreQueryService; import com.example.umc.mission.validation.annotation.CheckMissionStatus; +import com.example.umc.mission.validation.annotation.ExistStore; import com.example.umc.mission.web.dto.request.MissionRequestDTO; import com.example.umc.mission.web.dto.request.StoreRequestDTO; import com.example.umc.mission.web.dto.response.MissionResponseDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -32,6 +41,8 @@ public class StoreRestController { private final MissionCommandService missionCommandService; + private final StoreQueryService storeQueryService; + //1) 특정 지역에 가게 추가하기 @PostMapping("/") public ApiResponse addStore(@RequestBody @Valid StoreRequestDTO.addStoreDTO request){ @@ -46,6 +57,24 @@ public ApiResponse postReview(@RequestBody @ return ApiResponse.onSucccess(ReviewConverter.toReviewResponseDTO(review)); } + //리뷰 조회 + @GetMapping("/{storeId}/reviews") + @Operation(summary = "특정 가게의 리뷰 목록 조회 API", description = "특정 가게의 리뷰들의 목록을 조회하는 API이며, 페이징을 포함합니다. queryString올 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "storeId", description = "가게의 아이디, path variable") + }) + public ApiResponse getReviewList(@ExistStore @PathVariable(name = "storeId") Long storeId, @RequestParam(name = "page") Integer page){ + Page reviewList = storeQueryService.getReviewList(storeId, page); + return ApiResponse.onSucccess(ReviewConverter.toReviewPreViewListDTO(reviewList)); + //return null; + } + //3) 가게에 미션 추가하기 @PostMapping("/mission") public ApiResponse postMission(@RequestBody @Valid MissionRequestDTO.addMissionDTO request){ @@ -54,8 +83,8 @@ public ApiResponse postMission(@Reques } //4) 가게의 미션을 도전 중인 미션에 추가 - @PutMapping("/challenge/{missionId}") - public ApiResponse challengeMission(@CheckMissionStatus @PathVariable Long missionId){ + @PutMapping("/{missionId}/challenge") + public ApiResponse challengeMission(@CheckMissionStatus @PathVariable(name = "missionId") Long missionId){ Mission changedMission = missionCommandService.changeStatusOfMission(missionId); return ApiResponse.onSucccess(MissionConverter.toUpdateMissionResponseDTO(changedMission)); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java index 58c553f..ec69565 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java @@ -5,6 +5,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import java.util.List; + public class StoreResponseDTO { @Builder @@ -26,4 +28,27 @@ public static class reviewResponseDTO{ Long review_id; } + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewListDTO{ + List reviewList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewDTO{ + String ownerNickname; + Integer starPoint; + String content; + } + } From 1b23ed9d1a49370c0735add5a1d8561db012d531 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 2 Jul 2024 11:11:02 +0900 Subject: [PATCH 12/18] =?UTF-8?q?feat=20:=20mission10=5Fapi=5F1=20?= =?UTF-8?q?=EB=A9=A4=EB=B2=84=20=EB=A6=AC=EB=B7=B0=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=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 --- .../apiPayload/code/status/ErrorStatus.java | 5 ++- .../mission/converter/ReviewConverter.java | 24 ++++++++++++ .../mission/repository/ReviewRepository.java | 3 ++ .../MemberService/MemberQueryService.java | 5 +++ .../MemberService/MemberQueryServiceImpl.java | 28 +++++++++++++- .../mission/validation/ValidationAspect.java | 24 ++++++++++++ .../validation/annotation/CheckPage.java | 17 +++++++++ .../validator/CheckPageValidator.java | 30 +++++++++++++++ .../web/controller/MemberRestController.java | 38 +++++++++++++++++-- .../web/dto/response/MemberResponseDTO.java | 26 +++++++++++++ 10 files changed, 194 insertions(+), 6 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/ValidationAspect.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckPage.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckPageValidator.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java index 7e78c0f..42311b9 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -16,7 +16,10 @@ public enum ErrorStatus implements BaseErrorCode { _UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON401", "인증이 필요합니다."), _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), - //멤버 관련 응답 등 + //페이지 에러 + PAGE_FORBIDDEN(HttpStatus.BAD_REQUEST,"PAGE4001", "페이지 값이 음수입니다."), + + //멤버 에러 MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 존재하지 않습니다."), NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수입니다."), diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java index bdb46f2..c5acaf5 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java @@ -4,6 +4,7 @@ import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import com.example.umc.mission.web.dto.response.MemberResponseDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; import org.springframework.data.domain.Page; @@ -13,6 +14,29 @@ public class ReviewConverter { + public static MemberResponseDTO.ReviewPreViewListDTO toMemberReviewListDTO(Page reviewList) { + + List reviewPreViewDTOList = reviewList.stream() + .map(ReviewConverter::toMemberReviewDTO).toList(); + + return MemberResponseDTO.ReviewPreViewListDTO.builder() + .isLast(reviewList.isLast()) + .isFirst(reviewList.isFirst()) + .totalPage(reviewList.getTotalPages()) + .totalElements(reviewList.getTotalElements()) + .listSize(reviewPreViewDTOList.size()) + .reviewList(reviewPreViewDTOList) + .build(); + } + + public static MemberResponseDTO.ReviewPreViewDTO toMemberReviewDTO(Review review) { + return MemberResponseDTO.ReviewPreViewDTO.builder() + .storeName(review.getStore().getName()) + .starPoint(review.getStarPoint()) + .content(review.getContent()) + .build(); + } + public static StoreResponseDTO.ReviewPreViewListDTO toReviewPreViewListDTO(Page reviewList) { List reviewPreViewDTOList = reviewList.stream() diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java index 54d85fc..990cf5d 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewRepository.java @@ -1,5 +1,6 @@ package com.example.umc.mission.repository; +import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; import org.springframework.data.domain.Page; @@ -9,4 +10,6 @@ public interface ReviewRepository extends JpaRepository { Page findAllByStore(Store store, PageRequest pageRequest); + + Page findAllByMember(Member member, PageRequest pageRequest); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java index 04b0129..21b2f52 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java @@ -1,4 +1,9 @@ package com.example.umc.mission.service.MemberService; +import com.example.umc.mission.domain.Review; +import org.springframework.data.domain.Page; + public interface MemberQueryService { + + Page getReviewList(Long MemberId, Integer page); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java index b5e2fcd..821f286 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java @@ -1,4 +1,30 @@ package com.example.umc.mission.service.MemberService; -public class MemberQueryServiceImpl { +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.MemberHandler; +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Review; +import com.example.umc.mission.repository.MemberRepository; +import com.example.umc.mission.repository.ReviewRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberQueryServiceImpl implements MemberQueryService{ + + private final MemberRepository memberRepository; + + private final ReviewRepository reviewRepository; + + @Override + public Page getReviewList(Long MemberId, Integer page){ + Member member = memberRepository.findById(MemberId).get(); + + Page MemberPage = reviewRepository.findAllByMember(member, PageRequest.of(page, 10)); + return MemberPage; + } + } diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/ValidationAspect.java b/umc.mission/src/main/java/com/example/umc/mission/validation/ValidationAspect.java new file mode 100644 index 0000000..cf16c99 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/ValidationAspect.java @@ -0,0 +1,24 @@ +package com.example.umc.mission.validation; + +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.stereotype.Component; + +@Aspect +@Component +public class ValidationAspect { + + //@Around("execution(* com.example.umc.mission.web.controller.MemberRestController.*(..)) && args(..,@com.example.umc.mission.validation.annotation.CheckPage(*)))") + /*public Object around(ProceedingJoinPoint joinPoint) throws Throwable { + //값 변경 로직 구현 + Object[] args = joinPoint.getArgs(); + for (int i = 0; i < args.length; i++) { + if (args[i] instanceof Integer num) { + args[i] = num-1; + } + } + + return joinPoint.proceed(args); + }*/ +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckPage.java b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckPage.java new file mode 100644 index 0000000..665b78e --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/CheckPage.java @@ -0,0 +1,17 @@ +package com.example.umc.mission.validation.annotation; + +import com.example.umc.mission.validation.validator.CheckPageValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = CheckPageValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface CheckPage { + + String message() default "페이지의 값이 1보다 작습니다 :: 페이지의 값은 양수가 되어야 합니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckPageValidator.java b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckPageValidator.java new file mode 100644 index 0000000..ba68c0c --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckPageValidator.java @@ -0,0 +1,30 @@ +package com.example.umc.mission.validation.validator; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.validation.annotation.CheckPage; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class CheckPageValidator implements ConstraintValidator { + + @Override + public void initialize(CheckPage constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(Integer value, ConstraintValidatorContext context) { + boolean isValid = (value > 0); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.PAGE_FORBIDDEN.toString()).addConstraintViolation(); + } + + return isValid; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java index 15fa07f..4ca23ab 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java @@ -2,27 +2,57 @@ import com.example.umc.mission.apiPayload.ApiResponse; import com.example.umc.mission.converter.MemberConverter; +import com.example.umc.mission.converter.ReviewConverter; import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Review; import com.example.umc.mission.service.MemberService.MemberCommandService; +import com.example.umc.mission.service.MemberService.MemberQueryService; +import com.example.umc.mission.validation.annotation.CheckPage; +import com.example.umc.mission.validation.annotation.ExistMember; import com.example.umc.mission.web.dto.request.MemberRequestDTO; import com.example.umc.mission.web.dto.response.MemberResponseDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.data.domain.Page; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor +@Validated @RequestMapping("/members") public class MemberRestController { private final MemberCommandService memberCommandService; + private final MemberQueryService memberQueryService; + @PostMapping("/") public ApiResponse join(@RequestBody @Valid MemberRequestDTO.JoinDTO request) { Member member = memberCommandService.joinMember(request); return ApiResponse.onSucccess(MemberConverter.toJoinResultDTO(member)); } + + //리뷰 조회 + @GetMapping("/{memberId}/reviews") + @Operation(summary = "특정 멤버의 리뷰 목록 조회 API", description = "특정 멤버의 리뷰목록을 조회하는 API이며, 페이징을 포함합니다. queryString올 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "memberId", description = "멤버의 아이디, path variable") + }) + public ApiResponse getReviewList(@ExistMember @PathVariable(name = "memberId") Long memberId, @CheckPage @RequestParam(name = "page") Integer page){ + Page reviews = memberQueryService.getReviewList(memberId, page-1); + return ApiResponse.onSucccess(ReviewConverter.toMemberReviewListDTO(reviews)); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java index 4874486..25bd5ba 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java @@ -5,6 +5,8 @@ import lombok.Getter; import lombok.NoArgsConstructor; +import java.util.List; + public class MemberResponseDTO { @Builder @@ -15,4 +17,28 @@ public static class JoinResultDTO { Long memberId; //LocalDateTime createdAt; } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewListDTO{ + List reviewList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewDTO{ + String storeName; + Integer starPoint; + String content; + } + } From ad1b4d130bf32a9202009cc4d3e2c2de2f713081 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 2 Jul 2024 12:06:19 +0900 Subject: [PATCH 13/18] =?UTF-8?q?feat=20:=20mission10=5Fapi=5F2=20?= =?UTF-8?q?=EA=B0=80=EA=B2=8C=20=EB=B3=84=20=EB=AF=B8=EC=85=98=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20api=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/converter/MissionConverter.java | 29 +++++++++++++++++++ .../mission/repository/MissionRepository.java | 5 ++++ .../MissionService/MissionQueryService.java | 9 ++++++ .../MissionQueryServiceImpl.java | 29 +++++++++++++++++++ .../web/controller/StoreRestController.java | 21 ++++++++++++++ .../web/dto/response/StoreResponseDTO.java | 24 +++++++++++++++ 6 files changed, 117 insertions(+) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java index 6f2e424..9f8dc36 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java @@ -1,12 +1,41 @@ package com.example.umc.mission.converter; import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; import com.example.umc.mission.web.dto.request.MissionRequestDTO; +import com.example.umc.mission.web.dto.response.MemberResponseDTO; import com.example.umc.mission.web.dto.response.MissionResponseDTO; +import com.example.umc.mission.web.dto.response.StoreResponseDTO; +import org.springframework.data.domain.Page; + +import java.util.ArrayList; +import java.util.List; public class MissionConverter { + public static StoreResponseDTO.MissionPreViewListDTO toMissionPreReviewListDTO(Page missionList) { + List missionPreViewDTOList = missionList.stream() + .map(MissionConverter::toMissionPreReviewDTO).toList(); + + return StoreResponseDTO.MissionPreViewListDTO.builder() + .isLast(missionList.isLast()) + .isFirst(missionList.isFirst()) + .totalPage(missionList.getTotalPages()) + .totalElements(missionList.getTotalElements()) + .listSize(missionPreViewDTOList.size()) + .missionList(missionPreViewDTOList) + .build(); + } + + public static StoreResponseDTO.MissionPreViewDTO toMissionPreReviewDTO(Mission mission) { + return StoreResponseDTO.MissionPreViewDTO.builder() + .storeName(mission.getStore().getName()) + .reward(mission.getReward()) + .cond(mission.getCond()) + .build(); + } + public static MissionResponseDTO.updateMissionResponseDTO toUpdateMissionResponseDTO(Mission mission) { return MissionResponseDTO.updateMissionResponseDTO.builder() .mission_id(mission.getId()) diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java index c1d89d6..90ee9d9 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/MissionRepository.java @@ -1,7 +1,12 @@ package com.example.umc.mission.repository; import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.Store; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; public interface MissionRepository extends JpaRepository { + + Page findAllByStore(Store store, PageRequest pageRequest); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java new file mode 100644 index 0000000..a4b5cb2 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java @@ -0,0 +1,9 @@ +package com.example.umc.mission.service.MissionService; + +import com.example.umc.mission.domain.Mission; +import org.springframework.data.domain.Page; + +public interface MissionQueryService { + + Page getMissions(Long StoreId, Integer page); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java new file mode 100644 index 0000000..8e59add --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java @@ -0,0 +1,29 @@ +package com.example.umc.mission.service.MissionService; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.StoreHandler; +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.Store; +import com.example.umc.mission.repository.MissionRepository; +import com.example.umc.mission.repository.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MissionQueryServiceImpl implements MissionQueryService{ + + private final MissionRepository missionRepository; + + private final StoreRepository storeRepository; + + @Override + public Page getMissions(Long StoreId, Integer page){ + Store store = storeRepository.findById(StoreId) + .orElseThrow(()->new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); + return missionRepository.findAllByStore(store, PageRequest.of(page,10)); + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index f01445c..35c8f33 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -8,10 +8,12 @@ import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; import com.example.umc.mission.service.MissionService.MissionCommandService; +import com.example.umc.mission.service.MissionService.MissionQueryService; import com.example.umc.mission.service.ReviewService.ReviewCommandService; import com.example.umc.mission.service.StoreService.StoreCommandService; import com.example.umc.mission.service.StoreService.StoreQueryService; import com.example.umc.mission.validation.annotation.CheckMissionStatus; +import com.example.umc.mission.validation.annotation.CheckPage; import com.example.umc.mission.validation.annotation.ExistStore; import com.example.umc.mission.web.dto.request.MissionRequestDTO; import com.example.umc.mission.web.dto.request.StoreRequestDTO; @@ -43,6 +45,8 @@ public class StoreRestController { private final StoreQueryService storeQueryService; + private final MissionQueryService missionQueryService; + //1) 특정 지역에 가게 추가하기 @PostMapping("/") public ApiResponse addStore(@RequestBody @Valid StoreRequestDTO.addStoreDTO request){ @@ -82,6 +86,23 @@ public ApiResponse postMission(@Reques return ApiResponse.onSucccess(MissionConverter.toAddMissionResponseDTO(mission)); } + //미션 조회 + @GetMapping("/{storeId}/missions") + @Operation(summary = "특정 가게의 미션 목록 조회 API", description = "특정 가게의 미션 목록을 조회하는 API이며, 페이징을 포함합니다. queryString으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "storeId", description = "가게의 아이디, path variable") + }) + public ApiResponse getMissionList(@ExistStore @PathVariable(name = "storeId") Long storeId,@CheckPage @RequestParam(name = "page") Integer page){ + Page missions = missionQueryService.getMissions(storeId, page-1); + return ApiResponse.onSucccess(MissionConverter.toMissionPreReviewListDTO(missions)); + } + //4) 가게의 미션을 도전 중인 미션에 추가 @PutMapping("/{missionId}/challenge") public ApiResponse challengeMission(@CheckMissionStatus @PathVariable(name = "missionId") Long missionId){ diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java index ec69565..6a5a643 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java @@ -1,5 +1,6 @@ package com.example.umc.mission.web.dto.response; +import com.example.umc.mission.domain.enums.MissionStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -51,4 +52,27 @@ public static class ReviewPreViewDTO{ String content; } + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionPreViewListDTO{ + List missionList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionPreViewDTO{ + String storeName; + String cond; + Integer reward; + } + } From 99d14a9236d5906e0193ec88835af4de17324dd9 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 2 Jul 2024 17:42:20 +0900 Subject: [PATCH 14/18] =?UTF-8?q?fix=20:=20mission9=5Fapi=5F4=20=EB=AF=B8?= =?UTF-8?q?=EC=85=98=20=EB=8F=84=EC=A0=84=ED=95=98=EA=B8=B0=20api=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 --- .../mission/converter/MissionConverter.java | 7 ---- .../umc/mission/converter/StoreConverter.java | 22 ++++++++++-- .../example/umc/mission/domain/Mission.java | 8 ----- .../domain/mapping/MembersMission.java | 1 + .../repository/MembersMissionRepository.java | 11 ++++++ .../MissionService/MissionCommandService.java | 8 ++--- .../MissionCommandServiceImpl.java | 27 ++++++++------ .../MissionService/MissionQueryService.java | 5 +++ .../MissionQueryServiceImpl.java | 29 +++++++++++++++ .../StoreService/StoreQueryServiceImpl.java | 3 +- .../validation/annotation/ExistMission.java | 17 +++++++++ .../CheckMissionStatusValidator.java | 24 +++++++------ .../validator/ExistMissionValidator.java | 35 +++++++++++++++++++ .../web/controller/StoreRestController.java | 10 +++--- .../web/dto/request/StoreRequestDTO.java | 10 ++++++ .../web/dto/response/MissionResponseDTO.java | 9 ----- .../web/dto/response/StoreResponseDTO.java | 10 ++++++ 17 files changed, 178 insertions(+), 58 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMission.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/validation/validator/ExistMissionValidator.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java index 9f8dc36..d3fcd8d 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/MissionConverter.java @@ -36,13 +36,6 @@ public static StoreResponseDTO.MissionPreViewDTO toMissionPreReviewDTO(Mission m .build(); } - public static MissionResponseDTO.updateMissionResponseDTO toUpdateMissionResponseDTO(Mission mission) { - return MissionResponseDTO.updateMissionResponseDTO.builder() - .mission_id(mission.getId()) - .status(mission.getStatus()) - .build(); - } - public static MissionResponseDTO.addMissionResponseDTO toAddMissionResponseDTO(Mission mission) { return MissionResponseDTO.addMissionResponseDTO.builder() .mission_id(mission.getId()) diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java index caabf64..bb78d38 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/StoreConverter.java @@ -1,8 +1,8 @@ package com.example.umc.mission.converter; -import com.example.umc.mission.domain.Region; -import com.example.umc.mission.domain.Review; -import com.example.umc.mission.domain.Store; +import com.example.umc.mission.domain.*; +import com.example.umc.mission.domain.enums.MissionStatus; +import com.example.umc.mission.domain.mapping.MembersMission; import com.example.umc.mission.web.dto.request.StoreRequestDTO; import com.example.umc.mission.web.dto.response.StoreResponseDTO; @@ -24,4 +24,20 @@ public static Store toStore(StoreRequestDTO.addStoreDTO request, Region region){ .build(); } + + public static MembersMission toMembersMission(Member member, Mission mission){ + return MembersMission.builder() + .member(member) + .mission(mission) + .status(MissionStatus.CHALLENGING) + .build(); + } + + public static StoreResponseDTO.ChallengeResponseDTO toChallengeResponseDTO(MembersMission challenge) { + return StoreResponseDTO.ChallengeResponseDTO.builder() + .challengeId(challenge.getId()) + .missionId(challenge.getMission().getId()) + .memberId(challenge.getMember().getId()) + .build(); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java index 5c58077..3b987f1 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Mission.java @@ -32,10 +32,6 @@ public class Mission { @Column(nullable = false) private Integer reward; - @Enumerated(EnumType.STRING) - @Column(columnDefinition = "VARCHAR(15) DEFAULT 'INCOMPLETE'") - private MissionStatus status; - @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "store_id") private Store store; @@ -43,8 +39,4 @@ public class Mission { @OneToMany(mappedBy = "mission") private List membersMissionList = new ArrayList<>(); - public void changeStatusToChallenging(){ - this.status=MissionStatus.CHALLENGING; - } - } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java index b2c0efd..805f958 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/mapping/MembersMission.java @@ -18,6 +18,7 @@ public class MembersMission { private Long id; @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'CHALLENGING'") private MissionStatus status; @ManyToOne(fetch = FetchType.LAZY) diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java new file mode 100644 index 0000000..d56ecd5 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java @@ -0,0 +1,11 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.mapping.MembersMission; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MembersMissionRepository extends JpaRepository { + boolean existsByMissionAndMember(Mission mission, Member member); + MembersMission findByMissionAndMember(Mission mission, Member member); +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java index b7cdfaf..5d8a13f 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandService.java @@ -2,15 +2,15 @@ import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.enums.MissionStatus; +import com.example.umc.mission.domain.mapping.MembersMission; import com.example.umc.mission.web.dto.request.MissionRequestDTO; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; public interface MissionCommandService { public Mission saveMission(MissionRequestDTO.addMissionDTO request); - - public Mission changeStatusOfMission(Long missionId); - - public MissionStatus checkStatusOfMission(Long missionId); + + public MembersMission saveChallenge(StoreRequestDTO.postChallengeDTO request); public boolean existOfMission(Long missionId); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java index 2693350..408ec82 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionCommandServiceImpl.java @@ -1,15 +1,22 @@ package com.example.umc.mission.service.MissionService; import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.MemberHandler; import com.example.umc.mission.apiPayload.exception.handler.MissionHandler; import com.example.umc.mission.apiPayload.exception.handler.StoreHandler; import com.example.umc.mission.converter.MissionConverter; +import com.example.umc.mission.converter.StoreConverter; +import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.Store; import com.example.umc.mission.domain.enums.MissionStatus; +import com.example.umc.mission.domain.mapping.MembersMission; +import com.example.umc.mission.repository.MemberRepository; +import com.example.umc.mission.repository.MembersMissionRepository; import com.example.umc.mission.repository.MissionRepository; import com.example.umc.mission.repository.StoreRepository; import com.example.umc.mission.web.dto.request.MissionRequestDTO; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -21,6 +28,10 @@ public class MissionCommandServiceImpl implements MissionCommandService { private final StoreRepository storeRepository; + private final MemberRepository memberRepository; + + private final MembersMissionRepository membersMissionRepository; + public Mission saveMission(MissionRequestDTO.addMissionDTO request){ Store store = storeRepository.findById(request.getStoreId()).orElseThrow(()->new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); Mission newmission = MissionConverter.toMission(request, store); @@ -28,19 +39,13 @@ public Mission saveMission(MissionRequestDTO.addMissionDTO request){ return missionRepository.save(newmission); } - public Mission changeStatusOfMission(Long missionId){ - Mission changedmission = missionRepository.findById(missionId) - .orElseThrow(()-> new MissionHandler(ErrorStatus.MISSION_NOT_FOUND)); - changedmission.changeStatusToChallenging(); - - return missionRepository.save(changedmission); - } - - public MissionStatus checkStatusOfMission(Long missionId){ - Mission mission = missionRepository.findById(missionId) + public MembersMission saveChallenge(StoreRequestDTO.postChallengeDTO request){ + Member member = memberRepository.findById(request.getMemberId()) + .orElseThrow(()-> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); + Mission mission = missionRepository.findById(request.getMissionId()) .orElseThrow(()-> new MissionHandler(ErrorStatus.MISSION_NOT_FOUND)); - return mission.getStatus(); + return membersMissionRepository.save(StoreConverter.toMembersMission(member,mission)); } public boolean existOfMission(Long missionId){ diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java index a4b5cb2..90b9c19 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryService.java @@ -1,9 +1,14 @@ package com.example.umc.mission.service.MissionService; import com.example.umc.mission.domain.Mission; +import com.example.umc.mission.domain.mapping.MembersMission; import org.springframework.data.domain.Page; public interface MissionQueryService { + MembersMission getMembersMission(Long missionId, Long memberId); + + boolean checkMembersMission(Long missionId, Long memberId); + Page getMissions(Long StoreId, Integer page); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java index 8e59add..378fdcb 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MissionService/MissionQueryServiceImpl.java @@ -1,10 +1,15 @@ package com.example.umc.mission.service.MissionService; import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.apiPayload.exception.handler.MemberHandler; +import com.example.umc.mission.apiPayload.exception.handler.MissionHandler; import com.example.umc.mission.apiPayload.exception.handler.StoreHandler; import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.Store; +import com.example.umc.mission.domain.mapping.MembersMission; +import com.example.umc.mission.repository.MemberRepository; +import com.example.umc.mission.repository.MembersMissionRepository; import com.example.umc.mission.repository.MissionRepository; import com.example.umc.mission.repository.StoreRepository; import lombok.RequiredArgsConstructor; @@ -20,10 +25,34 @@ public class MissionQueryServiceImpl implements MissionQueryService{ private final StoreRepository storeRepository; + private final MembersMissionRepository membersMissionRepository; + + private final MemberRepository memberRepository; + @Override public Page getMissions(Long StoreId, Integer page){ Store store = storeRepository.findById(StoreId) .orElseThrow(()->new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); return missionRepository.findAllByStore(store, PageRequest.of(page,10)); } + + + @Override + public boolean checkMembersMission(Long missionId, Long memberId){ + Member member = memberRepository.findById(memberId) + .orElseThrow(()->new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); + Mission mission = missionRepository.findById(missionId) + .orElseThrow(()->new MissionHandler(ErrorStatus.MISSION_NOT_FOUND)); + return membersMissionRepository.existsByMissionAndMember(mission, member); + } + + @Override + public MembersMission getMembersMission(Long missionId, Long memberId){ + Member member = memberRepository.findById(memberId) + .orElseThrow(()->new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); + Mission mission = missionRepository.findById(missionId) + .orElseThrow(()->new MissionHandler(ErrorStatus.MISSION_NOT_FOUND)); + return membersMissionRepository.findByMissionAndMember(mission, member); + } + } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java index d8cd9c0..ff06302 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/StoreService/StoreQueryServiceImpl.java @@ -2,8 +2,7 @@ import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; -import com.example.umc.mission.repository.ReviewRepository; -import com.example.umc.mission.repository.StoreRepository; +import com.example.umc.mission.repository.*; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMission.java b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMission.java new file mode 100644 index 0000000..8449ae8 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMission.java @@ -0,0 +1,17 @@ +package com.example.umc.mission.validation.annotation; + +import com.example.umc.mission.validation.validator.ExistMissionValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = ExistMissionValidator.class) +@Target({ElementType.PARAMETER, ElementType.FIELD,ElementType.METHOD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistMission { + String message() default "해당미션은 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java index bc238e3..ac6828f 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/CheckMissionStatusValidator.java @@ -2,18 +2,25 @@ import com.example.umc.mission.apiPayload.code.status.ErrorStatus; import com.example.umc.mission.domain.enums.MissionStatus; +import com.example.umc.mission.domain.mapping.MembersMission; +import com.example.umc.mission.repository.MembersMissionRepository; import com.example.umc.mission.service.MissionService.MissionCommandService; +import com.example.umc.mission.service.MissionService.MissionQueryService; +import com.example.umc.mission.service.StoreService.StoreQueryService; import com.example.umc.mission.validation.annotation.CheckMissionStatus; +import com.example.umc.mission.web.dto.request.StoreRequestDTO; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import java.util.List; + @Component @RequiredArgsConstructor -public class CheckMissionStatusValidator implements ConstraintValidator { +public class CheckMissionStatusValidator implements ConstraintValidator { - private final MissionCommandService missionCommandService; + private final MissionQueryService missionQueryService; @Override public void initialize(CheckMissionStatus constraintAnnotation){ @@ -21,11 +28,12 @@ public void initialize(CheckMissionStatus constraintAnnotation){ } @Override - public boolean isValid(Long value, ConstraintValidatorContext context) { - boolean isExist = missionCommandService.existOfMission(value); + public boolean isValid(StoreRequestDTO.postChallengeDTO request, ConstraintValidatorContext context) { + boolean isExist = missionQueryService.checkMembersMission(request.getMissionId(),request.getMemberId()); if(isExist){ - boolean isValid = (missionCommandService.checkStatusOfMission(value) != MissionStatus.CHALLENGING); + MembersMission membersMission = missionQueryService.getMembersMission(request.getMissionId(), request.getMemberId()); + boolean isValid = (membersMission.getStatus() != MissionStatus.CHALLENGING); if(!isValid){ context.disableDefaultConstraintViolation(); @@ -34,11 +42,7 @@ public boolean isValid(Long value, ConstraintValidatorContext context) { return isValid; } - else{ - context.disableDefaultConstraintViolation(); - context.buildConstraintViolationWithTemplate(ErrorStatus.MISSION_NOT_FOUND.toString()).addConstraintViolation(); - } - return false; + return true; } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/validator/ExistMissionValidator.java b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/ExistMissionValidator.java new file mode 100644 index 0000000..b6a382f --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/validator/ExistMissionValidator.java @@ -0,0 +1,35 @@ +package com.example.umc.mission.validation.validator; + +import com.example.umc.mission.apiPayload.code.status.ErrorStatus; +import com.example.umc.mission.domain.enums.MissionStatus; +import com.example.umc.mission.service.MissionService.MissionCommandService; +import com.example.umc.mission.validation.annotation.ExistMission; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ExistMissionValidator implements ConstraintValidator { + + private final MissionCommandService missionCommandService; + + @Override + public void initialize(ExistMission constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(Long value, ConstraintValidatorContext context) { + boolean isValid = missionCommandService.existOfMission(value); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.MISSION_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + } + +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index 35c8f33..0d3f591 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -7,6 +7,7 @@ import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; +import com.example.umc.mission.domain.mapping.MembersMission; import com.example.umc.mission.service.MissionService.MissionCommandService; import com.example.umc.mission.service.MissionService.MissionQueryService; import com.example.umc.mission.service.ReviewService.ReviewCommandService; @@ -14,6 +15,7 @@ import com.example.umc.mission.service.StoreService.StoreQueryService; import com.example.umc.mission.validation.annotation.CheckMissionStatus; import com.example.umc.mission.validation.annotation.CheckPage; +import com.example.umc.mission.validation.annotation.ExistMember; import com.example.umc.mission.validation.annotation.ExistStore; import com.example.umc.mission.web.dto.request.MissionRequestDTO; import com.example.umc.mission.web.dto.request.StoreRequestDTO; @@ -104,9 +106,9 @@ public ApiResponse getMissionList(@Exist } //4) 가게의 미션을 도전 중인 미션에 추가 - @PutMapping("/{missionId}/challenge") - public ApiResponse challengeMission(@CheckMissionStatus @PathVariable(name = "missionId") Long missionId){ - Mission changedMission = missionCommandService.changeStatusOfMission(missionId); - return ApiResponse.onSucccess(MissionConverter.toUpdateMissionResponseDTO(changedMission)); + @PostMapping("/challenge") + public ApiResponse challengeMission(@CheckMissionStatus @RequestBody @Valid StoreRequestDTO.postChallengeDTO request){ + MembersMission challenge = missionCommandService.saveChallenge(request); + return ApiResponse.onSucccess(StoreConverter.toChallengeResponseDTO(challenge)); } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java index 7cb5c69..e69e87a 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java @@ -1,6 +1,8 @@ package com.example.umc.mission.web.dto.request; +import com.example.umc.mission.validation.annotation.CheckMissionStatus; import com.example.umc.mission.validation.annotation.ExistMember; +import com.example.umc.mission.validation.annotation.ExistMission; import com.example.umc.mission.validation.annotation.ExistStore; import jakarta.validation.constraints.*; import lombok.Getter; @@ -35,4 +37,12 @@ public static class postReviewDTO{ @ExistStore Long storeId; } + + @Getter + public static class postChallengeDTO{ + @ExistMember + Long memberId; + @ExistMission + Long missionId; + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java index e6653e2..05cd8aa 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MissionResponseDTO.java @@ -17,13 +17,4 @@ public static class addMissionResponseDTO { Long mission_id; Long store_id; } - - @Builder - @Getter - @NoArgsConstructor - @AllArgsConstructor - public static class updateMissionResponseDTO { - Long mission_id; - MissionStatus status; - } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java index 6a5a643..5942cb7 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java @@ -75,4 +75,14 @@ public static class MissionPreViewDTO{ Integer reward; } + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ChallengeResponseDTO{ + Long challengeId; + Long missionId; + Long memberId; + } + } From 3a86818a247ab66c85085c83b5a2866bb5a3c7ef Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Tue, 2 Jul 2024 18:19:59 +0900 Subject: [PATCH 15/18] =?UTF-8?q?feat=20:=20mission10=5Fapi=5F3=20?= =?UTF-8?q?=EB=A9=A4=EB=B2=84=EB=B3=84=20=EC=A7=84=ED=96=89=20=EC=A4=91?= =?UTF-8?q?=EC=9D=B8=20=EB=AF=B8=EC=85=98=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20api=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mission/converter/MemberConverter.java | 29 +++++++++++++++++++ .../repository/MembersMissionRepository.java | 3 ++ .../MemberService/MemberQueryService.java | 3 ++ .../MemberService/MemberQueryServiceImpl.java | 12 ++++++++ .../web/controller/MemberRestController.java | 18 ++++++++++++ .../web/dto/response/MemberResponseDTO.java | 25 ++++++++++++++++ 6 files changed, 90 insertions(+) diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java index 5830ab7..b274889 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/MemberConverter.java @@ -1,14 +1,43 @@ package com.example.umc.mission.converter; import com.example.umc.mission.domain.Member; +import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.enums.Gender; +import com.example.umc.mission.domain.mapping.MembersMission; import com.example.umc.mission.web.dto.request.MemberRequestDTO; import com.example.umc.mission.web.dto.response.MemberResponseDTO; +import com.example.umc.mission.web.dto.response.StoreResponseDTO; +import org.springframework.data.domain.Page; import java.util.ArrayList; +import java.util.List; public class MemberConverter { + public static MemberResponseDTO.MissionPreViewListDTO toMissionPreReviewListDTO(Page missionList) { + List missionPreViewDTOList = missionList.stream() + .map(MemberConverter::toMissionPreReviewDTO).toList(); + + return MemberResponseDTO.MissionPreViewListDTO.builder() + .isFirst(missionList.isFirst()) + .isLast(missionList.isLast()) + .totalElements(missionList.getTotalElements()) + .totalPage(missionList.getTotalPages()) + .listSize(missionPreViewDTOList.size()) + .missionList(missionPreViewDTOList) + .build(); + } + + public static MemberResponseDTO.MissionPreViewDTO toMissionPreReviewDTO(MembersMission membersMission) { + return MemberResponseDTO.MissionPreViewDTO.builder() + .storeName(membersMission.getMission().getStore().getName()) + .cond(membersMission.getMission().getCond()) + .reward(membersMission.getMission().getReward()) + .status(membersMission.getStatus()) + .build(); + } + + public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member){ return MemberResponseDTO.JoinResultDTO.builder() .memberId(member.getId()) diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java index d56ecd5..13b156f 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/MembersMissionRepository.java @@ -3,9 +3,12 @@ import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Mission; import com.example.umc.mission.domain.mapping.MembersMission; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; public interface MembersMissionRepository extends JpaRepository { boolean existsByMissionAndMember(Mission mission, Member member); MembersMission findByMissionAndMember(Mission mission, Member member); + Page findAllByMember(Member member, PageRequest pageRequest); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java index 21b2f52..7287266 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryService.java @@ -1,9 +1,12 @@ package com.example.umc.mission.service.MemberService; import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.mapping.MembersMission; import org.springframework.data.domain.Page; public interface MemberQueryService { + Page getChallengingMissionList(Long memberId, Integer page); + Page getReviewList(Long MemberId, Integer page); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java index 821f286..cf4c8a5 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/MemberService/MemberQueryServiceImpl.java @@ -4,7 +4,9 @@ import com.example.umc.mission.apiPayload.exception.handler.MemberHandler; import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.mapping.MembersMission; import com.example.umc.mission.repository.MemberRepository; +import com.example.umc.mission.repository.MembersMissionRepository; import com.example.umc.mission.repository.ReviewRepository; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -19,6 +21,8 @@ public class MemberQueryServiceImpl implements MemberQueryService{ private final ReviewRepository reviewRepository; + private final MembersMissionRepository membersMissionRepository; + @Override public Page getReviewList(Long MemberId, Integer page){ Member member = memberRepository.findById(MemberId).get(); @@ -27,4 +31,12 @@ public Page getReviewList(Long MemberId, Integer page){ return MemberPage; } + @Override + public Page getChallengingMissionList(Long memberId, Integer page){ + Member member = memberRepository.findById(memberId) + .orElseThrow(()->new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); + Page missionPage = membersMissionRepository.findAllByMember(member, PageRequest.of(page, 10)); + return missionPage; + } + } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java index 4ca23ab..2faff1c 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/MemberRestController.java @@ -5,6 +5,7 @@ import com.example.umc.mission.converter.ReviewConverter; import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.mapping.MembersMission; import com.example.umc.mission.service.MemberService.MemberCommandService; import com.example.umc.mission.service.MemberService.MemberQueryService; import com.example.umc.mission.validation.annotation.CheckPage; @@ -55,4 +56,21 @@ public ApiResponse getReviewList(@ExistM Page reviews = memberQueryService.getReviewList(memberId, page-1); return ApiResponse.onSucccess(ReviewConverter.toMemberReviewListDTO(reviews)); } + + //진행 중인 미션 조회 + @GetMapping("/{memberId}/missions/challenge") + @Operation(summary = "특정 멤버의 진행 중인 미션목록 조회 API", description = "특정 멤버의 진행 중인 미션목록을 조회하는 API이며, 페이징을 포함합니다. queryString으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "memberId", description = "멤버의 아이디, path variable") + }) + public ApiResponse getChallengingMissionList(@ExistMember @PathVariable(name = "memberId") Long memberId, @CheckPage @RequestParam(name = "page") Integer page){ + Page challengingMissions = memberQueryService.getChallengingMissionList(memberId, page-1); + return ApiResponse.onSucccess(MemberConverter.toMissionPreReviewListDTO(challengingMissions)); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java index 25bd5ba..876b36d 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/MemberResponseDTO.java @@ -1,5 +1,6 @@ package com.example.umc.mission.web.dto.response; +import com.example.umc.mission.domain.enums.MissionStatus; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -41,4 +42,28 @@ public static class ReviewPreViewDTO{ String content; } + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionPreViewListDTO{ + List missionList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionPreViewDTO{ + String storeName; + String cond; + Integer reward; + MissionStatus status; + } + } From 70fbc736d6f64105fce2e66e8d99f2ba8466d6c0 Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Thu, 18 Jul 2024 05:23:48 +0900 Subject: [PATCH 16/18] =?UTF-8?q?config=20:=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20?= =?UTF-8?q?=EC=9C=84=ED=95=9C=20s3=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- umc.mission/build.gradle | 3 +- .../umc/mission/aws/s3/AmazonS3Manager.java | 42 ++++++++++++++++ .../umc/mission/config/AmazonConfig.java | 50 +++++++++++++++++++ .../com/example/umc/mission/domain/Uuid.java | 19 +++++++ .../mission/repository/UuidRepository.java | 7 +++ 5 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/config/AmazonConfig.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/Uuid.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/UuidRepository.java diff --git a/umc.mission/build.gradle b/umc.mission/build.gradle index 4705d4b..66bac50 100644 --- a/umc.mission/build.gradle +++ b/umc.mission/build.gradle @@ -28,8 +28,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' - implementation 'io.springfox:springfox-swagger2:2.9.2' - implementation 'io.springfox:springfox-swagger-ui:2.9.2' + implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' diff --git a/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java b/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java new file mode 100644 index 0000000..7bef95e --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java @@ -0,0 +1,42 @@ +package com.example.umc.mission.aws.s3; + +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.model.ObjectMetadata; +import com.amazonaws.services.s3.model.PutObjectRequest; +import com.example.umc.mission.config.AmazonConfig; +import com.example.umc.mission.domain.Uuid; +import com.example.umc.mission.repository.UuidRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; + +@Slf4j +@Component +@RequiredArgsConstructor +public class AmazonS3Manager { + + private final AmazonS3 amazonS3; + + private final AmazonConfig amazonConfig; + + private final UuidRepository uuidRepository; + + public String generateReviewKeyName(Uuid uuid){ + return amazonConfig.getReviewPath() + '/' + uuid.getUuid(); + } + + public String uploadFile(String keyName, MultipartFile file){ + ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentLength(file.getSize()); + try{ + amazonS3.putObject(new PutObjectRequest(amazonConfig.getBucket(),keyName,file.getInputStream(), metadata)); + }catch (IOException e){ + log.error("error at AmazonS3Manager uploadFile : {}",(Object) e.getStackTrace()); + } + return null; + } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/config/AmazonConfig.java b/umc.mission/src/main/java/com/example/umc/mission/config/AmazonConfig.java new file mode 100644 index 0000000..c2b5bfa --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/config/AmazonConfig.java @@ -0,0 +1,50 @@ +package com.example.umc.mission.config; + +import com.amazonaws.auth.AWSCredentials; +import com.amazonaws.auth.AWSCredentialsProvider; +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import jakarta.annotation.PostConstruct; +import lombok.Getter; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@Getter +public class AmazonConfig { + + private AWSCredentials awsCredentials; + + @Value("${cloud.aws.credentials.accessKey}") + private String accesskey; + + @Value("${cloud.aws.credentials.secretKey}") + private String secretkey; + + @Value("${cloud.aws.region.static}") + private String region; + + @Value("${cloud.aws.s3.bucket}") + private String bucket; + + @Value("${cloud.aws.s3.path.review}") + private String reviewPath; + + @PostConstruct + public void init() { this.awsCredentials = new BasicAWSCredentials(accesskey, secretkey); } + + @Bean + public AmazonS3 s3Client() { + AWSCredentials awsCredentials1 = new BasicAWSCredentials(accesskey,secretkey); + return AmazonS3ClientBuilder.standard() + .withRegion(region) + .withCredentials(new AWSStaticCredentialsProvider(awsCredentials1)) + .build(); + } + + @Bean + public AWSCredentialsProvider awsCredentialsProvider(){ return new AWSStaticCredentialsProvider(awsCredentials); } +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Uuid.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Uuid.java new file mode 100644 index 0000000..141b4ff --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Uuid.java @@ -0,0 +1,19 @@ +package com.example.umc.mission.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@Getter +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Uuid{ + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(unique = true) + private String uuid; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/UuidRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/UuidRepository.java new file mode 100644 index 0000000..a5433f4 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/UuidRepository.java @@ -0,0 +1,7 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.Uuid; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UuidRepository extends JpaRepository { +} From 33b6fa826c13e49b4e395d8608e055db20ee8dae Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Thu, 18 Jul 2024 11:15:36 +0900 Subject: [PATCH 17/18] =?UTF-8?q?refactor=20:=20=EB=A6=AC=EB=B7=B0=20API,?= =?UTF-8?q?=20=EC=82=AC=EC=A7=84=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umc/mission/aws/s3/AmazonS3Manager.java | 1 + .../mission/converter/ReviewConverter.java | 8 ++++++ .../umc/mission/domain/ReviewImage.java | 22 ++++++++++++++++ .../repository/ReviewImageRepository.java | 7 +++++ .../ReviewService/ReviewCommandService.java | 3 ++- .../ReviewCommandServiceImpl.java | 26 ++++++++++++++++--- .../validation/annotation/ExistMember.java | 2 +- .../web/controller/StoreRestController.java | 9 ++++--- .../web/dto/request/StoreRequestDTO.java | 1 + 9 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java create mode 100644 umc.mission/src/main/java/com/example/umc/mission/repository/ReviewImageRepository.java diff --git a/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java b/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java index 7bef95e..9013470 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java +++ b/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java @@ -31,6 +31,7 @@ public String generateReviewKeyName(Uuid uuid){ public String uploadFile(String keyName, MultipartFile file){ ObjectMetadata metadata = new ObjectMetadata(); + metadata.setContentType(file.getContentType()); metadata.setContentLength(file.getSize()); try{ amazonS3.putObject(new PutObjectRequest(amazonConfig.getBucket(),keyName,file.getInputStream(), metadata)); diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java index c5acaf5..09837ae 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java @@ -2,6 +2,7 @@ import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Review; +import com.example.umc.mission.domain.ReviewImage; import com.example.umc.mission.domain.Store; import com.example.umc.mission.web.dto.request.StoreRequestDTO; import com.example.umc.mission.web.dto.response.MemberResponseDTO; @@ -77,4 +78,11 @@ public static Review toReivew(StoreRequestDTO.postReviewDTO request, Store store .member(member) .build(); } + + public static ReviewImage toReviewImage(String pictureUrl, Review review){ + return ReviewImage.builder() + .review(review) + .pictureUrl(pictureUrl) + .build(); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java b/umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java new file mode 100644 index 0000000..cfe0b99 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java @@ -0,0 +1,22 @@ +package com.example.umc.mission.domain; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ReviewImage { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String pictureUrl; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewImageRepository.java b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewImageRepository.java new file mode 100644 index 0000000..243dfd2 --- /dev/null +++ b/umc.mission/src/main/java/com/example/umc/mission/repository/ReviewImageRepository.java @@ -0,0 +1,7 @@ +package com.example.umc.mission.repository; + +import com.example.umc.mission.domain.ReviewImage; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReviewImageRepository extends JpaRepository { +} diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java index 0883b6d..b876080 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java @@ -2,8 +2,9 @@ import com.example.umc.mission.domain.Review; import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import org.springframework.web.multipart.MultipartFile; public interface ReviewCommandService { - public Review saveReview(StoreRequestDTO.postReviewDTO request); + public Review saveReview(StoreRequestDTO.postReviewDTO request, MultipartFile reviewPicture); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java index de48f62..652d4f9 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java @@ -3,18 +3,23 @@ import com.example.umc.mission.apiPayload.code.status.ErrorStatus; import com.example.umc.mission.apiPayload.exception.handler.MemberHandler; import com.example.umc.mission.apiPayload.exception.handler.StoreHandler; +import com.example.umc.mission.aws.s3.AmazonS3Manager; import com.example.umc.mission.converter.ReviewConverter; import com.example.umc.mission.domain.Member; import com.example.umc.mission.domain.Review; import com.example.umc.mission.domain.Store; -import com.example.umc.mission.repository.MemberRepository; -import com.example.umc.mission.repository.ReviewRepository; -import com.example.umc.mission.repository.StoreRepository; +import com.example.umc.mission.domain.Uuid; +import com.example.umc.mission.repository.*; import com.example.umc.mission.web.dto.request.StoreRequestDTO; +import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.util.UUID; @Service +@Transactional @RequiredArgsConstructor public class ReviewCommandServiceImpl implements ReviewCommandService{ @@ -24,12 +29,25 @@ public class ReviewCommandServiceImpl implements ReviewCommandService{ private final StoreRepository storeRepository; - public Review saveReview(StoreRequestDTO.postReviewDTO request){ + private final AmazonS3Manager s3Manager; + + private final UuidRepository uuidRepository; + + private final ReviewImageRepository reviewImageRepository; + + public Review saveReview(StoreRequestDTO.postReviewDTO request, MultipartFile reviewPicture){ Store store = storeRepository.findById(request.getStoreId()).orElseThrow(()->new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); Member member =memberRepository.findById(request.getUserId()).orElseThrow(()->new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); Review newReview = ReviewConverter.toReivew(request, store, member); + String uuid = UUID.randomUUID().toString(); + Uuid saveUuid = uuidRepository.save(Uuid.builder() + .uuid(uuid).build()); + + String pictureUrl = s3Manager.uploadFile(s3Manager.generateReviewKeyName(saveUuid), reviewPicture); + + reviewImageRepository.save(ReviewConverter.toReviewImage(pictureUrl,newReview)); return reviewRepository.save(newReview); } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java index c7913e4..67aac38 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java +++ b/umc.mission/src/main/java/com/example/umc/mission/validation/annotation/ExistMember.java @@ -3,7 +3,7 @@ import com.example.umc.mission.validation.validator.MemberExistValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; -import net.bytebuddy.build.RepeatedAnnotationPlugin; +//import net.bytebuddy.build.RepeatedAnnotationPlugin; import java.lang.annotation.*; diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index 0d3f591..bcd5434 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -32,6 +32,7 @@ import org.springframework.data.domain.Page; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; @RestController @RequiredArgsConstructor @@ -57,9 +58,11 @@ public ApiResponse addStore(@RequestBody @ } //2) 가게에 리뷰 추가하기 - @PostMapping("/review") - public ApiResponse postReview(@RequestBody @Valid StoreRequestDTO.postReviewDTO request){ - Review review = reviewCommandService.saveReview(request); + @PostMapping(value = "/review", consumes = "multipart/form-data") + public ApiResponse postReview( + @Valid @RequestPart @Parameter(schema =@Schema(type = "string", format = "binary")) StoreRequestDTO.postReviewDTO request, + @RequestPart MultipartFile reviewPicture){ + Review review = reviewCommandService.saveReview(request, reviewPicture); return ApiResponse.onSucccess(ReviewConverter.toReviewResponseDTO(review)); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java index e69e87a..19d3e65 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/request/StoreRequestDTO.java @@ -6,6 +6,7 @@ import com.example.umc.mission.validation.annotation.ExistStore; import jakarta.validation.constraints.*; import lombok.Getter; +import org.springframework.web.multipart.MultipartFile; public class StoreRequestDTO { From 424c7d4744c601064726885fc7b729b8a903a76a Mon Sep 17 00:00:00 2001 From: hyoinkang Date: Sun, 21 Jul 2024 23:29:01 +0900 Subject: [PATCH 18/18] =?UTF-8?q?feat=20:=20=EB=A6=AC=EB=B7=B0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20API=20=EA=B5=AC=ED=98=84=20+=20s3=20=EC=82=AC?= =?UTF-8?q?=EC=A7=84=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiPayload/code/status/ErrorStatus.java | 1 + .../umc/mission/aws/s3/AmazonS3Manager.java | 15 ++++++++++++++- .../umc/mission/converter/ReviewConverter.java | 7 +++++++ .../com/example/umc/mission/domain/Review.java | 5 +++++ .../example/umc/mission/domain/ReviewImage.java | 2 +- .../ReviewService/ReviewCommandService.java | 2 ++ .../ReviewService/ReviewCommandServiceImpl.java | 11 +++++++++++ .../web/controller/StoreRestController.java | 16 ++++++++++++++++ .../web/dto/response/StoreResponseDTO.java | 9 +++++++++ 9 files changed, 66 insertions(+), 2 deletions(-) diff --git a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java index 42311b9..a4ad0cc 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java +++ b/umc.mission/src/main/java/com/example/umc/mission/apiPayload/code/status/ErrorStatus.java @@ -31,6 +31,7 @@ public enum ErrorStatus implements BaseErrorCode { //가게 에러 STORE_NOT_FOUND(HttpStatus.BAD_REQUEST, "STORE4001", "해당하는 가게가 존재하지 않습니다."), + REVIEW_NOT_FOUND(HttpStatus.BAD_REQUEST, "REVIEW4001", "해당하는 리뷰가 존재하지 않습니다."), //미션 에러 MISSION_NOT_FOUND(HttpStatus.BAD_REQUEST, "MISSION4001", "미션이 존재하지 않습니다."), diff --git a/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java b/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java index 9013470..5b77937 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java +++ b/umc.mission/src/main/java/com/example/umc/mission/aws/s3/AmazonS3Manager.java @@ -1,6 +1,8 @@ package com.example.umc.mission.aws.s3; +import com.amazonaws.SdkClientException; import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.model.DeleteObjectRequest; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import com.example.umc.mission.config.AmazonConfig; @@ -38,6 +40,17 @@ public String uploadFile(String keyName, MultipartFile file){ }catch (IOException e){ log.error("error at AmazonS3Manager uploadFile : {}",(Object) e.getStackTrace()); } - return null; + return amazonS3.getUrl(amazonConfig.getBucket(), keyName).toString(); + } + + public void deleteImage(String fileUrl){ + try{ + String splitStr = ".com/"; + String fileName = fileUrl.substring(fileUrl.lastIndexOf(splitStr) + splitStr.length()); + amazonS3.deleteObject(new DeleteObjectRequest(amazonConfig.getBucket(), fileName)); + } + catch(SdkClientException e){ + log.error("Error deleting file from s3"); + } } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java index 09837ae..a4fd398 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java +++ b/umc.mission/src/main/java/com/example/umc/mission/converter/ReviewConverter.java @@ -85,4 +85,11 @@ public static ReviewImage toReviewImage(String pictureUrl, Review review){ .pictureUrl(pictureUrl) .build(); } + + public static StoreResponseDTO.DeleteReviewDTO toDeleteReviewDTO(Long storeId){ + return StoreResponseDTO.DeleteReviewDTO.builder() + .storeId(storeId) + .text("해당 리뷰가 삭제되었습니다.") + .build(); + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java b/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java index 850e80a..82a1d58 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/Review.java @@ -5,6 +5,9 @@ import jakarta.validation.constraints.Min; import lombok.*; +import java.util.ArrayList; +import java.util.List; + @Entity @Getter @Builder @@ -35,5 +38,7 @@ public class Review { @JoinColumn(name = "store_id") private Store store; + @OneToOne(mappedBy = "review",fetch = FetchType.LAZY,cascade = CascadeType.ALL) + private ReviewImage reviewImage; } diff --git a/umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java b/umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java index cfe0b99..240e366 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java +++ b/umc.mission/src/main/java/com/example/umc/mission/domain/ReviewImage.java @@ -16,7 +16,7 @@ public class ReviewImage { private String pictureUrl; - @OneToOne(fetch = FetchType.LAZY) + @OneToOne @JoinColumn(name = "review_id") private Review review; } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java index b876080..1626b66 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandService.java @@ -7,4 +7,6 @@ public interface ReviewCommandService { public Review saveReview(StoreRequestDTO.postReviewDTO request, MultipartFile reviewPicture); + + public Long deleteReview(Long reviewId); } diff --git a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java index 652d4f9..e07a6df 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java +++ b/umc.mission/src/main/java/com/example/umc/mission/service/ReviewService/ReviewCommandServiceImpl.java @@ -47,7 +47,18 @@ public Review saveReview(StoreRequestDTO.postReviewDTO request, MultipartFile re String pictureUrl = s3Manager.uploadFile(s3Manager.generateReviewKeyName(saveUuid), reviewPicture); + reviewImageRepository.save(ReviewConverter.toReviewImage(pictureUrl,newReview)); return reviewRepository.save(newReview); } + + public Long deleteReview(Long reviewId){ + + Review review = reviewRepository.findById(reviewId).orElseThrow(()->new StoreHandler(ErrorStatus.REVIEW_NOT_FOUND)); + s3Manager.deleteImage(review.getReviewImage().getPictureUrl()); + + Long storeId = review.getStore().getId(); + reviewRepository.delete(review); + return storeId; + } } diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java index bcd5434..38acea6 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/controller/StoreRestController.java @@ -84,6 +84,22 @@ public ApiResponse getReviewList(@ExistSt //return null; } + //리뷰 삭제 + @DeleteMapping("/{reviewId}/delete") + @Operation(summary = "특정 가게의 리뷰 삭제 API", description = "특정 리뷰를 삭제하는 API입니다. queryString 으로 reviewId를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "reviewId", description = "삭제할 리뷰의 아이디, path variable") + }) + public ApiResponse deleteReview(@PathVariable Long reviewId){ + return ApiResponse.onSucccess(ReviewConverter.toDeleteReviewDTO(reviewCommandService.deleteReview(reviewId))); + } + //3) 가게에 미션 추가하기 @PostMapping("/mission") public ApiResponse postMission(@RequestBody @Valid MissionRequestDTO.addMissionDTO request){ diff --git a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java index 5942cb7..b95be8c 100644 --- a/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java +++ b/umc.mission/src/main/java/com/example/umc/mission/web/dto/response/StoreResponseDTO.java @@ -85,4 +85,13 @@ public static class ChallengeResponseDTO{ Long memberId; } + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class DeleteReviewDTO{ + Long storeId; + String text; + } + }