From 202bf170e22622d76e53b12b0d59c0f6b1b15a8f Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Sat, 12 Jul 2025 01:16:09 +0900 Subject: [PATCH 01/25] =?UTF-8?q?docs:=20pr=20=ED=85=9C=ED=94=8C=EB=A6=BF?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/PULL_REQUEST_TEMPLATE.md | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ccc453d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,44 @@ +## ๐Ÿ” ๊ด€๋ จ ์ด์Šˆ + + +
+ +## โœ… ์ž‘์—… ๋ถ„๋ฅ˜ +- [ ] ๋ฒ„๊ทธ ์ˆ˜์ • +- [ ] ์‹ ๊ทœ ๊ธฐ๋Šฅ +- [ ] ํ”„๋กœ์ ํŠธ ๊ตฌ์กฐ ๋ณ€๊ฒฝ +- [ ] ์ฝ”๋“œ ๋ฆฌํŒฉํ† ๋ง +- [ ] ๊ธฐ๋Šฅ ์ˆ˜์ • + +
+ +## โœจ ์ž‘์—… ๋‚ด์šฉ + + +
+ +## ๐Ÿ‘ฅ ์ „๋‹ฌ์‚ฌํ•ญ + + +
+ +## โœ… ์ฒดํฌ๋ฆฌ์ŠคํŠธ +- [ ] ์ฝ”๋“œ๊ฐ€ ์ปดํŒŒ์ผ ๋ฐ ๋นŒ๋“œ๋จ +- [ ] ๋ชจ๋“  ํ…Œ์ŠคํŠธ๊ฐ€ ํ†ต๊ณผํ•จ +- [ ] ๊ด€๋ จ ๋ฌธ์„œ๊ฐ€ ์—…๋ฐ์ดํŠธ๋จ +- [ ] ์ฝ”๋“œ ๋ฆฌ๋ทฐ๊ฐ€ ์ˆ˜ํ–‰๋จ +- [ ] ์ปค๋ฐ‹ ๋ฉ”์‹œ์ง€๋ฅผ ํ™•์ธํ•จ + +
+ +## ๐Ÿ“ธ ์Šคํฌ๋ฆฐ์ƒท + From d5e97b288563544aa427851fa64e0842c0ca236e Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Sat, 12 Jul 2025 23:24:26 +0900 Subject: [PATCH 02/25] =?UTF-8?q?=E2=9C=A8=20=20feat:=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EC=A0=9D=ED=8A=B8=20=EA=B8=B0=EC=B4=88=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 37 +++ build.gradle | 45 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../Centralthon/CentralthonApplication.java | 13 + .../Centralthon/global/config/WebConfig.java | 16 ++ .../global/constant/StaticValue.java | 17 ++ .../Centralthon/global/entity/BaseEntity.java | 24 ++ .../global/exception/BaseException.java | 11 + .../exception/GlobalExceptionHandler.java | 105 ++++++++ .../global/response/BaseResponse.java | 31 +++ .../global/response/ErrorResponse.java | 45 ++++ .../global/response/SuccessResponse.java | 39 +++ .../response/code/BaseResponseCode.java | 7 + .../response/code/ErrorResponseCode.java | 22 ++ .../response/code/SuccessResponseCode.java | 17 ++ src/main/resources/application.properties | 1 + .../CentralthonApplicationTests.java | 13 + 22 files changed, 799 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/example/Centralthon/CentralthonApplication.java create mode 100644 src/main/java/com/example/Centralthon/global/config/WebConfig.java create mode 100644 src/main/java/com/example/Centralthon/global/constant/StaticValue.java create mode 100644 src/main/java/com/example/Centralthon/global/entity/BaseEntity.java create mode 100644 src/main/java/com/example/Centralthon/global/exception/BaseException.java create mode 100644 src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/example/Centralthon/global/response/BaseResponse.java create mode 100644 src/main/java/com/example/Centralthon/global/response/ErrorResponse.java create mode 100644 src/main/java/com/example/Centralthon/global/response/SuccessResponse.java create mode 100644 src/main/java/com/example/Centralthon/global/response/code/BaseResponseCode.java create mode 100644 src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java create mode 100644 src/main/java/com/example/Centralthon/global/response/code/SuccessResponseCode.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/example/Centralthon/CentralthonApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..2a6c99b --- /dev/null +++ b/build.gradle @@ -0,0 +1,45 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.3' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +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-security' + 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' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // JWT + implementation 'io.jsonwebtoken:jjwt-api:0.12.3' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..3728fce --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'Centralthon' diff --git a/src/main/java/com/example/Centralthon/CentralthonApplication.java b/src/main/java/com/example/Centralthon/CentralthonApplication.java new file mode 100644 index 0000000..a9d7bb5 --- /dev/null +++ b/src/main/java/com/example/Centralthon/CentralthonApplication.java @@ -0,0 +1,13 @@ +package com.example.Centralthon; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CentralthonApplication { + + public static void main(String[] args) { + SpringApplication.run(CentralthonApplication.class, args); + } + +} diff --git a/src/main/java/com/example/Centralthon/global/config/WebConfig.java b/src/main/java/com/example/Centralthon/global/config/WebConfig.java new file mode 100644 index 0000000..9986b2b --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/config/WebConfig.java @@ -0,0 +1,16 @@ +package com.example.Centralthon.global.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry){ + registry.addMapping("/**") + .allowedOriginPatterns("*") + .allowedMethods("GET", "POST", "PUT", "DELETE","OPTIONS") + .allowCredentials(true); + } +} diff --git a/src/main/java/com/example/Centralthon/global/constant/StaticValue.java b/src/main/java/com/example/Centralthon/global/constant/StaticValue.java new file mode 100644 index 0000000..0e756ab --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/constant/StaticValue.java @@ -0,0 +1,17 @@ +package com.example.Centralthon.global.constant; + +public class StaticValue { + // SUCCESS + public static final int OK = 200; + public static final int CREATED = 201; + public static final int NO_CONTENT = 204; + + // ERROR + public static final int BAD_REQUEST = 400; + public static final int UNAUTHORIZED = 401; + public static final int FORBIDDEN = 403; + public static final int NOT_FOUND = 404; + public static final int METHOD_NOT_ALLOWED = 405; + public static final int CONFLICT = 409; + public static final int INTERNAL_SERVER_ERROR = 500; +} diff --git a/src/main/java/com/example/Centralthon/global/entity/BaseEntity.java b/src/main/java/com/example/Centralthon/global/entity/BaseEntity.java new file mode 100644 index 0000000..5d66812 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/entity/BaseEntity.java @@ -0,0 +1,24 @@ +package com.example.Centralthon.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; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public class BaseEntity { + @CreatedDate + @Column(name = "created_at") + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at") + private LocalDateTime updatedAt; +} diff --git a/src/main/java/com/example/Centralthon/global/exception/BaseException.java b/src/main/java/com/example/Centralthon/global/exception/BaseException.java new file mode 100644 index 0000000..5b90d67 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/exception/BaseException.java @@ -0,0 +1,11 @@ +package com.example.Centralthon.global.exception; + +import com.example.Centralthon.global.response.code.BaseResponseCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class BaseException extends RuntimeException { + private final BaseResponseCode baseResponseCode; +} diff --git a/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..d6fa5c5 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java @@ -0,0 +1,105 @@ +package com.example.Centralthon.global.exception; + +import com.example.Centralthon.global.response.ErrorResponse; + +import com.example.Centralthon.global.response.code.ErrorResponseCode; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.validation.BindException; + +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; +import org.springframework.web.multipart.support.MissingServletRequestPartException; +import org.springframework.web.servlet.NoHandlerFoundException; +import org.springframework.web.servlet.resource.NoResourceFoundException; + + +@RestControllerAdvice +@Slf4j +public class GlobalExceptionHandler { + // ํ•„๋“œ์— ์„ ์–ธ๋œ ๊ฒ€์ฆ ์กฐ๊ฑด ์œ„๋ฐ˜ ์‹œ ๋ฐœ์ƒ + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { + log.error("MethodArgumentNotValidException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.of( + ErrorResponseCode.INVALID_HTTP_MESSAGE_BODY, e.getFieldError().getDefaultMessage()); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // ์„ ์–ธ๋œ ๊ฒ€์ฆ ์กฐ๊ฑด ์œ„๋ฐ˜ ์‹œ ๋ฐœ์ƒ + @ExceptionHandler(BindException.class) + public ResponseEntity> handleBindException(BindException e) { + log.error("BindException : {}", e.getMessage(), e); + ErrorResponse errorREsponse = ErrorResponse.of( + ErrorResponseCode.INVALID_HTTP_MESSAGE_BODY, e.getFieldError().getDefaultMessage()); + return ResponseEntity.status(errorREsponse.getHttpStatus()).body(errorREsponse); + } + + //ReqeustBody ๋“ฑ์œผ๋กœ ์ „๋‹ฌ ๋ฐ›์€ JSON ๋ฐ”๋””์˜ ํŒŒ์‹ฑ์ด ์‹คํŒจ ํ–ˆ์„ ๋•Œ + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { + log.error("HttpMessageNotReadableException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.INVALID_HTTP_MESSAGE_BODY); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // ์š”์ฒญ ํŒŒ๋ผ๋ฏธํ„ฐ ํƒ€์ž… ๋ณ€ํ™˜์— ์‹คํŒจ ํ–ˆ์„ ๋•Œ + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public ResponseEntity> handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e) { + log.error("MethodArgumentTypeMismatchException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.INVALID_HTTP_MESSAGE_PARAMETER); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // Request Part ๋ˆ„๋ฝ ์‹œ ๋ฐœ์ƒ + @ExceptionHandler(MissingServletRequestPartException.class) + public ResponseEntity> handleMissingServletRequestPartException(MissingServletRequestPartException e) { + log.error("MissingServletRequestPartException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.INVALID_HTTP_MESSAGE_PARAMETER); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + //์ง€์›ํ•˜์ง€ ์•Š๋Š” HTTP ๋ฉ”์†Œ๋“œ๋ฅผ ํ˜ธ์ถœํ•  ๊ฒฝ์šฐ + @ExceptionHandler(HttpRequestMethodNotSupportedException.class) + public ResponseEntity> handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) { + log.error("HttpRequestMethodNotSupportedException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.UNSUPPORTED_HTTP_METHOD); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // ์กด์žฌํ•˜์ง€ ์•Š๋Š” ์•ค๋“œํฌ์ธํŠธ ํ˜ธ์ถœ ์‹œ ๋ฐœ์ƒ + @ExceptionHandler(NoHandlerFoundException.class) + public ResponseEntity> handleNoHandlerFoundException(NoHandlerFoundException e) { + log.error("NoHandlerFoundException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.NOT_FOUND_ENDPOINT); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // ์ •์  ๋ฆฌ์†Œ์Šค๋„ ์ฐพ์ง€ ๋ชปํ–ˆ์„ ๋•Œ ๋ฐœ์ƒ + @ExceptionHandler(NoResourceFoundException.class) + public ResponseEntity> handleNoResourceFoundException(NoResourceFoundException e) { + log.error("NoResourceFoundException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.NOT_FOUND_ENDPOINT); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // ๋น„์ฆˆ๋‹ˆ์Šค ๋กœ์ง ์—๋Ÿฌ + @ExceptionHandler(BaseException.class) + public ResponseEntity> handleBaseException(BaseException e) { + log.error("BaseException : {}", e.getBaseResponseCode().getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(e.getBaseResponseCode()); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // ๋‚˜๋จธ์ง€ ์˜ˆ์™ธ ์ฒ˜๋ฆฌ + @ExceptionHandler(Exception.class) + public ResponseEntity> handleException(Exception e) { + log.error("Exception : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.SERVER_ERROR); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } +} diff --git a/src/main/java/com/example/Centralthon/global/response/BaseResponse.java b/src/main/java/com/example/Centralthon/global/response/BaseResponse.java new file mode 100644 index 0000000..680e3ed --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/response/BaseResponse.java @@ -0,0 +1,31 @@ +package com.example.Centralthon.global.response; + +import com.example.Centralthon.global.response.code.BaseResponseCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.ToString; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +@Getter +@ToString +@RequiredArgsConstructor +public class BaseResponse { + private final Boolean inSuccess; + private final String code; + private final String message; + private final String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + + public static BaseResponse of(Boolean inSuccess, BaseResponseCode baseResponseCode) { + return new BaseResponse(inSuccess, baseResponseCode.getCode(), baseResponseCode.getMessage()); + } + + public static BaseResponse of(Boolean inSuccess, BaseResponseCode baseResponseCode, String message){ + return new BaseResponse(inSuccess, baseResponseCode.getCode(), message); + } + + public static BaseResponse of(Boolean inSuccess, String code, String message) { + return new BaseResponse(inSuccess, code, message); + } +} diff --git a/src/main/java/com/example/Centralthon/global/response/ErrorResponse.java b/src/main/java/com/example/Centralthon/global/response/ErrorResponse.java new file mode 100644 index 0000000..c9e9288 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/response/ErrorResponse.java @@ -0,0 +1,45 @@ +package com.example.Centralthon.global.response; + +import com.example.Centralthon.global.response.code.BaseResponseCode; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.Builder; +import lombok.Getter; +import lombok.ToString; + +@Getter +@ToString +@JsonPropertyOrder({"inSuccess","timestamp","code","httpStatus","message","data"}) +public class ErrorResponse extends BaseResponse{ + private final int httpStatus; + private final T data; + + @Builder + public ErrorResponse(T data, BaseResponseCode baseResponseCode){ + super(false, baseResponseCode.getCode(), baseResponseCode.getMessage()); + this.httpStatus = baseResponseCode.getHttpStatus(); + this.data = data; + } + + @Builder + public ErrorResponse(T data, BaseResponseCode baseResponseCode, String message){ + super(false, baseResponseCode.getCode(),message); + this.httpStatus = baseResponseCode.getHttpStatus(); + this.data = data; + } + + public static ErrorResponse from(BaseResponseCode baseResponseCode){ + return new ErrorResponse<>(null, baseResponseCode); + } + + public static ErrorResponse of(BaseResponseCode baseResponseCode, String message){ + return new ErrorResponse<>(null, baseResponseCode, message); + } + + public static ErrorResponse of(BaseResponseCode baseResponseCode, T data){ + return new ErrorResponse<>(data, baseResponseCode); + } + + public static ErrorResponse of(BaseResponseCode baseResponseCode, T data, String message){ + return new ErrorResponse<>(data,baseResponseCode,message); + } +} diff --git a/src/main/java/com/example/Centralthon/global/response/SuccessResponse.java b/src/main/java/com/example/Centralthon/global/response/SuccessResponse.java new file mode 100644 index 0000000..17344a6 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/response/SuccessResponse.java @@ -0,0 +1,39 @@ +package com.example.Centralthon.global.response; + +import com.example.Centralthon.global.response.code.BaseResponseCode; +import com.example.Centralthon.global.response.code.SuccessResponseCode; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.Builder; +import lombok.Getter; +import lombok.ToString; + +@Getter +@ToString +@JsonPropertyOrder({"inSuccess","timestamp","code","httpStatus","message","data"}) +public class SuccessResponse extends BaseResponse { + private final int httpStatus; + private final T data; + + @Builder + public SuccessResponse(T data, BaseResponseCode baseResponseCode) { + super(true, baseResponseCode.getCode(), baseResponseCode.getMessage()); + this.httpStatus = baseResponseCode.getHttpStatus(); + this.data = data; + } + + public static SuccessResponse from(T data){ + return new SuccessResponse<>(data, SuccessResponseCode.SUCCESS_OK); + } + + public static SuccessResponse empty(){ + return new SuccessResponse<>(null, SuccessResponseCode.SUCCESS_OK); + } + + public static SuccessResponse of(T data, BaseResponseCode baseResponseCode){ + return new SuccessResponse<>(data, baseResponseCode); + } + + public static SuccessResponse from(BaseResponseCode baseResponseCode){ + return new SuccessResponse<>(null, baseResponseCode); + } +} diff --git a/src/main/java/com/example/Centralthon/global/response/code/BaseResponseCode.java b/src/main/java/com/example/Centralthon/global/response/code/BaseResponseCode.java new file mode 100644 index 0000000..1933679 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/response/code/BaseResponseCode.java @@ -0,0 +1,7 @@ +package com.example.Centralthon.global.response.code; + +public interface BaseResponseCode { + String getCode(); + int getHttpStatus(); + String getMessage(); +} diff --git a/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java b/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java new file mode 100644 index 0000000..6e4fb27 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java @@ -0,0 +1,22 @@ +package com.example.Centralthon.global.response.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import static com.example.Centralthon.global.constant.StaticValue.*; + +@Getter +@AllArgsConstructor +public enum ErrorResponseCode implements BaseResponseCode { + BAD_REQUEST_ERROR("GLOBAL_400_1",BAD_REQUEST,"์ž˜๋ชป๋œ ์š”์ฒญ์ž…๋‹ˆ๋‹ค."), + INVALID_HTTP_MESSAGE_BODY("GLOBAL_400_2",BAD_REQUEST,"HTTP ์š”์ฒญ ๋ฐ”๋””์˜ ํ˜•์‹์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค."), + INVALID_HTTP_MESSAGE_PARAMETER("GLOBAL_400_2",BAD_REQUEST,"HTTP ์š”์ฒญ ํŒŒ๋ผ๋ฏธํ„ฐ ํ˜•์‹์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค."), + ACCESS_DENIED_REQUEST("GLOBAL_403",FORBIDDEN,"ํ•ด๋‹น ์š”์ฒญ์— ์ ‘๊ทผ ๊ถŒํ•œ์ด ์—†์Šต๋‹ˆ๋‹ค."), + NOT_FOUND_ENDPOINT("GLOBAL_404",NOT_FOUND,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ์•ค๋“œํฌ์ธํŠธ ์ž…๋‹ˆ๋‹ค. ์š”์ฒญ URL์„ ํ™•์ธํ•ด์ฃผ์„ธ์š”,."), + UNSUPPORTED_HTTP_METHOD("GLOBAL_405",METHOD_NOT_ALLOWED,"์ง€์›ํ•˜์ง€ ์•Š๋Š” HTTP ๋ฉ”์†Œ๋“œ ์ž…๋‹ˆ๋‹ค."), + SERVER_ERROR("GLOBAL_500",INTERNAL_SERVER_ERROR,"์„œ๋ฒ„ ๋‚ด๋ถ€์—์„œ ์•Œ ์ˆ˜ ์—†๋Š” ์—๋Ÿฌ๊ฑฐใ… ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค."); + + private final String code; + private final int httpStatus; + private final String message; +} diff --git a/src/main/java/com/example/Centralthon/global/response/code/SuccessResponseCode.java b/src/main/java/com/example/Centralthon/global/response/code/SuccessResponseCode.java new file mode 100644 index 0000000..a0cb1ff --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/response/code/SuccessResponseCode.java @@ -0,0 +1,17 @@ +package com.example.Centralthon.global.response.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import static com.example.Centralthon.global.constant.StaticValue.*; + +@Getter +@AllArgsConstructor +public enum SuccessResponseCode implements BaseResponseCode { + SUCCESS_OK("SUCCESS_200",OK,"ํ˜ธ์ถœ์— ์„ฑ๊ณตํ•˜์˜€์Šต๋‹ˆ๋‹ค."), + SUCCESS_CREATED("SUCCESS_201",CREATED,"ํ˜ธ์ถœ์— ์„ฑ๊ณตํ•˜์˜€์Šต๋‹ˆ๋‹ค."); + + private final String code; + private final int httpStatus; + private final String message; +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..c62fde1 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=Centralthon diff --git a/src/test/java/com/example/Centralthon/CentralthonApplicationTests.java b/src/test/java/com/example/Centralthon/CentralthonApplicationTests.java new file mode 100644 index 0000000..3e88f57 --- /dev/null +++ b/src/test/java/com/example/Centralthon/CentralthonApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.Centralthon; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CentralthonApplicationTests { + + @Test + void contextLoads() { + } + +} From d43bd5c245eabf035a02ac8b53aecacfffa9efaf Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Fri, 18 Jul 2025 13:14:27 +0900 Subject: [PATCH 03/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refacotr=20:=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/Centralthon/domain/member/entity/Member.java | 8 ++++---- .../domain/member/service/MemberServiceImpl.java | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/example/Centralthon/domain/member/entity/Member.java b/src/main/java/com/example/Centralthon/domain/member/entity/Member.java index ef80f01..7e82abc 100644 --- a/src/main/java/com/example/Centralthon/domain/member/entity/Member.java +++ b/src/main/java/com/example/Centralthon/domain/member/entity/Member.java @@ -31,12 +31,12 @@ public class Member extends BaseEntity { @Enumerated(EnumType.STRING) private MemberRole role; - public static Member toEntity(SignUpReq signUpReq, PasswordEncoder passwordEncoder) { + public static Member toEntity(String email, String encoded, String nickName) { return Member.builder() - .email(signUpReq.getEmail()) - .password(passwordEncoder.encode(signUpReq.getPassword())) - .nickName(signUpReq.getNickName()) + .email(email) + .password(encoded) + .nickName(nickName) .role(MemberRole.USER) .build(); } diff --git a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java b/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java index 73f65ea..09b2a10 100644 --- a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java @@ -26,8 +26,9 @@ public void signUp(SignUpReq signUpReq) { if (memberRepository .findByEmailOrNickName(signUpReq.getEmail(), signUpReq.getNickName()) .isPresent()) { throw new MemberAlreadyExistException(); } - Member newMember = Member.toEntity(signUpReq, passwordEncoder); + String encoded = passwordEncoder.encode(signUpReq.getPassword()); + Member member = Member.toEntity(signUpReq.getEmail(),encoded,signUpReq.getNickName()); - memberRepository.save(newMember); + memberRepository.save(member); } } From 6d6e3a6a15637a72de4b5f8f0326b6855c076d1c Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Sun, 20 Jul 2025 14:07:35 +0900 Subject: [PATCH 04/25] =?UTF-8?q?=E2=9C=A8=20=20feat=20:=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/entity/enums/MemberRole.java | 3 + .../InvalidCredentialsException.java | 7 ++ .../member/exception/MemberErrorCode.java | 4 +- .../exception/MemberNotFoundException.java | 7 ++ .../member/repository/MemberRepository.java | 2 + .../domain/member/service/MemberService.java | 4 + .../member/service/MemberServiceImpl.java | 23 +++++ .../web/controller/MemberController.java | 27 +++++- .../domain/member/web/dto/LoginReq.java | 15 ++++ .../domain/member/web/dto/LoginRes.java | 6 ++ .../domain/member/web/dto/ProfileRes.java | 7 ++ .../global/config/SecurityConfig.java | 16 +++- .../exception/CustomAccessDeniedHandler.java | 35 ++++++++ .../global/jwt/JwtTokenFilter.java | 46 ++++++++++ .../global/jwt/JwtTokenProvider.java | 87 +++++++++++++++++++ .../global/security/CustomMemberDetails.java | 34 ++++++++ src/main/resources/application.properties | 4 + 17 files changed, 321 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java create mode 100644 src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java create mode 100644 src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java create mode 100644 src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java create mode 100644 src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java create mode 100644 src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java create mode 100644 src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java create mode 100644 src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java create mode 100644 src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java diff --git a/src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java b/src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java index 1d29f02..206b1eb 100644 --- a/src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java +++ b/src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java @@ -12,4 +12,7 @@ public enum MemberRole { @Getter private final String memberRole; + public String getStringRole() { + return memberRole; + } } diff --git a/src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java b/src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java new file mode 100644 index 0000000..3d06aea --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java @@ -0,0 +1,7 @@ +package com.example.Centralthon.domain.member.exception; + +import com.example.Centralthon.global.exception.BaseException; + +public class InvalidCredentialsException extends BaseException { + public InvalidCredentialsException( ) {super(MemberErrorCode.INVALID_CREDENTIALS);} +} diff --git a/src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java b/src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java index d35dd86..b83c403 100644 --- a/src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java +++ b/src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java @@ -7,7 +7,9 @@ @Getter @AllArgsConstructor public enum MemberErrorCode implements BaseResponseCode { - MEMBER_ALREADY_EXIST("MEMBER_409_1", 409, "์ด๋ฏธ ์กด์žฌํ•˜๋Š” ์‚ฌ์šฉ์ž์ž…๋‹ˆ๋‹ค."); + MEMBER_ALREADY_EXIST("MEMBER_409_1", 409, "์ด๋ฏธ ์กด์žฌํ•˜๋Š” ์‚ฌ์šฉ์ž์ž…๋‹ˆ๋‹ค."), + INVALID_CREDENTIALS("MEMBER_401_1", 401, "์•„์ด๋”” ๋˜๋Š” ๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ ๋‹ค์‹œ ํ™•์ธํ•ด์ฃผ์„ธ์š”"), + MEMBER_NOT_FOUND("MEMBER_404_1",404,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ์‚ฌ์šฉ์ž์ž…๋‹ˆ๋‹ค."); private final String code; private final int httpStatus; diff --git a/src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java b/src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java new file mode 100644 index 0000000..4fcdac3 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java @@ -0,0 +1,7 @@ +package com.example.Centralthon.domain.member.exception; + +import com.example.Centralthon.global.exception.BaseException; + +public class MemberNotFoundException extends BaseException { + public MemberNotFoundException() {super(MemberErrorCode.MEMBER_NOT_FOUND);} +} diff --git a/src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java b/src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java index e408aa4..5872243 100644 --- a/src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java +++ b/src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; @Repository @@ -13,4 +14,5 @@ public interface MemberRepository extends JpaRepository { Optional findByEmailOrNickName( String email, String nickName); + Optional findByEmail(String email); } diff --git a/src/main/java/com/example/Centralthon/domain/member/service/MemberService.java b/src/main/java/com/example/Centralthon/domain/member/service/MemberService.java index fe46b48..b57da9a 100644 --- a/src/main/java/com/example/Centralthon/domain/member/service/MemberService.java +++ b/src/main/java/com/example/Centralthon/domain/member/service/MemberService.java @@ -1,5 +1,7 @@ package com.example.Centralthon.domain.member.service; +import com.example.Centralthon.domain.member.web.dto.LoginReq; +import com.example.Centralthon.domain.member.web.dto.LoginRes; import com.example.Centralthon.domain.member.web.dto.SignUpReq; import com.example.Centralthon.global.response.SuccessResponse; import jakarta.validation.Valid; @@ -8,4 +10,6 @@ public interface MemberService { void signUp( SignUpReq signupReq); + + LoginRes login( LoginReq loginReq); } diff --git a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java b/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java index 09b2a10..ba20994 100644 --- a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java @@ -2,10 +2,14 @@ import com.example.Centralthon.domain.member.entity.Member; import com.example.Centralthon.domain.member.entity.enums.MemberRole; +import com.example.Centralthon.domain.member.exception.InvalidCredentialsException; import com.example.Centralthon.domain.member.exception.MemberAlreadyExistException; import com.example.Centralthon.domain.member.exception.MemberErrorCode; import com.example.Centralthon.domain.member.repository.MemberRepository; +import com.example.Centralthon.domain.member.web.dto.LoginReq; +import com.example.Centralthon.domain.member.web.dto.LoginRes; import com.example.Centralthon.domain.member.web.dto.SignUpReq; +import com.example.Centralthon.global.jwt.JwtTokenProvider; import com.example.Centralthon.global.response.SuccessResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -18,6 +22,7 @@ public class MemberServiceImpl implements MemberService { private final MemberRepository memberRepository; private final PasswordEncoder passwordEncoder; + private final JwtTokenProvider jwtTokenProvider; @Override @@ -31,4 +36,22 @@ public void signUp(SignUpReq signUpReq) { memberRepository.save(member); } + + @Override + public LoginRes login(LoginReq loginReq) { + // ์•„์ด๋”” ํ™•์ธ + Member member = memberRepository.findByEmail(loginReq.getEmail()) + .orElseThrow(InvalidCredentialsException::new); + + // ๋น„๋ฐ€๋ฒˆํ˜ธ ๊ฒ€์ฆ + if (!passwordEncoder.matches(loginReq.getPassword(), member.getPassword())) { + throw new InvalidCredentialsException(); + } + + // ํ† ํฐ ์ƒ์„ฑ + String token = jwtTokenProvider.createToken(member); + + // ๋ฐ˜ํ™˜ + return new LoginRes(token); + } } diff --git a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java b/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java index 3703ed8..0761e87 100644 --- a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java +++ b/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java @@ -1,16 +1,19 @@ package com.example.Centralthon.domain.member.web.controller; +import com.example.Centralthon.domain.member.entity.Member; import com.example.Centralthon.domain.member.service.MemberService; +import com.example.Centralthon.domain.member.web.dto.LoginReq; +import com.example.Centralthon.domain.member.web.dto.LoginRes; +import com.example.Centralthon.domain.member.web.dto.ProfileRes; import com.example.Centralthon.domain.member.web.dto.SignUpReq; import com.example.Centralthon.global.response.SuccessResponse; +import com.example.Centralthon.global.security.CustomMemberDetails; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/members") @@ -25,4 +28,20 @@ public ResponseEntity> signup(@RequestBody @Valid SignUpReq s return ResponseEntity.status(HttpStatus.CREATED).body(SuccessResponse.created(null)); } + + //๋กœ๊ทธ์ธ + @PostMapping("/login") + public ResponseEntity> login(@RequestBody @Valid LoginReq loginReq){ + LoginRes loginRes = memberService.login(loginReq); + + return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.created(loginRes)); + } + + // ์ธ๊ฐ€ ํ…Œ์ŠคํŠธ์šฉ API + @GetMapping("/profile") + public ResponseEntity getProfile(@AuthenticationPrincipal CustomMemberDetails memberDetails) { + Member member = memberDetails.getMember(); + return ResponseEntity + .ok(new ProfileRes(member.getNickName(), member.getRole().getStringRole())); + } } diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java new file mode 100644 index 0000000..94bfc6b --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java @@ -0,0 +1,15 @@ +package com.example.Centralthon.domain.member.web.dto; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Getter; + +@Getter +public class LoginReq { + @NotBlank(message = "์ด๋ฉ”์ผ์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") + private String email; + + @NotBlank(message = "๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") + private String password; +} diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java new file mode 100644 index 0000000..0a2a897 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java @@ -0,0 +1,6 @@ +package com.example.Centralthon.domain.member.web.dto; + +public record LoginRes( + String token +) { +} diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java new file mode 100644 index 0000000..e79e7f5 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java @@ -0,0 +1,7 @@ +package com.example.Centralthon.domain.member.web.dto; + +public record ProfileRes( + String nickName, + String role +) { +} diff --git a/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java b/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java index 492e276..41e7884 100644 --- a/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java +++ b/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java @@ -1,8 +1,12 @@ package com.example.Centralthon.global.config; +import com.example.Centralthon.global.exception.CustomAccessDeniedHandler; +import com.example.Centralthon.global.jwt.JwtTokenFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; @@ -12,21 +16,31 @@ @Configuration @RequiredArgsConstructor public class SecurityConfig { + private final CustomAccessDeniedHandler customAccessDeniedHandler; + private final JwtTokenFilter jwtTokenFilter; + // ๋น„๋ฐ€๋ฒˆํ˜ธ ์ธ์ฝ”๋” @Bean public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } + // ํ•„ํ„ฐ ์ฒด์ธ ์„ค์ • @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { http .csrf(csrf -> csrf.disable()) .authorizeHttpRequests(auth -> auth .requestMatchers("/api/members/signup", "/api/members/login").permitAll() //๋ˆ„๊ตฌ๋‚˜ ์ ‘๊ทผ ํ—ˆ์šฉ - .requestMatchers("/api/members/profile").hasRole("ADMIN") // ๊ด€๋ฆฌ์ž๋งŒ ํ”„๋กœํ•„ ์—ด๋žŒ ๊ฐ€๋Šฅ + .requestMatchers("/api/members/profile").hasRole("ADMIN") // ๊ด€๋ฆฌ์ž ๊ถŒํ•œ ํ•„์š”ํ•œ API .anyRequest().authenticated() //๋กœ๊ทธ์ธํ•œ ์‚ฌ์šฉ์ž๋งŒ ์ ‘๊ทผ ํ—ˆ์šฉ + ) + + .addFilterBefore(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class) + .exceptionHandling(ex -> ex + .accessDeniedHandler(customAccessDeniedHandler) ); + return http.build(); } } diff --git a/src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java b/src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java new file mode 100644 index 0000000..dc8a2c6 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java @@ -0,0 +1,35 @@ +package com.example.Centralthon.global.exception; + +import com.example.Centralthon.global.response.BaseResponse; +import com.example.Centralthon.global.response.code.ErrorResponseCode; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.web.access.AccessDeniedHandler; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class CustomAccessDeniedHandler implements AccessDeniedHandler { + + private final ObjectMapper objectMapper; // ํ˜น์€ ๋นˆ ์ฃผ์ž… ๊ฐ€๋Šฅ + + /** + * ์ธ์ฆ์€ ๋˜์—ˆ์ง€๋งŒ, ์ธ๊ฐ€๊ฐ€ ๋ถ€์กฑํ•œ ์š”์ฒญ์ด ๋“ค์–ด์˜ฌ ๋•Œ ์ฒ˜๋ฆฌํ•˜๋Š” ํ•ธ๋“ค๋Ÿฌ + */ + @Override + public void handle(HttpServletRequest request, + HttpServletResponse response, + AccessDeniedException accessDeniedException) throws IOException { + + response.setStatus(ErrorResponseCode.ACCESS_DENIED_REQUEST.getHttpStatus()); + response.setContentType("application/json;charset=UTF-8"); + + BaseResponse body = BaseResponse.of(false, ErrorResponseCode.ACCESS_DENIED_REQUEST); + response.getWriter().write(objectMapper.writeValueAsString(body)); + } +} diff --git a/src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java b/src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java new file mode 100644 index 0000000..9f41bf0 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java @@ -0,0 +1,46 @@ +package com.example.Centralthon.global.jwt; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class JwtTokenFilter extends OncePerRequestFilter { + + private final JwtTokenProvider jwtTokenProvider; + @Override + protected void doFilterInternal( + HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain + ) throws ServletException, IOException { + String token = extractToken(request); + + // ํ† ํฐ ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ + if(token != null && jwtTokenProvider.validateToken(token)) { + Authentication authentication = jwtTokenProvider.getAuthentication(token); + + SecurityContextHolder.getContext().setAuthentication(authentication); + } + + filterChain.doFilter(request, response); + } + + private String extractToken(HttpServletRequest request) { + String bearer = request.getHeader("Authorization"); + if (bearer != null && bearer.startsWith("Bearer ")) { + return bearer.substring(7); + } + return null; + } +} diff --git a/src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java b/src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java new file mode 100644 index 0000000..f93a4a0 --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java @@ -0,0 +1,87 @@ +package com.example.Centralthon.global.jwt; + +import com.example.Centralthon.domain.member.entity.Member; +import com.example.Centralthon.domain.member.exception.InvalidCredentialsException; +import com.example.Centralthon.domain.member.exception.MemberNotFoundException; +import com.example.Centralthon.domain.member.repository.MemberRepository; +import com.example.Centralthon.global.security.CustomMemberDetails; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import jakarta.annotation.PostConstruct; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.security.Key; +import java.util.Date; + +@Component +@RequiredArgsConstructor +public class JwtTokenProvider { + private final MemberRepository memberRepository; + + @Value("${jwt.secret}") + private String secretKey; + + @Value("${jwt.expiration}") + private long expiration; + + private Key key; + + @PostConstruct + public void init() { this.key = Keys.hmacShaKeyFor(secretKey.getBytes()); } + + public String createToken(Member member) { + Date now = new Date(); + Date expiry = new Date(now.getTime() + expiration); + + return Jwts.builder() + .subject(member.getEmail()) + .claim("nickname", member.getNickName()) + .claim("role", member.getRole()) + .issuedAt(now) + .expiration(expiry) + .signWith(key) + .compact(); + } + + // ํ† ํฐ ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ + ๋งŒ๋ฃŒ ๊ฒ€์‚ฌ + public boolean validateToken(String token) { + try{ + getClaims(token); + return true; + }catch (JwtException | IllegalArgumentException e){ + return false; + } + } + + // Claim ํŒŒ์‹ฑ + public Claims getClaims(String token) { + return Jwts.parser() + .verifyWith((SecretKey) key) + .build() + .parseSignedClaims(token) + .getPayload(); + } + + public Authentication getAuthentication(String token) { + Claims claims = getClaims(token); + String email = claims.getSubject(); + + Member member = memberRepository.findByEmail(email) + .orElseThrow(MemberNotFoundException::new); + + CustomMemberDetails memberDetails = new CustomMemberDetails(member); + + return new UsernamePasswordAuthenticationToken( + memberDetails, + null, + memberDetails.getAuthorities() + ); + } +} diff --git a/src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java b/src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java new file mode 100644 index 0000000..4d76d4a --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java @@ -0,0 +1,34 @@ +package com.example.Centralthon.global.security; + +import com.example.Centralthon.domain.member.entity.Member; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; + +@Getter +@RequiredArgsConstructor +public class CustomMemberDetails implements UserDetails { + + private final Member member; + + @Override + public Collection getAuthorities() { + return List.of(new SimpleGrantedAuthority(member.getRole().getStringRole())); + } + + @Override + public String getPassword() { + return member.getPassword(); + } + + @Override + public String getUsername() { + return member.getEmail(); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3289bd9..f856f6c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,6 +3,10 @@ spring.application.name=Centralthon # application-secret.properties spring.config.import=optional:application-secret.properties +#JWT +jwt.secret=${jwt.secret} +jwt.expiration=${jwt.expiration} + # Datasource spring.datasource.url=${DATABASE_URL} spring.datasource.username=${DATABASE_USERNAME} From 5bd0de19f3d672303e6d483c4e5b9b074197d5bc Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Sun, 20 Jul 2025 14:28:55 +0900 Subject: [PATCH 05/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/web/controller/MemberController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java b/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java index 0761e87..3410c5f 100644 --- a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java +++ b/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java @@ -34,7 +34,7 @@ public ResponseEntity> signup(@RequestBody @Valid SignUpReq s public ResponseEntity> login(@RequestBody @Valid LoginReq loginReq){ LoginRes loginRes = memberService.login(loginReq); - return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.created(loginRes)); + return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(loginRes)); } // ์ธ๊ฐ€ ํ…Œ์ŠคํŠธ์šฉ API From fc1a79e3d46aa8c1845945feec0a675bd24b6dad Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Tue, 5 Aug 2025 12:25:13 +0900 Subject: [PATCH 06/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20JW?= =?UTF-8?q?T=20=EA=B4=80=EB=A0=A8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/entity/Member.java | 4 +- .../member/service/MemberServiceImpl.java | 10 +-- .../web/controller/MemberController.java | 15 +--- .../domain/member/web/dto/LoginRes.java | 2 +- .../domain/member/web/dto/ProfileRes.java | 7 -- .../domain/member/web/dto/SignUpReq.java | 10 ++- .../global/config/SecurityConfig.java | 12 --- .../exception/CustomAccessDeniedHandler.java | 35 -------- .../exception/GlobalExceptionHandler.java | 10 +++ .../global/jwt/JwtTokenFilter.java | 46 ---------- .../global/jwt/JwtTokenProvider.java | 87 ------------------- .../global/response/BaseResponse.java | 2 +- src/main/resources/application.properties | 4 - 13 files changed, 24 insertions(+), 220 deletions(-) delete mode 100644 src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java delete mode 100644 src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java delete mode 100644 src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java delete mode 100644 src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java diff --git a/src/main/java/com/example/Centralthon/domain/member/entity/Member.java b/src/main/java/com/example/Centralthon/domain/member/entity/Member.java index 7e82abc..b4bee43 100644 --- a/src/main/java/com/example/Centralthon/domain/member/entity/Member.java +++ b/src/main/java/com/example/Centralthon/domain/member/entity/Member.java @@ -31,13 +31,13 @@ public class Member extends BaseEntity { @Enumerated(EnumType.STRING) private MemberRole role; - public static Member toEntity(String email, String encoded, String nickName) { + public static Member toEntity(String email, String encoded, String nickName, MemberRole role) { return Member.builder() .email(email) .password(encoded) .nickName(nickName) - .role(MemberRole.USER) + .role(role) .build(); } } diff --git a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java b/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java index ba20994..10d7a3b 100644 --- a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java @@ -9,7 +9,6 @@ import com.example.Centralthon.domain.member.web.dto.LoginReq; import com.example.Centralthon.domain.member.web.dto.LoginRes; import com.example.Centralthon.domain.member.web.dto.SignUpReq; -import com.example.Centralthon.global.jwt.JwtTokenProvider; import com.example.Centralthon.global.response.SuccessResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -22,8 +21,6 @@ public class MemberServiceImpl implements MemberService { private final MemberRepository memberRepository; private final PasswordEncoder passwordEncoder; - private final JwtTokenProvider jwtTokenProvider; - @Override @Transactional @@ -32,7 +29,7 @@ public void signUp(SignUpReq signUpReq) { throw new MemberAlreadyExistException(); } String encoded = passwordEncoder.encode(signUpReq.getPassword()); - Member member = Member.toEntity(signUpReq.getEmail(),encoded,signUpReq.getNickName()); + Member member = Member.toEntity(signUpReq.getEmail(),encoded,signUpReq.getNickName(),signUpReq.getRole()); memberRepository.save(member); } @@ -48,10 +45,7 @@ public LoginRes login(LoginReq loginReq) { throw new InvalidCredentialsException(); } - // ํ† ํฐ ์ƒ์„ฑ - String token = jwtTokenProvider.createToken(member); - // ๋ฐ˜ํ™˜ - return new LoginRes(token); + return new LoginRes(member.getNickName()); } } diff --git a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java b/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java index 3410c5f..eb013ca 100644 --- a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java +++ b/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java @@ -1,18 +1,14 @@ package com.example.Centralthon.domain.member.web.controller; -import com.example.Centralthon.domain.member.entity.Member; import com.example.Centralthon.domain.member.service.MemberService; import com.example.Centralthon.domain.member.web.dto.LoginReq; import com.example.Centralthon.domain.member.web.dto.LoginRes; -import com.example.Centralthon.domain.member.web.dto.ProfileRes; import com.example.Centralthon.domain.member.web.dto.SignUpReq; import com.example.Centralthon.global.response.SuccessResponse; -import com.example.Centralthon.global.security.CustomMemberDetails; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @RestController @@ -23,7 +19,7 @@ public class MemberController { //ํšŒ์› ๊ฐ€์ž… @PostMapping("/signup") - public ResponseEntity> signup(@RequestBody @Valid SignUpReq signupReq) { + public ResponseEntity> signup(@RequestBody @Valid SignUpReq signupReq) { memberService.signUp(signupReq); return ResponseEntity.status(HttpStatus.CREATED).body(SuccessResponse.created(null)); @@ -31,17 +27,10 @@ public ResponseEntity> signup(@RequestBody @Valid SignUpReq s //๋กœ๊ทธ์ธ @PostMapping("/login") - public ResponseEntity> login(@RequestBody @Valid LoginReq loginReq){ + public ResponseEntity> login(@RequestBody @Valid LoginReq loginReq){ LoginRes loginRes = memberService.login(loginReq); return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(loginRes)); } - // ์ธ๊ฐ€ ํ…Œ์ŠคํŠธ์šฉ API - @GetMapping("/profile") - public ResponseEntity getProfile(@AuthenticationPrincipal CustomMemberDetails memberDetails) { - Member member = memberDetails.getMember(); - return ResponseEntity - .ok(new ProfileRes(member.getNickName(), member.getRole().getStringRole())); - } } diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java index 0a2a897..c06794e 100644 --- a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java +++ b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java @@ -1,6 +1,6 @@ package com.example.Centralthon.domain.member.web.dto; public record LoginRes( - String token + String nickname ) { } diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java deleted file mode 100644 index e79e7f5..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/web/dto/ProfileRes.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.Centralthon.domain.member.web.dto; - -public record ProfileRes( - String nickName, - String role -) { -} diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java index eb29923..be963e6 100644 --- a/src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java +++ b/src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java @@ -1,11 +1,9 @@ package com.example.Centralthon.domain.member.web.dto; -import jakarta.validation.constraints.AssertTrue; +import com.example.Centralthon.domain.member.entity.enums.MemberRole; +import jakarta.validation.constraints.*; import lombok.Data; import lombok.Getter; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; @Getter public class SignUpReq { @@ -23,6 +21,10 @@ public class SignUpReq { @NotBlank(message = "์ด๋ฆ„์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") private String nickName; + @NotNull(message = "ํšŒ์› ๊ถŒํ•œ์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") + private MemberRole role; + + @AssertTrue(message = "๋น„๋ฐ€๋ฒˆํ˜ธ๊ฐ€ ์ผ์น˜ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.") public boolean isPasswordMatching() { if (password == null || passwordCheck == null) return false; diff --git a/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java b/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java index 41e7884..3e7e499 100644 --- a/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java +++ b/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java @@ -1,23 +1,16 @@ package com.example.Centralthon.global.config; -import com.example.Centralthon.global.exception.CustomAccessDeniedHandler; -import com.example.Centralthon.global.jwt.JwtTokenFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @Configuration @RequiredArgsConstructor public class SecurityConfig { - private final CustomAccessDeniedHandler customAccessDeniedHandler; - private final JwtTokenFilter jwtTokenFilter; // ๋น„๋ฐ€๋ฒˆํ˜ธ ์ธ์ฝ”๋” @Bean @@ -34,11 +27,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .requestMatchers("/api/members/signup", "/api/members/login").permitAll() //๋ˆ„๊ตฌ๋‚˜ ์ ‘๊ทผ ํ—ˆ์šฉ .requestMatchers("/api/members/profile").hasRole("ADMIN") // ๊ด€๋ฆฌ์ž ๊ถŒํ•œ ํ•„์š”ํ•œ API .anyRequest().authenticated() //๋กœ๊ทธ์ธํ•œ ์‚ฌ์šฉ์ž๋งŒ ์ ‘๊ทผ ํ—ˆ์šฉ - ) - - .addFilterBefore(jwtTokenFilter, UsernamePasswordAuthenticationFilter.class) - .exceptionHandling(ex -> ex - .accessDeniedHandler(customAccessDeniedHandler) ); return http.build(); diff --git a/src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java b/src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java deleted file mode 100644 index dc8a2c6..0000000 --- a/src/main/java/com/example/Centralthon/global/exception/CustomAccessDeniedHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.example.Centralthon.global.exception; - -import com.example.Centralthon.global.response.BaseResponse; -import com.example.Centralthon.global.response.code.ErrorResponseCode; -import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.web.access.AccessDeniedHandler; -import org.springframework.stereotype.Component; - -import java.io.IOException; - -@Component -@RequiredArgsConstructor -public class CustomAccessDeniedHandler implements AccessDeniedHandler { - - private final ObjectMapper objectMapper; // ํ˜น์€ ๋นˆ ์ฃผ์ž… ๊ฐ€๋Šฅ - - /** - * ์ธ์ฆ์€ ๋˜์—ˆ์ง€๋งŒ, ์ธ๊ฐ€๊ฐ€ ๋ถ€์กฑํ•œ ์š”์ฒญ์ด ๋“ค์–ด์˜ฌ ๋•Œ ์ฒ˜๋ฆฌํ•˜๋Š” ํ•ธ๋“ค๋Ÿฌ - */ - @Override - public void handle(HttpServletRequest request, - HttpServletResponse response, - AccessDeniedException accessDeniedException) throws IOException { - - response.setStatus(ErrorResponseCode.ACCESS_DENIED_REQUEST.getHttpStatus()); - response.setContentType("application/json;charset=UTF-8"); - - BaseResponse body = BaseResponse.of(false, ErrorResponseCode.ACCESS_DENIED_REQUEST); - response.getWriter().write(objectMapper.writeValueAsString(body)); - } -} diff --git a/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java index d6fa5c5..1dc1edd 100644 --- a/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java @@ -43,6 +43,16 @@ public ResponseEntity> handleBindException(BindException e) { @ExceptionHandler(HttpMessageNotReadableException.class) public ResponseEntity> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { log.error("HttpMessageNotReadableException : {}", e.getMessage(), e); + + // ํšŒ์› ๊ถŒํ•œ Enum ํŒŒ์‹ฑ ์‹คํŒจ ํ–ˆ์„ ๋•Œ + if (e.getMessage() != null && e.getMessage().contains("MemberRole")) { + ErrorResponse errorResponse = ErrorResponse.of( + ErrorResponseCode.INVALID_HTTP_MESSAGE_BODY, + "ํšŒ์› ๊ถŒํ•œ์€ USER ๋˜๋Š” ADMIN ์ค‘ ํ•˜๋‚˜์—ฌ์•ผ ํ•ฉ๋‹ˆ๋‹ค."); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + + // ์ผ๋ฐ˜์ ์ธ ํŒŒ์‹ฑ ์‹คํŒจ ์ฒ˜๋ฆฌ ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.INVALID_HTTP_MESSAGE_BODY); return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); } diff --git a/src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java b/src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java deleted file mode 100644 index 9f41bf0..0000000 --- a/src/main/java/com/example/Centralthon/global/jwt/JwtTokenFilter.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.example.Centralthon.global.jwt; - -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.filter.OncePerRequestFilter; - -import java.io.IOException; - -@Component -@RequiredArgsConstructor -public class JwtTokenFilter extends OncePerRequestFilter { - - private final JwtTokenProvider jwtTokenProvider; - @Override - protected void doFilterInternal( - HttpServletRequest request, - HttpServletResponse response, - FilterChain filterChain - ) throws ServletException, IOException { - String token = extractToken(request); - - // ํ† ํฐ ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ - if(token != null && jwtTokenProvider.validateToken(token)) { - Authentication authentication = jwtTokenProvider.getAuthentication(token); - - SecurityContextHolder.getContext().setAuthentication(authentication); - } - - filterChain.doFilter(request, response); - } - - private String extractToken(HttpServletRequest request) { - String bearer = request.getHeader("Authorization"); - if (bearer != null && bearer.startsWith("Bearer ")) { - return bearer.substring(7); - } - return null; - } -} diff --git a/src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java b/src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java deleted file mode 100644 index f93a4a0..0000000 --- a/src/main/java/com/example/Centralthon/global/jwt/JwtTokenProvider.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.example.Centralthon.global.jwt; - -import com.example.Centralthon.domain.member.entity.Member; -import com.example.Centralthon.domain.member.exception.InvalidCredentialsException; -import com.example.Centralthon.domain.member.exception.MemberNotFoundException; -import com.example.Centralthon.domain.member.repository.MemberRepository; -import com.example.Centralthon.global.security.CustomMemberDetails; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.JwtException; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.security.Keys; -import jakarta.annotation.PostConstruct; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.stereotype.Component; - -import javax.crypto.SecretKey; -import java.security.Key; -import java.util.Date; - -@Component -@RequiredArgsConstructor -public class JwtTokenProvider { - private final MemberRepository memberRepository; - - @Value("${jwt.secret}") - private String secretKey; - - @Value("${jwt.expiration}") - private long expiration; - - private Key key; - - @PostConstruct - public void init() { this.key = Keys.hmacShaKeyFor(secretKey.getBytes()); } - - public String createToken(Member member) { - Date now = new Date(); - Date expiry = new Date(now.getTime() + expiration); - - return Jwts.builder() - .subject(member.getEmail()) - .claim("nickname", member.getNickName()) - .claim("role", member.getRole()) - .issuedAt(now) - .expiration(expiry) - .signWith(key) - .compact(); - } - - // ํ† ํฐ ์œ ํšจ์„ฑ ๊ฒ€์‚ฌ + ๋งŒ๋ฃŒ ๊ฒ€์‚ฌ - public boolean validateToken(String token) { - try{ - getClaims(token); - return true; - }catch (JwtException | IllegalArgumentException e){ - return false; - } - } - - // Claim ํŒŒ์‹ฑ - public Claims getClaims(String token) { - return Jwts.parser() - .verifyWith((SecretKey) key) - .build() - .parseSignedClaims(token) - .getPayload(); - } - - public Authentication getAuthentication(String token) { - Claims claims = getClaims(token); - String email = claims.getSubject(); - - Member member = memberRepository.findByEmail(email) - .orElseThrow(MemberNotFoundException::new); - - CustomMemberDetails memberDetails = new CustomMemberDetails(member); - - return new UsernamePasswordAuthenticationToken( - memberDetails, - null, - memberDetails.getAuthorities() - ); - } -} diff --git a/src/main/java/com/example/Centralthon/global/response/BaseResponse.java b/src/main/java/com/example/Centralthon/global/response/BaseResponse.java index 680e3ed..eb85b66 100644 --- a/src/main/java/com/example/Centralthon/global/response/BaseResponse.java +++ b/src/main/java/com/example/Centralthon/global/response/BaseResponse.java @@ -12,7 +12,7 @@ @ToString @RequiredArgsConstructor public class BaseResponse { - private final Boolean inSuccess; + private final Boolean isSuccess; private final String code; private final String message; private final String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f856f6c..3289bd9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,10 +3,6 @@ spring.application.name=Centralthon # application-secret.properties spring.config.import=optional:application-secret.properties -#JWT -jwt.secret=${jwt.secret} -jwt.expiration=${jwt.expiration} - # Datasource spring.datasource.url=${DATABASE_URL} spring.datasource.username=${DATABASE_USERNAME} From 31fc2c426b6e86de125af5706fa41f16ea954e7c Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Sun, 10 Aug 2025 18:56:42 +0900 Subject: [PATCH 07/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20me?= =?UTF-8?q?mber=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/entity/Member.java | 43 ---------------- .../member/entity/enums/MemberRole.java | 18 ------- .../InvalidCredentialsException.java | 7 --- .../MemberAlreadyExistException.java | 8 --- .../member/exception/MemberErrorCode.java | 17 ------- .../exception/MemberNotFoundException.java | 7 --- .../member/repository/MemberRepository.java | 18 ------- .../domain/member/service/MemberService.java | 15 ------ .../member/service/MemberServiceImpl.java | 51 ------------------- .../web/controller/MemberController.java | 36 ------------- .../domain/member/web/dto/LoginReq.java | 15 ------ .../domain/member/web/dto/LoginRes.java | 6 --- .../domain/member/web/dto/SignUpReq.java | 33 ------------ .../global/config/SecurityConfig.java | 34 ------------- .../exception/GlobalExceptionHandler.java | 10 ---- 15 files changed, 318 deletions(-) delete mode 100644 src/main/java/com/example/Centralthon/domain/member/entity/Member.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/exception/MemberAlreadyExistException.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/service/MemberService.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java delete mode 100644 src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java delete mode 100644 src/main/java/com/example/Centralthon/global/config/SecurityConfig.java diff --git a/src/main/java/com/example/Centralthon/domain/member/entity/Member.java b/src/main/java/com/example/Centralthon/domain/member/entity/Member.java deleted file mode 100644 index b4bee43..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/entity/Member.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.example.Centralthon.domain.member.entity; - -import com.example.Centralthon.domain.member.entity.enums.MemberRole; -import com.example.Centralthon.domain.member.web.dto.SignUpReq; -import com.example.Centralthon.global.entity.BaseEntity; -import jakarta.persistence.*; -import lombok.*; -import org.springframework.security.crypto.password.PasswordEncoder; - -@Entity -@Getter -@Setter -@Builder -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor(access = AccessLevel.PROTECTED) -@Table(name = "MEMBERS") -public class Member extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(nullable = false, unique = true) - private String email; - - @Column(nullable = false) - private String password; - - @Column(nullable = false, unique = true) - private String nickName; - - @Enumerated(EnumType.STRING) - private MemberRole role; - - public static Member toEntity(String email, String encoded, String nickName, MemberRole role) { - - return Member.builder() - .email(email) - .password(encoded) - .nickName(nickName) - .role(role) - .build(); - } -} diff --git a/src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java b/src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java deleted file mode 100644 index 206b1eb..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/entity/enums/MemberRole.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.Centralthon.domain.member.entity.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum MemberRole { - USER("ROLE_USER"), - ADMIN("ROLE_ADMIN"); - - @Getter - private final String memberRole; - - public String getStringRole() { - return memberRole; - } -} diff --git a/src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java b/src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java deleted file mode 100644 index 3d06aea..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/exception/InvalidCredentialsException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.Centralthon.domain.member.exception; - -import com.example.Centralthon.global.exception.BaseException; - -public class InvalidCredentialsException extends BaseException { - public InvalidCredentialsException( ) {super(MemberErrorCode.INVALID_CREDENTIALS);} -} diff --git a/src/main/java/com/example/Centralthon/domain/member/exception/MemberAlreadyExistException.java b/src/main/java/com/example/Centralthon/domain/member/exception/MemberAlreadyExistException.java deleted file mode 100644 index efa1891..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/exception/MemberAlreadyExistException.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.Centralthon.domain.member.exception; - -import com.example.Centralthon.global.exception.BaseException; -import com.example.Centralthon.global.response.code.BaseResponseCode; - -public class MemberAlreadyExistException extends BaseException { - public MemberAlreadyExistException() {super(MemberErrorCode.MEMBER_ALREADY_EXIST);} -} diff --git a/src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java b/src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java deleted file mode 100644 index b83c403..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/exception/MemberErrorCode.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.example.Centralthon.domain.member.exception; - -import com.example.Centralthon.global.response.code.BaseResponseCode; -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum MemberErrorCode implements BaseResponseCode { - MEMBER_ALREADY_EXIST("MEMBER_409_1", 409, "์ด๋ฏธ ์กด์žฌํ•˜๋Š” ์‚ฌ์šฉ์ž์ž…๋‹ˆ๋‹ค."), - INVALID_CREDENTIALS("MEMBER_401_1", 401, "์•„์ด๋”” ๋˜๋Š” ๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ ๋‹ค์‹œ ํ™•์ธํ•ด์ฃผ์„ธ์š”"), - MEMBER_NOT_FOUND("MEMBER_404_1",404,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ์‚ฌ์šฉ์ž์ž…๋‹ˆ๋‹ค."); - - private final String code; - private final int httpStatus; - private final String message; -} diff --git a/src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java b/src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java deleted file mode 100644 index 4fcdac3..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/exception/MemberNotFoundException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.Centralthon.domain.member.exception; - -import com.example.Centralthon.global.exception.BaseException; - -public class MemberNotFoundException extends BaseException { - public MemberNotFoundException() {super(MemberErrorCode.MEMBER_NOT_FOUND);} -} diff --git a/src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java b/src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java deleted file mode 100644 index 5872243..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/repository/MemberRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.Centralthon.domain.member.repository; - -import com.example.Centralthon.domain.member.entity.Member; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; -import java.util.Optional; - -@Repository -public interface MemberRepository extends JpaRepository { - - Optional findByEmailOrNickName( String email, String nickName); - - Optional findByEmail(String email); -} diff --git a/src/main/java/com/example/Centralthon/domain/member/service/MemberService.java b/src/main/java/com/example/Centralthon/domain/member/service/MemberService.java deleted file mode 100644 index b57da9a..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/service/MemberService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.Centralthon.domain.member.service; - -import com.example.Centralthon.domain.member.web.dto.LoginReq; -import com.example.Centralthon.domain.member.web.dto.LoginRes; -import com.example.Centralthon.domain.member.web.dto.SignUpReq; -import com.example.Centralthon.global.response.SuccessResponse; -import jakarta.validation.Valid; -import org.springframework.http.ResponseEntity; - -public interface MemberService { - - void signUp( SignUpReq signupReq); - - LoginRes login( LoginReq loginReq); -} diff --git a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java b/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java deleted file mode 100644 index 10d7a3b..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/service/MemberServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.example.Centralthon.domain.member.service; - -import com.example.Centralthon.domain.member.entity.Member; -import com.example.Centralthon.domain.member.entity.enums.MemberRole; -import com.example.Centralthon.domain.member.exception.InvalidCredentialsException; -import com.example.Centralthon.domain.member.exception.MemberAlreadyExistException; -import com.example.Centralthon.domain.member.exception.MemberErrorCode; -import com.example.Centralthon.domain.member.repository.MemberRepository; -import com.example.Centralthon.domain.member.web.dto.LoginReq; -import com.example.Centralthon.domain.member.web.dto.LoginRes; -import com.example.Centralthon.domain.member.web.dto.SignUpReq; -import com.example.Centralthon.global.response.SuccessResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -public class MemberServiceImpl implements MemberService { - private final MemberRepository memberRepository; - private final PasswordEncoder passwordEncoder; - - @Override - @Transactional - public void signUp(SignUpReq signUpReq) { - if (memberRepository .findByEmailOrNickName(signUpReq.getEmail(), signUpReq.getNickName()) .isPresent()) { - throw new MemberAlreadyExistException(); } - - String encoded = passwordEncoder.encode(signUpReq.getPassword()); - Member member = Member.toEntity(signUpReq.getEmail(),encoded,signUpReq.getNickName(),signUpReq.getRole()); - - memberRepository.save(member); - } - - @Override - public LoginRes login(LoginReq loginReq) { - // ์•„์ด๋”” ํ™•์ธ - Member member = memberRepository.findByEmail(loginReq.getEmail()) - .orElseThrow(InvalidCredentialsException::new); - - // ๋น„๋ฐ€๋ฒˆํ˜ธ ๊ฒ€์ฆ - if (!passwordEncoder.matches(loginReq.getPassword(), member.getPassword())) { - throw new InvalidCredentialsException(); - } - - // ๋ฐ˜ํ™˜ - return new LoginRes(member.getNickName()); - } -} diff --git a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java b/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java deleted file mode 100644 index eb013ca..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/web/controller/MemberController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.example.Centralthon.domain.member.web.controller; - -import com.example.Centralthon.domain.member.service.MemberService; -import com.example.Centralthon.domain.member.web.dto.LoginReq; -import com.example.Centralthon.domain.member.web.dto.LoginRes; -import com.example.Centralthon.domain.member.web.dto.SignUpReq; -import com.example.Centralthon.global.response.SuccessResponse; -import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/api/members") -@RequiredArgsConstructor -public class MemberController { - private final MemberService memberService; - - //ํšŒ์› ๊ฐ€์ž… - @PostMapping("/signup") - public ResponseEntity> signup(@RequestBody @Valid SignUpReq signupReq) { - memberService.signUp(signupReq); - - return ResponseEntity.status(HttpStatus.CREATED).body(SuccessResponse.created(null)); - } - - //๋กœ๊ทธ์ธ - @PostMapping("/login") - public ResponseEntity> login(@RequestBody @Valid LoginReq loginReq){ - LoginRes loginRes = memberService.login(loginReq); - - return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(loginRes)); - } - -} diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java deleted file mode 100644 index 94bfc6b..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginReq.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.Centralthon.domain.member.web.dto; - -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Pattern; -import lombok.Getter; - -@Getter -public class LoginReq { - @NotBlank(message = "์ด๋ฉ”์ผ์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - private String email; - - @NotBlank(message = "๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - private String password; -} diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java deleted file mode 100644 index c06794e..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/web/dto/LoginRes.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.Centralthon.domain.member.web.dto; - -public record LoginRes( - String nickname -) { -} diff --git a/src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java b/src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java deleted file mode 100644 index be963e6..0000000 --- a/src/main/java/com/example/Centralthon/domain/member/web/dto/SignUpReq.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.Centralthon.domain.member.web.dto; - -import com.example.Centralthon.domain.member.entity.enums.MemberRole; -import jakarta.validation.constraints.*; -import lombok.Data; -import lombok.Getter; - -@Getter -public class SignUpReq { - @NotBlank(message = "์ด๋ฉ”์ผ์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - @Email(message = "์˜ฌ๋ฐ”๋ฅธ ์ด๋ฉ”์ผ ํ˜•์‹์œผ๋กœ ์ž‘์„ฑํ•ด์ฃผ์„ธ์š”.") - private String email; - - @NotBlank(message = "๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - @Pattern(regexp = "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d\\S]{8,20}$", message = "์˜๋ฌธ, ์ˆซ์ž๋ฅผ ํฌํ•จํ•œ 8~20์ž๋ฆฌ ์ด๋‚ด๋กœ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - private String password; - - @NotBlank(message = "๋น„๋ฐ€๋ฒˆํ˜ธ๋ฅผ ํ•œ ๋ฒˆ ๋” ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - private String passwordCheck; - - @NotBlank(message = "์ด๋ฆ„์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - private String nickName; - - @NotNull(message = "ํšŒ์› ๊ถŒํ•œ์„ ์ž…๋ ฅํ•ด์ฃผ์„ธ์š”.") - private MemberRole role; - - - @AssertTrue(message = "๋น„๋ฐ€๋ฒˆํ˜ธ๊ฐ€ ์ผ์น˜ํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค.") - public boolean isPasswordMatching() { - if (password == null || passwordCheck == null) return false; - return password.equals(passwordCheck); - } -} diff --git a/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java b/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java deleted file mode 100644 index 3e7e499..0000000 --- a/src/main/java/com/example/Centralthon/global/config/SecurityConfig.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.example.Centralthon.global.config; - -import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.SecurityFilterChain; - -@Configuration -@RequiredArgsConstructor -public class SecurityConfig { - - // ๋น„๋ฐ€๋ฒˆํ˜ธ ์ธ์ฝ”๋” - @Bean - public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } - - // ํ•„ํ„ฐ ์ฒด์ธ ์„ค์ • - @Bean - public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { - http - .csrf(csrf -> csrf.disable()) - .authorizeHttpRequests(auth -> auth - .requestMatchers("/api/members/signup", "/api/members/login").permitAll() //๋ˆ„๊ตฌ๋‚˜ ์ ‘๊ทผ ํ—ˆ์šฉ - .requestMatchers("/api/members/profile").hasRole("ADMIN") // ๊ด€๋ฆฌ์ž ๊ถŒํ•œ ํ•„์š”ํ•œ API - .anyRequest().authenticated() //๋กœ๊ทธ์ธํ•œ ์‚ฌ์šฉ์ž๋งŒ ์ ‘๊ทผ ํ—ˆ์šฉ - ); - - return http.build(); - } -} diff --git a/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java index 1dc1edd..d6fa5c5 100644 --- a/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java @@ -43,16 +43,6 @@ public ResponseEntity> handleBindException(BindException e) { @ExceptionHandler(HttpMessageNotReadableException.class) public ResponseEntity> handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { log.error("HttpMessageNotReadableException : {}", e.getMessage(), e); - - // ํšŒ์› ๊ถŒํ•œ Enum ํŒŒ์‹ฑ ์‹คํŒจ ํ–ˆ์„ ๋•Œ - if (e.getMessage() != null && e.getMessage().contains("MemberRole")) { - ErrorResponse errorResponse = ErrorResponse.of( - ErrorResponseCode.INVALID_HTTP_MESSAGE_BODY, - "ํšŒ์› ๊ถŒํ•œ์€ USER ๋˜๋Š” ADMIN ์ค‘ ํ•˜๋‚˜์—ฌ์•ผ ํ•ฉ๋‹ˆ๋‹ค."); - return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); - } - - // ์ผ๋ฐ˜์ ์ธ ํŒŒ์‹ฑ ์‹คํŒจ ์ฒ˜๋ฆฌ ErrorResponse errorResponse = ErrorResponse.from(ErrorResponseCode.INVALID_HTTP_MESSAGE_BODY); return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); } From 019a582d80d811989af33b15071fa9e440b7fbbb Mon Sep 17 00:00:00 2001 From: frombunny Date: Mon, 11 Aug 2025 19:03:45 +0900 Subject: [PATCH 08/25] =?UTF-8?q?:recycle:=20refactor:=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20CustomMember?= =?UTF-8?q?Details=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/security/CustomMemberDetails.java | 34 ------------------- 1 file changed, 34 deletions(-) delete mode 100644 src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java diff --git a/src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java b/src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java deleted file mode 100644 index 4d76d4a..0000000 --- a/src/main/java/com/example/Centralthon/global/security/CustomMemberDetails.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.example.Centralthon.global.security; - -import com.example.Centralthon.domain.member.entity.Member; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import java.util.Collection; -import java.util.List; - -@Getter -@RequiredArgsConstructor -public class CustomMemberDetails implements UserDetails { - - private final Member member; - - @Override - public Collection getAuthorities() { - return List.of(new SimpleGrantedAuthority(member.getRole().getStringRole())); - } - - @Override - public String getPassword() { - return member.getPassword(); - } - - @Override - public String getUsername() { - return member.getEmail(); - } - -} From efec916d9b62c595f3a6e83a4c43e9e9747f8e33 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Mon, 11 Aug 2025 23:15:11 +0900 Subject: [PATCH 09/25] =?UTF-8?q?=E2=9C=A8=20=20feat=20:=20=EB=A7=9E?= =?UTF-8?q?=EC=B6=A4=20=EC=B6=94=EC=B2=9C=EC=9A=A9=20=EB=A9=94=EB=89=B4=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20API=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # build.gradle --- build.gradle | 4 +- .../Centralthon/domain/menu/entity/Menu.java | 38 ++++++++++++++++++ .../menu/entity/enums/MenuCategory.java | 16 ++++++++ .../domain/menu/exception/MenuErrorCode.java | 15 +++++++ .../menu/exception/MenuNotFoundException.java | 9 +++++ .../menu/repository/MenuRepository.java | 33 ++++++++++++++++ .../domain/menu/service/MenuService.java | 9 +++++ .../domain/menu/service/MenuServiceImpl.java | 39 +++++++++++++++++++ .../menu/web/controller/MenuController.java | 31 +++++++++++++++ .../domain/menu/web/dto/NearbyMenusRes.java | 21 ++++++++++ .../domain/store/entity/Store.java | 37 ++++++++++++++++++ .../store/entity/enums/StoreCategory.java | 16 ++++++++ .../store/repository/StoreRepository.java | 9 +++++ .../exception/GlobalExceptionHandler.java | 9 +++++ .../response/code/ErrorResponseCode.java | 2 +- .../global/util/geo/BoundingBox.java | 10 +++++ .../Centralthon/global/util/geo/GeoUtils.java | 18 +++++++++ 17 files changed, 314 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java create mode 100644 src/main/java/com/example/Centralthon/domain/store/entity/Store.java create mode 100644 src/main/java/com/example/Centralthon/domain/store/entity/enums/StoreCategory.java create mode 100644 src/main/java/com/example/Centralthon/domain/store/repository/StoreRepository.java create mode 100644 src/main/java/com/example/Centralthon/global/util/geo/BoundingBox.java create mode 100644 src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java diff --git a/build.gradle b/build.gradle index 2a6c99b..f02e39f 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,6 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' @@ -34,6 +33,9 @@ dependencies { testImplementation 'org.springframework.security:spring-security-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-validation' + + // JWT implementation 'io.jsonwebtoken:jjwt-api:0.12.3' runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3' diff --git a/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java b/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java new file mode 100644 index 0000000..07d1e81 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java @@ -0,0 +1,38 @@ +package com.example.Centralthon.domain.menu.entity; + +import com.example.Centralthon.domain.menu.entity.enums.MenuCategory; +import com.example.Centralthon.domain.store.entity.Store; +import com.example.Centralthon.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDateTime; + +@Entity +@Getter +@Setter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "MENUS") +public class Menu extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String name; + + private int costPrice; + private int salePrice; + private int quantity; + + @Enumerated(EnumType.STRING) + private MenuCategory category; + + private LocalDateTime deadline; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java b/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java new file mode 100644 index 0000000..30fc7da --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java @@ -0,0 +1,16 @@ +package com.example.Centralthon.domain.menu.entity.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum MenuCategory { + SOUP("๊ตญ"), + BRAISED("์กฐ๋ฆผ"), + SEASONED("๋‚˜๋ฌผ"), + STIR_FRY("๋ณถ์Œ"), + GRILLED("๊ตฌ์ด"); + + private final String category; +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java new file mode 100644 index 0000000..fe5c192 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java @@ -0,0 +1,15 @@ +package com.example.Centralthon.domain.menu.exception; + +import com.example.Centralthon.global.response.code.BaseResponseCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MenuErrorCode implements BaseResponseCode { + MENU_NOT_FOUND("MENU_NOT_FOUND_404_1",404,"๋ฐ˜๊ฒฝ ๋‚ด์— ๋ฐ˜์ฐฌ ๋งค๋ฌผ์ด ์—†์Šต๋‹ˆ๋‹ค."); + + private final String code; + private final int httpStatus; + private final String message; +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java new file mode 100644 index 0000000..8dbb4d1 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java @@ -0,0 +1,9 @@ +package com.example.Centralthon.domain.menu.exception; + +import com.example.Centralthon.global.exception.BaseException; + +public class MenuNotFoundException extends BaseException { + public MenuNotFoundException() { + super(MenuErrorCode.MENU_NOT_FOUND); + } +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java new file mode 100644 index 0000000..76d4f89 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java @@ -0,0 +1,33 @@ +package com.example.Centralthon.domain.menu.repository; + +import com.example.Centralthon.domain.menu.entity.Menu; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.time.LocalDateTime; + +@Repository +public interface MenuRepository extends JpaRepository { + @Query(value = "SELECT m.* FROM menus m JOIN stores s ON m.store_id = s.id WHERE " + + "s.latitude BETWEEN :minLat AND :maxLat " + + "AND s.longitude BETWEEN :minLng AND :maxLng " + + "AND ST_Distance_Sphere(POINT(s.longitude, s.latitude), POINT(:lng, :lat)) <= 2000 " + + "AND m.quantity > 0 " + + "AND m.deadline > :now " + + "ORDER BY " + + "ST_Distance_Sphere(POINT(s.longitude, s.latitude), POINT(:lng, :lat)) ASC, " + + "m.deadline ASC", nativeQuery = true) + List findNearbyMenus( + double lat, + double lng, + LocalDateTime now, + double minLat, + double maxLat, + double minLng, + double maxLng + ); + +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java new file mode 100644 index 0000000..c35966a --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java @@ -0,0 +1,9 @@ +package com.example.Centralthon.domain.menu.service; + +import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; +import jakarta.validation.constraints.NotNull; +import java.util.List; + +public interface MenuService { + List nearbyMenus(double latitude, double longitude); +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java new file mode 100644 index 0000000..1c7f97e --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -0,0 +1,39 @@ +package com.example.Centralthon.domain.menu.service; + +import com.example.Centralthon.domain.menu.entity.Menu; +import com.example.Centralthon.domain.menu.exception.MenuNotFoundException; +import com.example.Centralthon.domain.menu.repository.MenuRepository; +import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; +import com.example.Centralthon.global.util.geo.BoundingBox; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +import static com.example.Centralthon.global.util.geo.GeoUtils.calculateBoundingBox; + +@Service +@RequiredArgsConstructor +public class MenuServiceImpl implements MenuService { + private final MenuRepository menuRepository; + + @Override + public List nearbyMenus(double latitude, double longitude) { + LocalDateTime now = LocalDateTime.now(); + + // ์‚ฌ์šฉ์ž ์œ„์น˜๋ฅผ ๊ธฐ๋ฐ˜์œผ๋กœ 2km ๋ฐ˜๊ฒฝ์˜ Bounding Box ๊ณ„์‚ฐ + BoundingBox bbox = calculateBoundingBox(latitude, longitude, 2.0); + + // ์ขŒํ‘œ ์ „๋‹ฌ + List menus = menuRepository.findNearbyMenus( + latitude, longitude, now, + bbox.minLat(), bbox.maxLat(), bbox.minLng(), bbox.maxLng() + ); + if (menus.isEmpty()) {throw new MenuNotFoundException();} + + return menus.stream() + .map(NearbyMenusRes::from) + .toList(); + } +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java new file mode 100644 index 0000000..cff8de0 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java @@ -0,0 +1,31 @@ +package com.example.Centralthon.domain.menu.web.controller; + +import com.example.Centralthon.domain.menu.service.MenuService; +import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; +import com.example.Centralthon.global.response.SuccessResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/api/menus") +@RequiredArgsConstructor +public class MenuController { + private final MenuService menuService; + + //๋งž์ถค ์ถ”์ฒœ์šฉ ๋ฉ”๋‰ด ๋ชฉ๋ก ์กฐํšŒ + @GetMapping("") + public ResponseEntity>> nearbyMenus( + @RequestParam("lat") Double lat, + @RequestParam("lng") Double lng) { + + List menus = menuService.nearbyMenus(lat,lng); + Map data = Map.of("menus", menus); + + return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(data)); + } +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java new file mode 100644 index 0000000..584119c --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java @@ -0,0 +1,21 @@ +package com.example.Centralthon.domain.menu.web.dto; + +import com.example.Centralthon.domain.menu.entity.Menu; + +public record NearbyMenusRes( + Long id, + String name, + String category, + int salePrice, + String storeName +) { + public static NearbyMenusRes from(Menu m) { + return new NearbyMenusRes( + m.getId(), + m.getName(), + m.getCategory().getCategory(), + m.getSalePrice(), + m.getStore().getName() + ); + } +} diff --git a/src/main/java/com/example/Centralthon/domain/store/entity/Store.java b/src/main/java/com/example/Centralthon/domain/store/entity/Store.java new file mode 100644 index 0000000..b987317 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/store/entity/Store.java @@ -0,0 +1,37 @@ +package com.example.Centralthon.domain.store.entity; + +import com.example.Centralthon.domain.menu.entity.Menu; +import com.example.Centralthon.domain.store.entity.enums.StoreCategory; +import com.example.Centralthon.global.entity.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Setter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "STORES") +public class Store extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String name; + + private String address; + + @Enumerated(EnumType.STRING) + private StoreCategory category; + + private double latitude; + private double longitude; + + @OneToMany(mappedBy ="store", cascade = CascadeType.ALL, orphanRemoval = true) + private List menus = new ArrayList<>(); +} diff --git a/src/main/java/com/example/Centralthon/domain/store/entity/enums/StoreCategory.java b/src/main/java/com/example/Centralthon/domain/store/entity/enums/StoreCategory.java new file mode 100644 index 0000000..31ca0dc --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/store/entity/enums/StoreCategory.java @@ -0,0 +1,16 @@ +package com.example.Centralthon.domain.store.entity.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum StoreCategory { + KOREAN("ํ•œ์‹ ์ „๋ฌธ์ "), + FUSION_SIDE_DISH("ํ“จ์ „ ๋ฐ˜์ฐฌ ์ „๋ฌธ์ "), + VEGAN_SIDE_DISH("์ฑ„์‹/๋น„๊ฑด ๋ฐ˜์ฐฌ ์ „๋ฌธ์ "), + PREMIUM_SIDE_DISH("๊ณ ๊ธ‰ ๋ฐ˜์ฐฌ ์ „๋ฌธ์ "), + HOME_MADE("์ˆ˜์ œ ๋ฐ˜์ฐฌ๊ฐ€๊ฒŒ"); + + private final String categoryName; +} diff --git a/src/main/java/com/example/Centralthon/domain/store/repository/StoreRepository.java b/src/main/java/com/example/Centralthon/domain/store/repository/StoreRepository.java new file mode 100644 index 0000000..d7ea91b --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/store/repository/StoreRepository.java @@ -0,0 +1,9 @@ +package com.example.Centralthon.domain.store.repository; + +import com.example.Centralthon.domain.store.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface StoreRepository extends JpaRepository { +} diff --git a/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java index d6fa5c5..33d6bc9 100644 --- a/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/example/Centralthon/global/exception/GlobalExceptionHandler.java @@ -10,6 +10,7 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; @@ -95,6 +96,14 @@ public ResponseEntity> handleBaseException(BaseException e) { return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); } + // @RequestParam ๋ˆ„๋ฝ ์‹œ ๋ฐœ์ƒ + @ExceptionHandler(MissingServletRequestParameterException.class) + public ResponseEntity> handleMissingRequestParam(MissingServletRequestParameterException e) { + log.error("MissingServletRequestParameterException : {}", e.getMessage(), e); + ErrorResponse errorResponse = ErrorResponse.of(ErrorResponseCode.INVALID_HTTP_MESSAGE_PARAMETER, e.getParameterName() + " ๊ฐ’์€ ํ•„์ˆ˜์ž…๋‹ˆ๋‹ค."); + return ResponseEntity.status(errorResponse.getHttpStatus()).body(errorResponse); + } + // ๋‚˜๋จธ์ง€ ์˜ˆ์™ธ ์ฒ˜๋ฆฌ @ExceptionHandler(Exception.class) public ResponseEntity> handleException(Exception e) { diff --git a/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java b/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java index 6e4fb27..29dc4c4 100644 --- a/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java +++ b/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java @@ -12,7 +12,7 @@ public enum ErrorResponseCode implements BaseResponseCode { INVALID_HTTP_MESSAGE_BODY("GLOBAL_400_2",BAD_REQUEST,"HTTP ์š”์ฒญ ๋ฐ”๋””์˜ ํ˜•์‹์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค."), INVALID_HTTP_MESSAGE_PARAMETER("GLOBAL_400_2",BAD_REQUEST,"HTTP ์š”์ฒญ ํŒŒ๋ผ๋ฏธํ„ฐ ํ˜•์‹์ด ์ž˜๋ชป๋˜์—ˆ์Šต๋‹ˆ๋‹ค."), ACCESS_DENIED_REQUEST("GLOBAL_403",FORBIDDEN,"ํ•ด๋‹น ์š”์ฒญ์— ์ ‘๊ทผ ๊ถŒํ•œ์ด ์—†์Šต๋‹ˆ๋‹ค."), - NOT_FOUND_ENDPOINT("GLOBAL_404",NOT_FOUND,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ์•ค๋“œํฌ์ธํŠธ ์ž…๋‹ˆ๋‹ค. ์š”์ฒญ URL์„ ํ™•์ธํ•ด์ฃผ์„ธ์š”,."), + NOT_FOUND_ENDPOINT("GLOBAL_404",NOT_FOUND,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ์•ค๋“œํฌ์ธํŠธ ์ž…๋‹ˆ๋‹ค. ์š”์ฒญ URL์„ ํ™•์ธํ•ด์ฃผ์„ธ์š”."), UNSUPPORTED_HTTP_METHOD("GLOBAL_405",METHOD_NOT_ALLOWED,"์ง€์›ํ•˜์ง€ ์•Š๋Š” HTTP ๋ฉ”์†Œ๋“œ ์ž…๋‹ˆ๋‹ค."), SERVER_ERROR("GLOBAL_500",INTERNAL_SERVER_ERROR,"์„œ๋ฒ„ ๋‚ด๋ถ€์—์„œ ์•Œ ์ˆ˜ ์—†๋Š” ์—๋Ÿฌ๊ฑฐใ… ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค."); diff --git a/src/main/java/com/example/Centralthon/global/util/geo/BoundingBox.java b/src/main/java/com/example/Centralthon/global/util/geo/BoundingBox.java new file mode 100644 index 0000000..eb4e44d --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/util/geo/BoundingBox.java @@ -0,0 +1,10 @@ +package com.example.Centralthon.global.util.geo; + +public record BoundingBox( + double minLat, + double maxLat, + double minLng, + double maxLng) { +} + + diff --git a/src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java b/src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java new file mode 100644 index 0000000..b31a7ed --- /dev/null +++ b/src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java @@ -0,0 +1,18 @@ +package com.example.Centralthon.global.util.geo; + +public class GeoUtils { + private static final double R = 6371.0; // ์ง€๊ตฌ ๋ฐ˜๊ฒฝ (km) + + public static BoundingBox calculateBoundingBox(double lat, double lng, double radiusKm) { + // Bounding Box ๊ณ„์‚ฐ ๋กœ์ง + double latRadius = Math.toDegrees(radiusKm / R); + double lngRadius = Math.toDegrees(radiusKm / R / Math.cos(Math.toRadians(lat))); + + double minLat = lat - latRadius; + double maxLat = lat + latRadius; + double minLng = lng - lngRadius; + double maxLng = lng + lngRadius; + + return new BoundingBox(minLat, maxLat, minLng, maxLng); + } +} From cbfc47b34572f035102b1c4c1caf6f1ad7fbcf3a Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Mon, 11 Aug 2025 23:40:21 +0900 Subject: [PATCH 10/25] =?UTF-8?q?=F0=9F=90=9B=20=20fix=20:=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=20=EB=B0=98=EC=B0=AC=20=EB=B0=98=ED=99=98=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Centralthon/domain/menu/service/MenuServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java index 1c7f97e..003bd8e 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -9,7 +9,9 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import static com.example.Centralthon.global.util.geo.GeoUtils.calculateBoundingBox; @@ -32,7 +34,12 @@ public List nearbyMenus(double latitude, double longitude) { ); if (menus.isEmpty()) {throw new MenuNotFoundException();} - return menus.stream() + Map uniqueMenus = new LinkedHashMap<>(); + for (Menu menu : menus) { + uniqueMenus.putIfAbsent(menu.getName(), menu); + } + + return uniqueMenus.values().stream() .map(NearbyMenusRes::from) .toList(); } From fc0af5035c9bee384a25ae47af92c15cd31caebc Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Tue, 12 Aug 2025 02:53:49 +0900 Subject: [PATCH 11/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9?= =?UTF-8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 ++++++ build.gradle | 7 +------ .../Centralthon/CentralthonApplication.java | 2 ++ .../domain/menu/repository/MenuRepository.java | 6 +----- .../domain/menu/service/MenuServiceImpl.java | 1 + .../domain/menu/web/dto/NearbyMenusRes.java | 8 ++------ .../Centralthon/global/response/BaseResponse.java | 2 +- .../global/response/SuccessResponse.java | 4 ++++ src/main/resources/application.properties | 14 ++++++++++++++ 9 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index c2065bc..cdffbe7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,12 @@ build/ !**/src/main/**/build/ !**/src/test/**/build/ +# Spring secret config +application-secret.yml +application-*.secret.yml +application-secret.properties +application-*.secret.properties + ### STS ### .apt_generated .classpath diff --git a/build.gradle b/build.gradle index f02e39f..e42d1d3 100644 --- a/build.gradle +++ b/build.gradle @@ -35,13 +35,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-validation' - - // JWT - implementation 'io.jsonwebtoken:jjwt-api:0.12.3' - runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3' - runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3' } tasks.named('test') { useJUnitPlatform() -} +} \ No newline at end of file diff --git a/src/main/java/com/example/Centralthon/CentralthonApplication.java b/src/main/java/com/example/Centralthon/CentralthonApplication.java index a9d7bb5..b973730 100644 --- a/src/main/java/com/example/Centralthon/CentralthonApplication.java +++ b/src/main/java/com/example/Centralthon/CentralthonApplication.java @@ -2,8 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication +@EnableJpaAuditing public class CentralthonApplication { public static void main(String[] args) { diff --git a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java index 76d4f89..15ae7e6 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java +++ b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java @@ -8,7 +8,6 @@ import java.util.List; import java.time.LocalDateTime; - @Repository public interface MenuRepository extends JpaRepository { @Query(value = "SELECT m.* FROM menus m JOIN stores s ON m.store_id = s.id WHERE " + @@ -16,10 +15,7 @@ public interface MenuRepository extends JpaRepository { "AND s.longitude BETWEEN :minLng AND :maxLng " + "AND ST_Distance_Sphere(POINT(s.longitude, s.latitude), POINT(:lng, :lat)) <= 2000 " + "AND m.quantity > 0 " + - "AND m.deadline > :now " + - "ORDER BY " + - "ST_Distance_Sphere(POINT(s.longitude, s.latitude), POINT(:lng, :lat)) ASC, " + - "m.deadline ASC", nativeQuery = true) + "AND m.deadline > :now", nativeQuery = true) List findNearbyMenus( double lat, double lng, diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java index 003bd8e..18f2789 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -34,6 +34,7 @@ public List nearbyMenus(double latitude, double longitude) { ); if (menus.isEmpty()) {throw new MenuNotFoundException();} + // ์ค‘๋ณต ๋ฉ”๋‰ด ์ œ๊ฑฐ Map uniqueMenus = new LinkedHashMap<>(); for (Menu menu : menus) { uniqueMenus.putIfAbsent(menu.getName(), menu); diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java index 584119c..44665c8 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java @@ -5,17 +5,13 @@ public record NearbyMenusRes( Long id, String name, - String category, - int salePrice, - String storeName + String category ) { public static NearbyMenusRes from(Menu m) { return new NearbyMenusRes( m.getId(), m.getName(), - m.getCategory().getCategory(), - m.getSalePrice(), - m.getStore().getName() + m.getCategory().getCategory() ); } } diff --git a/src/main/java/com/example/Centralthon/global/response/BaseResponse.java b/src/main/java/com/example/Centralthon/global/response/BaseResponse.java index 680e3ed..eb85b66 100644 --- a/src/main/java/com/example/Centralthon/global/response/BaseResponse.java +++ b/src/main/java/com/example/Centralthon/global/response/BaseResponse.java @@ -12,7 +12,7 @@ @ToString @RequiredArgsConstructor public class BaseResponse { - private final Boolean inSuccess; + private final Boolean isSuccess; private final String code; private final String message; private final String timestamp = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); diff --git a/src/main/java/com/example/Centralthon/global/response/SuccessResponse.java b/src/main/java/com/example/Centralthon/global/response/SuccessResponse.java index 17344a6..690f31a 100644 --- a/src/main/java/com/example/Centralthon/global/response/SuccessResponse.java +++ b/src/main/java/com/example/Centralthon/global/response/SuccessResponse.java @@ -21,6 +21,10 @@ public SuccessResponse(T data, BaseResponseCode baseResponseCode) { this.data = data; } + public static SuccessResponse created(T data) { + return new SuccessResponse<>(data, SuccessResponseCode.SUCCESS_CREATED); + } + public static SuccessResponse from(T data){ return new SuccessResponse<>(data, SuccessResponseCode.SUCCESS_OK); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c62fde1..3289bd9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,15 @@ spring.application.name=Centralthon + +# application-secret.properties +spring.config.import=optional:application-secret.properties + +# Datasource +spring.datasource.url=${DATABASE_URL} +spring.datasource.username=${DATABASE_USERNAME} +spring.datasource.password=${DATABASE_PASSWORD} + +# JPA +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.format_sql=true +spring.jpa.properties.hibernate.use_sql_comments=true \ No newline at end of file From d6ed155d86357326d8a580aad4a1d7d89ee2c1bf Mon Sep 17 00:00:00 2001 From: frombunny Date: Tue, 12 Aug 2025 03:19:39 +0900 Subject: [PATCH 12/25] =?UTF-8?q?:construction=5Fworker:=20CI:=20=EC=9B=8C?= =?UTF-8?q?=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cicd.yml | 86 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 .github/workflows/cicd.yml diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml new file mode 100644 index 0000000..e1ececa --- /dev/null +++ b/.github/workflows/cicd.yml @@ -0,0 +1,86 @@ +name: cicd.yml +on: + push: + branches: [ "main" ] # main ๋ธŒ๋žœ์น˜์— push๊ฐ€ ๋ฐœ์ƒํ•˜๋ฉด ์‹คํ–‰ํ•œ๋‹ค๋Š” ์กฐ๊ฑด + pull_request: + branches: [ "main" ] # main ๋ธŒ๋žœ์น˜์— pull_request๊ฐ€ ๋ฐœ์ƒํ•˜๋ฉด ์‹คํ–‰ํ•œ๋‹ค๋Š” ์กฐ๊ฑด + workflow_dispatch: + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: Gradle Caching + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build -x test + + - name: Docker build + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + docker build -t ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest . + docker push ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest + + - name: Deploy to dev + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ubuntu + key: ${{ secrets.PRIVATE_KEY }} + script: | + echo "${{ secrets.ENV_FILE }}" > .env + export $(grep -v '^#' .env | xargs) + + sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest + sudo docker stop leftOversFlirting || true + sudo docker rm leftOversFlirting || true + set -a + source .env + set +a + sudo docker run -d \ + --name leftOversFlirting \ + --restart always \ + --log-driver=syslog \ + -p 8080:8080 \ + --env-file .env \ + ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest + sudo docker image prune -a -f + + + - name: Check logs + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ubuntu + key: ${{ secrets.PRIVATE_KEY }} + script: | + if sudo docker ps -a --format '{{.Names}}' | grep -q '^leftOversFlirting$'; then + sudo docker logs leftOversFlirting + else + echo "!!! no container !!!" + exit 1 + fi \ No newline at end of file From ecb619111ff3276e9de8a84ce8b01000a5c73be1 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Tue, 12 Aug 2025 13:32:16 +0900 Subject: [PATCH 13/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Centralthon/domain/menu/entity/Menu.java | 10 +++++++++- .../domain/menu/entity/enums/MenuCategory.java | 13 +++++-------- .../domain/menu/repository/MenuRepository.java | 2 +- .../domain/menu/service/MenuServiceImpl.java | 3 ++- .../domain/menu/web/controller/MenuController.java | 5 ++--- .../domain/menu/web/dto/NearbyMenusRes.java | 7 +++---- .../Centralthon/domain/store/entity/Store.java | 6 ++++-- .../global/response/code/ErrorResponseCode.java | 2 +- 8 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java b/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java index 07d1e81..cb15f39 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java +++ b/src/main/java/com/example/Centralthon/domain/menu/entity/Menu.java @@ -18,21 +18,29 @@ public class Menu extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="menu_id") private Long id; @Column(nullable = false) private String name; + @Column(nullable = false) private int costPrice; + + @Column(nullable = false) private int salePrice; + + @Column(nullable = false) private int quantity; + @Column(nullable = false) @Enumerated(EnumType.STRING) private MenuCategory category; + @Column(nullable = false) private LocalDateTime deadline; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "store_id") + @JoinColumn(name = "store_id", nullable = false) private Store store; } diff --git a/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java b/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java index 30fc7da..4700ef0 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java +++ b/src/main/java/com/example/Centralthon/domain/menu/entity/enums/MenuCategory.java @@ -4,13 +4,10 @@ import lombok.RequiredArgsConstructor; @Getter -@RequiredArgsConstructor public enum MenuCategory { - SOUP("๊ตญ"), - BRAISED("์กฐ๋ฆผ"), - SEASONED("๋‚˜๋ฌผ"), - STIR_FRY("๋ณถ์Œ"), - GRILLED("๊ตฌ์ด"); - - private final String category; + SOUP, + BRAISED, + SEASONED, + STIR_FRY, + GRILLED; } diff --git a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java index 15ae7e6..a5fcb45 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java +++ b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Repository public interface MenuRepository extends JpaRepository { - @Query(value = "SELECT m.* FROM menus m JOIN stores s ON m.store_id = s.id WHERE " + + @Query(value = "SELECT m.* FROM menus m JOIN stores s ON m.store_id = s.store_id WHERE " + "s.latitude BETWEEN :minLat AND :maxLat " + "AND s.longitude BETWEEN :minLng AND :maxLng " + "AND ST_Distance_Sphere(POINT(s.longitude, s.latitude), POINT(:lng, :lat)) <= 2000 " + diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java index 18f2789..12fc7f1 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -7,6 +7,7 @@ import com.example.Centralthon.global.util.geo.BoundingBox; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.LinkedHashMap; @@ -21,6 +22,7 @@ public class MenuServiceImpl implements MenuService { private final MenuRepository menuRepository; @Override + @Transactional(readOnly=true) public List nearbyMenus(double latitude, double longitude) { LocalDateTime now = LocalDateTime.now(); @@ -32,7 +34,6 @@ public List nearbyMenus(double latitude, double longitude) { latitude, longitude, now, bbox.minLat(), bbox.maxLat(), bbox.minLng(), bbox.maxLng() ); - if (menus.isEmpty()) {throw new MenuNotFoundException();} // ์ค‘๋ณต ๋ฉ”๋‰ด ์ œ๊ฑฐ Map uniqueMenus = new LinkedHashMap<>(); diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java index cff8de0..512111d 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java @@ -19,13 +19,12 @@ public class MenuController { //๋งž์ถค ์ถ”์ฒœ์šฉ ๋ฉ”๋‰ด ๋ชฉ๋ก ์กฐํšŒ @GetMapping("") - public ResponseEntity>> nearbyMenus( + public ResponseEntity>> nearbyMenus( @RequestParam("lat") Double lat, @RequestParam("lng") Double lng) { List menus = menuService.nearbyMenus(lat,lng); - Map data = Map.of("menus", menus); - return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(data)); + return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(menus)); } } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java index 44665c8..ff41bfc 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/NearbyMenusRes.java @@ -1,17 +1,16 @@ package com.example.Centralthon.domain.menu.web.dto; import com.example.Centralthon.domain.menu.entity.Menu; +import com.example.Centralthon.domain.menu.entity.enums.MenuCategory; public record NearbyMenusRes( - Long id, String name, - String category + MenuCategory category ) { public static NearbyMenusRes from(Menu m) { return new NearbyMenusRes( - m.getId(), m.getName(), - m.getCategory().getCategory() + m.getCategory() ); } } diff --git a/src/main/java/com/example/Centralthon/domain/store/entity/Store.java b/src/main/java/com/example/Centralthon/domain/store/entity/Store.java index b987317..844f582 100644 --- a/src/main/java/com/example/Centralthon/domain/store/entity/Store.java +++ b/src/main/java/com/example/Centralthon/domain/store/entity/Store.java @@ -19,17 +19,19 @@ public class Store extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="store_id") private Long id; @Column(nullable = false) private String name; - private String address; - + @Column(nullable = false) @Enumerated(EnumType.STRING) private StoreCategory category; + @Column(nullable = false) private double latitude; + @Column(nullable = false) private double longitude; @OneToMany(mappedBy ="store", cascade = CascadeType.ALL, orphanRemoval = true) diff --git a/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java b/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java index 29dc4c4..5a5a226 100644 --- a/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java +++ b/src/main/java/com/example/Centralthon/global/response/code/ErrorResponseCode.java @@ -14,7 +14,7 @@ public enum ErrorResponseCode implements BaseResponseCode { ACCESS_DENIED_REQUEST("GLOBAL_403",FORBIDDEN,"ํ•ด๋‹น ์š”์ฒญ์— ์ ‘๊ทผ ๊ถŒํ•œ์ด ์—†์Šต๋‹ˆ๋‹ค."), NOT_FOUND_ENDPOINT("GLOBAL_404",NOT_FOUND,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ์•ค๋“œํฌ์ธํŠธ ์ž…๋‹ˆ๋‹ค. ์š”์ฒญ URL์„ ํ™•์ธํ•ด์ฃผ์„ธ์š”."), UNSUPPORTED_HTTP_METHOD("GLOBAL_405",METHOD_NOT_ALLOWED,"์ง€์›ํ•˜์ง€ ์•Š๋Š” HTTP ๋ฉ”์†Œ๋“œ ์ž…๋‹ˆ๋‹ค."), - SERVER_ERROR("GLOBAL_500",INTERNAL_SERVER_ERROR,"์„œ๋ฒ„ ๋‚ด๋ถ€์—์„œ ์•Œ ์ˆ˜ ์—†๋Š” ์—๋Ÿฌ๊ฑฐใ… ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค."); + SERVER_ERROR("GLOBAL_500",INTERNAL_SERVER_ERROR,"์„œ๋ฒ„ ๋‚ด๋ถ€์—์„œ ์•Œ ์ˆ˜ ์—†๋Š” ์—๋Ÿฌ๊ฐ€ ๋ฐœ์ƒํ–ˆ์Šต๋‹ˆ๋‹ค."); private final String code; private final int httpStatus; From b1d37fb9c00a8f4edddd7a46dbb84f171bfcbc42 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Tue, 12 Aug 2025 17:21:07 +0900 Subject: [PATCH 14/25] =?UTF-8?q?=E2=9C=A8=20=20feat=20:=20=ED=8A=B9?= =?UTF-8?q?=EC=A0=95=20=EB=A9=94=EB=89=B4=EB=A5=BC=20=ED=8C=8C=EB=8A=94=20?= =?UTF-8?q?=EA=B0=80=EA=B2=8C=20=EC=A1=B0=ED=9A=8C=20API=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menu/repository/MenuRepository.java | 2 ++ .../domain/menu/service/MenuService.java | 3 ++ .../domain/menu/service/MenuServiceImpl.java | 36 +++++++++++++++++-- .../menu/web/controller/MenuController.java | 13 +++++++ .../domain/menu/web/dto/StoresByMenu.java | 22 ++++++++++++ .../Centralthon/global/util/geo/GeoUtils.java | 12 +++++++ 6 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenu.java diff --git a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java index a5fcb45..46b30a5 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java +++ b/src/main/java/com/example/Centralthon/domain/menu/repository/MenuRepository.java @@ -26,4 +26,6 @@ List findNearbyMenus( double maxLng ); + + } diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java index c35966a..03c25ec 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java @@ -1,9 +1,12 @@ package com.example.Centralthon.domain.menu.service; import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; +import com.example.Centralthon.domain.menu.web.dto.StoresByMenu; import jakarta.validation.constraints.NotNull; import java.util.List; public interface MenuService { List nearbyMenus(double latitude, double longitude); + + List storesByMenu(String name, double lat, double lng); } diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java index 12fc7f1..4f4ada5 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -4,26 +4,30 @@ import com.example.Centralthon.domain.menu.exception.MenuNotFoundException; import com.example.Centralthon.domain.menu.repository.MenuRepository; import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; +import com.example.Centralthon.domain.menu.web.dto.StoresByMenu; +import com.example.Centralthon.domain.store.entity.Store; import com.example.Centralthon.global.util.geo.BoundingBox; +import com.example.Centralthon.global.util.geo.GeoUtils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.Comparator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import static com.example.Centralthon.global.util.geo.GeoUtils.calculateBoundingBox; +import static com.example.Centralthon.global.util.geo.GeoUtils.calculateDistance; @Service @RequiredArgsConstructor public class MenuServiceImpl implements MenuService { private final MenuRepository menuRepository; - @Override - @Transactional(readOnly=true) - public List nearbyMenus(double latitude, double longitude) { + // ์ฃผ์–ด์ง„ ์œ„๋„, ๊ฒฝ๋„๋ฅผ ์ค‘์‹ฌ์œผ๋กœ ๋ฐ˜๊ฒฝ 2km ์ด๋‚ด์˜ ๋ฉ”๋‰ด ์กฐํšŒ + private List findMenusWithinRadius(double latitude, double longitude) { LocalDateTime now = LocalDateTime.now(); // ์‚ฌ์šฉ์ž ์œ„์น˜๋ฅผ ๊ธฐ๋ฐ˜์œผ๋กœ 2km ๋ฐ˜๊ฒฝ์˜ Bounding Box ๊ณ„์‚ฐ @@ -34,6 +38,13 @@ public List nearbyMenus(double latitude, double longitude) { latitude, longitude, now, bbox.minLat(), bbox.maxLat(), bbox.minLng(), bbox.maxLng() ); + return menus; + } + + @Override + @Transactional(readOnly=true) + public List nearbyMenus(double latitude, double longitude) { + List menus = findMenusWithinRadius(latitude, longitude); // ์ค‘๋ณต ๋ฉ”๋‰ด ์ œ๊ฑฐ Map uniqueMenus = new LinkedHashMap<>(); @@ -45,4 +56,23 @@ public List nearbyMenus(double latitude, double longitude) { .map(NearbyMenusRes::from) .toList(); } + + @Override + @Transactional(readOnly=true) + public List storesByMenu(String name, double lat, double lng) { + List menus = findMenusWithinRadius(lat, lng); + + // ์ด๋ฆ„์ด ์ผ์น˜ํ•˜๋Š” ๋ฉ”๋‰ด๋งŒ ํ•„ํ„ฐ๋ง, ๊ฐ€๊ฒฉ ์˜ค๋ฆ„์ฐจ์ˆœ ์ •๋ ฌ + List filtered = menus.stream() + .filter(m -> m.getName().equals(name)) + .sorted(Comparator.comparingInt(Menu::getSalePrice)) + .toList(); + + return filtered.stream() + .map(menu -> StoresByMenu.from( + menu, + GeoUtils.calculateDistance(lat, lng, menu.getStore().getLatitude(), menu.getStore().getLongitude()) + )) + .toList(); + } } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java index 512111d..01c021b 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java @@ -2,6 +2,7 @@ import com.example.Centralthon.domain.menu.service.MenuService; import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; +import com.example.Centralthon.domain.menu.web.dto.StoresByMenu; import com.example.Centralthon.global.response.SuccessResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -27,4 +28,16 @@ public ResponseEntity>> nearbyMenus( return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(menus)); } + + //ํŠน์ • ๋ฉ”๋‰ด๋ฅผ ํŒ๋งค ํ•˜๋Š” ๊ฐ€๊ฒŒ ์กฐํšŒ + @GetMapping("/stores") + public ResponseEntity>> storesByMenu( + @RequestParam("name") String name, + @RequestParam("lat") Double lat, + @RequestParam("lng") Double lng) { + + List stores = menuService.storesByMenu(name,lat,lng); + + return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(stores)); + } } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenu.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenu.java new file mode 100644 index 0000000..f17c211 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenu.java @@ -0,0 +1,22 @@ +package com.example.Centralthon.domain.menu.web.dto; + +import com.example.Centralthon.domain.menu.entity.Menu; +import com.example.Centralthon.domain.menu.entity.enums.MenuCategory; +import com.example.Centralthon.domain.store.entity.Store; + +public record StoresByMenu( + String storeName, + double distance, + int salePrice, + int quantity +) { + public static StoresByMenu from(Menu menu, double distance) { + Store store = menu.getStore(); + return new StoresByMenu( + store.getName(), + distance, + menu.getSalePrice(), + menu.getQuantity() + ); + } +} diff --git a/src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java b/src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java index b31a7ed..69dc17e 100644 --- a/src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java +++ b/src/main/java/com/example/Centralthon/global/util/geo/GeoUtils.java @@ -3,6 +3,7 @@ public class GeoUtils { private static final double R = 6371.0; // ์ง€๊ตฌ ๋ฐ˜๊ฒฝ (km) + // ๊ฑฐ๋ฆฌ ๋ฐ˜๊ฒฝ ์ง€์ • public static BoundingBox calculateBoundingBox(double lat, double lng, double radiusKm) { // Bounding Box ๊ณ„์‚ฐ ๋กœ์ง double latRadius = Math.toDegrees(radiusKm / R); @@ -15,4 +16,15 @@ public static BoundingBox calculateBoundingBox(double lat, double lng, double ra return new BoundingBox(minLat, maxLat, minLng, maxLng); } + + // ๊ฑฐ๋ฆฌ ๊ณ„์‚ฐ + public static double calculateDistance(double lat1, double lng1, double lat2, double lng2) { + double dLat = Math.toRadians(lat2 - lat1); + double dLng = Math.toRadians(lng2 - lng1); + double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) + * Math.sin(dLng / 2) * Math.sin(dLng / 2); + double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); + return R * c; + } } From 08f9bdc61a8904fd4c6465c4778e7e005e0fe5f2 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Tue, 12 Aug 2025 21:11:46 +0900 Subject: [PATCH 15/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20Re?= =?UTF-8?q?s=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Centralthon/domain/menu/service/MenuService.java | 4 ++-- .../Centralthon/domain/menu/service/MenuServiceImpl.java | 6 +++--- .../domain/menu/web/controller/MenuController.java | 6 +++--- .../web/dto/{StoresByMenu.java => StoresByMenuRes.java} | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/com/example/Centralthon/domain/menu/web/dto/{StoresByMenu.java => StoresByMenuRes.java} (79%) diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java index 03c25ec..5057130 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java @@ -1,12 +1,12 @@ package com.example.Centralthon.domain.menu.service; import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; -import com.example.Centralthon.domain.menu.web.dto.StoresByMenu; +import com.example.Centralthon.domain.menu.web.dto.StoresByMenuRes; import jakarta.validation.constraints.NotNull; import java.util.List; public interface MenuService { List nearbyMenus(double latitude, double longitude); - List storesByMenu(String name, double lat, double lng); + List storesByMenu(String name, double lat, double lng); } diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java index 4f4ada5..7c3dfcf 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -4,7 +4,7 @@ import com.example.Centralthon.domain.menu.exception.MenuNotFoundException; import com.example.Centralthon.domain.menu.repository.MenuRepository; import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; -import com.example.Centralthon.domain.menu.web.dto.StoresByMenu; +import com.example.Centralthon.domain.menu.web.dto.StoresByMenuRes; import com.example.Centralthon.domain.store.entity.Store; import com.example.Centralthon.global.util.geo.BoundingBox; import com.example.Centralthon.global.util.geo.GeoUtils; @@ -59,7 +59,7 @@ public List nearbyMenus(double latitude, double longitude) { @Override @Transactional(readOnly=true) - public List storesByMenu(String name, double lat, double lng) { + public List storesByMenu(String name, double lat, double lng) { List menus = findMenusWithinRadius(lat, lng); // ์ด๋ฆ„์ด ์ผ์น˜ํ•˜๋Š” ๋ฉ”๋‰ด๋งŒ ํ•„ํ„ฐ๋ง, ๊ฐ€๊ฒฉ ์˜ค๋ฆ„์ฐจ์ˆœ ์ •๋ ฌ @@ -69,7 +69,7 @@ public List storesByMenu(String name, double lat, double lng) { .toList(); return filtered.stream() - .map(menu -> StoresByMenu.from( + .map(menu -> StoresByMenuRes.from( menu, GeoUtils.calculateDistance(lat, lng, menu.getStore().getLatitude(), menu.getStore().getLongitude()) )) diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java index 01c021b..4f40c25 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java @@ -2,7 +2,7 @@ import com.example.Centralthon.domain.menu.service.MenuService; import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; -import com.example.Centralthon.domain.menu.web.dto.StoresByMenu; +import com.example.Centralthon.domain.menu.web.dto.StoresByMenuRes; import com.example.Centralthon.global.response.SuccessResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -31,12 +31,12 @@ public ResponseEntity>> nearbyMenus( //ํŠน์ • ๋ฉ”๋‰ด๋ฅผ ํŒ๋งค ํ•˜๋Š” ๊ฐ€๊ฒŒ ์กฐํšŒ @GetMapping("/stores") - public ResponseEntity>> storesByMenu( + public ResponseEntity>> storesByMenu( @RequestParam("name") String name, @RequestParam("lat") Double lat, @RequestParam("lng") Double lng) { - List stores = menuService.storesByMenu(name,lat,lng); + List stores = menuService.storesByMenu(name,lat,lng); return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(stores)); } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenu.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenuRes.java similarity index 79% rename from src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenu.java rename to src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenuRes.java index f17c211..272e9d9 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenu.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenuRes.java @@ -4,15 +4,15 @@ import com.example.Centralthon.domain.menu.entity.enums.MenuCategory; import com.example.Centralthon.domain.store.entity.Store; -public record StoresByMenu( +public record StoresByMenuRes( String storeName, double distance, int salePrice, int quantity ) { - public static StoresByMenu from(Menu menu, double distance) { + public static StoresByMenuRes from(Menu menu, double distance) { Store store = menu.getStore(); - return new StoresByMenu( + return new StoresByMenuRes( store.getName(), distance, menu.getSalePrice(), From d232b1fab55b70b6a21e72ac5b79f12e2ff8d9c0 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Wed, 13 Aug 2025 00:18:15 +0900 Subject: [PATCH 16/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20Re?= =?UTF-8?q?s=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Centralthon/domain/menu/web/dto/StoresByMenuRes.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenuRes.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenuRes.java index 272e9d9..cfdbd77 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenuRes.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/StoresByMenuRes.java @@ -5,6 +5,7 @@ import com.example.Centralthon.domain.store.entity.Store; public record StoresByMenuRes( + long menuId, String storeName, double distance, int salePrice, @@ -13,6 +14,7 @@ public record StoresByMenuRes( public static StoresByMenuRes from(Menu menu, double distance) { Store store = menu.getStore(); return new StoresByMenuRes( + menu.getId(), store.getName(), distance, menu.getSalePrice(), From 79ab459025b431e1ef74fc905e993cc002bccaa9 Mon Sep 17 00:00:00 2001 From: frombunny Date: Wed, 13 Aug 2025 06:18:45 +0900 Subject: [PATCH 17/25] =?UTF-8?q?:construction=5Fworker:=20CI:=20ci.yml=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 68 ++++++++++++++++++++++++++++++ .github/workflows/cicd.yml | 86 -------------------------------------- 2 files changed, 68 insertions(+), 86 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/cicd.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1d0d5c0 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,68 @@ +name: CI with Gradle + +on: + pull_request: + branches: ["main"] + push: + branches: ["main"] + workflow_dispatch: + +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +env: + JAVA_VERSION: '21' + IMAGE: ${{ secrets.DOCKER_USERNAME }}/leftoversflirting + +jobs: + build: # 1) ๋นŒ๋“œ ์ „์šฉ Job โ€” PR๊ณผ push ๋ชจ๋‘ ์‹คํ–‰ + name: Build + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Temurin JDK + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: ${{ env.JAVA_VERSION }} + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build JAR + run: ./gradlew bootJar -x test --no-daemon + + docker-push: + name: Docker Build & Push + if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' + needs: build + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build & Push image + uses: docker/build-push-action@v6 + with: + context: . + push: true + tags: | + ${{ env.IMAGE }}:latest + ${{ env.IMAGE }}:${{ github.sha }} \ No newline at end of file diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml deleted file mode 100644 index e1ececa..0000000 --- a/.github/workflows/cicd.yml +++ /dev/null @@ -1,86 +0,0 @@ -name: cicd.yml -on: - push: - branches: [ "main" ] # main ๋ธŒ๋žœ์น˜์— push๊ฐ€ ๋ฐœ์ƒํ•˜๋ฉด ์‹คํ–‰ํ•œ๋‹ค๋Š” ์กฐ๊ฑด - pull_request: - branches: [ "main" ] # main ๋ธŒ๋žœ์น˜์— pull_request๊ฐ€ ๋ฐœ์ƒํ•˜๋ฉด ์‹คํ–‰ํ•œ๋‹ค๋Š” ์กฐ๊ฑด - workflow_dispatch: - -permissions: - contents: read - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up JDK 17 - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - - name: Gradle Caching - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Build with Gradle - run: ./gradlew build -x test - - - name: Docker build - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest . - docker push ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest - - - name: Deploy to dev - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ubuntu - key: ${{ secrets.PRIVATE_KEY }} - script: | - echo "${{ secrets.ENV_FILE }}" > .env - export $(grep -v '^#' .env | xargs) - - sudo docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - sudo docker pull ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest - sudo docker stop leftOversFlirting || true - sudo docker rm leftOversFlirting || true - set -a - source .env - set +a - sudo docker run -d \ - --name leftOversFlirting \ - --restart always \ - --log-driver=syslog \ - -p 8080:8080 \ - --env-file .env \ - ${{ secrets.DOCKER_USERNAME }}/leftOversFlirting:latest - sudo docker image prune -a -f - - - - name: Check logs - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ubuntu - key: ${{ secrets.PRIVATE_KEY }} - script: | - if sudo docker ps -a --format '{{.Names}}' | grep -q '^leftOversFlirting$'; then - sudo docker logs leftOversFlirting - else - echo "!!! no container !!!" - exit 1 - fi \ No newline at end of file From 84f100457c8a79226597fa22ffe89c3698739f70 Mon Sep 17 00:00:00 2001 From: frombunny Date: Wed, 13 Aug 2025 06:25:48 +0900 Subject: [PATCH 18/25] =?UTF-8?q?:construction=5Fworker:=20CI:=20cd.yml=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 43 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/cd.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000..d089d69 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,43 @@ +name: CD + +on: + push: + branches: + - main # main ๋ธŒ๋žœ์น˜ push ์‹œ ์ž๋™ ๋ฐฐํฌ + workflow_dispatch: # ์ˆ˜๋™ ์‹คํ–‰ + +permissions: + contents: read + +env: + IMAGE: ${{ secrets.DOCKER_USERNAME }}/leftoversflirting + +jobs: + deploy: + name: Deploy to Server + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + # SSH๋กœ ์„œ๋ฒ„์— ์ ‘์†ํ•ด ๋ฐฐํฌ + - name: Deploy over SSH + uses: appleboy/ssh-action@v1.2.0 + with: + host: ${{ secrets.SERVER_HOST }} + username: ${{ secrets.SERVER_USER }} + key: ${{ secrets.SERVER_SSH_KEY }} + port: 22 + script: | + echo "[1/3] Pull latest Docker image..." + docker pull ${{ env.IMAGE }}:latest + + echo "[2/3] Restart container with new image..." + docker stop leftoversflirting || true + docker rm leftoversflirting || true + docker run -d --name leftoversflirting \ + -p 8080:8080 \ + ${{ env.IMAGE }}:latest + + echo "[3/3] Cleanup unused images..." + docker image prune -f \ No newline at end of file From 0d92dee4b1bc8be64f2476d4a99f9bfee92b992d Mon Sep 17 00:00:00 2001 From: frombunny Date: Wed, 13 Aug 2025 06:40:50 +0900 Subject: [PATCH 19/25] =?UTF-8?q?:construction=5Fworker:=20CI:=20Dockerfil?= =?UTF-8?q?e=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..71d8cc1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM eclipse-temurin:21-jre +WORKDIR /app +COPY build/libs/*.jar /app/app.jar +ENTRYPOINT ["java","-jar","/app/app.jar"] \ No newline at end of file From 85177efa4f1b7adcb737072acc699e31db89b4fe Mon Sep 17 00:00:00 2001 From: frombunny Date: Wed, 13 Aug 2025 06:59:01 +0900 Subject: [PATCH 20/25] =?UTF-8?q?:green=5Fheart:=20CI:=20ci=20=ED=9B=84?= =?UTF-8?q?=EC=97=90=20cd=EA=B0=80=20=EC=A7=84=ED=96=89=EB=90=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index d089d69..396107a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,10 +1,10 @@ name: CD on: - push: - branches: - - main # main ๋ธŒ๋žœ์น˜ push ์‹œ ์ž๋™ ๋ฐฐํฌ - workflow_dispatch: # ์ˆ˜๋™ ์‹คํ–‰ + workflow_run: + workflows: ["CI with Gradle"] # CI ์›Œํฌํ”Œ๋กœ ์ด๋ฆ„๊ณผ ์ •ํ™•ํžˆ ์ผ์น˜ํ•ด์•ผ ํ•จ + types: [completed] # CI๊ฐ€ ๋๋‚ฌ์„ ๋•Œ ํŠธ๋ฆฌ๊ฑฐ + branches: [main] # main ์—์„œ๋งŒ permissions: contents: read From 275eb8393d2e2bc2b6af5f714fe2d02f7e96ea7f Mon Sep 17 00:00:00 2001 From: frombunny Date: Wed, 13 Aug 2025 07:09:11 +0900 Subject: [PATCH 21/25] =?UTF-8?q?:green=5Fheart:=20CI:=20ci=EC=97=90?= =?UTF-8?q?=EC=84=9C=20job=20=EA=B0=84=EC=9D=98=20=EC=95=84=ED=8B=B0?= =?UTF-8?q?=ED=8C=A9=ED=8A=B8=EB=A5=BC=20=EC=A0=84=EB=8B=AC=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d0d5c0..f05a098 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,12 @@ jobs: - name: Build JAR run: ./gradlew bootJar -x test --no-daemon + - name: Upload JAR artifact + uses: actions/upload-artifact@v4 + with: + name: app-jar + path: build/libs/*.jar + docker-push: name: Docker Build & Push if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' @@ -52,6 +58,12 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Download JAR artifact + uses: actions/download-artifact@v4 + with: + name: app-jar + path: build/libs + - name: Login to Docker Hub uses: docker/login-action@v3 with: From fb04c4592b47d4523e5e6a032bf979a8231a8f8b Mon Sep 17 00:00:00 2001 From: frombunny Date: Wed, 13 Aug 2025 07:32:09 +0900 Subject: [PATCH 22/25] =?UTF-8?q?:green=5Fheart:=20CI.=20cd=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=EC=8B=9C,=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98?= =?UTF-8?q?=EA=B0=80=20=EC=A0=81=EC=9A=A9=EB=90=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 396107a..8fbd6b4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -29,6 +29,7 @@ jobs: key: ${{ secrets.SERVER_SSH_KEY }} port: 22 script: | + echo "${{ secrets.ENV_FILE }}" > /home/${{ secrets.SERVER_USER }}/.env echo "[1/3] Pull latest Docker image..." docker pull ${{ env.IMAGE }}:latest @@ -36,8 +37,10 @@ jobs: docker stop leftoversflirting || true docker rm leftoversflirting || true docker run -d --name leftoversflirting \ + --env-file /home/${{ secrets.SERVER_USER }}/.env \ -p 8080:8080 \ ${{ env.IMAGE }}:latest - + + echo "[3/3] Cleanup unused images..." docker image prune -f \ No newline at end of file From b7e64ea7ea84a43e37a6f9b2e8c83a8ead26ac17 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Wed, 13 Aug 2025 14:52:42 +0900 Subject: [PATCH 23/25] =?UTF-8?q?=E2=9C=A8=20=20feat=20:=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=20=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20API=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/menu/exception/MenuErrorCode.java | 15 ++++++++++ .../menu/exception/MenuNotFoundException.java | 7 +++++ .../domain/menu/service/MenuService.java | 6 ++-- .../domain/menu/service/MenuServiceImpl.java | 25 +++++++++++++---- .../menu/web/controller/MenuController.java | 12 ++++++-- .../menu/web/dto/MenuDetailsListReq.java | 13 +++++++++ .../domain/menu/web/dto/MenuDetailsReq.java | 13 +++++++++ .../domain/menu/web/dto/MenuDetailsRes.java | 28 +++++++++++++++++++ 8 files changed, 109 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java diff --git a/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java new file mode 100644 index 0000000..7fc5dba --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java @@ -0,0 +1,15 @@ +package com.example.Centralthon.domain.menu.exception; + +import com.example.Centralthon.global.response.code.BaseResponseCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MenuErrorCode implements BaseResponseCode { + MENU_NOT_FOUND("MENU_404_1",404,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ๋ฉ”๋‰ด ์ž…๋‹ˆ๋‹ค."); + + private final String code; + private final int httpStatus; + private final String message; +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java new file mode 100644 index 0000000..a6a5f24 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuNotFoundException.java @@ -0,0 +1,7 @@ +package com.example.Centralthon.domain.menu.exception; + +import com.example.Centralthon.global.exception.BaseException; + +public class MenuNotFoundException extends BaseException { + public MenuNotFoundException() {super(MenuErrorCode.MENU_NOT_FOUND);} +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java index 5057130..b354eae 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java @@ -1,7 +1,7 @@ package com.example.Centralthon.domain.menu.service; -import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; -import com.example.Centralthon.domain.menu.web.dto.StoresByMenuRes; +import com.example.Centralthon.domain.menu.web.dto.*; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import java.util.List; @@ -9,4 +9,6 @@ public interface MenuService { List nearbyMenus(double latitude, double longitude); List storesByMenu(String name, double lat, double lng); + + List details( MenuDetailsListReq menus); } diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java index d8cedb0..29b8883 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -1,9 +1,9 @@ package com.example.Centralthon.domain.menu.service; import com.example.Centralthon.domain.menu.entity.Menu; +import com.example.Centralthon.domain.menu.exception.MenuNotFoundException; import com.example.Centralthon.domain.menu.repository.MenuRepository; -import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; -import com.example.Centralthon.domain.menu.web.dto.StoresByMenuRes; +import com.example.Centralthon.domain.menu.web.dto.*; import com.example.Centralthon.domain.store.entity.Store; import com.example.Centralthon.global.util.geo.BoundingBox; import com.example.Centralthon.global.util.geo.GeoUtils; @@ -12,10 +12,8 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.Comparator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; import static com.example.Centralthon.global.util.geo.GeoUtils.calculateBoundingBox; import static com.example.Centralthon.global.util.geo.GeoUtils.calculateDistance; @@ -74,4 +72,19 @@ public List storesByMenu(String name, double lat, double lng) { )) .toList(); } + + @Override + @Transactional(readOnly=true) + public List details(MenuDetailsListReq menus) { + Map menuMap = menus.getMenus().stream() + .collect(Collectors.toMap(MenuDetailsReq::getMenuId, MenuDetailsReq::getQuantity)); + + List menuList = menuRepository.findAllById(menuMap.keySet()); + + if (menuList.isEmpty()) {throw new MenuNotFoundException();} + + return menuList.stream() + .map(menu -> MenuDetailsRes.from(menu, menuMap.get(menu.getId()))) + .toList(); + } } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java index 4f40c25..c4d053b 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java @@ -1,9 +1,9 @@ package com.example.Centralthon.domain.menu.web.controller; import com.example.Centralthon.domain.menu.service.MenuService; -import com.example.Centralthon.domain.menu.web.dto.NearbyMenusRes; -import com.example.Centralthon.domain.menu.web.dto.StoresByMenuRes; +import com.example.Centralthon.domain.menu.web.dto.*; import com.example.Centralthon.global.response.SuccessResponse; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -40,4 +40,12 @@ public ResponseEntity>> storesByMenu( return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(stores)); } + + //๋ฉ”๋‰ด ์ƒ์„ธ ์กฐํšŒ + @PostMapping("/details") + public ResponseEntity>> details(@RequestBody @Valid MenuDetailsListReq menus){ + List menuList = menuService.details(menus); + + return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(menuList)); + } } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java new file mode 100644 index 0000000..8012347 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java @@ -0,0 +1,13 @@ +package com.example.Centralthon.domain.menu.web.dto; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import lombok.Getter; +import java.util.List; + +@Getter +public class MenuDetailsListReq { + @NotEmpty(message = "menus ๋ฆฌ์ŠคํŠธ๊ฐ€ ๋น„์–ด์žˆ์Šต๋‹ˆ๋‹ค.") + @Valid + private List menus; +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java new file mode 100644 index 0000000..930630a --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java @@ -0,0 +1,13 @@ +package com.example.Centralthon.domain.menu.web.dto; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; + +@Getter +public class MenuDetailsReq { + @NotNull(message = "menuId๋Š” ํ•„์ˆ˜์ž…๋‹ˆ๋‹ค.") + private Long menuId; + @Min(value=1, message="quantity๋Š” 1 ์ด์ƒ์ด์–ด์•ผ ํ•ฉ๋‹ˆ๋‹ค.") + private int quantity; +} diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java new file mode 100644 index 0000000..656dd96 --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java @@ -0,0 +1,28 @@ +package com.example.Centralthon.domain.menu.web.dto; + +import com.example.Centralthon.domain.menu.entity.Menu; +import com.example.Centralthon.domain.menu.entity.enums.MenuCategory; +import com.example.Centralthon.domain.store.entity.Store; + +public record MenuDetailsRes( + long menuId, + String name, + MenuCategory category, + int costPrice, + int salePrice, + String storeName, + int quantity +) { + public static MenuDetailsRes from(Menu menu, int quantity) { + Store store = menu.getStore(); + return new MenuDetailsRes( + menu.getId(), + menu.getName(), + menu.getCategory(), + menu.getCostPrice(), + menu.getSalePrice(), + store.getName(), + quantity + ); + } +} From ec751f7a0ad76d64b4cafdfc25c6df415f3a5bbc Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Wed, 13 Aug 2025 22:32:44 +0900 Subject: [PATCH 24/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20Re?= =?UTF-8?q?q=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/menu/service/MenuService.java | 5 ++--- .../domain/menu/service/MenuServiceImpl.java | 9 +++----- .../menu/web/controller/MenuController.java | 2 +- .../menu/web/dto/MenuDetailsListReq.java | 13 ----------- .../domain/menu/web/dto/MenuDetailsReq.java | 13 ----------- .../domain/menu/web/dto/MenuDetailsRes.java | 22 +++++++++++++------ .../domain/menu/web/dto/MenuIdsReq.java | 13 +++++++++++ 7 files changed, 34 insertions(+), 43 deletions(-) delete mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java delete mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java create mode 100644 src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuIdsReq.java diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java index b354eae..4e83493 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuService.java @@ -1,8 +1,7 @@ package com.example.Centralthon.domain.menu.service; import com.example.Centralthon.domain.menu.web.dto.*; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; + import java.util.List; public interface MenuService { @@ -10,5 +9,5 @@ public interface MenuService { List storesByMenu(String name, double lat, double lng); - List details( MenuDetailsListReq menus); + List details(MenuIdsReq menus); } diff --git a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java index 29b8883..4bb93b2 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java +++ b/src/main/java/com/example/Centralthon/domain/menu/service/MenuServiceImpl.java @@ -75,16 +75,13 @@ public List storesByMenu(String name, double lat, double lng) { @Override @Transactional(readOnly=true) - public List details(MenuDetailsListReq menus) { - Map menuMap = menus.getMenus().stream() - .collect(Collectors.toMap(MenuDetailsReq::getMenuId, MenuDetailsReq::getQuantity)); - - List menuList = menuRepository.findAllById(menuMap.keySet()); + public List details(MenuIdsReq menus) { + List menuList = menuRepository.findAllById(menus.getMenuIds()); if (menuList.isEmpty()) {throw new MenuNotFoundException();} return menuList.stream() - .map(menu -> MenuDetailsRes.from(menu, menuMap.get(menu.getId()))) + .map(menu -> MenuDetailsRes.from(menu)) .toList(); } } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java index c4d053b..21172fc 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/controller/MenuController.java @@ -43,7 +43,7 @@ public ResponseEntity>> storesByMenu( //๋ฉ”๋‰ด ์ƒ์„ธ ์กฐํšŒ @PostMapping("/details") - public ResponseEntity>> details(@RequestBody @Valid MenuDetailsListReq menus){ + public ResponseEntity>> details(@RequestBody @Valid MenuIdsReq menus){ List menuList = menuService.details(menus); return ResponseEntity.status(HttpStatus.OK).body(SuccessResponse.from(menuList)); diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java deleted file mode 100644 index 8012347..0000000 --- a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsListReq.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.Centralthon.domain.menu.web.dto; - -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import lombok.Getter; -import java.util.List; - -@Getter -public class MenuDetailsListReq { - @NotEmpty(message = "menus ๋ฆฌ์ŠคํŠธ๊ฐ€ ๋น„์–ด์žˆ์Šต๋‹ˆ๋‹ค.") - @Valid - private List menus; -} diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java deleted file mode 100644 index 930630a..0000000 --- a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsReq.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.Centralthon.domain.menu.web.dto; - -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; -import lombok.Getter; - -@Getter -public class MenuDetailsReq { - @NotNull(message = "menuId๋Š” ํ•„์ˆ˜์ž…๋‹ˆ๋‹ค.") - private Long menuId; - @Min(value=1, message="quantity๋Š” 1 ์ด์ƒ์ด์–ด์•ผ ํ•ฉ๋‹ˆ๋‹ค.") - private int quantity; -} diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java index 656dd96..636c51a 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuDetailsRes.java @@ -2,7 +2,9 @@ import com.example.Centralthon.domain.menu.entity.Menu; import com.example.Centralthon.domain.menu.entity.enums.MenuCategory; -import com.example.Centralthon.domain.store.entity.Store; + +import java.math.BigDecimal; +import java.math.RoundingMode; public record MenuDetailsRes( long menuId, @@ -10,19 +12,25 @@ public record MenuDetailsRes( MenuCategory category, int costPrice, int salePrice, - String storeName, - int quantity + int salePercent, + String storeName ) { - public static MenuDetailsRes from(Menu menu, int quantity) { - Store store = menu.getStore(); + public static MenuDetailsRes from(Menu menu) { return new MenuDetailsRes( menu.getId(), menu.getName(), menu.getCategory(), menu.getCostPrice(), menu.getSalePrice(), - store.getName(), - quantity + calculateDiscount(menu.getCostPrice(), menu.getSalePrice()), + menu.getStore().getName() ); } + + private static int calculateDiscount(int cost, int sale) { + return BigDecimal.valueOf(cost - sale) + .multiply(BigDecimal.valueOf(100)) + .divide(BigDecimal.valueOf(cost), 0, RoundingMode.HALF_UP) + .intValue(); + } } diff --git a/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuIdsReq.java b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuIdsReq.java new file mode 100644 index 0000000..2c3e8ba --- /dev/null +++ b/src/main/java/com/example/Centralthon/domain/menu/web/dto/MenuIdsReq.java @@ -0,0 +1,13 @@ +package com.example.Centralthon.domain.menu.web.dto; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import java.util.List; + +@Getter +public class MenuIdsReq { + @NotEmpty(message = "menuIds ๋ฆฌ์ŠคํŠธ๊ฐ€ ๋น„์–ด์žˆ์Šต๋‹ˆ๋‹ค.") + private List<@NotNull(message = "menuId๋Š” null์ผ ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.") Long> menuIds; +} From 8662baa6c9f444a38b10eb7114c82fa9f8c587d1 Mon Sep 17 00:00:00 2001 From: oroi2009 Date: Wed, 13 Aug 2025 22:44:47 +0900 Subject: [PATCH 25/25] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20refactor=20:=20Me?= =?UTF-8?q?nuErrorCode=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Centralthon/domain/menu/exception/MenuErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java index fe5c192..3e53d4c 100644 --- a/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java +++ b/src/main/java/com/example/Centralthon/domain/menu/exception/MenuErrorCode.java @@ -7,7 +7,7 @@ @Getter @AllArgsConstructor public enum MenuErrorCode implements BaseResponseCode { - MENU_NOT_FOUND("MENU_NOT_FOUND_404_1",404,"๋ฐ˜๊ฒฝ ๋‚ด์— ๋ฐ˜์ฐฌ ๋งค๋ฌผ์ด ์—†์Šต๋‹ˆ๋‹ค."); + MENU_NOT_FOUND("MENU_NOT_FOUND_404_1",404,"์กด์žฌํ•˜์ง€ ์•Š๋Š” ๋ฉ”๋‰ด ์ž…๋‹ˆ๋‹ค."); private final String code; private final int httpStatus;