diff --git a/jhjalison01/chapter4/.gitattributes b/jhjalison01/chapter4/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/jhjalison01/chapter4/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/jhjalison01/chapter4/.gitignore b/jhjalison01/chapter4/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/jhjalison01/chapter4/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/jhjalison01/chapter4/build.gradle b/jhjalison01/chapter4/build.gradle new file mode 100644 index 0000000..a0fa333 --- /dev/null +++ b/jhjalison01/chapter4/build.gradle @@ -0,0 +1,72 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.6' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' +description = 'Demo project for Spring Boot' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // QueryDSL : OpenFeign + implementation "io.github.openfeign.querydsl:querydsl-jpa:7.0" + implementation "io.github.openfeign.querydsl:querydsl-core:7.0" + annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:7.0:jpa" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.8.13' + + // Validation + implementation 'org.springframework.boot:spring-boot-starter-validation' +} + +tasks.named('test') { + useJUnitPlatform() +} + +// QueryDSL 관련 설정 +// generated/querydsl 폴더 생성 & 삽입 +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +// 소스 세트에 생성 경로 추가 (구체적인 경로 지정) +sourceSets { + main.java.srcDirs += [ querydslDir ] +} + +// 컴파일 시 생성 경로 지정 +tasks.withType(JavaCompile).configureEach { + options.generatedSourceOutputDirectory.set(querydslDir) +} + +// clean 태스크에 생성 폴더 삭제 로직 추가 +clean.doLast { + file(querydslDir).deleteDir() +} diff --git a/jhjalison01/chapter4/gradle/wrapper/gradle-wrapper.jar b/jhjalison01/chapter4/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/jhjalison01/chapter4/gradle/wrapper/gradle-wrapper.jar differ diff --git a/jhjalison01/chapter4/gradle/wrapper/gradle-wrapper.properties b/jhjalison01/chapter4/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/jhjalison01/chapter4/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/jhjalison01/chapter4/gradlew b/jhjalison01/chapter4/gradlew new file mode 100644 index 0000000..23d15a9 --- /dev/null +++ b/jhjalison01/chapter4/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/jhjalison01/chapter4/gradlew.bat b/jhjalison01/chapter4/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/jhjalison01/chapter4/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/jhjalison01/chapter4/settings.gradle b/jhjalison01/chapter4/settings.gradle new file mode 100644 index 0000000..1cccfaf --- /dev/null +++ b/jhjalison01/chapter4/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'chapter4' diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/Chapter4Application.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/Chapter4Application.java new file mode 100644 index 0000000..0897a54 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/Chapter4Application.java @@ -0,0 +1,15 @@ +package com.example.chapter4; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class Chapter4Application { + + public static void main(String[] args) { + SpringApplication.run(Chapter4Application.class, args); + } + +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/controller/MemberController.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/controller/MemberController.java new file mode 100644 index 0000000..8e95f92 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/controller/MemberController.java @@ -0,0 +1,27 @@ +package com.example.chapter4.domain.member.controller; + +import com.example.chapter4.domain.member.dto.req.MemberReqDto; +import com.example.chapter4.domain.member.dto.res.MemberResDto; +import com.example.chapter4.domain.member.exception.code.MemberSuccessCode; +import com.example.chapter4.domain.member.service.command.MemberCommandService; +import com.example.chapter4.global.apiPayLoad.ApiResponse; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +public class MemberController { + + private final MemberCommandService memberCommandService; + + // 회원가입 + @PostMapping("/sign-up") + public ApiResponse signUp( + @RequestBody @Valid MemberReqDto.JoinDto dto + ){ + return ApiResponse.onSuccess(MemberSuccessCode.FOUND, memberCommandService.signup(dto)); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/converter/MemberConverter.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/converter/MemberConverter.java new file mode 100644 index 0000000..8d0a9da --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/converter/MemberConverter.java @@ -0,0 +1,30 @@ +package com.example.chapter4.domain.member.converter; + +import com.example.chapter4.domain.member.dto.req.MemberReqDto; +import com.example.chapter4.domain.member.dto.res.MemberResDto; +import com.example.chapter4.domain.member.entity.Member; + +public class MemberConverter { + // Entity -> DTO + public static MemberResDto.JoinDto toJoinDto( + Member member + ){ + return MemberResDto.JoinDto.builder() + .memberId(member.getId()) + .createAt(member.getCreatedAt()) + .build(); + } + + // DTO -> Entity + public static Member toMember( + MemberReqDto.JoinDto dto + ){ + return Member.builder() + .name(dto.name()) + .birth(dto.birth()) + .address(dto.address()) + //.detailAddress(dto.specAddress()) + .gender(dto.gender()) + .build(); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/MyPageInfoDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/MyPageInfoDto.java new file mode 100644 index 0000000..bb1db82 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/MyPageInfoDto.java @@ -0,0 +1,13 @@ +package com.example.chapter4.domain.member.dto; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public class MyPageInfoDto { + private final String name; + private final String email; + private final String phoneNum; + private final Integer point; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/req/MemberReqDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/req/MemberReqDto.java new file mode 100644 index 0000000..9a92731 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/req/MemberReqDto.java @@ -0,0 +1,26 @@ +package com.example.chapter4.domain.member.dto.req; + +import com.example.chapter4.domain.member.enums.Gender; +import com.example.chapter4.global.annotation.ExistFoods; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +import java.time.LocalDate; +import java.util.List; + +public class MemberReqDto { + public record JoinDto( + @NotBlank + String name, + @NotNull + Gender gender, + @NotNull + LocalDate birth, + @NotNull + String address, + @NotNull + String specAddress, + @ExistFoods + List preferCategory + ){} +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/res/MemberResDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/res/MemberResDto.java new file mode 100644 index 0000000..aec707c --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/dto/res/MemberResDto.java @@ -0,0 +1,13 @@ +package com.example.chapter4.domain.member.dto.res; + +import lombok.Builder; + +import java.time.LocalDateTime; + +public class MemberResDto { + @Builder + public record JoinDto( + Long memberId, + LocalDateTime createAt + ){} +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Food.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Food.java new file mode 100644 index 0000000..64b1745 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Food.java @@ -0,0 +1,30 @@ +package com.example.chapter4.domain.member.entity; + + +import com.example.chapter4.domain.member.entity.mapping.MemberFood; +import com.example.chapter4.domain.member.enums.FoodName; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "food") +public class Food { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name",nullable = false) + @Enumerated(EnumType.STRING) + private FoodName name; + + @OneToMany(mappedBy = "food") + private List memberFoodList = new ArrayList<>(); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Member.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Member.java new file mode 100644 index 0000000..2a333af --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Member.java @@ -0,0 +1,78 @@ +package com.example.chapter4.domain.member.entity; + +import com.example.chapter4.domain.member.entity.mapping.MemberFood; +import com.example.chapter4.domain.member.entity.mapping.MemberTerm; +import com.example.chapter4.domain.member.enums.Gender; +import com.example.chapter4.domain.member.enums.Status; +import com.example.chapter4.domain.mission.entity.mapping.MemberMission; +import com.example.chapter4.domain.review.entity.Review; +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member") +@EntityListeners(AuditingEntityListener.class) +public class Member extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", length = 3, nullable = false) + private String name; + + @Column(name = "gender", nullable = false) + @Enumerated(EnumType.STRING) + @Builder.Default + private Gender gender = Gender.NONE; + + @Column(name = "birth", nullable = false) + private LocalDate birth; + + @Column(name = "location", nullable = false) + private String location; + + @Column(name = "address", nullable = false) + private String address; + + @Column(name = "point", nullable = false) + private int point; + + @Column(name = "email", nullable = false) + private String email; + + @Column(name = "phone_num", nullable = false) + private String phoneNum; + + @Column(name = "status", nullable = false) + @Enumerated(EnumType.STRING) + private Status status; + + @Column(name = "inactive_data", nullable = false) + private LocalDateTime inactiveData; + + @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + private List memberFoodList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + private List memberTermList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + private List memberMissionList = new ArrayList<>(); + + @OneToMany(mappedBy = "member") + private List reviewList = new ArrayList<>(); + + +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Term.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Term.java new file mode 100644 index 0000000..2c9ee4d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/Term.java @@ -0,0 +1,29 @@ +package com.example.chapter4.domain.member.entity; + +import com.example.chapter4.domain.member.entity.mapping.MemberTerm; +import com.example.chapter4.domain.member.enums.TermName; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "term") +public class Term { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name",nullable = false) + @Enumerated(EnumType.STRING) + private TermName name; + + @OneToMany(mappedBy = "term") + private List memberTermList = new ArrayList<>(); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/mapping/MemberFood.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/mapping/MemberFood.java new file mode 100644 index 0000000..def099c --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/mapping/MemberFood.java @@ -0,0 +1,27 @@ +package com.example.chapter4.domain.member.entity.mapping; + +import com.example.chapter4.domain.member.entity.Food; +import com.example.chapter4.domain.member.entity.Member; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_food") +public class MemberFood { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food food; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/mapping/MemberTerm.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/mapping/MemberTerm.java new file mode 100644 index 0000000..ba78924 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/entity/mapping/MemberTerm.java @@ -0,0 +1,28 @@ +package com.example.chapter4.domain.member.entity.mapping; + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.member.entity.Term; +import jakarta.persistence.*; +import lombok.*; + + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_term") +public class MemberTerm { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "term_id") + private Term term; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/FoodName.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/FoodName.java new file mode 100644 index 0000000..d2a7e1d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/FoodName.java @@ -0,0 +1,7 @@ +package com.example.chapter4.domain.member.enums; + +public enum FoodName { + KOREAN_FOOD, + CHINESE_FOOD, + JAPANESE_FOOD +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/Gender.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/Gender.java new file mode 100644 index 0000000..2c1d10d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/Gender.java @@ -0,0 +1,5 @@ +package com.example.chapter4.domain.member.enums; + +public enum Gender { + MALE, FEMALE, NONE +} \ No newline at end of file diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/Status.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/Status.java new file mode 100644 index 0000000..f35ce55 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/Status.java @@ -0,0 +1,7 @@ +package com.example.chapter4.domain.member.enums; + +public enum Status { + IN_USE, + DELETE_REQUESTED, + DELETED +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/TermName.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/TermName.java new file mode 100644 index 0000000..dc8f4e2 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/enums/TermName.java @@ -0,0 +1,6 @@ +package com.example.chapter4.domain.member.enums; + +public enum TermName { + LOCATION, + MARKETING +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/FoodException.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/FoodException.java new file mode 100644 index 0000000..8deb640 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/FoodException.java @@ -0,0 +1,10 @@ +package com.example.chapter4.domain.member.exception; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import com.example.chapter4.global.apiPayLoad.exception.GeneralException; + +public class FoodException extends GeneralException { + public FoodException(BaseErrorCode code){ + super(code); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/MemberException.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/MemberException.java new file mode 100644 index 0000000..597dfc4 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/MemberException.java @@ -0,0 +1,10 @@ +package com.example.chapter4.domain.member.exception; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import com.example.chapter4.global.apiPayLoad.exception.GeneralException; + +public class MemberException extends GeneralException { + public MemberException(BaseErrorCode code){ + super(code); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/FoodErrorCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/FoodErrorCode.java new file mode 100644 index 0000000..07d2902 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/FoodErrorCode.java @@ -0,0 +1,19 @@ +package com.example.chapter4.domain.member.exception.code; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum FoodErrorCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.NOT_FOUND, + "FOOD404_1", + "해당 음식을 찾지 못했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/MemberErrorCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/MemberErrorCode.java new file mode 100644 index 0000000..8396dd2 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/MemberErrorCode.java @@ -0,0 +1,19 @@ +package com.example.chapter4.domain.member.exception.code; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MemberErrorCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.NOT_FOUND, + "MEMBER404_1", + "해당 사용자를 찾지 못했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/MemberSuccessCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/MemberSuccessCode.java new file mode 100644 index 0000000..c832ca8 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/exception/code/MemberSuccessCode.java @@ -0,0 +1,19 @@ +package com.example.chapter4.domain.member.exception.code; + +import com.example.chapter4.global.apiPayLoad.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MemberSuccessCode implements BaseSuccessCode { + FOUND(HttpStatus.OK, + "MEMBER200_1", + "성공적으로 사용자를 조회했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/FoodRepository.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/FoodRepository.java new file mode 100644 index 0000000..3c7ff01 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/FoodRepository.java @@ -0,0 +1,7 @@ +package com.example.chapter4.domain.member.repository; + +import com.example.chapter4.domain.member.entity.Food; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FoodRepository extends JpaRepository { +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/MemberFoodRepository.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/MemberFoodRepository.java new file mode 100644 index 0000000..f0b5fce --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/MemberFoodRepository.java @@ -0,0 +1,7 @@ +package com.example.chapter4.domain.member.repository; + +import com.example.chapter4.domain.member.entity.mapping.MemberFood; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberFoodRepository extends JpaRepository { +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/MemberRepository.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..4fbbb1e --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/repository/MemberRepository.java @@ -0,0 +1,14 @@ +package com.example.chapter4.domain.member.repository; + +import com.example.chapter4.domain.member.dto.MyPageInfoDto; +import com.example.chapter4.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface MemberRepository extends JpaRepository { + + //마이페이지 정보 조회 + @Query("SELECT new com.example.chapter4.domain.member.dto.MyPageInfoDto(m.name, m.email, m.phoneNum, m.point) FROM Member m WHERE m.id = :memberId") + MyPageInfoDto findMyPageInfoById(@Param("memberId") Long memberId); +} \ No newline at end of file diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/MemberService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/MemberService.java new file mode 100644 index 0000000..9182673 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/MemberService.java @@ -0,0 +1,24 @@ +package com.example.chapter4.domain.member.service; + +import com.example.chapter4.domain.member.dto.MyPageInfoDto; +import com.example.chapter4.domain.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberService { + private final MemberRepository memberRepository; + + //마이페이지 정보 조회 + public MyPageInfoDto getMyPageInfo(Long memberId) { + MyPageInfoDto memberInfo = memberRepository.findMyPageInfoById(memberId); + + return new MyPageInfoDto( + memberInfo.getName(), + memberInfo.getEmail(), + memberInfo.getPhoneNum(), + memberInfo.getPoint() + ); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/command/MemberCommandService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/command/MemberCommandService.java new file mode 100644 index 0000000..8587079 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/command/MemberCommandService.java @@ -0,0 +1,8 @@ +package com.example.chapter4.domain.member.service.command; + +import com.example.chapter4.domain.member.dto.req.MemberReqDto; +import com.example.chapter4.domain.member.dto.res.MemberResDto; + +public interface MemberCommandService { + MemberResDto.JoinDto signup(MemberReqDto.JoinDto dto); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/command/MemberCommandServiceImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/command/MemberCommandServiceImpl.java new file mode 100644 index 0000000..363de42 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/command/MemberCommandServiceImpl.java @@ -0,0 +1,74 @@ +package com.example.chapter4.domain.member.service.command; + +import com.example.chapter4.domain.member.converter.MemberConverter; +import com.example.chapter4.domain.member.dto.req.MemberReqDto; +import com.example.chapter4.domain.member.dto.res.MemberResDto; +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.member.entity.mapping.MemberFood; +import com.example.chapter4.domain.member.exception.FoodException; +import com.example.chapter4.domain.member.exception.code.FoodErrorCode; +import com.example.chapter4.domain.member.repository.FoodRepository; +import com.example.chapter4.domain.member.repository.MemberFoodRepository; +import com.example.chapter4.domain.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class MemberCommandServiceImpl implements MemberCommandService{ + + private final MemberRepository memberRepository; + private final MemberFoodRepository memberFoodRepository; + private final FoodRepository foodRepository; + + // 회원가입 + @Override + public MemberResDto.JoinDto signup(MemberReqDto.JoinDto dto){ + // 사용자 생성 + Member member = MemberConverter.toMember(dto); + // DB 적용 + memberRepository.save(member); + + // 선호 음식 존재 여부 확인 + if (dto.preferCategory().size() > 1){ + List memberFoodList = new ArrayList<>(); + + // 선호 음식 ID별 조회 +// for (Long id : dto.preferCategory()){ +// +// // 음식 존재 여부 검증 +// Food food = foodRepository.findById(id) +// .orElseThrow(() -> new FoodException(FoodErrorCode.NOT_FOUND)); +// +// // MemberFood 엔티티 생성 (컨버터 사용해야 함) +// MemberFood memberFood = MemberFood.builder() +// .member(member) +// .food(food) +// .build(); +// +// // 사용자 - 음식 (선호 음식) 추가 +// memberFoodList.add(memberFood); +// } + + List memberFood = dto.preferCategory().stream() + .map(id -> MemberFood.builder() + .member(member) + .food(foodRepository.findById(id) + .orElseThrow(() -> new FoodException(FoodErrorCode.NOT_FOUND))) + .build() + ) + .toList(); + + // 모든 선호 음식 추가: DB 적용 + memberFoodRepository.saveAll(memberFoodList); + } + + + // 응답 DTO 생성 + return MemberConverter.toJoinDto(member); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/query/MemberQueryService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/query/MemberQueryService.java new file mode 100644 index 0000000..6c1a27f --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/query/MemberQueryService.java @@ -0,0 +1,4 @@ +package com.example.chapter4.domain.member.service.query; + +public interface MemberQueryService { +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/query/MemberQueryServiceImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/query/MemberQueryServiceImpl.java new file mode 100644 index 0000000..8dc8bdc --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/member/service/query/MemberQueryServiceImpl.java @@ -0,0 +1,4 @@ +package com.example.chapter4.domain.member.service.query; + +public class MemberQueryServiceImpl implements MemberQueryService { +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/controller/MemberMissionController.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/controller/MemberMissionController.java new file mode 100644 index 0000000..dd15dbd --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/controller/MemberMissionController.java @@ -0,0 +1,33 @@ +package com.example.chapter4.domain.mission.controller; + +import com.example.chapter4.domain.mission.converter.MemberMissionConverter; +import com.example.chapter4.domain.mission.dto.req.MemberMissionRequestDto; +import com.example.chapter4.domain.mission.dto.res.MemberMissionResponseDto; +import com.example.chapter4.domain.mission.entity.mapping.MemberMission; +import com.example.chapter4.domain.mission.service.command.MemberMissionCommandService; +import com.example.chapter4.global.apiPayLoad.ApiResponse; +import com.example.chapter4.global.apiPayLoad.code.GeneralSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/member-missions") +public class MemberMissionController { + private final MemberMissionCommandService memberMissionCommandService; + + //미션 도전하기 + @PostMapping + public ApiResponse createMemberMission( + @RequestBody MemberMissionRequestDto.CreateDto request + ) { + Long memberId = 1L; + + MemberMission memberMission = memberMissionCommandService.createMemberMission(request, memberId); + + return ApiResponse.onSuccess(GeneralSuccessCode.OK,MemberMissionConverter.toCreateResultDto(memberMission)); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/converter/MemberMissionConverter.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/converter/MemberMissionConverter.java new file mode 100644 index 0000000..c6e75af --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/converter/MemberMissionConverter.java @@ -0,0 +1,23 @@ +package com.example.chapter4.domain.mission.converter; + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.mission.dto.res.MemberMissionResponseDto; +import com.example.chapter4.domain.mission.entity.Mission; +import com.example.chapter4.domain.mission.entity.mapping.MemberMission; + +public class MemberMissionConverter { + public static MemberMission toMemberMission(Member member, Mission mission) { + return MemberMission.builder() + .member(member) + .mission(mission) + .isComplete(false) + .build(); + } + + public static MemberMissionResponseDto.CreateResultDto toCreateResultDto(MemberMission memberMission) { + return MemberMissionResponseDto.CreateResultDto.builder() + .memberMissionId(memberMission.getId()) + .createdAt(memberMission.getCreatedAt()) + .build(); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/ChallengeableMissionDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/ChallengeableMissionDto.java new file mode 100644 index 0000000..bd22087 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/ChallengeableMissionDto.java @@ -0,0 +1,19 @@ +package com.example.chapter4.domain.mission.dto; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import java.util.Date; + +@Getter +@RequiredArgsConstructor +public class ChallengeableMissionDto { + // Mission 정보 + private final int point; + private final Date deadline; + private final String content; + + // Restaurant(Store) 정보 + private final String storeType; + private final String storeName; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/CompletedMissionDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/CompletedMissionDto.java new file mode 100644 index 0000000..40e66e2 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/CompletedMissionDto.java @@ -0,0 +1,12 @@ +package com.example.chapter4.domain.mission.dto; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public class CompletedMissionDto { + private final int point; + private final String content; + private final Long userMissionId; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/InProgressMissionDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/InProgressMissionDto.java new file mode 100644 index 0000000..a42a4bc --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/InProgressMissionDto.java @@ -0,0 +1,12 @@ +package com.example.chapter4.domain.mission.dto; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public class InProgressMissionDto { + private final int point; + private final String content; + private final Long userMissionId; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/req/MemberMissionRequestDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/req/MemberMissionRequestDto.java new file mode 100644 index 0000000..1ffd860 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/req/MemberMissionRequestDto.java @@ -0,0 +1,12 @@ +package com.example.chapter4.domain.mission.dto.req; + +import jakarta.validation.constraints.NotNull; +import lombok.Getter; + +public class MemberMissionRequestDto { + @Getter + public static class CreateDto { + @NotNull + private Long missionId; // 어떤 미션에 도전할지 ID가 필요합니다. + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/res/MemberMissionResponseDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/res/MemberMissionResponseDto.java new file mode 100644 index 0000000..a02ffca --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/dto/res/MemberMissionResponseDto.java @@ -0,0 +1,19 @@ +package com.example.chapter4.domain.mission.dto.res; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class MemberMissionResponseDto { + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class CreateResultDto { + private Long memberMissionId; // 생성된 매핑 ID + private LocalDateTime createdAt; + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/entity/Mission.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/entity/Mission.java new file mode 100644 index 0000000..9945875 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/entity/Mission.java @@ -0,0 +1,45 @@ +package com.example.chapter4.domain.mission.entity; + +import com.example.chapter4.domain.member.entity.mapping.MemberFood; +import com.example.chapter4.domain.member.enums.FoodName; +import com.example.chapter4.domain.mission.entity.mapping.MemberMission; +import com.example.chapter4.domain.store.entity.Store; +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "mission") +public class Mission extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "verficiation_code", nullable = false) + private String verificationCode; + + @Column(name = "point", nullable = false) + private int point; + + @Column(name = "deadline", nullable = false) + private Date deadline; + + @Column(name = "content", nullable = false) + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission") + private List memberMissionList = new ArrayList<>(); + +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/entity/mapping/MemberMission.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/entity/mapping/MemberMission.java new file mode 100644 index 0000000..abf98b4 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/entity/mapping/MemberMission.java @@ -0,0 +1,30 @@ +package com.example.chapter4.domain.mission.entity.mapping; + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.mission.entity.Mission; +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "member_mission") +public class MemberMission extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "is_complete") + private boolean isComplete; + + @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/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/exception/MissionException.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/exception/MissionException.java new file mode 100644 index 0000000..933479d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/exception/MissionException.java @@ -0,0 +1,10 @@ +package com.example.chapter4.domain.mission.exception; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import com.example.chapter4.global.apiPayLoad.exception.GeneralException; + +public class MissionException extends GeneralException { + public MissionException(BaseErrorCode code) { + super(code); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/exception/code/MissionErrorCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..f54c6d6 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,20 @@ +package com.example.chapter4.domain.mission.exception.code; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MissionErrorCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.NOT_FOUND, + "Mission404_1", + "해당 음식을 찾지 못했습니다."), + ALREADY_CHALLENGED(HttpStatus.CONFLICT, "MISSION409_1", "이미 도전 중인 미션입니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/repository/MemberMissionRepository.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/repository/MemberMissionRepository.java new file mode 100644 index 0000000..408587d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/repository/MemberMissionRepository.java @@ -0,0 +1,43 @@ +package com.example.chapter4.domain.mission.repository; + +import com.example.chapter4.domain.mission.dto.CompletedMissionDto; +import com.example.chapter4.domain.mission.dto.InProgressMissionDto; +import com.example.chapter4.domain.mission.entity.mapping.MemberMission; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface MemberMissionRepository extends JpaRepository { + //진행중인 미션 조회 + @Query("SELECT new com.example.chapter4.domain.mission.dto.InProgressMissionDto(m.point, m.content, mm.id) " + + "FROM MemberMission mm JOIN mm.mission m " + + "WHERE mm.member.id = :memberId " + + " AND mm.isComplete = false " + + " AND mm.id < :lastCursorId " + + "ORDER BY mm.id DESC") + List findInProgressMissions( + @Param("memberId") Long memberId, + @Param("lastCursorId") Long lastCursorId, + Pageable pageable + ); + + //완료한 미션 조회 + @Query("SELECT new com.example.chapter4.domain.mission.dto.InProgressMissionDto(m.point, m.content, mm.id) " + + "FROM MemberMission mm JOIN mm.mission m " + + "WHERE mm.member.id = :memberId " + + " AND mm.isComplete = true " + + " AND mm.id < :lastCursorId " + + "ORDER BY mm.id DESC") + List findCompletedMissions( + @Param("memberId") Long memberId, + @Param("lastCursorId") Long lastCursorId, + Pageable pageable); + + //중복 확인 + boolean existsByMemberIdAndMissionId(Long memberId, Long missionId); + + +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/repository/MissionRepository.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/repository/MissionRepository.java new file mode 100644 index 0000000..cd6cbdf --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/repository/MissionRepository.java @@ -0,0 +1,29 @@ +package com.example.chapter4.domain.mission.repository; + +import com.example.chapter4.domain.mission.dto.ChallengeableMissionDto; +import com.example.chapter4.domain.mission.entity.Mission; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface MissionRepository extends JpaRepository { + + //도전 가능한 미션 조회 (페이징) + @Query("SELECT new com.example.chapter4.domain.mission.dto.ChallengeableMissionDto(m.point, m.deadline, m.content, s.type, s.name) " + + "FROM Mission m " + + "JOIN m.store s " + + "JOIN s.location l " + + "LEFT JOIN MemberMission mm ON m = mm.mission AND mm.member.id = :memberId " + + "WHERE mm.id IS NULL " + // LEFT JOIN에 아직 도전하지 않은 미션만 필터링 + " AND l.name = :locationName " + + " AND m.id < :lastCursorId " + + "ORDER BY m.id DESC") + List findChallengeableMissions( + @Param("memberId") Long memberId, + @Param("locationName") String locationName, + @Param("lastCursorId") Long lastCursorId, + Pageable pageable); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MemberMissionCommandService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MemberMissionCommandService.java new file mode 100644 index 0000000..3a5d8d4 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MemberMissionCommandService.java @@ -0,0 +1,8 @@ +package com.example.chapter4.domain.mission.service.command; + +import com.example.chapter4.domain.mission.dto.req.MemberMissionRequestDto; +import com.example.chapter4.domain.mission.entity.mapping.MemberMission; + +public interface MemberMissionCommandService { + MemberMission createMemberMission(MemberMissionRequestDto.CreateDto request, Long memberId); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MemberMissionCommandServiceImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MemberMissionCommandServiceImpl.java new file mode 100644 index 0000000..b491c42 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MemberMissionCommandServiceImpl.java @@ -0,0 +1,45 @@ +package com.example.chapter4.domain.mission.service.command; + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.member.exception.MemberException; +import com.example.chapter4.domain.member.exception.code.MemberErrorCode; +import com.example.chapter4.domain.member.repository.MemberRepository; +import com.example.chapter4.domain.mission.converter.MemberMissionConverter; +import com.example.chapter4.domain.mission.dto.req.MemberMissionRequestDto; +import com.example.chapter4.domain.mission.entity.Mission; +import com.example.chapter4.domain.mission.entity.mapping.MemberMission; +import com.example.chapter4.domain.mission.exception.MissionException; +import com.example.chapter4.domain.mission.exception.code.MissionErrorCode; +import com.example.chapter4.domain.mission.repository.MemberMissionRepository; +import com.example.chapter4.domain.mission.repository.MissionRepository; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@Transactional +public class MemberMissionCommandServiceImpl implements MemberMissionCommandService{ + private final MemberMissionRepository memberMissionRepository; + private final MemberRepository memberRepository; + private final MissionRepository missionRepository; + + @Override + public MemberMission createMemberMission(MemberMissionRequestDto.CreateDto request, Long memberId) { + + Mission mission = missionRepository.findById(request.getMissionId()) + .orElseThrow(() -> new MissionException(MissionErrorCode.NOT_FOUND)); + + if (memberMissionRepository.existsByMemberIdAndMissionId(memberId, mission.getId())) { + throw new MissionException(MissionErrorCode.ALREADY_CHALLENGED); + } + + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.NOT_FOUND)); + + // 매핑 엔티티 생성 (Converter 활용) + MemberMission memberMission = MemberMissionConverter.toMemberMission(member, mission); + + return memberMissionRepository.save(memberMission); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MissionCommandService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MissionCommandService.java new file mode 100644 index 0000000..4bef6ca --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MissionCommandService.java @@ -0,0 +1,4 @@ +package com.example.chapter4.domain.mission.service.command; + +public interface MissionCommandService { +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MissionCommandServiceImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MissionCommandServiceImpl.java new file mode 100644 index 0000000..c1aa8ca --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/command/MissionCommandServiceImpl.java @@ -0,0 +1,9 @@ +package com.example.chapter4.domain.mission.service.command; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MissionCommandServiceImpl implements MissionCommandService { +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/query/MissionQueryService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/query/MissionQueryService.java new file mode 100644 index 0000000..66a8c36 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/query/MissionQueryService.java @@ -0,0 +1,15 @@ +package com.example.chapter4.domain.mission.service.query; + +import com.example.chapter4.domain.mission.dto.ChallengeableMissionDto; +import com.example.chapter4.domain.mission.dto.CompletedMissionDto; +import com.example.chapter4.domain.mission.dto.InProgressMissionDto; + +import java.util.List; + +public interface MissionQueryService { + List getInProgressMissions(Long memberId, Long lastCursorId); + + List getCompletedMissions(Long memberId, Long lastCursorId); + + List getChallengeableMissions(Long memberId, String locationName, Long lastCursorId); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/query/MissionQueryServiceImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/query/MissionQueryServiceImpl.java new file mode 100644 index 0000000..602bd55 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/mission/service/query/MissionQueryServiceImpl.java @@ -0,0 +1,44 @@ +package com.example.chapter4.domain.mission.service.query; + +import com.example.chapter4.domain.mission.dto.ChallengeableMissionDto; +import com.example.chapter4.domain.mission.dto.CompletedMissionDto; +import com.example.chapter4.domain.mission.dto.InProgressMissionDto; +import com.example.chapter4.domain.mission.repository.MemberMissionRepository; +import com.example.chapter4.domain.mission.repository.MissionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class MissionQueryServiceImpl implements MissionQueryService { + private final MemberMissionRepository memberMissionRepository; + private final MissionRepository missionRepository; + + //진행중인 미션 가져오기 + public List getInProgressMissions(Long memberId, Long lastCursorId) { + // 첫 번째 페이지(0), 사이즈(3) + Pageable pageable = PageRequest.of(0, 3); + + return memberMissionRepository.findInProgressMissions(memberId, lastCursorId, pageable); + } + + //완료한 미션 가져오기 + public List getCompletedMissions(Long memberId, Long lastCursorId) { + // 첫 번째 페이지(0), 사이즈(3) + Pageable pageable = PageRequest.of(0, 3); + + return memberMissionRepository.findCompletedMissions(memberId, lastCursorId, pageable); + } + + //도전 가능한 미션 가져오기 + public List getChallengeableMissions(Long memberId, String locationName, Long lastCursorId) { + // Pageable 객체를 생성하여 LIMIT 3 효과를 줍니다. + Pageable pageable = PageRequest.of(0, 3); + + return missionRepository.findChallengeableMissions(memberId, locationName, lastCursorId, pageable); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/controller/ReviewController.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/controller/ReviewController.java new file mode 100644 index 0000000..bc85718 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/controller/ReviewController.java @@ -0,0 +1,45 @@ +package com.example.chapter4.domain.review.controller; + +import com.example.chapter4.domain.review.dto.req.ReviewRequestDto; +import com.example.chapter4.domain.review.dto.res.ReviewResponseDto; +import com.example.chapter4.domain.review.dto.ReviewSearchCondition; +import com.example.chapter4.domain.review.entity.Review; +import com.example.chapter4.domain.review.service.command.ReviewCommandServiceImpl; +import com.example.chapter4.domain.review.service.query.ReviewQueryServiceImpl; +import com.example.chapter4.global.apiPayLoad.ApiResponse; +import com.example.chapter4.global.apiPayLoad.code.GeneralSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/reviews") +public class ReviewController { + + private final ReviewCommandServiceImpl reviewCommandServiceImpl; + private final ReviewQueryServiceImpl reviewQueryServiceImpl; + + @GetMapping("member/{memberId}") + public ApiResponse> getMyReviews( + @PathVariable Long memberId, + @ModelAttribute ReviewSearchCondition condition // Query Parameter를 DTO로 바인딩 + ) { + + List reviews = reviewQueryServiceImpl.getMemberReviews(memberId, condition); + return ApiResponse.onSuccess(GeneralSuccessCode.OK,reviews); + } + + @PostMapping() + public ApiResponse createReview(@RequestBody ReviewRequestDto.CreateDto request) { + Review review = reviewCommandServiceImpl.createReview(request,1L); //memberId를 1로 하드코딩 + ReviewResponseDto.CreateResultDto result = ReviewResponseDto.CreateResultDto.builder() + .reviewId(review.getId()) + .createdAt(review.getCreatedAt()) + .build(); + + return ApiResponse.onSuccess(GeneralSuccessCode.OK,result); + } + +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/converter/ReviewConverter.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/converter/ReviewConverter.java new file mode 100644 index 0000000..844be47 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/converter/ReviewConverter.java @@ -0,0 +1,17 @@ +package com.example.chapter4.domain.review.converter; + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.review.dto.req.ReviewRequestDto; +import com.example.chapter4.domain.review.entity.Review; +import com.example.chapter4.domain.store.entity.Store; + +public class ReviewConverter { + public static Review toReview(Member member, Store store, ReviewRequestDto.CreateDto request) { + return Review.builder() + .member(member) + .store(store) + .content(request.getContent()) + .rating(request.getRating()) + .build(); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/ReviewSearchCondition.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/ReviewSearchCondition.java new file mode 100644 index 0000000..5fc01b7 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/ReviewSearchCondition.java @@ -0,0 +1,10 @@ +package com.example.chapter4.domain.review.dto; + +import lombok.Data; +import lombok.Getter; + +@Data +public class ReviewSearchCondition { + private Long storeId; // 가게별 필터링 + private Float rating; // 별점별 필터링 +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/req/ReviewRequestDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/req/ReviewRequestDto.java new file mode 100644 index 0000000..c48982a --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/req/ReviewRequestDto.java @@ -0,0 +1,24 @@ +package com.example.chapter4.domain.review.dto.req; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + + +public class ReviewRequestDto { + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class CreateDto { + @NotNull(message = "별점 필수") + private Float rating; + @NotBlank(message = "리뷰 내용 필수") + private String content; + @NotNull(message = "가게ID 필수") + private Long storeId; + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/res/ReviewResponseDto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/res/ReviewResponseDto.java new file mode 100644 index 0000000..91127c2 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/dto/res/ReviewResponseDto.java @@ -0,0 +1,30 @@ +package com.example.chapter4.domain.review.dto.res; + +import lombok.*; + +import java.time.LocalDateTime; + +@Data +public class ReviewResponseDto { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class CreateResultDto { + private Long reviewId; + private LocalDateTime createdAt; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewDetailDto { + private Long reviewId; + private String storeName; + private String content; + private int rating; + private LocalDateTime createdAt; + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/Reply.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/Reply.java new file mode 100644 index 0000000..12b11fd --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/Reply.java @@ -0,0 +1,24 @@ +package com.example.chapter4.domain.review.entity; + +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "reply") +public class Reply extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "content", nullable = false) + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/Review.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/Review.java new file mode 100644 index 0000000..795ee8a --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/Review.java @@ -0,0 +1,43 @@ +package com.example.chapter4.domain.review.entity; + + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.store.entity.Store; +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "review") +public class Review extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "content",nullable = false) + private String content; + + @Column(name = "rating",nullable = false) + private Float rating; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "review") + private List replyList = new ArrayList<>(); + + @OneToMany(mappedBy = "review") + private List reviewPhotoList = new ArrayList<>(); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/ReviewPhoto.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/ReviewPhoto.java new file mode 100644 index 0000000..e0c2fad --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/entity/ReviewPhoto.java @@ -0,0 +1,24 @@ +package com.example.chapter4.domain.review.entity; + +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "review_photo") +public class ReviewPhoto extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "photo_url", nullable = false) + private String photoUrl; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewQueryDsl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewQueryDsl.java new file mode 100644 index 0000000..c38e37d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewQueryDsl.java @@ -0,0 +1,18 @@ +package com.example.chapter4.domain.review.repository; + +import com.example.chapter4.domain.review.dto.res.ReviewResponseDto; +import com.example.chapter4.domain.review.dto.ReviewSearchCondition; +import com.example.chapter4.domain.review.entity.Review; +import com.querydsl.core.types.Predicate; + +import java.util.List; + +public interface ReviewQueryDsl { + + //리뷰 검색 + List searchReview( + Predicate predicate + ); + + List searchMemberReviews(Long memberId, ReviewSearchCondition condition); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewQueryDslImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewQueryDslImpl.java new file mode 100644 index 0000000..46ae256 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewQueryDslImpl.java @@ -0,0 +1,77 @@ +package com.example.chapter4.domain.review.repository; + +import com.example.chapter4.domain.review.dto.res.ReviewResponseDto; +import com.example.chapter4.domain.review.dto.ReviewSearchCondition; +import com.example.chapter4.domain.review.entity.QReview; +import com.example.chapter4.domain.review.entity.Review; +import com.example.chapter4.domain.store.entity.QLocation; +import com.example.chapter4.domain.store.entity.QStore; +import com.querydsl.core.BooleanBuilder; +import com.querydsl.core.types.Predicate; +import com.querydsl.core.types.Projections; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; + +import java.util.List; + +@RequiredArgsConstructor +public class ReviewQueryDslImpl implements ReviewQueryDsl { + + private final JPAQueryFactory queryFactory; + + @Override + public List searchReview( + Predicate predicate + ){ + + //Q클래스 선언 + QReview review = QReview.review; + QStore store = QStore.store; + QLocation location = QLocation.location; + + return queryFactory + .selectFrom(review) + .leftJoin(store).on(store.id.eq(review.store.id)) + .leftJoin(location).on(location.id.eq(store.location.id)) + .where(predicate) + .fetch(); + } + + @Override + public List searchMemberReviews(Long memberId, ReviewSearchCondition condition) { + + QReview review = QReview.review; + QStore store = QStore.store; + + BooleanBuilder builder = new BooleanBuilder(); + + // 필수: 내가 작성한 리뷰 + builder.and(review.member.id.eq(memberId)); + + // 선택 필터: 가게별 + if (condition.getStoreId() != null) { + builder.and(store.id.eq(condition.getStoreId())); + } + + // 선택 필터: 별점별 + if (condition.getRating() != null) { + builder.and(review.rating.eq(condition.getRating())); + } + + return queryFactory + .select(Projections.constructor( + ReviewResponseDto.ReviewDetailDto.class, + review.id, + review.store.id, + review.rating, + review.content, + review.createdAt + ) + ) + .leftJoin(review).on(review.store.id.eq(store.id)) + .where(builder) + .orderBy(review.createdAt.desc()) // 최신순 정렬 + .fetch(); + + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewRepository.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewRepository.java new file mode 100644 index 0000000..f9d9a10 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/repository/ReviewRepository.java @@ -0,0 +1,6 @@ +package com.example.chapter4.domain.review.repository; + +import com.example.chapter4.domain.review.entity.Review; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReviewRepository extends JpaRepository, ReviewQueryDsl{} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/command/ReviewCommandService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/command/ReviewCommandService.java new file mode 100644 index 0000000..b87dc1d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/command/ReviewCommandService.java @@ -0,0 +1,10 @@ +package com.example.chapter4.domain.review.service.command; + +import com.example.chapter4.domain.review.dto.req.ReviewRequestDto; +import com.example.chapter4.domain.review.entity.Review; + +import java.util.List; + +public interface ReviewCommandService { + Review createReview(ReviewRequestDto.CreateDto requestDto, Long memberId); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/command/ReviewCommandServiceImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/command/ReviewCommandServiceImpl.java new file mode 100644 index 0000000..ea40011 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/command/ReviewCommandServiceImpl.java @@ -0,0 +1,46 @@ +package com.example.chapter4.domain.review.service.command; + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.member.exception.MemberException; +import com.example.chapter4.domain.member.exception.code.MemberErrorCode; +import com.example.chapter4.domain.member.repository.MemberRepository; +import com.example.chapter4.domain.review.converter.ReviewConverter; +import com.example.chapter4.domain.review.dto.req.ReviewRequestDto; +import com.example.chapter4.domain.review.dto.res.ReviewResponseDto; +import com.example.chapter4.domain.review.dto.ReviewSearchCondition; +import com.example.chapter4.domain.review.entity.QReview; +import com.example.chapter4.domain.review.entity.Review; +import com.example.chapter4.domain.review.repository.ReviewRepository; +import com.example.chapter4.domain.store.entity.QLocation; +import com.example.chapter4.domain.store.entity.Store; +import com.example.chapter4.domain.store.exception.StoreException; +import com.example.chapter4.domain.store.exception.code.StoreErrorCode; +import com.example.chapter4.domain.store.repository.StoreRepository; +import com.example.chapter4.global.apiPayLoad.exception.GeneralException; +import com.querydsl.core.BooleanBuilder; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ReviewCommandServiceImpl implements ReviewCommandService { + private final ReviewRepository reviewRepository; + private final StoreRepository storeRepository; + private final MemberRepository memberRepository; + + //리뷰 작성하기 + @Override + public Review createReview(ReviewRequestDto.CreateDto request, Long memberId) { + Store store = storeRepository.findById(request.getStoreId()) + .orElseThrow(() -> new StoreException(StoreErrorCode.NOT_FOUND)); + + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.NOT_FOUND)); + + Review review = ReviewConverter.toReview(member, store, request); + + return reviewRepository.save(review); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/query/ReviewQueryService.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/query/ReviewQueryService.java new file mode 100644 index 0000000..c4dd90b --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/query/ReviewQueryService.java @@ -0,0 +1,10 @@ +package com.example.chapter4.domain.review.service.query; + +import com.example.chapter4.domain.review.dto.req.ReviewRequestDto; +import com.example.chapter4.domain.review.entity.Review; + +import java.util.List; + +public interface ReviewQueryService { + List searchReview(String query, String type); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/query/ReviewQueryServiceImpl.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/query/ReviewQueryServiceImpl.java new file mode 100644 index 0000000..7ee158f --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/review/service/query/ReviewQueryServiceImpl.java @@ -0,0 +1,58 @@ +package com.example.chapter4.domain.review.service.query; + + +import com.example.chapter4.domain.member.entity.Member; +import com.example.chapter4.domain.member.repository.MemberRepository; +import com.example.chapter4.domain.review.dto.ReviewSearchCondition; +import com.example.chapter4.domain.review.dto.req.ReviewRequestDto; +import com.example.chapter4.domain.review.dto.res.ReviewResponseDto; +import com.example.chapter4.domain.review.entity.QReview; +import com.example.chapter4.domain.review.entity.Review; +import com.example.chapter4.domain.review.repository.ReviewRepository; +import com.example.chapter4.domain.store.entity.QLocation; +import com.example.chapter4.domain.store.entity.Store; +import com.example.chapter4.domain.store.repository.StoreRepository; +import com.querydsl.core.BooleanBuilder; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +@Transactional +public class ReviewQueryServiceImpl implements ReviewQueryService { //GET 요청 전용 service + private final ReviewRepository reviewRepository; + + @Override + public List searchReview(String query, String type){ + QReview review = QReview.review; + QLocation location = QLocation.location; + + BooleanBuilder builder = new BooleanBuilder(); + + //동적 쿼리: 검색 조건 + if(type.equals("location")){ + builder.and(location.name.contains(query)); + } + if(type.equals("rating")){ + builder.and(review.rating.goe(Float.parseFloat(query))); + } + if(type.equals("both")){ + String firstQuery = query.split("&")[0]; + String secondQuery = query.split("&")[1]; + + builder.and(location.name.contains(firstQuery)); + builder.and(review.rating.goe(Float.parseFloat(secondQuery))); + } + + List reviewList = reviewRepository.searchReview(builder); + + return reviewList; + } + + public List getMemberReviews(Long memberId, ReviewSearchCondition condition) { + return reviewRepository.searchMemberReviews(memberId, condition); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/entity/Location.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/entity/Location.java new file mode 100644 index 0000000..db537d7 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/entity/Location.java @@ -0,0 +1,26 @@ +package com.example.chapter4.domain.store.entity; + +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "location") +public class Location extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", nullable = false) + private String name; + + @OneToMany(mappedBy = "location") + private List storeList = new ArrayList<>(); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/entity/Store.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/entity/Store.java new file mode 100644 index 0000000..caa1194 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/entity/Store.java @@ -0,0 +1,42 @@ +package com.example.chapter4.domain.store.entity; + +import com.example.chapter4.domain.mission.entity.Mission; +import com.example.chapter4.domain.review.entity.Review; +import com.example.chapter4.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Getter +@Table(name = "store") +public class Store extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "type", nullable = false) + private String type; + + @Column(name = "address", nullable = false) + private String address; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "location_id") + private Location location; + + @OneToMany(mappedBy = "store") + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "store") + private List missionList = new ArrayList<>(); + +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/exception/StoreException.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/exception/StoreException.java new file mode 100644 index 0000000..c501b77 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/exception/StoreException.java @@ -0,0 +1,10 @@ +package com.example.chapter4.domain.store.exception; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import com.example.chapter4.global.apiPayLoad.exception.GeneralException; + +public class StoreException extends GeneralException { + public StoreException(BaseErrorCode code) { + super(code); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/exception/code/StoreErrorCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/exception/code/StoreErrorCode.java new file mode 100644 index 0000000..533df5b --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/exception/code/StoreErrorCode.java @@ -0,0 +1,19 @@ +package com.example.chapter4.domain.store.exception.code; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum StoreErrorCode implements BaseErrorCode { + NOT_FOUND(HttpStatus.NOT_FOUND, + "STORE404_1", + "해당 가게를 찾지 못했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/repository/StoreRepository.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/repository/StoreRepository.java new file mode 100644 index 0000000..35f2eed --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/domain/store/repository/StoreRepository.java @@ -0,0 +1,7 @@ +package com.example.chapter4.domain.store.repository; + +import com.example.chapter4.domain.store.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreRepository extends JpaRepository { +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/annotation/ExistFoods.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/annotation/ExistFoods.java new file mode 100644 index 0000000..5e52217 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/annotation/ExistFoods.java @@ -0,0 +1,18 @@ +package com.example.chapter4.global.annotation; + +import com.example.chapter4.global.validator.FoodExistValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented //사용자 정의 어노테이션을 만들 때 붙임 +@Constraint(validatedBy = FoodExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) //어노테이션의 적용 범위를 지정 +@Retention(RetentionPolicy.RUNTIME) //어노테이션의 생명 주기를 지정 +public @interface ExistFoods { + //여기서 디폴트 메시지를 설정합니다. + String message() default "해당 음식이 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/ApiResponse.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/ApiResponse.java new file mode 100644 index 0000000..3f69947 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/ApiResponse.java @@ -0,0 +1,36 @@ +package com.example.chapter4.global.apiPayLoad; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import com.example.chapter4.global.apiPayLoad.code.BaseSuccessCode; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + + @JsonProperty("code") + private final String code; + + @JsonProperty("message") + private final String message; + + @JsonProperty("result") + private T result; + + // 성공한 경우 (result 포함) + public static ApiResponse onSuccess(BaseSuccessCode code, T result) { + return new ApiResponse<>(true, code.getCode(), code.getMessage(), result); + } + + // 실패한 경우 (result 포함) + public static ApiResponse onFailure(BaseErrorCode code, T result) { + return new ApiResponse<>(false, code.getCode(), code.getMessage(), result); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/BaseErrorCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/BaseErrorCode.java new file mode 100644 index 0000000..fef82b5 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/BaseErrorCode.java @@ -0,0 +1,9 @@ +package com.example.chapter4.global.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +public interface BaseErrorCode { + HttpStatus getStatus(); + String getCode(); + String getMessage(); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/BaseSuccessCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/BaseSuccessCode.java new file mode 100644 index 0000000..23d909d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/BaseSuccessCode.java @@ -0,0 +1,9 @@ +package com.example.chapter4.global.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +public interface BaseSuccessCode { + HttpStatus getStatus(); + String getCode(); + String getMessage(); +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/GeneralErrorCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/GeneralErrorCode.java new file mode 100644 index 0000000..6a7ea5d --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/GeneralErrorCode.java @@ -0,0 +1,31 @@ +package com.example.chapter4.global.apiPayLoad.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum GeneralErrorCode implements BaseErrorCode{ + BAD_REQUEST(HttpStatus.BAD_REQUEST, + "COMMON400_1", + "잘못된 요청입니다."), + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, + "AUTH401_1", + "인증이 필요합니다."), + FORBIDDEN(HttpStatus.FORBIDDEN, + "AUTH403_1", + "요청이 거부되었습니다."), + NOT_FOUND(HttpStatus.NOT_FOUND, + "COMMON404_1", + "요청한 리소스를 찾을 수 없습니다."), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, + "COMMON500_1", + "예기치 않은 서버 에러가 발생했습니다."), + VALID_FAIL(HttpStatus.BAD_REQUEST, "VALID400_1", "검증에 실패했습니다.") + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/GeneralSuccessCode.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/GeneralSuccessCode.java new file mode 100644 index 0000000..de1de6a --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/code/GeneralSuccessCode.java @@ -0,0 +1,44 @@ +package com.example.chapter4.global.apiPayLoad.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + + +public enum GeneralSuccessCode implements BaseSuccessCode{ + // 200 OK + OK(HttpStatus.OK, + "COMMON200_1", + "요청이 성공적으로 처리되었습니다."), + + // 201 Created + CREATED(HttpStatus.CREATED, + "COMMON201_1", + "리소스가 성공적으로 생성되었습니다."); + + private final HttpStatus status; + private final String code; + private final String message; + + GeneralSuccessCode(HttpStatus status, String code, String message) { + this.status = status; + this.code = code; + this.message = message; + } + + + @Override + public HttpStatus getStatus() { + return this.status; + } + + @Override + public String getCode() { + return this.code; + } + + @Override + public String getMessage() { + return this.message; + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/exception/GeneralException.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/exception/GeneralException.java new file mode 100644 index 0000000..3e48de9 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/exception/GeneralException.java @@ -0,0 +1,11 @@ +package com.example.chapter4.global.apiPayLoad.exception; + +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException{ + private final BaseErrorCode code; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/handler/GeneralExceptionAdvice.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/handler/GeneralExceptionAdvice.java new file mode 100644 index 0000000..8ec92c0 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/apiPayLoad/handler/GeneralExceptionAdvice.java @@ -0,0 +1,67 @@ +package com.example.chapter4.global.apiPayLoad.handler; + +import com.example.chapter4.global.apiPayLoad.ApiResponse; +import com.example.chapter4.global.apiPayLoad.code.BaseErrorCode; +import com.example.chapter4.global.apiPayLoad.code.GeneralErrorCode; +import com.example.chapter4.global.apiPayLoad.exception.GeneralException; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import java.util.HashMap; +import java.util.Map; + +@RestControllerAdvice +public class GeneralExceptionAdvice { + + @ExceptionHandler(MethodArgumentNotValidException.class) + protected ResponseEntity>> handleMethodArgumentNotValidException( + MethodArgumentNotValidException ex + ) { + // 실패한 필드와 메시지를 담을 Map 생성 + Map errors = new HashMap<>(); + + ex.getBindingResult().getFieldErrors().forEach(error -> + errors.put(error.getField(), error.getDefaultMessage()) + ); + + // 앞서 정의한 VALID_FAIL 코드 사용 + GeneralErrorCode code = GeneralErrorCode.VALID_FAIL; + + // 에러 상세 내용(errors Map)을 담아서 응답 생성 + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure(code, errors)); + } + + // 애플리케이션에서 발생하는 커스텀 예외를 처리 + @ExceptionHandler(GeneralException.class) + public ResponseEntity> handleException( + GeneralException ex + ) { + + return ResponseEntity.status(ex.getCode().getStatus()) + .body(ApiResponse.onFailure( + ex.getCode(), + null + ) + ); + } + + // 그 외의 정의되지 않은 모든 예외 처리 + @ExceptionHandler(Exception.class) + public ResponseEntity> handleException( + Exception ex + ) { + + BaseErrorCode code = GeneralErrorCode.INTERNAL_SERVER_ERROR; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure( + code, + ex.getMessage() + ) + ); + } + + +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/config/QueryDslConfig.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/config/QueryDslConfig.java new file mode 100644 index 0000000..02c6beb --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/config/QueryDslConfig.java @@ -0,0 +1,19 @@ +package com.example.chapter4.global.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QueryDslConfig { + + @PersistenceContext + private EntityManager em; // JPA의 EntityManager 주입 + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(em); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/config/SwaggerConfig.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/config/SwaggerConfig.java new file mode 100644 index 0000000..5d239f9 --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/config/SwaggerConfig.java @@ -0,0 +1,35 @@ +package com.example.chapter4.global.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public OpenAPI swagger() { + Info info = new Info().title("Project").description("Project Swagger").version("0.0.1"); + + // JWT 토큰 헤더 방식 + String securityScheme = "JWT TOKEN"; + SecurityRequirement securityRequirement = new SecurityRequirement().addList(securityScheme); + + Components components = new Components() + .addSecuritySchemes(securityScheme, new SecurityScheme() + .name(securityScheme) + .type(SecurityScheme.Type.HTTP) + .scheme("Bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .info(info) + .addServersItem(new Server().url("/")) + .addSecurityItem(securityRequirement) + .components(components); + } +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/entity/BaseEntity.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/entity/BaseEntity.java new file mode 100644 index 0000000..61a351f --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/entity/BaseEntity.java @@ -0,0 +1,25 @@ +package com.example.chapter4.global.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + @Column(name = "created_at", nullable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at", nullable = false) + private LocalDateTime updatedAt; +} diff --git a/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/validator/FoodExistValidator.java b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/validator/FoodExistValidator.java new file mode 100644 index 0000000..602ee6c --- /dev/null +++ b/jhjalison01/chapter4/src/main/java/com/example/chapter4/global/validator/FoodExistValidator.java @@ -0,0 +1,37 @@ +package com.example.chapter4.global.validator; + +import com.example.chapter4.domain.member.exception.code.FoodErrorCode; +import com.example.chapter4.domain.member.repository.FoodRepository; +import com.example.chapter4.global.annotation.ExistFoods; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class FoodExistValidator implements ConstraintValidator> { + + private final FoodRepository foodRepository; + + @Override + public void initialize(ExistFoods constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> foodRepository.existsById(value)); + + if (!isValid) { + // 디폴트 메시지를 초기화 시키고 새로운 메시지로 덮어씌움 + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(FoodErrorCode.NOT_FOUND.getMessage()).addConstraintViolation(); + } + + return isValid; + } +} diff --git a/jhjalison01/chapter4/src/main/resources/application.yml b/jhjalison01/chapter4/src/main/resources/application.yml new file mode 100644 index 0000000..297abaf --- /dev/null +++ b/jhjalison01/chapter4/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + application: + name: "chapter4" + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${DB_USER} + password: ${DB_PW} + + jpa: + database: mysql + database-platform: org.hibernate.dialect.MySQLDialect + show-sql: true + hibernate: + ddl-auto: update + properties: + hibernate: + format_sql: true diff --git a/jhjalison01/chapter4/src/test/java/com/example/chapter4/Chapter4ApplicationTests.java b/jhjalison01/chapter4/src/test/java/com/example/chapter4/Chapter4ApplicationTests.java new file mode 100644 index 0000000..61792b4 --- /dev/null +++ b/jhjalison01/chapter4/src/test/java/com/example/chapter4/Chapter4ApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.chapter4; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Chapter4ApplicationTests { + + @Test + void contextLoads() { + } + +}