From 7298534b0712cc7ffa58bbc0db54a36aa300adcd Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Thu, 13 Nov 2025 12:26:59 +0900 Subject: [PATCH 01/46] Chore: Spring Boot initial --- .gitignore | 46 ++++ build.gradle | 57 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../SpringVote22ndApplication.java | 13 + .../SpringVote22ndApplicationTests.java | 13 + 9 files changed, 482 insertions(+) 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 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java create mode 100644 src/test/java/com/storix/spring_vote_22nd/SpringVote22ndApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..43a1d59 --- /dev/null +++ b/.gitignore @@ -0,0 +1,46 @@ +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/ + +*.pem +.env + +*.yml +*.properties + +!gradle/wrapper/gradle-wrapper.jar +!gradle/wrapper/gradle-wrapper.properties \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ea8e9a0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,57 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.7' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.storix' +version = '0.0.1-SNAPSHOT' +description = 'Demo project for Spring Boot' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // Lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + // MySQL + runtimeOnly 'com.mysql:mysql-connector-j' + + // Spring Security + implementation 'org.springframework.boot:spring-boot-starter-security' + testImplementation 'org.springframework.security:spring-security-test' + + // jwt + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.7.0' + +} + +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..d4a6f3c --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'spring-vote-22nd' diff --git a/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java b/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java new file mode 100644 index 0000000..e928365 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringVote22ndApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringVote22ndApplication.class, args); + } + +} diff --git a/src/test/java/com/storix/spring_vote_22nd/SpringVote22ndApplicationTests.java b/src/test/java/com/storix/spring_vote_22nd/SpringVote22ndApplicationTests.java new file mode 100644 index 0000000..1739550 --- /dev/null +++ b/src/test/java/com/storix/spring_vote_22nd/SpringVote22ndApplicationTests.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SpringVote22ndApplicationTests { + + @Test + void contextLoads() { + } + +} From 13f469062df2e4c1fba530f1c3186edab6051c3c Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Thu, 13 Nov 2025 12:37:48 +0900 Subject: [PATCH 02/46] =?UTF-8?q?Chore:=20=EA=B3=B5=ED=86=B5=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EA=B5=AC=EC=A1=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 8 +++ Dockerfile | 27 ++++++++ .../global/apiPayload/CustomResponse.java | 37 ++++++++++ .../global/apiPayload/code/ErrorCode.java | 27 ++++++++ .../global/apiPayload/code/SuccessCode.java | 23 +++++++ .../apiPayload/exception/ErrorResponse.java | 20 ++++++ .../apiPayload/exception/GlobalException.java | 4 ++ .../global/config/SecurityConfig.java | 69 +++++++++++++++++++ .../global/config/SwaggerConfig.java | 41 +++++++++++ .../global/model/BaseTimeEntity.java | 25 +++++++ 10 files changed, 281 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/CustomResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ErrorResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/config/SwaggerConfig.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/model/BaseTimeEntity.java diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..45cd0ed --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +.idea +*.iml +*.ipr +*.iws +.gradle +.git +*.log +.DS_Store \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1ea972c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +# 1. Build Stage +FROM amazoncorretto:17-alpine-jdk AS builder + +ENV TZ=Asia/Seoul +WORKDIR /app + +COPY gradlew ./gradlew +COPY gradle ./gradle +COPY build.gradle ./ +COPY settings.gradle ./ + +RUN ./gradlew dependencies + +COPY . . + +RUN ./gradlew build -x test --no-daemon + + +# 2. Run Stage +FROM amazoncorretto:17-alpine-jdk + +ENV TZ=Asia/Seoul +WORKDIR /app + +COPY --from=builder /app/build/libs/*.jar app.jar + +ENTRYPOINT ["java","-Duser.timezone=Asia/Seoul","-jar","app.jar"] \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/CustomResponse.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/CustomResponse.java new file mode 100644 index 0000000..43e463b --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/CustomResponse.java @@ -0,0 +1,37 @@ +package com.storix.spring_vote_22nd.global.apiPayload; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.Builder; + +import java.time.LocalDateTime; + +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +public record CustomResponse ( + Boolean isSuccess, + String code, + String message, + T result, + LocalDateTime timestamp +) { + + public static CustomResponse onSuccess(SuccessCode successCode) { + return CustomResponse.builder() + .isSuccess(true) + .code(successCode.getCode()) + .message(successCode.getMessage()) + .timestamp(LocalDateTime.now()) + .build(); + } + + public static CustomResponse onSuccess(SuccessCode successCode, T result) { + return CustomResponse.builder() + .isSuccess(true) + .code(successCode.getCode()) + .message(successCode.getMessage()) + .result(result) + .timestamp(LocalDateTime.now()) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java new file mode 100644 index 0000000..84edb7f --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java @@ -0,0 +1,27 @@ +package com.storix.spring_vote_22nd.global.apiPayload.code; + +import lombok.Getter; +import lombok.ToString; +import org.springframework.http.HttpStatus; + +@Getter +@ToString +public enum ErrorCode { + + // Common Error + BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON_ERROR_001", "잘못된 요청입니다"), + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON_ERROR_002", "인증이 필요합니다"), + FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON_ERROR_003", "접근이 금지되었습니다"), + NOT_FOUND(HttpStatus.NOT_FOUND, "COMMON_ERROR_004", "요청한 자원을 찾을 수 없습니다"), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_ERROR_005", "서버 내부 오류가 발생했습니다"); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + ErrorCode(HttpStatus httpStatus, String code, String message) { + this.httpStatus = httpStatus; + this.code = code; + this.message = message; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java new file mode 100644 index 0000000..be9a16d --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java @@ -0,0 +1,23 @@ +package com.storix.spring_vote_22nd.global.apiPayload.code; + +import lombok.Getter; +import lombok.ToString; +import org.springframework.http.HttpStatus; + +@Getter +@ToString +public enum SuccessCode { + + SUCCESS(HttpStatus.OK, "COMMON_SUCCESS_001", "정상적인 요청입니다."), + CREATED(HttpStatus.CREATED, "COMMON_SUCCESS_002", "정상적으로 생성되었습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + SuccessCode(HttpStatus httpStatus, String code, String message) { + this.httpStatus = httpStatus; + this.code = code; + this.message = message; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ErrorResponse.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ErrorResponse.java new file mode 100644 index 0000000..72118bc --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ErrorResponse.java @@ -0,0 +1,20 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import lombok.Builder; + +import java.time.LocalDateTime; + +@Builder +public record ErrorResponse ( + Boolean isSuccess, + String code, + String message, + LocalDateTime timestamp +) { + + public ErrorResponse(ErrorCode errorCode) { + this(false, errorCode.getCode(), errorCode.getMessage(), LocalDateTime.now()); + } + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java new file mode 100644 index 0000000..a4cec3e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java @@ -0,0 +1,4 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +public class GlobalException { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java new file mode 100644 index 0000000..d885267 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java @@ -0,0 +1,69 @@ +package com.storix.spring_vote_22nd.global.config; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + + http + .cors(Customizer.withDefaults()) + .csrf(AbstractHttpConfigurer::disable) + .httpBasic(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + + .authorizeHttpRequests( + (requests) -> requests + .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() + .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() + // TODO: endpoint 결정 시 기본 api 추가 (일단 전부 허용) + .anyRequest().permitAll() + ); + + // JWT 설정 + + return http.build(); + } + + @Bean + CorsConfigurationSource corsConfigurationSource() { + + CorsConfiguration config = new CorsConfiguration(); + + // TODO : 프론트 서버 주소 추가 + config.setAllowedOriginPatterns(List.of("*")); + config.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); + config.setAllowedHeaders(List.of("*")); + config.setAllowCredentials(true); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", config); + return source; + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/SwaggerConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/SwaggerConfig.java new file mode 100644 index 0000000..66e33bb --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/SwaggerConfig.java @@ -0,0 +1,41 @@ +package com.storix.spring_vote_22nd.global.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI openAPI() { + + Info info = new Info().title("CEOS 투표 서비스 API 명세서") + .description("합동 과제를 위한 Swagger UI입니다.") + .version("0.0.1"); + + String securityScheme = "JWT TOKEN"; + + SecurityRequirement securityRequirement = new SecurityRequirement().addList(securityScheme); + + Components components = new Components() + .addSecuritySchemes(securityScheme, new SecurityScheme() + .name(securityScheme) + .type(SecurityScheme.Type.HTTP) + .scheme("Bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .info(info) + .addServersItem(new Server().url("/")) + .addSecurityItem(securityRequirement) + .components(components); + + } + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/model/BaseTimeEntity.java b/src/main/java/com/storix/spring_vote_22nd/global/model/BaseTimeEntity.java new file mode 100644 index 0000000..bd6d17e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/model/BaseTimeEntity.java @@ -0,0 +1,25 @@ +package com.storix.spring_vote_22nd.global.model; + +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 abstract class BaseTimeEntity { + + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column + private LocalDateTime updatedAt; +} From 2b23b2b2021c59c27ced7507cca6815c18f992a4 Mon Sep 17 00:00:00 2001 From: Immmii Date: Thu, 13 Nov 2025 22:53:11 +0900 Subject: [PATCH 03/46] =?UTF-8?q?Feat:=20Member=20domain=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/member/adaptor/MemberReader.java | 41 +++++++++++++++++++ .../domains/member/adaptor/MemberSaver.java | 23 +++++++++++ .../domains/member/domain/MemberEntity.java | 30 ++++++++++++++ .../domains/member/dto/Member.java | 17 ++++++++ .../member/repository/MemberRepository.java | 11 +++++ 5 files changed, 122 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java new file mode 100644 index 0000000..dad1997 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java @@ -0,0 +1,41 @@ +package com.storix.spring_vote_22nd.domains.member.adaptor; + +import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; +import com.storix.spring_vote_22nd.domains.member.dto.Member; +import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class MemberReader { + + private final MemberRepository memberRepository; + + /** 회원 단건 조회 */ + public Member getById(Long memberId) { + MemberEntity member = memberRepository.findById(memberId) + .orElseThrow(() -> new IllegalArgumentException("회원을 찾을 수 없습니다. id=" + memberId)); + return Member.from(member); + } + + /** 회원 아이디 존재 여부 조회 */ + public Member getByLoginIdOrThrow(String loginId) { + MemberEntity member = memberRepository.findByLoginId(loginId) + .orElseThrow(() -> new IllegalArgumentException("회원을 찾을 수 없습니다. id=" + loginId)); + return Member.from(member); + } + + /** 회원 아이디 중복 여부 조회 */ + public boolean getByLoginId(String loginId) { + Optional member = memberRepository.findByLoginId(loginId); + if (!member.isPresent()) { + return true; // 가입 가능 + } else { + return false; // 가입 불가능 + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java new file mode 100644 index 0000000..a4a69b2 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java @@ -0,0 +1,23 @@ +package com.storix.spring_vote_22nd.domains.member.adaptor; + +import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; +import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; +import com.storix.spring_vote_22nd.domains.member.service.CreateMemberCommand; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class MemberSaver { + + private final MemberRepository memberRepository; + + /** 회원 가입 */ + @Transactional + public Long execute(CreateMemberCommand createMemberCommand) { // member join command + MemberEntity saved = memberRepository.save(createMemberCommand.toEntity()); + return saved.getId(); + } + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java new file mode 100644 index 0000000..a499801 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java @@ -0,0 +1,30 @@ +package com.storix.spring_vote_22nd.domains.member.domain; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.Builder; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Entity +@Getter +@RequiredArgsConstructor +public class MemberEntity { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + private String loginId; + private String password; + + @Builder + public MemberEntity(String name, String loginId, String password) { + this.name = name; + this.loginId = loginId; + this.password = password; + } + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java new file mode 100644 index 0000000..1be3b74 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java @@ -0,0 +1,17 @@ +package com.storix.spring_vote_22nd.domains.member.dto; + +import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; + +public record Member( + Long id, + String loginId, + String name +) { + public static Member from(MemberEntity m) { + return new Member( + m.getId(), + m.getLoginId(), + m.getName() + ); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java new file mode 100644 index 0000000..4ba09ea --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java @@ -0,0 +1,11 @@ +package com.storix.spring_vote_22nd.domains.member.repository; + +import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface MemberRepository extends JpaRepository { + + Optional findByLoginId(String loginId); +} From 85664df719f65c948403351b977943e3e5eeb9c0 Mon Sep 17 00:00:00 2001 From: Immmii Date: Thu, 13 Nov 2025 22:54:23 +0900 Subject: [PATCH 04/46] =?UTF-8?q?Feat:=20Spring=20Security=20JWT=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/CustomUserDetailsService.java | 26 +++++ .../security/JwtAuthenticationFilter.java | 35 +++++++ .../global/security/TokenProvider.java | 96 +++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java new file mode 100644 index 0000000..2d44fe0 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java @@ -0,0 +1,26 @@ +package com.storix.spring_vote_22nd.domains.member.service; + +import com.storix.spring_vote_22nd.domains.member.adaptor.MemberReader; +import com.storix.spring_vote_22nd.domains.member.dto.Member; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final MemberReader memberReader; + + @Override + public UserDetails loadUserByUsername(String loginId) throws UsernameNotFoundException { + Member member = memberReader.getByLoginIdOrThrow(loginId); + + return User.builder() + .username(member.loginId()) // username = loginId + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java new file mode 100644 index 0000000..14f0580 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java @@ -0,0 +1,35 @@ +package com.storix.spring_vote_22nd.global.security; + +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.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final TokenProvider tokenProvider; + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain chain) + throws ServletException, IOException, java.io.IOException { + + String token = tokenProvider.getAccessToken(request); + if (token != null && tokenProvider.validateAccessToken(token)) { + Authentication auth = tokenProvider.getAuthentication(token); + SecurityContextHolder.getContext().setAuthentication(auth); + } + + chain.doFilter(request, response); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java new file mode 100644 index 0000000..5150112 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java @@ -0,0 +1,96 @@ +package com.storix.spring_vote_22nd.global.security; + +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.stereotype.Component; + +import java.security.Key; +import java.util.Date; +import java.util.stream.Collectors; + +@Component +@RequiredArgsConstructor +public class TokenProvider implements InitializingBean { + + private final UserDetailsService userDetailsService; + @Value("${JWT_SECRET_KEY}") private String secret; + @Value("${JWT_ACCESS_TOKEN_VALIDITY_MS}") private long accessValidityMs; + + + private Key key; + + @Override + public void afterPropertiesSet() { + byte[] keyBytes = Decoders.BASE64.decode(secret); + this.key = Keys.hmacShaKeyFor(keyBytes); // HMAC-SHA + } + + /** 요청 헤더에서 Bearer 토큰만 추출 */ + public String getAccessToken(HttpServletRequest request) { + String header = request.getHeader(HttpHeaders.AUTHORIZATION); + if (header != null && header.startsWith("Bearer ")) { + return header.substring(7); + } + return null; + } + + /** 액세스 토큰 생성: subject = userId, roles = 권한 CSV */ + public String createAccessToken(Long id, Authentication authentication) { + String authorities = authentication.getAuthorities().stream() + .map(GrantedAuthority::getAuthority) + .collect(Collectors.joining(",")); + + Date now = new Date(); + Date expiry = new Date(now.getTime() + accessValidityMs); + + return Jwts.builder() + .setSubject(String.valueOf(id)) // user 식별자 + .claim("roles", authorities) // 권한 + .setIssuedAt(now) + .setExpiration(expiry) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + + /** 토큰에서 사용자 ID(subject) 추출 */ + public String getTokenUserId(String token) { + return Jwts.parserBuilder().setSigningKey(key).build() + .parseClaimsJws(token) + .getBody().getSubject(); + } + + /** 토큰을 기반으로 Authentication 생성 (SecurityContext에 넣을 용도) */ + public Authentication getAuthentication(String token) { + String userId = getTokenUserId(token); + UserDetails userDetails = userDetailsService.loadUserByUsername(userId); + return new UsernamePasswordAuthenticationToken( + userDetails, token, userDetails.getAuthorities()); + } + + /** 유효성 검증 (서명/만료/포맷) */ + public boolean validateAccessToken(String token) { + try { + Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); + return true; + } catch (ExpiredJwtException e) { + return false; // 만료 + } catch (JwtException | IllegalArgumentException e) { + return false; // 서명 불일치/변조/형식 오류 + } + } +} + From e9f9de369466dc56a278c14a7208f7476daefe15 Mon Sep 17 00:00:00 2001 From: Immmii Date: Thu, 13 Nov 2025 22:54:52 +0900 Subject: [PATCH 05/46] =?UTF-8?q?Feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring_vote_22nd/api/LoginRequest.java | 7 +++ .../spring_vote_22nd/api/LoginResponse.java | 6 +++ .../spring_vote_22nd/api/SignUpRequest.java | 8 +++ .../api/controller/AuthController.java | 30 +++++++++++ .../domains/member/service/AuthService.java | 34 +++++++++++++ .../member/service/CreateMemberCommand.java | 18 +++++++ .../domains/member/service/LoginService.java | 51 +++++++++++++++++++ 7 files changed, 154 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/LoginRequest.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java diff --git a/src/main/java/com/storix/spring_vote_22nd/api/LoginRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/LoginRequest.java new file mode 100644 index 0000000..8dd9f62 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/LoginRequest.java @@ -0,0 +1,7 @@ +package com.storix.spring_vote_22nd.api; + +public record LoginRequest( + String loginId, + String password +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java new file mode 100644 index 0000000..5c74304 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api; + +public record LoginResponse( + String accessToken +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java new file mode 100644 index 0000000..8145fe1 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java @@ -0,0 +1,8 @@ +package com.storix.spring_vote_22nd.api; + +public record SignUpRequest( + String name, + String loginId, + String password +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java new file mode 100644 index 0000000..1eb96d3 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java @@ -0,0 +1,30 @@ +package com.storix.spring_vote_22nd.api.controller; + +import com.storix.spring_vote_22nd.api.LoginRequest; +import com.storix.spring_vote_22nd.api.LoginResponse; +import com.storix.spring_vote_22nd.api.SignUpRequest; +import com.storix.spring_vote_22nd.domains.member.service.AuthService; +import com.storix.spring_vote_22nd.domains.member.service.LoginService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/auth") +@RequiredArgsConstructor +public class AuthController { + private final AuthService authService; + private final LoginService loginService; + + @PostMapping("/signup") + public void signUp(@RequestBody SignUpRequest req) { + authService.signUp(req); + } + + @PostMapping("/login") + public LoginResponse login(@RequestBody LoginRequest req) { + return loginService.login(req); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java new file mode 100644 index 0000000..d4c9c42 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java @@ -0,0 +1,34 @@ +package com.storix.spring_vote_22nd.domains.member.service; + +import com.storix.spring_vote_22nd.api.SignUpRequest; +import com.storix.spring_vote_22nd.domains.member.adaptor.MemberReader; +import com.storix.spring_vote_22nd.domains.member.adaptor.MemberSaver; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class AuthService { + + private final MemberReader memberReader; + private final MemberSaver memberSaver; + private final PasswordEncoder passwordEncoder; // BCryptPasswordEncoder + + @Transactional + public void signUp(SignUpRequest req) { + // 이미 존재하는 loginId 체크 + memberReader.getByLoginId(req.loginId()); + + // 새 회원 생성 (비밀번호는 반드시 암호화) + CreateMemberCommand m = new CreateMemberCommand( + req.name(), + req.loginId(), + passwordEncoder.encode(req.password()) + ); + + memberSaver.execute(m); + + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java new file mode 100644 index 0000000..5b1a24e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java @@ -0,0 +1,18 @@ +package com.storix.spring_vote_22nd.domains.member.service; + +import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; + +public record CreateMemberCommand( + String name, + String loginId, + String password +) { + + public MemberEntity toEntity() { + return new MemberEntity( + name, + loginId, + password + ); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java new file mode 100644 index 0000000..01f32f0 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java @@ -0,0 +1,51 @@ +package com.storix.spring_vote_22nd.domains.member.service; + +import com.storix.spring_vote_22nd.api.LoginRequest; +import com.storix.spring_vote_22nd.api.LoginResponse; +import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; +import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; +import com.storix.spring_vote_22nd.global.security.TokenProvider; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class LoginService { + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + private final TokenProvider tokenProvider; + + public LoginResponse login(LoginRequest req) { + // 아이디 확인 + MemberEntity m = memberRepository.findByLoginId(req.loginId()) + .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자")); + + // 비밀번호 확인 + if (!passwordEncoder.matches(req.password(), m.getPassword())) { + throw new IllegalArgumentException("비밀번호 불일치"); + } + + UserDetails user = new User( + m.getLoginId(), + m.getPassword(), + List.of(new SimpleGrantedAuthority("ROLE_USER")) + ); + + Authentication auth = new UsernamePasswordAuthenticationToken( + user, null, user.getAuthorities() + ); + + // 액세스 토큰 발급 + String accessToken = tokenProvider.createAccessToken(m.getId(), auth); + + return new LoginResponse(accessToken); + } +} From fa0c0ef74d6731364f478fed53a7456ae875906b Mon Sep 17 00:00:00 2001 From: Immmii Date: Thu, 13 Nov 2025 23:02:33 +0900 Subject: [PATCH 06/46] =?UTF-8?q?Chore:=20SecurityConfig=20JWT=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring_vote_22nd/global/config/SecurityConfig.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java index d885267..736a6e2 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java @@ -1,5 +1,6 @@ package com.storix.spring_vote_22nd.global.config; +import com.storix.spring_vote_22nd.global.security.JwtAuthenticationFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -12,6 +13,7 @@ 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; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @@ -23,6 +25,8 @@ @RequiredArgsConstructor public class SecurityConfig { + private final JwtAuthenticationFilter jwtFilter; + @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { @@ -39,9 +43,10 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Except .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() // TODO: endpoint 결정 시 기본 api 추가 (일단 전부 허용) .anyRequest().permitAll() - ); + ) - // JWT 설정 + // JWT 설정 + .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class); return http.build(); } From c9895324dc0f6e6a6c3e5e443c8421417c552fd4 Mon Sep 17 00:00:00 2001 From: Immmii Date: Fri, 14 Nov 2025 00:26:35 +0900 Subject: [PATCH 07/46] =?UTF-8?q?Feat:=20RefreshToken=20=EB=B0=9C=EA=B8=89?= =?UTF-8?q?=20=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring_vote_22nd/api/LoginResponse.java | 3 +- .../api/controller/AuthController.java | 6 +++ .../api/dto/LogoutRequest.java | 6 +++ .../domains/member/domain/RefreshToken.java | 33 +++++++++++++++ .../repository/RefreshTokenRepository.java | 15 +++++++ .../domains/member/service/LoginService.java | 41 ++++++++++++++++++- .../global/security/TokenProvider.java | 21 ++++++++++ 7 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java diff --git a/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java index 5c74304..4205be1 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java @@ -1,6 +1,7 @@ package com.storix.spring_vote_22nd.api; public record LoginResponse( - String accessToken + String accessToken, + String refreshToken ) { } \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java index 1eb96d3..6dc54c6 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java @@ -3,6 +3,7 @@ import com.storix.spring_vote_22nd.api.LoginRequest; import com.storix.spring_vote_22nd.api.LoginResponse; import com.storix.spring_vote_22nd.api.SignUpRequest; +import com.storix.spring_vote_22nd.api.dto.LogoutRequest; import com.storix.spring_vote_22nd.domains.member.service.AuthService; import com.storix.spring_vote_22nd.domains.member.service.LoginService; import lombok.RequiredArgsConstructor; @@ -27,4 +28,9 @@ public void signUp(@RequestBody SignUpRequest req) { public LoginResponse login(@RequestBody LoginRequest req) { return loginService.login(req); } + + @PostMapping("/logout") + public void logout(@RequestBody LogoutRequest req) { + loginService.logout(req.refreshToken()); + } } diff --git a/src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java new file mode 100644 index 0000000..8adf4f3 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api.dto; + +public record LogoutRequest( + String refreshToken +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java new file mode 100644 index 0000000..5ae9082 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java @@ -0,0 +1,33 @@ +package com.storix.spring_vote_22nd.domains.member.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +import java.time.LocalDateTime; + +@Builder +@AllArgsConstructor +@Data +public class RefreshToken { + + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String token; + + private Long memberId; + + private LocalDateTime expiryDateTime; + + @Builder + public RefreshToken(String token, Long memberId, LocalDateTime expiryDateTime) { + this.token = token; + this.memberId = memberId; + this.expiryDateTime = expiryDateTime; + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java new file mode 100644 index 0000000..c98a9a4 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java @@ -0,0 +1,15 @@ +package com.storix.spring_vote_22nd.domains.member.repository; + +import com.storix.spring_vote_22nd.domains.member.domain.RefreshToken; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface RefreshTokenRepository extends JpaRepository { + + Optional findByToken(String token); + + void deleteByMemberId(Long memberId); + + void deleteByToken(String token); +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java index 01f32f0..98b3ff8 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java @@ -3,8 +3,11 @@ import com.storix.spring_vote_22nd.api.LoginRequest; import com.storix.spring_vote_22nd.api.LoginResponse; import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; +import com.storix.spring_vote_22nd.domains.member.domain.RefreshToken; import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; +import com.storix.spring_vote_22nd.domains.member.repository.RefreshTokenRepository; import com.storix.spring_vote_22nd.global.security.TokenProvider; +import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; @@ -14,6 +17,9 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; import java.util.List; @Service @@ -22,6 +28,7 @@ public class LoginService { private final MemberRepository memberRepository; private final PasswordEncoder passwordEncoder; private final TokenProvider tokenProvider; + private final RefreshTokenRepository refreshTokenRepository; public LoginResponse login(LoginRequest req) { // 아이디 확인 @@ -46,6 +53,38 @@ public LoginResponse login(LoginRequest req) { // 액세스 토큰 발급 String accessToken = tokenProvider.createAccessToken(m.getId(), auth); - return new LoginResponse(accessToken); + // 리프레시 토큰 발급 + String refreshToken = tokenProvider.createRefreshToken(m.getId()); + + // 리프레시 토큰을 발급받은 적이 있을 경우, DB에서 해당 토큰 삭제 + refreshTokenRepository.deleteByMemberId(m.getId()); + + // 리프레시 토큰 DB 저장 + Date expiry = tokenProvider.getRefreshTokenExpiry(refreshToken); + RefreshToken refreshTokenEntity = RefreshToken.builder() + .memberId(m.getId()) + .token(refreshToken) + .expiryDateTime( + LocalDateTime.ofInstant( + expiry.toInstant(), + ZoneId.systemDefault() + ) + ) + .build(); + + refreshTokenRepository.save(refreshTokenEntity); + + return new LoginResponse(accessToken, refreshToken); + } + + @Transactional + public void logout(String refreshToken) { + // 토큰 검증 + if (!tokenProvider.validateRefreshToken(refreshToken)) { + throw new IllegalArgumentException("유효하지 않은 리프레시 토큰"); + } + + // DB에서 해당 토큰 삭제 + refreshTokenRepository.deleteByToken(refreshToken); } } diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java index 5150112..e12d952 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java @@ -29,6 +29,7 @@ public class TokenProvider implements InitializingBean { private final UserDetailsService userDetailsService; @Value("${JWT_SECRET_KEY}") private String secret; @Value("${JWT_ACCESS_TOKEN_VALIDITY_MS}") private long accessValidityMs; + @Value("${JWT_REFRESH_TOKEN_VALIDITY_MS}") private long refreshValidityMs; private Key key; @@ -66,6 +67,19 @@ public String createAccessToken(Long id, Authentication authentication) { .compact(); } + /** 리프레시 토큰 생성 */ + public String createRefreshToken(Long id) { + Date now = new Date(); + Date expiry = new Date(now.getTime() + refreshValidityMs); + + return Jwts.builder() + .setSubject(String.valueOf(id)) + .setIssuedAt(now) + .setExpiration(expiry) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + /** 토큰에서 사용자 ID(subject) 추출 */ public String getTokenUserId(String token) { return Jwts.parserBuilder().setSigningKey(key).build() @@ -92,5 +106,12 @@ public boolean validateAccessToken(String token) { return false; // 서명 불일치/변조/형식 오류 } } + + /** 리프레시 토큰 만료 시간을 Date로 얻고 싶은 경우 */ + public Date getRefreshTokenExpiry(String token) { + return Jwts.parserBuilder().setSigningKey(key).build() + .parseClaimsJws(token) + .getBody().getExpiration(); + } } From d14e0c8f611a4bf1c40e1285b486344e5da06090 Mon Sep 17 00:00:00 2001 From: Immmii Date: Fri, 14 Nov 2025 00:41:17 +0900 Subject: [PATCH 08/46] =?UTF-8?q?Fix:=20RefreshToken=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/member/domain/RefreshToken.java | 15 +++++---------- .../global/security/TokenProvider.java | 11 +++++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java index 5ae9082..6007b71 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java @@ -1,18 +1,13 @@ package com.storix.spring_vote_22nd.domains.member.domain; -import jakarta.persistence.Column; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; +import jakarta.persistence.*; +import lombok.*; import java.time.LocalDateTime; -@Builder -@AllArgsConstructor -@Data +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class RefreshToken { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java index e12d952..97fa524 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java @@ -107,6 +107,17 @@ public boolean validateAccessToken(String token) { } } + public boolean validateRefreshToken(String token) { + try { + Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); + return true; + } catch (ExpiredJwtException e) { + return false; + } catch (JwtException | IllegalArgumentException e) { + return false; + } + } + /** 리프레시 토큰 만료 시간을 Date로 얻고 싶은 경우 */ public Date getRefreshTokenExpiry(String token) { return Jwts.parserBuilder().setSigningKey(key).build() From 7a32e25026a26bf6f4c8a78ef5ac3d83d6c81968 Mon Sep 17 00:00:00 2001 From: Immmii Date: Fri, 14 Nov 2025 17:37:05 +0900 Subject: [PATCH 09/46] =?UTF-8?q?Chore:=20=ED=9A=8C=EC=9B=90=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring_vote_22nd/api/SignUpRequest.java | 10 ++++++++-- .../domains/member/domain/MemberEntity.java | 15 +++++++++++---- .../domains/member/domain/Part.java | 13 +++++++++++++ .../domains/member/domain/Team.java | 16 ++++++++++++++++ .../domains/member/service/AuthService.java | 10 +++++----- .../member/service/CreateMemberCommand.java | 16 ++++++++++++---- 6 files changed, 65 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Part.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Team.java diff --git a/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java index 8145fe1..5678822 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java @@ -1,8 +1,14 @@ package com.storix.spring_vote_22nd.api; +import com.storix.spring_vote_22nd.domains.member.domain.Part; +import com.storix.spring_vote_22nd.domains.member.domain.Team; + public record SignUpRequest( - String name, String loginId, - String password + String password, + String email, + Part part, + String name, + Team team ) { } \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java index a499801..38e637b 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java @@ -15,16 +15,23 @@ public class MemberEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private String name; - private String loginId; private String password; + private String email; + + private Part part; + private String name; + private Team team; + @Builder - public MemberEntity(String name, String loginId, String password) { - this.name = name; + public MemberEntity(String loginId, String password, String email, Part part, String name, Team team) { this.loginId = loginId; this.password = password; + this.email = email; + this.part = part; + this.name = name; + this.team = team; } } diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Part.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Part.java new file mode 100644 index 0000000..fa4ca63 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Part.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd.domains.member.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum Part { + FE("프론트엔드"), + BE("백엔드"); + + private String value; +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Team.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Team.java new file mode 100644 index 0000000..2d1d220 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Team.java @@ -0,0 +1,16 @@ +package com.storix.spring_vote_22nd.domains.member.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum Team { + DIGGINDIE("DiggIndie"), + MODELLY("Modelly"), + CATCHUP("Catch Up"), + GROOMEASY("GroomEasy"), + STORIX("STORIX"),; + + private String value; +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java index d4c9c42..33f4aba 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java @@ -18,14 +18,14 @@ public class AuthService { @Transactional public void signUp(SignUpRequest req) { - // 이미 존재하는 loginId 체크 - memberReader.getByLoginId(req.loginId()); - // 새 회원 생성 (비밀번호는 반드시 암호화) CreateMemberCommand m = new CreateMemberCommand( - req.name(), req.loginId(), - passwordEncoder.encode(req.password()) + passwordEncoder.encode(req.password()), + req.email(), + req.part(), + req.name(), + req.team() ); memberSaver.execute(m); diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java index 5b1a24e..09e2a84 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java @@ -1,18 +1,26 @@ package com.storix.spring_vote_22nd.domains.member.service; import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; +import com.storix.spring_vote_22nd.domains.member.domain.Part; +import com.storix.spring_vote_22nd.domains.member.domain.Team; public record CreateMemberCommand( - String name, String loginId, - String password + String password, + String email, + Part part, + String name, + Team team ) { public MemberEntity toEntity() { return new MemberEntity( - name, loginId, - password + password, + email, + part, + name, + team ); } } From fde590967306fe53837966ac645ae4604004d901 Mon Sep 17 00:00:00 2001 From: Immmii Date: Fri, 14 Nov 2025 17:38:27 +0900 Subject: [PATCH 10/46] =?UTF-8?q?Chore:=20DTO=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring_vote_22nd/api/controller/AuthController.java | 6 +++--- .../storix/spring_vote_22nd/api/{ => dto}/LoginRequest.java | 2 +- .../spring_vote_22nd/api/{ => dto}/LoginResponse.java | 2 +- .../spring_vote_22nd/api/{ => dto}/SignUpRequest.java | 2 +- .../domains/member/service/AuthService.java | 2 +- .../domains/member/service/LoginService.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/com/storix/spring_vote_22nd/api/{ => dto}/LoginRequest.java (64%) rename src/main/java/com/storix/spring_vote_22nd/api/{ => dto}/LoginResponse.java (66%) rename src/main/java/com/storix/spring_vote_22nd/api/{ => dto}/SignUpRequest.java (86%) diff --git a/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java index 6dc54c6..d6c1850 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java @@ -1,8 +1,8 @@ package com.storix.spring_vote_22nd.api.controller; -import com.storix.spring_vote_22nd.api.LoginRequest; -import com.storix.spring_vote_22nd.api.LoginResponse; -import com.storix.spring_vote_22nd.api.SignUpRequest; +import com.storix.spring_vote_22nd.api.dto.LoginRequest; +import com.storix.spring_vote_22nd.api.dto.LoginResponse; +import com.storix.spring_vote_22nd.api.dto.SignUpRequest; import com.storix.spring_vote_22nd.api.dto.LogoutRequest; import com.storix.spring_vote_22nd.domains.member.service.AuthService; import com.storix.spring_vote_22nd.domains.member.service.LoginService; diff --git a/src/main/java/com/storix/spring_vote_22nd/api/LoginRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginRequest.java similarity index 64% rename from src/main/java/com/storix/spring_vote_22nd/api/LoginRequest.java rename to src/main/java/com/storix/spring_vote_22nd/api/dto/LoginRequest.java index 8dd9f62..3343836 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/LoginRequest.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package com.storix.spring_vote_22nd.api; +package com.storix.spring_vote_22nd.api.dto; public record LoginRequest( String loginId, diff --git a/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginResponse.java similarity index 66% rename from src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java rename to src/main/java/com/storix/spring_vote_22nd/api/dto/LoginResponse.java index 4205be1..1f37dde 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/LoginResponse.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginResponse.java @@ -1,4 +1,4 @@ -package com.storix.spring_vote_22nd.api; +package com.storix.spring_vote_22nd.api.dto; public record LoginResponse( String accessToken, diff --git a/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/dto/SignUpRequest.java similarity index 86% rename from src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java rename to src/main/java/com/storix/spring_vote_22nd/api/dto/SignUpRequest.java index 5678822..69f4158 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/SignUpRequest.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/dto/SignUpRequest.java @@ -1,4 +1,4 @@ -package com.storix.spring_vote_22nd.api; +package com.storix.spring_vote_22nd.api.dto; import com.storix.spring_vote_22nd.domains.member.domain.Part; import com.storix.spring_vote_22nd.domains.member.domain.Team; diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java index 33f4aba..46d3bd3 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java @@ -1,6 +1,6 @@ package com.storix.spring_vote_22nd.domains.member.service; -import com.storix.spring_vote_22nd.api.SignUpRequest; +import com.storix.spring_vote_22nd.api.dto.SignUpRequest; import com.storix.spring_vote_22nd.domains.member.adaptor.MemberReader; import com.storix.spring_vote_22nd.domains.member.adaptor.MemberSaver; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java index 98b3ff8..e65078e 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java @@ -1,7 +1,7 @@ package com.storix.spring_vote_22nd.domains.member.service; -import com.storix.spring_vote_22nd.api.LoginRequest; -import com.storix.spring_vote_22nd.api.LoginResponse; +import com.storix.spring_vote_22nd.api.dto.LoginRequest; +import com.storix.spring_vote_22nd.api.dto.LoginResponse; import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; import com.storix.spring_vote_22nd.domains.member.domain.RefreshToken; import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; From 5f34138216989a4fef71677e26bdf9a4092b69ee Mon Sep 17 00:00:00 2001 From: Immmii Date: Fri, 14 Nov 2025 17:39:32 +0900 Subject: [PATCH 11/46] =?UTF-8?q?Remove:=20Exception=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/security/JwtAuthenticationFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java index 14f0580..6be5418 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java @@ -22,7 +22,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException, java.io.IOException { + throws ServletException, IOException { String token = tokenProvider.getAccessToken(request); if (token != null && tokenProvider.validateAccessToken(token)) { From f78afeb56280ad13b0974f15610bd3fb0e3ced96 Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 18:20:46 +0900 Subject: [PATCH 12/46] =?UTF-8?q?Chore:=20Member=20->=20User=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20User=20=EC=8A=A4=ED=8E=99=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/member/adaptor/MemberReader.java | 41 ------------ .../domains/member/adaptor/MemberSaver.java | 23 ------- .../domains/member/dto/Member.java | 17 ----- .../member/repository/MemberRepository.java | 11 ---- .../member/service/CreateMemberCommand.java | 26 -------- .../domains/user/adaptor/UserAdaptor.java | 62 +++++++++++++++++++ .../domains/{member => user}/domain/Part.java | 2 +- .../domains/user/domain/Role.java | 13 ++++ .../domains/{member => user}/domain/Team.java | 2 +- .../domain/User.java} | 16 ++--- .../domains/user/dto/CreateUserCommand.java | 26 ++++++++ .../user/repository/UserRepository.java | 10 +++ 12 files changed, 122 insertions(+), 127 deletions(-) delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java rename src/main/java/com/storix/spring_vote_22nd/domains/{member => user}/domain/Part.java (75%) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Role.java rename src/main/java/com/storix/spring_vote_22nd/domains/{member => user}/domain/Team.java (81%) rename src/main/java/com/storix/spring_vote_22nd/domains/{member/domain/MemberEntity.java => user/domain/User.java} (61%) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/dto/CreateUserCommand.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java deleted file mode 100644 index dad1997..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberReader.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.adaptor; - -import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; -import com.storix.spring_vote_22nd.domains.member.dto.Member; -import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.Optional; - -@Service -@RequiredArgsConstructor -public class MemberReader { - - private final MemberRepository memberRepository; - - /** 회원 단건 조회 */ - public Member getById(Long memberId) { - MemberEntity member = memberRepository.findById(memberId) - .orElseThrow(() -> new IllegalArgumentException("회원을 찾을 수 없습니다. id=" + memberId)); - return Member.from(member); - } - - /** 회원 아이디 존재 여부 조회 */ - public Member getByLoginIdOrThrow(String loginId) { - MemberEntity member = memberRepository.findByLoginId(loginId) - .orElseThrow(() -> new IllegalArgumentException("회원을 찾을 수 없습니다. id=" + loginId)); - return Member.from(member); - } - - /** 회원 아이디 중복 여부 조회 */ - public boolean getByLoginId(String loginId) { - Optional member = memberRepository.findByLoginId(loginId); - if (!member.isPresent()) { - return true; // 가입 가능 - } else { - return false; // 가입 불가능 - } - } - -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java deleted file mode 100644 index a4a69b2..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/adaptor/MemberSaver.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.adaptor; - -import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; -import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; -import com.storix.spring_vote_22nd.domains.member.service.CreateMemberCommand; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -public class MemberSaver { - - private final MemberRepository memberRepository; - - /** 회원 가입 */ - @Transactional - public Long execute(CreateMemberCommand createMemberCommand) { // member join command - MemberEntity saved = memberRepository.save(createMemberCommand.toEntity()); - return saved.getId(); - } - -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java deleted file mode 100644 index 1be3b74..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/dto/Member.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.dto; - -import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; - -public record Member( - Long id, - String loginId, - String name -) { - public static Member from(MemberEntity m) { - return new Member( - m.getId(), - m.getLoginId(), - m.getName() - ); - } -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java deleted file mode 100644 index 4ba09ea..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/MemberRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.repository; - -import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.Optional; - -public interface MemberRepository extends JpaRepository { - - Optional findByLoginId(String loginId); -} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java deleted file mode 100644 index 09e2a84..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CreateMemberCommand.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.service; - -import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; -import com.storix.spring_vote_22nd.domains.member.domain.Part; -import com.storix.spring_vote_22nd.domains.member.domain.Team; - -public record CreateMemberCommand( - String loginId, - String password, - String email, - Part part, - String name, - Team team -) { - - public MemberEntity toEntity() { - return new MemberEntity( - loginId, - password, - email, - part, - name, - team - ); - } -} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java new file mode 100644 index 0000000..2cbf728 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java @@ -0,0 +1,62 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import com.storix.spring_vote_22nd.domains.user.domain.User; +import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; +import com.storix.spring_vote_22nd.domains.user.repository.UserRepository; +import com.storix.spring_vote_22nd.domains.user.dto.CreateUserCommand; +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import com.storix.spring_vote_22nd.global.apiPayload.exception.ArtistLoginException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.ErrorResponse; +import com.storix.spring_vote_22nd.global.apiPayload.exception.UnknownUserException; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@Transactional +@RequiredArgsConstructor +public class UserAdaptor { + + private final UserRepository userRepository; + + public Long findUserIdByLoginId(String loginId){ + Optional user = userRepository.findUserByLoginId(loginId); + if(user.isPresent()){ + return user.get().getId(); + } + throw UnknownUserException.EXCEPTION; + } + + public LoginInfo findUserLoginInfoByLoginI(String loginId){ + Optional user = userRepository.findUserByLoginId(loginId); + if(!user.isPresent()) { + throw ArtistLoginException.EXCEPTION; + } + + LoginInfo loginInfo = new LoginInfo(user.get().getLoginId(), user.get().getPassword()); + return loginInfo; + } + + public AuthUserDetails findUserIdAndRoleByLoginId(String loginId){ + Optional user = userRepository.findUserByLoginId(loginId); + if(user.isPresent()){ + return new AuthUserDetails(String.valueOf(user.get().getId()), String.valueOf(user.get().getRole())); + } + throw UnknownUserException.EXCEPTION; + } + + public ErrorResponse isLoginIdDuplicate(String loginId) { + Optional user = userRepository.findUserByLoginId(loginId); + if (user.isPresent()) { + return new ErrorResponse(ErrorCode.BAD_REQUEST); + } + return null; + } + + public User saveUser(CreateUserCommand cmd) { + User user = userRepository.save(cmd.toEntity()); + return userRepository.save(user); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Part.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Part.java similarity index 75% rename from src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Part.java rename to src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Part.java index fa4ca63..c282a29 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Part.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Part.java @@ -1,4 +1,4 @@ -package com.storix.spring_vote_22nd.domains.member.domain; +package com.storix.spring_vote_22nd.domains.user.domain; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Role.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Role.java new file mode 100644 index 0000000..63595f3 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Role.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd.domains.user.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum Role { + USER("USER"), + ADMIN("ADMIN"); + + private String value; +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Team.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java similarity index 81% rename from src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Team.java rename to src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java index 2d1d220..bb7b4fa 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/Team.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java @@ -1,4 +1,4 @@ -package com.storix.spring_vote_22nd.domains.member.domain; +package com.storix.spring_vote_22nd.domains.user.domain; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/User.java similarity index 61% rename from src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java rename to src/main/java/com/storix/spring_vote_22nd/domains/user/domain/User.java index 38e637b..b26df79 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/MemberEntity.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/User.java @@ -1,9 +1,6 @@ -package com.storix.spring_vote_22nd.domains.member.domain; +package com.storix.spring_vote_22nd.domains.user.domain; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; import lombok.Builder; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -11,21 +8,26 @@ @Entity @Getter @RequiredArgsConstructor -public class MemberEntity { +public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + // 계정 정보 + @Column(unique = true) private String loginId; private String password; + @Column(unique = true) private String email; private Part part; private String name; private Team team; + private Role role = Role.USER; + @Builder - public MemberEntity(String loginId, String password, String email, Part part, String name, Team team) { + public User(String loginId, String password, String email, Part part, String name, Team team) { this.loginId = loginId; this.password = password; this.email = email; diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/CreateUserCommand.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/CreateUserCommand.java new file mode 100644 index 0000000..601690e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/CreateUserCommand.java @@ -0,0 +1,26 @@ +package com.storix.spring_vote_22nd.domains.user.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.User; +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; + +public record CreateUserCommand( + String loginId, + String password, + String email, + Part part, + String name, + Team team +) { + + public User toEntity() { + return new User( + loginId, + password, + email, + part, + name, + team + ); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java new file mode 100644 index 0000000..8ce1abc --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.domains.user.repository; + +import com.storix.spring_vote_22nd.domains.user.domain.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface UserRepository extends JpaRepository { + Optional findUserByLoginId(String loginId); +} From 797951f91f50673aa0823b2b2f055eec30fd444b Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 18:24:46 +0900 Subject: [PATCH 13/46] =?UTF-8?q?Refactor:=20Spring=20Security=20&=20JWT?= =?UTF-8?q?=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81=20=EB=B0=8F=20RefreshTo?= =?UTF-8?q?ken=20=EC=A0=80=EC=9E=A5=EC=86=8C=20Mysql=20->=20Redis=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 + .../domains/member/domain/RefreshToken.java | 28 ---- .../repository/RefreshTokenRepository.java | 15 -- .../user/adaptor/RefreshTokenAdaptor.java | 26 ++++ .../domains/user/domain/RefreshToken.java | 28 ++++ .../repository/RefreshTokenRepository.java | 10 ++ .../global/apiPayload/STORIX_voteStatic.java | 14 ++ .../ExpiredRefreshTokenException.java | 10 ++ .../exception/ExpiredTokenException.java | 10 ++ .../exception/GlobalExceptionHandler.java | 25 ++++ .../exception/InvalidTokenException.java | 10 ++ .../exception/STORIXCodeException.java | 12 ++ .../global/config/RedisCacheConfig.java | 38 +++++ .../security/JwtAuthenticationFilter.java | 39 +++-- .../global/security/TokenProvider.java | 135 ++++++++---------- .../global/security/dto/AccessTokenInfo.java | 11 ++ 16 files changed, 289 insertions(+), 125 deletions(-) delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/domain/RefreshToken.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/repository/RefreshTokenRepository.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/STORIX_voteStatic.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredRefreshTokenException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredTokenException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/InvalidTokenException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/STORIXCodeException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/config/RedisCacheConfig.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/security/dto/AccessTokenInfo.java diff --git a/build.gradle b/build.gradle index ea8e9a0..3b01c2b 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,9 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.7.0' + // Redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' + implementation 'org.springframework.boot:spring-boot-starter-cache' } tasks.named('test') { diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java deleted file mode 100644 index 6007b71..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/domain/RefreshToken.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.domain; - -import jakarta.persistence.*; -import lombok.*; - -import java.time.LocalDateTime; - -@Entity -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class RefreshToken { - - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - private String token; - - private Long memberId; - - private LocalDateTime expiryDateTime; - - @Builder - public RefreshToken(String token, Long memberId, LocalDateTime expiryDateTime) { - this.token = token; - this.memberId = memberId; - this.expiryDateTime = expiryDateTime; - } -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java deleted file mode 100644 index c98a9a4..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/repository/RefreshTokenRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.repository; - -import com.storix.spring_vote_22nd.domains.member.domain.RefreshToken; -import org.springframework.data.jpa.repository.JpaRepository; - -import java.util.Optional; - -public interface RefreshTokenRepository extends JpaRepository { - - Optional findByToken(String token); - - void deleteByMemberId(Long memberId); - - void deleteByToken(String token); -} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java new file mode 100644 index 0000000..6a6398f --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java @@ -0,0 +1,26 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import com.storix.spring_vote_22nd.domains.user.repository.RefreshTokenRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class RefreshTokenAdaptor { + + private final RefreshTokenRepository refreshTokenRepository; + + public RefreshToken findByRefreshToken(String refreshToken) { + return refreshTokenRepository.findByRefreshToken(refreshToken) + .orElseThrow(() -> new IllegalArgumentException("Invalid refresh token")); // 커스텀 에러로 변경 + } + + public RefreshToken save(RefreshToken refreshToken) { + return refreshTokenRepository.save(refreshToken); + } + + public void deleteByUserId(Long userId) { + refreshTokenRepository.deleteById(userId.toString()); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/RefreshToken.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/RefreshToken.java new file mode 100644 index 0000000..97f363c --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/RefreshToken.java @@ -0,0 +1,28 @@ +package com.storix.spring_vote_22nd.domains.user.domain; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.TimeToLive; +import org.springframework.data.redis.core.index.Indexed; + +@RedisHash(value = "refreshToken") +@Getter +public class RefreshToken { + @Id + private String id; + + @Indexed + private String refreshToken; + + @TimeToLive + private Long ttl; + + @Builder + public RefreshToken(String id, String refreshToken, Long ttl) { + this.id = id; + this.refreshToken = refreshToken; + this.ttl = ttl; + } + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/RefreshTokenRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/RefreshTokenRepository.java new file mode 100644 index 0000000..97a28fa --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/RefreshTokenRepository.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.domains.user.repository; + +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface RefreshTokenRepository extends CrudRepository { + Optional findByRefreshToken(String refreshToken); +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/STORIX_voteStatic.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/STORIX_voteStatic.java new file mode 100644 index 0000000..39de43d --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/STORIX_voteStatic.java @@ -0,0 +1,14 @@ +package com.storix.spring_vote_22nd.global.apiPayload; + +public class STORIX_voteStatic { + public static final String AUTH_HEADER = "Authorization"; + public static final String BEARER = "Bearer "; + public static final String TOKEN_TYPE = "type"; + public static final String TOKEN_ROLE = "role"; + public static final String TOKEN_ISSUR = "STORIX_vote"; + public static final String ACCESS_TOKEN = "access_token"; + public static final String REFRESH_TOKEN = "refresh_token"; + + public static final int MILLI_TO_SECOND = 1000; + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredRefreshTokenException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredRefreshTokenException.java new file mode 100644 index 0000000..49c4fb1 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredRefreshTokenException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class ExpiredRefreshTokenException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new ExpiredRefreshTokenException(); + + private ExpiredRefreshTokenException() { super(ErrorCode.TOKEN_EXPIRED); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredTokenException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredTokenException.java new file mode 100644 index 0000000..4bea5fb --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredTokenException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class ExpiredTokenException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new ExpiredTokenException(); + + private ExpiredTokenException() { super(ErrorCode.TOKEN_EXPIRED); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..f2e5394 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java @@ -0,0 +1,25 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(STORIXCodeException.class) + public ResponseEntity STORIXCodeExceptionHandler (STORIXCodeException ex) { + + ErrorCode errorCode = ex.getErrorCode(); + ErrorResponse response = new ErrorResponse(errorCode); + + return ResponseEntity + .status(errorCode.getHttpStatus()) + .body(response); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/InvalidTokenException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/InvalidTokenException.java new file mode 100644 index 0000000..6f0a819 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/InvalidTokenException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class InvalidTokenException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new InvalidTokenException(); + + private InvalidTokenException() { super(ErrorCode.INVALID_TOKEN); } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/STORIXCodeException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/STORIXCodeException.java new file mode 100644 index 0000000..8f85bc0 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/STORIXCodeException.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class STORIXCodeException extends RuntimeException { + public ErrorCode errorCode; +} + diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/RedisCacheConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisCacheConfig.java new file mode 100644 index 0000000..99550eb --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisCacheConfig.java @@ -0,0 +1,38 @@ +package com.storix.spring_vote_22nd.global.config; + +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +import java.time.Duration; + +@EnableCaching +@Configuration +public class RedisCacheConfig { + + @Bean + public CacheManager redisCacheManager(RedisConnectionFactory redisConnectionFactory) { + + RedisCacheConfiguration redisCacheConfiguration + = RedisCacheConfiguration.defaultCacheConfig() + .serializeKeysWith( + RedisSerializationContext.SerializationPair.fromSerializer( + new StringRedisSerializer())) + .serializeValuesWith( + RedisSerializationContext.SerializationPair.fromSerializer( + new GenericJackson2JsonRedisSerializer())) + .entryTtl(Duration.ofHours(3)); + + return RedisCacheManager.RedisCacheManagerBuilder + .fromConnectionFactory(redisConnectionFactory) + .cacheDefaults(redisCacheConfiguration) + .build(); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java index 6be5418..c852e3a 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java @@ -1,17 +1,24 @@ package com.storix.spring_vote_22nd.global.security; +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.global.security.dto.AccessTokenInfo; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; +import static com.storix.spring_vote_22nd.global.apiPayload.STORIX_voteStatic.BEARER; + @Component @RequiredArgsConstructor public class JwtAuthenticationFilter extends OncePerRequestFilter { @@ -19,17 +26,33 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { private final TokenProvider tokenProvider; @Override - protected void doFilterInternal(HttpServletRequest request, - HttpServletResponse response, - FilterChain chain) + protected void doFilterInternal( + HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + String token = resolveToken(request); - String token = tokenProvider.getAccessToken(request); - if (token != null && tokenProvider.validateAccessToken(token)) { - Authentication auth = tokenProvider.getAuthentication(token); - SecurityContextHolder.getContext().setAuthentication(auth); + if (StringUtils.hasText(token) && tokenProvider.isAccessToken(token)) { + Authentication authentication = getAuthentication(token); + SecurityContextHolder.getContext().setAuthentication(authentication); } - chain.doFilter(request, response); + filterChain.doFilter(request, response); + } + + public String resolveToken(HttpServletRequest request) { + String bearerToken = request.getHeader(HttpHeaders.AUTHORIZATION); + if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(BEARER)) { + return bearerToken.substring(7); + } + return null; + } + + public Authentication getAuthentication(String token) { + AccessTokenInfo accessTokenInfo = tokenProvider.parseAccessToken(token); + + AuthUserDetails userDetails = new AuthUserDetails( + accessTokenInfo.getUserId().toString(), accessTokenInfo.getRole()); + return new UsernamePasswordAuthenticationToken( + userDetails, "user", userDetails.getAuthorities()); } } \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java index 97fa524..9e9d4df 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java @@ -1,128 +1,115 @@ package com.storix.spring_vote_22nd.global.security; -import io.jsonwebtoken.ExpiredJwtException; -import io.jsonwebtoken.JwtException; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; +import com.storix.spring_vote_22nd.domains.user.adaptor.RefreshTokenAdaptor; +import com.storix.spring_vote_22nd.global.apiPayload.exception.ExpiredRefreshTokenException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.ExpiredTokenException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.InvalidTokenException; +import com.storix.spring_vote_22nd.global.security.dto.AccessTokenInfo; +import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; -import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpHeaders; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; import java.security.Key; import java.util.Date; -import java.util.stream.Collectors; + +import static com.storix.spring_vote_22nd.global.apiPayload.STORIX_voteStatic.*; @Component @RequiredArgsConstructor public class TokenProvider implements InitializingBean { - private final UserDetailsService userDetailsService; - @Value("${JWT_SECRET_KEY}") private String secret; - @Value("${JWT_ACCESS_TOKEN_VALIDITY_MS}") private long accessValidityMs; - @Value("${JWT_REFRESH_TOKEN_VALIDITY_MS}") private long refreshValidityMs; + private final RefreshTokenAdaptor refreshTokenAdaptor; + + @Value("${JWT_SECRET_KEY}") private String secretKey; + @Value("${JWT_ACCESS_TOKEN_VALIDITY_MS}") private long accessTokenValidityMs; + @Value(("${JWT_REFRESH_TOKEN_VALIDITY_MS}")) private long refreshTokenValidityMs; private Key key; @Override public void afterPropertiesSet() { - byte[] keyBytes = Decoders.BASE64.decode(secret); + byte[] keyBytes = Decoders.BASE64.decode(secretKey); this.key = Keys.hmacShaKeyFor(keyBytes); // HMAC-SHA } - /** 요청 헤더에서 Bearer 토큰만 추출 */ - public String getAccessToken(HttpServletRequest request) { - String header = request.getHeader(HttpHeaders.AUTHORIZATION); - if (header != null && header.startsWith("Bearer ")) { - return header.substring(7); + private Jws getJws(String token) { + try { + return Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); + } catch (ExpiredJwtException e) { + throw ExpiredTokenException.EXCEPTION; + } catch (Exception e) { + throw InvalidTokenException.EXCEPTION; } - return null; } - /** 액세스 토큰 생성: subject = userId, roles = 권한 CSV */ - public String createAccessToken(Long id, Authentication authentication) { - String authorities = authentication.getAuthorities().stream() - .map(GrantedAuthority::getAuthority) - .collect(Collectors.joining(",")); + public String createAccessToken(String userId, String role) { - Date now = new Date(); - Date expiry = new Date(now.getTime() + accessValidityMs); + final Date issuedAt = new Date(); + final Date expiredAt = new Date(issuedAt.getTime() + accessTokenValidityMs); return Jwts.builder() - .setSubject(String.valueOf(id)) // user 식별자 - .claim("roles", authorities) // 권한 - .setIssuedAt(now) - .setExpiration(expiry) + .setIssuer(TOKEN_ISSUR) + .setSubject(userId) + .claim(TOKEN_TYPE, ACCESS_TOKEN) + .claim(TOKEN_ROLE, role) + .setIssuedAt(issuedAt) + .setExpiration(expiredAt) .signWith(key, SignatureAlgorithm.HS256) .compact(); } - /** 리프레시 토큰 생성 */ - public String createRefreshToken(Long id) { - Date now = new Date(); - Date expiry = new Date(now.getTime() + refreshValidityMs); + public String createRefreshToken(String userId) { + + final Date issuedAt = new Date(); + final Date expiredAt = new Date(issuedAt.getTime() + refreshTokenValidityMs); return Jwts.builder() - .setSubject(String.valueOf(id)) - .setIssuedAt(now) - .setExpiration(expiry) + .setIssuer(TOKEN_ISSUR) + .setSubject(userId) + .claim(TOKEN_TYPE, REFRESH_TOKEN) + .setIssuedAt(issuedAt) + .setExpiration(expiredAt) .signWith(key, SignatureAlgorithm.HS256) .compact(); } - /** 토큰에서 사용자 ID(subject) 추출 */ - public String getTokenUserId(String token) { - return Jwts.parserBuilder().setSigningKey(key).build() - .parseClaimsJws(token) - .getBody().getSubject(); + public boolean isAccessToken(String token) { + return getJws(token).getBody().get(TOKEN_TYPE).equals(ACCESS_TOKEN); } - /** 토큰을 기반으로 Authentication 생성 (SecurityContext에 넣을 용도) */ - public Authentication getAuthentication(String token) { - String userId = getTokenUserId(token); - UserDetails userDetails = userDetailsService.loadUserByUsername(userId); - return new UsernamePasswordAuthenticationToken( - userDetails, token, userDetails.getAuthorities()); + public boolean isRefreshToken(String token) { + return getJws(token).getBody().get(TOKEN_TYPE).equals(REFRESH_TOKEN); } - /** 유효성 검증 (서명/만료/포맷) */ - public boolean validateAccessToken(String token) { - try { - Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); - return true; - } catch (ExpiredJwtException e) { - return false; // 만료 - } catch (JwtException | IllegalArgumentException e) { - return false; // 서명 불일치/변조/형식 오류 + public AccessTokenInfo parseAccessToken(String token) { + if (isAccessToken(token)) { + Claims claims = getJws(token).getBody(); + return AccessTokenInfo.builder() + .userId(Long.parseLong(claims.getSubject())) + .role((String) claims.get(TOKEN_ROLE)) + .build(); } + throw InvalidTokenException.EXCEPTION; } - public boolean validateRefreshToken(String token) { + public Long parseRefreshToken(String token) { try { - Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); - return true; - } catch (ExpiredJwtException e) { - return false; - } catch (JwtException | IllegalArgumentException e) { - return false; + if (isRefreshToken(token)) { + Claims claims = getJws(token).getBody(); + return Long.parseLong(claims.getSubject()); + } + } catch (ExpiredTokenException e) { + throw ExpiredRefreshTokenException.EXCEPTION; } + throw InvalidTokenException.EXCEPTION; } - /** 리프레시 토큰 만료 시간을 Date로 얻고 싶은 경우 */ - public Date getRefreshTokenExpiry(String token) { - return Jwts.parserBuilder().setSigningKey(key).build() - .parseClaimsJws(token) - .getBody().getExpiration(); + public Long getRefreshTokenValidityMs() { + return refreshTokenValidityMs; } } - diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/dto/AccessTokenInfo.java b/src/main/java/com/storix/spring_vote_22nd/global/security/dto/AccessTokenInfo.java new file mode 100644 index 0000000..517eac8 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/dto/AccessTokenInfo.java @@ -0,0 +1,11 @@ +package com.storix.spring_vote_22nd.global.security.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class AccessTokenInfo { + private final Long userId; + private final String role; +} \ No newline at end of file From 57f890e74ee852fd0ba286f76892a1e7f76a5c0c Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 18:25:25 +0900 Subject: [PATCH 14/46] =?UTF-8?q?Chore:=20ErrorCode=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/apiPayload/code/ErrorCode.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java index 84edb7f..de0ba11 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java @@ -13,7 +13,15 @@ public enum ErrorCode { UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON_ERROR_002", "인증이 필요합니다"), FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON_ERROR_003", "접근이 금지되었습니다"), NOT_FOUND(HttpStatus.NOT_FOUND, "COMMON_ERROR_004", "요청한 자원을 찾을 수 없습니다"), - INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_ERROR_005", "서버 내부 오류가 발생했습니다"); + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_ERROR_005", "서버 내부 오류가 발생했습니다"), + + // Token error + INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "AUTH_ERROR_001", "잘못된 토큰입니다"), + TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "AUTH_401_001", "토큰이 만료되었습니다. 토큰을 재 발급 해주세요"), + REFRESH_TOKEN_EXPIRED(HttpStatus.FORBIDDEN, "AUTH_403_001", "토큰이 만료되었습니다. 재로그인 해주세요"), + + // Login error + FAILED_LOGIN(HttpStatus.UNAUTHORIZED, "AUTH_ERROR_002", "회원 아이디와 비밀번호가 일치하지 않습니다. 다시 로그인 해주세요."); private final HttpStatus httpStatus; private final String code; From a65554147dfedaf0767cb463753f773412bb426a Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 18:26:18 +0900 Subject: [PATCH 15/46] =?UTF-8?q?Refactor:=20User=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20&=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20api=20?= =?UTF-8?q?=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 --- .../com/storix/spring_vote_22nd/UseCase.java | 20 +++++ .../api/auth/AuthController.java | 41 +++++++++ .../api/{ => auth}/dto/LoginRequest.java | 2 +- .../api/auth/dto/LoginWithTokenResponse.java | 10 +++ .../api/auth/dto/SignupRequest.java | 14 +++ .../api/auth/dto/SignupResponse.java | 8 ++ .../api/auth/usecase/AuthUseCase.java | 22 +++++ .../api/auth/usecase/LoginUseCase.java | 26 ++++++ .../api/controller/AuthController.java | 36 -------- .../api/dto/LoginResponse.java | 7 -- .../api/dto/LogoutRequest.java | 6 -- .../api/dto/SignUpRequest.java | 14 --- .../domains/member/service/AuthService.java | 34 ------- .../service/CustomUserDetailsService.java | 26 ------ .../domains/member/service/LoginService.java | 90 ------------------- .../domains/user/adaptor/AuthUserDetails.java | 34 +++++++ .../user/adaptor/TokenGenerateHelper.java | 42 +++++++++ .../domains/user/dto/LoginInfo.java | 7 ++ .../domains/user/service/AuthService.java | 37 ++++++++ .../domains/user/service/LoginService.java | 44 +++++++++ .../exception/ArtistLoginException.java | 10 +++ .../apiPayload/exception/GlobalException.java | 4 - .../exception/UnknownUserException.java | 10 +++ 23 files changed, 326 insertions(+), 218 deletions(-) create mode 100644 src/main/java/com/storix/spring_vote_22nd/UseCase.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java rename src/main/java/com/storix/spring_vote_22nd/api/{ => auth}/dto/LoginRequest.java (62%) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginWithTokenResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupRequest.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthUseCase.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/api/dto/LoginResponse.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/api/dto/SignUpRequest.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/AuthUserDetails.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginInfo.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java delete mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/UnknownUserException.java diff --git a/src/main/java/com/storix/spring_vote_22nd/UseCase.java b/src/main/java/com/storix/spring_vote_22nd/UseCase.java new file mode 100644 index 0000000..eb15850 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/UseCase.java @@ -0,0 +1,20 @@ +package com.storix.spring_vote_22nd; + +import org.springframework.core.annotation.AliasFor; +import org.springframework.stereotype.Component; + +import java.lang.annotation.*; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Component +public @interface UseCase { + + /** + * Alias for {@link Component#value}. + */ + @AliasFor(annotation = Component.class) + String value() default ""; + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java new file mode 100644 index 0000000..08aa07c --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java @@ -0,0 +1,41 @@ +package com.storix.spring_vote_22nd.api.auth; + +import com.storix.spring_vote_22nd.api.auth.dto.LoginRequest; +import com.storix.spring_vote_22nd.api.auth.dto.SignupRequest; +import com.storix.spring_vote_22nd.api.auth.usecase.AuthUseCase; +import com.storix.spring_vote_22nd.api.auth.usecase.LoginUseCase; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +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; + +@RestController +@RequestMapping("/api/v1/auth") +@RequiredArgsConstructor +public class AuthController { + + private final AuthUseCase authUseCase; + private final LoginUseCase loginUseCase; + + @Operation(summary = "회원 가입용 api 입니다.") + @PostMapping("/user/signup") + public ResponseEntity userSignup(@RequestBody SignupRequest req){ + return ResponseEntity.ok() + .body(authUseCase.signup(req)); + } + + @Operation(summary = "로그인용 api 입니다.") + @PostMapping("/user/login") + public ResponseEntity userLogin(@RequestBody LoginRequest req){ + return ResponseEntity.ok() + .body(loginUseCase.userLoginWithLoginId(req)); + } + +// @PostMapping("/logout") +// public void logout(@RequestBody LogoutRequest req) { +// loginService.logout(req.refreshToken()); +// } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginRequest.java similarity index 62% rename from src/main/java/com/storix/spring_vote_22nd/api/dto/LoginRequest.java rename to src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginRequest.java index 3343836..eb62142 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginRequest.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package com.storix.spring_vote_22nd.api.dto; +package com.storix.spring_vote_22nd.api.auth.dto; public record LoginRequest( String loginId, diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginWithTokenResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginWithTokenResponse.java new file mode 100644 index 0000000..144288e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginWithTokenResponse.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +import lombok.Builder; + +@Builder +public record LoginWithTokenResponse( + String accessToken, + String refreshToken +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupRequest.java new file mode 100644 index 0000000..4fa0fa4 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupRequest.java @@ -0,0 +1,14 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; + +public record SignupRequest( + String loginId, + String password, + String email, + Part part, + String name, + Team team +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupResponse.java new file mode 100644 index 0000000..eeb5835 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupResponse.java @@ -0,0 +1,8 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record SignupResponse( + Long userId, + String loginId, + String name +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthUseCase.java new file mode 100644 index 0000000..a913cc6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthUseCase.java @@ -0,0 +1,22 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.SignupRequest; +import com.storix.spring_vote_22nd.api.auth.dto.SignupResponse; +import com.storix.spring_vote_22nd.domains.user.service.AuthService; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +@UseCase +@RequiredArgsConstructor +public class AuthUseCase { + + private final AuthService authService; + + public CustomResponse signup(SignupRequest req) { + Long userId = authService.signUp(req); + return CustomResponse.onSuccess(SuccessCode.SUCCESS, + new SignupResponse(userId, req.loginId(), req.name())); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java new file mode 100644 index 0000000..5712405 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java @@ -0,0 +1,26 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.LoginRequest; +import com.storix.spring_vote_22nd.api.auth.dto.LoginWithTokenResponse; +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.domains.user.adaptor.TokenGenerateHelper; +import com.storix.spring_vote_22nd.domains.user.service.LoginService; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +@UseCase +@RequiredArgsConstructor +public class LoginUseCase { + + private final LoginService loginService; + private final TokenGenerateHelper tokenGenerateHelper; + + public CustomResponse userLoginWithLoginId(LoginRequest req) { + loginService.validateUserLogin(req.loginId(), req.password()); + AuthUserDetails userDetails = loginService.loadUserByUsername(req.loginId()); + LoginWithTokenResponse loginWithTokenResponse = tokenGenerateHelper.generateLoginWithToken(userDetails); + return CustomResponse.onSuccess(SuccessCode.SUCCESS, loginWithTokenResponse); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java deleted file mode 100644 index d6c1850..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/api/controller/AuthController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.storix.spring_vote_22nd.api.controller; - -import com.storix.spring_vote_22nd.api.dto.LoginRequest; -import com.storix.spring_vote_22nd.api.dto.LoginResponse; -import com.storix.spring_vote_22nd.api.dto.SignUpRequest; -import com.storix.spring_vote_22nd.api.dto.LogoutRequest; -import com.storix.spring_vote_22nd.domains.member.service.AuthService; -import com.storix.spring_vote_22nd.domains.member.service.LoginService; -import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/auth") -@RequiredArgsConstructor -public class AuthController { - private final AuthService authService; - private final LoginService loginService; - - @PostMapping("/signup") - public void signUp(@RequestBody SignUpRequest req) { - authService.signUp(req); - } - - @PostMapping("/login") - public LoginResponse login(@RequestBody LoginRequest req) { - return loginService.login(req); - } - - @PostMapping("/logout") - public void logout(@RequestBody LogoutRequest req) { - loginService.logout(req.refreshToken()); - } -} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginResponse.java deleted file mode 100644 index 1f37dde..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/api/dto/LoginResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.storix.spring_vote_22nd.api.dto; - -public record LoginResponse( - String accessToken, - String refreshToken -) { -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java deleted file mode 100644 index 8adf4f3..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/api/dto/LogoutRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.storix.spring_vote_22nd.api.dto; - -public record LogoutRequest( - String refreshToken -) { -} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/dto/SignUpRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/dto/SignUpRequest.java deleted file mode 100644 index 69f4158..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/api/dto/SignUpRequest.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.storix.spring_vote_22nd.api.dto; - -import com.storix.spring_vote_22nd.domains.member.domain.Part; -import com.storix.spring_vote_22nd.domains.member.domain.Team; - -public record SignUpRequest( - String loginId, - String password, - String email, - Part part, - String name, - Team team -) { -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java deleted file mode 100644 index 46d3bd3..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/AuthService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.service; - -import com.storix.spring_vote_22nd.api.dto.SignUpRequest; -import com.storix.spring_vote_22nd.domains.member.adaptor.MemberReader; -import com.storix.spring_vote_22nd.domains.member.adaptor.MemberSaver; -import lombok.RequiredArgsConstructor; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -public class AuthService { - - private final MemberReader memberReader; - private final MemberSaver memberSaver; - private final PasswordEncoder passwordEncoder; // BCryptPasswordEncoder - - @Transactional - public void signUp(SignUpRequest req) { - - CreateMemberCommand m = new CreateMemberCommand( - req.loginId(), - passwordEncoder.encode(req.password()), - req.email(), - req.part(), - req.name(), - req.team() - ); - - memberSaver.execute(m); - - } -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java deleted file mode 100644 index 2d44fe0..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/CustomUserDetailsService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.service; - -import com.storix.spring_vote_22nd.domains.member.adaptor.MemberReader; -import com.storix.spring_vote_22nd.domains.member.dto.Member; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class CustomUserDetailsService implements UserDetailsService { - - private final MemberReader memberReader; - - @Override - public UserDetails loadUserByUsername(String loginId) throws UsernameNotFoundException { - Member member = memberReader.getByLoginIdOrThrow(loginId); - - return User.builder() - .username(member.loginId()) // username = loginId - .build(); - } -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java deleted file mode 100644 index e65078e..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/domains/member/service/LoginService.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.storix.spring_vote_22nd.domains.member.service; - -import com.storix.spring_vote_22nd.api.dto.LoginRequest; -import com.storix.spring_vote_22nd.api.dto.LoginResponse; -import com.storix.spring_vote_22nd.domains.member.domain.MemberEntity; -import com.storix.spring_vote_22nd.domains.member.domain.RefreshToken; -import com.storix.spring_vote_22nd.domains.member.repository.MemberRepository; -import com.storix.spring_vote_22nd.domains.member.repository.RefreshTokenRepository; -import com.storix.spring_vote_22nd.global.security.TokenProvider; -import jakarta.transaction.Transactional; -import lombok.RequiredArgsConstructor; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.Date; -import java.util.List; - -@Service -@RequiredArgsConstructor -public class LoginService { - private final MemberRepository memberRepository; - private final PasswordEncoder passwordEncoder; - private final TokenProvider tokenProvider; - private final RefreshTokenRepository refreshTokenRepository; - - public LoginResponse login(LoginRequest req) { - // 아이디 확인 - MemberEntity m = memberRepository.findByLoginId(req.loginId()) - .orElseThrow(() -> new IllegalArgumentException("존재하지 않는 사용자")); - - // 비밀번호 확인 - if (!passwordEncoder.matches(req.password(), m.getPassword())) { - throw new IllegalArgumentException("비밀번호 불일치"); - } - - UserDetails user = new User( - m.getLoginId(), - m.getPassword(), - List.of(new SimpleGrantedAuthority("ROLE_USER")) - ); - - Authentication auth = new UsernamePasswordAuthenticationToken( - user, null, user.getAuthorities() - ); - - // 액세스 토큰 발급 - String accessToken = tokenProvider.createAccessToken(m.getId(), auth); - - // 리프레시 토큰 발급 - String refreshToken = tokenProvider.createRefreshToken(m.getId()); - - // 리프레시 토큰을 발급받은 적이 있을 경우, DB에서 해당 토큰 삭제 - refreshTokenRepository.deleteByMemberId(m.getId()); - - // 리프레시 토큰 DB 저장 - Date expiry = tokenProvider.getRefreshTokenExpiry(refreshToken); - RefreshToken refreshTokenEntity = RefreshToken.builder() - .memberId(m.getId()) - .token(refreshToken) - .expiryDateTime( - LocalDateTime.ofInstant( - expiry.toInstant(), - ZoneId.systemDefault() - ) - ) - .build(); - - refreshTokenRepository.save(refreshTokenEntity); - - return new LoginResponse(accessToken, refreshToken); - } - - @Transactional - public void logout(String refreshToken) { - // 토큰 검증 - if (!tokenProvider.validateRefreshToken(refreshToken)) { - throw new IllegalArgumentException("유효하지 않은 리프레시 토큰"); - } - - // DB에서 해당 토큰 삭제 - refreshTokenRepository.deleteByToken(refreshToken); - } -} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/AuthUserDetails.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/AuthUserDetails.java new file mode 100644 index 0000000..b02548f --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/AuthUserDetails.java @@ -0,0 +1,34 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import lombok.AllArgsConstructor; +import lombok.Getter; +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.Collections; + +@Getter +@AllArgsConstructor +public class AuthUserDetails implements UserDetails { + + private String userId; + + private String role; + + @Override + public Collection getAuthorities() { + return Collections.singletonList( + new SimpleGrantedAuthority("ROLE_" + role) + ); + } + + @Override + public String getPassword() { return null; } + + @Override + public String getUsername() { return userId; } + +} + diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java new file mode 100644 index 0000000..23c9bef --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java @@ -0,0 +1,42 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import com.storix.spring_vote_22nd.api.auth.dto.LoginWithTokenResponse; +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import com.storix.spring_vote_22nd.global.security.TokenProvider; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import static com.storix.spring_vote_22nd.global.apiPayload.STORIX_voteStatic.MILLI_TO_SECOND; + +@Service +@RequiredArgsConstructor +public class TokenGenerateHelper { + + private final TokenProvider tokenProvider; + private final RefreshTokenAdaptor refreshTokenAdaptor; + + @Transactional + public LoginWithTokenResponse generateLoginWithToken(AuthUserDetails userDetails) { + + String userId = userDetails.getUserId(); + String role = userDetails.getRole(); + + String accessToken = tokenProvider.createAccessToken(userId, role); + String refreshToken = tokenProvider.createRefreshToken(userId); + + // redis 저장 + long ttlSeconds = tokenProvider.getRefreshTokenValidityMs() * MILLI_TO_SECOND; + RefreshToken newRefreshToken = RefreshToken.builder() + .id(userId) + .refreshToken(refreshToken) + .ttl(ttlSeconds) + .build(); + refreshTokenAdaptor.save(newRefreshToken); + + return LoginWithTokenResponse.builder() + .accessToken(accessToken) + .refreshToken(refreshToken) + .build(); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginInfo.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginInfo.java new file mode 100644 index 0000000..f28d2dd --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginInfo.java @@ -0,0 +1,7 @@ +package com.storix.spring_vote_22nd.domains.user.dto; + +public record LoginInfo( + String loginId, + String password +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java new file mode 100644 index 0000000..91194a6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java @@ -0,0 +1,37 @@ +package com.storix.spring_vote_22nd.domains.user.service; + + +import com.storix.spring_vote_22nd.api.auth.dto.SignupRequest; +import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; +import com.storix.spring_vote_22nd.domains.user.dto.CreateUserCommand; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AuthService { + + private final UserAdaptor userAdaptor; + private final PasswordEncoder passwordEncoder; + + @Transactional + public Long signUp(SignupRequest req) { + userAdaptor.isLoginIdDuplicate(req.loginId()); + + CreateUserCommand m = new CreateUserCommand( + req.loginId(), + passwordEncoder.encode(req.password()), + req.email(), + req.part(), + req.name(), + req.team() + ); + + userAdaptor.saveUser(m); + Long userId = userAdaptor.findUserIdByLoginId(req.loginId()); + + return userId; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java new file mode 100644 index 0000000..d12eeb2 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java @@ -0,0 +1,44 @@ +package com.storix.spring_vote_22nd.domains.user.service; + +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; +import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; +import com.storix.spring_vote_22nd.global.apiPayload.exception.ArtistLoginException; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@Transactional +@RequiredArgsConstructor +public class LoginService implements UserDetailsService { + + private final UserAdaptor userAdaptor; + private final PasswordEncoder passwordEncoder; + + @Override + public AuthUserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + return userAdaptor.findUserIdAndRoleByLoginId(username); + } + + public void validateUserLogin(String loginId, String password) { + LoginInfo artistUserLoginInfo = userAdaptor.findUserLoginInfoByLoginI(loginId); + + if (!passwordEncoder.matches(password, artistUserLoginInfo.password())) { + throw ArtistLoginException.EXCEPTION; + } + } + +// @Transactional +// public void logout(String refreshToken) { +// // 토큰 검증 +// refreshTokenAdaptor.findByRefreshToken(refreshToken); +// +// // DB에서 해당 토큰 삭제 +// refreshTokenAdaptor.deleteByUserId(); +// } +} + diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java new file mode 100644 index 0000000..2cbeee3 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class ArtistLoginException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new ArtistLoginException(); + + private ArtistLoginException() { super(ErrorCode.FAILED_LOGIN); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java deleted file mode 100644 index a4cec3e..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalException.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.storix.spring_vote_22nd.global.apiPayload.exception; - -public class GlobalException { -} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/UnknownUserException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/UnknownUserException.java new file mode 100644 index 0000000..9afc270 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/UnknownUserException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class UnknownUserException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new UnknownUserException(); + + private UnknownUserException() { super(ErrorCode.NOT_FOUND); } +} \ No newline at end of file From 62090f0a6b41496ffc8f70c4db99c6af90ca3966 Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 18:45:17 +0900 Subject: [PATCH 16/46] =?UTF-8?q?Rename:=20Exception=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/user/adaptor/UserAdaptor.java | 4 ++-- .../domains/user/service/LoginService.java | 4 ++-- .../apiPayload/exception/ArtistLoginException.java | 10 ---------- .../global/apiPayload/exception/LoginException.java | 10 ++++++++++ 4 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/LoginException.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java index 2cbf728..3439a78 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java @@ -5,7 +5,7 @@ import com.storix.spring_vote_22nd.domains.user.repository.UserRepository; import com.storix.spring_vote_22nd.domains.user.dto.CreateUserCommand; import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; -import com.storix.spring_vote_22nd.global.apiPayload.exception.ArtistLoginException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.LoginException; import com.storix.spring_vote_22nd.global.apiPayload.exception.ErrorResponse; import com.storix.spring_vote_22nd.global.apiPayload.exception.UnknownUserException; import jakarta.transaction.Transactional; @@ -32,7 +32,7 @@ public Long findUserIdByLoginId(String loginId){ public LoginInfo findUserLoginInfoByLoginI(String loginId){ Optional user = userRepository.findUserByLoginId(loginId); if(!user.isPresent()) { - throw ArtistLoginException.EXCEPTION; + throw LoginException.EXCEPTION; } LoginInfo loginInfo = new LoginInfo(user.get().getLoginId(), user.get().getPassword()); diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java index d12eeb2..f35c055 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java @@ -3,7 +3,7 @@ import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; -import com.storix.spring_vote_22nd.global.apiPayload.exception.ArtistLoginException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.LoginException; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.security.core.userdetails.UserDetailsService; @@ -28,7 +28,7 @@ public void validateUserLogin(String loginId, String password) { LoginInfo artistUserLoginInfo = userAdaptor.findUserLoginInfoByLoginI(loginId); if (!passwordEncoder.matches(password, artistUserLoginInfo.password())) { - throw ArtistLoginException.EXCEPTION; + throw LoginException.EXCEPTION; } } diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java deleted file mode 100644 index 2cbeee3..0000000 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ArtistLoginException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.storix.spring_vote_22nd.global.apiPayload.exception; - -import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; - -public class ArtistLoginException extends STORIXCodeException { - - public static final STORIXCodeException EXCEPTION = new ArtistLoginException(); - - private ArtistLoginException() { super(ErrorCode.FAILED_LOGIN); } -} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/LoginException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/LoginException.java new file mode 100644 index 0000000..13ef0b6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/LoginException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class LoginException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new LoginException(); + + private LoginException() { super(ErrorCode.FAILED_LOGIN); } +} \ No newline at end of file From a123f14106045bcc869da470615aaf359e24db32 Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 19:09:56 +0900 Subject: [PATCH 17/46] =?UTF-8?q?Feat:=20Login=20Exception=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/user/adaptor/UserAdaptor.java | 17 ++++++++++------- .../domains/user/repository/UserRepository.java | 2 ++ .../domains/user/service/AuthService.java | 3 ++- .../global/apiPayload/code/ErrorCode.java | 4 ++++ .../exception/DuplicateEmailException.java | 10 ++++++++++ .../exception/DuplicateLoginIdException.java | 10 ++++++++++ 6 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateEmailException.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateLoginIdException.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java index 3439a78..45a38cc 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java @@ -4,10 +4,7 @@ import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; import com.storix.spring_vote_22nd.domains.user.repository.UserRepository; import com.storix.spring_vote_22nd.domains.user.dto.CreateUserCommand; -import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; -import com.storix.spring_vote_22nd.global.apiPayload.exception.LoginException; -import com.storix.spring_vote_22nd.global.apiPayload.exception.ErrorResponse; -import com.storix.spring_vote_22nd.global.apiPayload.exception.UnknownUserException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.*; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -47,12 +44,18 @@ public AuthUserDetails findUserIdAndRoleByLoginId(String loginId){ throw UnknownUserException.EXCEPTION; } - public ErrorResponse isLoginIdDuplicate(String loginId) { + public void validateLoginId(String loginId) { Optional user = userRepository.findUserByLoginId(loginId); if (user.isPresent()) { - return new ErrorResponse(ErrorCode.BAD_REQUEST); + throw DuplicateLoginIdException.EXCEPTION; + } + } + + public void validateEmail(String email) { + Optional user = userRepository.findUserByEmail(email); + if (user.isPresent()) { + throw DuplicateEmailException.EXCEPTION; } - return null; } public User saveUser(CreateUserCommand cmd) { diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java index 8ce1abc..e2edb51 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java @@ -7,4 +7,6 @@ public interface UserRepository extends JpaRepository { Optional findUserByLoginId(String loginId); + + Optional findUserByEmail(String email); } diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java index 91194a6..172dc8e 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java @@ -18,7 +18,8 @@ public class AuthService { @Transactional public Long signUp(SignupRequest req) { - userAdaptor.isLoginIdDuplicate(req.loginId()); + userAdaptor.validateLoginId(req.loginId()); + userAdaptor.validateEmail(req.email()); CreateUserCommand m = new CreateUserCommand( req.loginId(), diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java index de0ba11..73ac4a6 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java @@ -20,6 +20,10 @@ public enum ErrorCode { TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "AUTH_401_001", "토큰이 만료되었습니다. 토큰을 재 발급 해주세요"), REFRESH_TOKEN_EXPIRED(HttpStatus.FORBIDDEN, "AUTH_403_001", "토큰이 만료되었습니다. 재로그인 해주세요"), + // Signup error + DUPLICATE_LOGINID_SIGNUP(HttpStatus.BAD_REQUEST, "AUTH_ERROR_003", "중복된 아이디입니다."), + DUPLICATE_EMIAL_SIGNUP(HttpStatus.BAD_REQUEST, "AUTH_ERROR_004", "이미 가입 중인 이메일입니다."), + // Login error FAILED_LOGIN(HttpStatus.UNAUTHORIZED, "AUTH_ERROR_002", "회원 아이디와 비밀번호가 일치하지 않습니다. 다시 로그인 해주세요."); diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateEmailException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateEmailException.java new file mode 100644 index 0000000..16b3ad2 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateEmailException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class DuplicateEmailException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new DuplicateEmailException(); + + private DuplicateEmailException() { super(ErrorCode.DUPLICATE_EMIAL_SIGNUP); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateLoginIdException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateLoginIdException.java new file mode 100644 index 0000000..6d689b5 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateLoginIdException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class DuplicateLoginIdException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new DuplicateLoginIdException(); + + private DuplicateLoginIdException() { super(ErrorCode.DUPLICATE_LOGINID_SIGNUP); } +} \ No newline at end of file From 912e00e322da85fe3f0cc2a54a9cbbb507765d76 Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 19:35:09 +0900 Subject: [PATCH 18/46] =?UTF-8?q?Refactor:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20api=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 --- .../spring_vote_22nd/api/auth/AuthController.java | 11 +++++++---- .../api/auth/dto/LogoutRequest.java | 6 ++++++ .../api/auth/usecase/LoginUseCase.java | 6 ++++++ .../domains/user/adaptor/RefreshTokenAdaptor.java | 13 ++++++++++--- .../domains/user/service/LoginService.java | 15 +++++++-------- 5 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LogoutRequest.java diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java index 08aa07c..c1cfb49 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java @@ -1,6 +1,7 @@ package com.storix.spring_vote_22nd.api.auth; import com.storix.spring_vote_22nd.api.auth.dto.LoginRequest; +import com.storix.spring_vote_22nd.api.auth.dto.LogoutRequest; import com.storix.spring_vote_22nd.api.auth.dto.SignupRequest; import com.storix.spring_vote_22nd.api.auth.usecase.AuthUseCase; import com.storix.spring_vote_22nd.api.auth.usecase.LoginUseCase; @@ -34,8 +35,10 @@ public ResponseEntity userLogin(@RequestBody LoginRequest req){ .body(loginUseCase.userLoginWithLoginId(req)); } -// @PostMapping("/logout") -// public void logout(@RequestBody LogoutRequest req) { -// loginService.logout(req.refreshToken()); -// } + @Operation(summary = "로그아웃용 api 입니다.") + @PostMapping("/user/logout") + public ResponseEntity logout(@RequestBody LogoutRequest req) { + return ResponseEntity.ok() + .body(loginUseCase.userLogoutWithRefreshToken(req)); + } } diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LogoutRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LogoutRequest.java new file mode 100644 index 0000000..86eec14 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LogoutRequest.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record LogoutRequest( + String refreshToken +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java index 5712405..09e5773 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java @@ -3,6 +3,7 @@ import com.storix.spring_vote_22nd.UseCase; import com.storix.spring_vote_22nd.api.auth.dto.LoginRequest; import com.storix.spring_vote_22nd.api.auth.dto.LoginWithTokenResponse; +import com.storix.spring_vote_22nd.api.auth.dto.LogoutRequest; import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; import com.storix.spring_vote_22nd.domains.user.adaptor.TokenGenerateHelper; import com.storix.spring_vote_22nd.domains.user.service.LoginService; @@ -23,4 +24,9 @@ public CustomResponse userLoginWithLoginId(LoginRequest LoginWithTokenResponse loginWithTokenResponse = tokenGenerateHelper.generateLoginWithToken(userDetails); return CustomResponse.onSuccess(SuccessCode.SUCCESS, loginWithTokenResponse); } + + public CustomResponse userLogoutWithRefreshToken(LogoutRequest req) { + loginService.logoutByRefreshToken(req.refreshToken()); + return CustomResponse.onSuccess(SuccessCode.SUCCESS); + } } diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java index 6a6398f..8ee9e8e 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java @@ -2,18 +2,25 @@ import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; import com.storix.spring_vote_22nd.domains.user.repository.RefreshTokenRepository; +import com.storix.spring_vote_22nd.global.apiPayload.exception.InvalidTokenException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service @RequiredArgsConstructor public class RefreshTokenAdaptor { private final RefreshTokenRepository refreshTokenRepository; - public RefreshToken findByRefreshToken(String refreshToken) { - return refreshTokenRepository.findByRefreshToken(refreshToken) - .orElseThrow(() -> new IllegalArgumentException("Invalid refresh token")); // 커스텀 에러로 변경 + public Long findUserIdByRefreshToken(String refreshToken) { + Optional refreshTokenInfo = refreshTokenRepository.findByRefreshToken(refreshToken); + if (!refreshTokenInfo.isPresent()) { + throw InvalidTokenException.EXCEPTION; + } + + return Long.valueOf(refreshTokenInfo.get().getId()); } public RefreshToken save(RefreshToken refreshToken) { diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java index f35c055..c79e579 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java @@ -1,7 +1,9 @@ package com.storix.spring_vote_22nd.domains.user.service; import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.domains.user.adaptor.RefreshTokenAdaptor; import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; import com.storix.spring_vote_22nd.global.apiPayload.exception.LoginException; import jakarta.transaction.Transactional; @@ -18,6 +20,7 @@ public class LoginService implements UserDetailsService { private final UserAdaptor userAdaptor; private final PasswordEncoder passwordEncoder; + private final RefreshTokenAdaptor refreshTokenAdaptor; @Override public AuthUserDetails loadUserByUsername(String username) throws UsernameNotFoundException { @@ -32,13 +35,9 @@ public void validateUserLogin(String loginId, String password) { } } -// @Transactional -// public void logout(String refreshToken) { -// // 토큰 검증 -// refreshTokenAdaptor.findByRefreshToken(refreshToken); -// -// // DB에서 해당 토큰 삭제 -// refreshTokenAdaptor.deleteByUserId(); -// } + public void logoutByRefreshToken(String refreshToken) { + Long userId = refreshTokenAdaptor.findUserIdByRefreshToken(refreshToken); + refreshTokenAdaptor.deleteByUserId(userId); + } } From af870731c03ee24e238b00f3b0a3139a4407b09e Mon Sep 17 00:00:00 2001 From: Immmii Date: Tue, 18 Nov 2025 20:24:26 +0900 Subject: [PATCH 19/46] =?UTF-8?q?Chore:=20LoginSucceseCode=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storix/spring_vote_22nd/api/auth/AuthController.java | 4 ++-- .../spring_vote_22nd/api/auth/usecase/LoginUseCase.java | 4 ++-- .../global/apiPayload/code/SuccessCode.java | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java index c1cfb49..7b77a81 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java @@ -23,14 +23,14 @@ public class AuthController { @Operation(summary = "회원 가입용 api 입니다.") @PostMapping("/user/signup") - public ResponseEntity userSignup(@RequestBody SignupRequest req){ + public ResponseEntity signup(@RequestBody SignupRequest req){ return ResponseEntity.ok() .body(authUseCase.signup(req)); } @Operation(summary = "로그인용 api 입니다.") @PostMapping("/user/login") - public ResponseEntity userLogin(@RequestBody LoginRequest req){ + public ResponseEntity login(@RequestBody LoginRequest req){ return ResponseEntity.ok() .body(loginUseCase.userLoginWithLoginId(req)); } diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java index 09e5773..0c0b37b 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java @@ -22,11 +22,11 @@ public CustomResponse userLoginWithLoginId(LoginRequest loginService.validateUserLogin(req.loginId(), req.password()); AuthUserDetails userDetails = loginService.loadUserByUsername(req.loginId()); LoginWithTokenResponse loginWithTokenResponse = tokenGenerateHelper.generateLoginWithToken(userDetails); - return CustomResponse.onSuccess(SuccessCode.SUCCESS, loginWithTokenResponse); + return CustomResponse.onSuccess(SuccessCode.VALID_LOGIN, loginWithTokenResponse); } public CustomResponse userLogoutWithRefreshToken(LogoutRequest req) { loginService.logoutByRefreshToken(req.refreshToken()); - return CustomResponse.onSuccess(SuccessCode.SUCCESS); + return CustomResponse.onSuccess(SuccessCode.VALID_LOGOUT); } } diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java index be9a16d..2db66c2 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java @@ -9,7 +9,12 @@ public enum SuccessCode { SUCCESS(HttpStatus.OK, "COMMON_SUCCESS_001", "정상적인 요청입니다."), - CREATED(HttpStatus.CREATED, "COMMON_SUCCESS_002", "정상적으로 생성되었습니다."); + CREATED(HttpStatus.CREATED, "COMMON_SUCCESS_002", "정상적으로 생성되었습니다."), + + // login success + VALID_LOGIN(HttpStatus.OK, "AUTH_SUCCESS_001", "로그인에 성공했습니다."), + VALID_LOGOUT(HttpStatus.OK, "AUTH_SUCCESS_002", "로그아웃에 성공했습니다."); + private final HttpStatus httpStatus; private final String code; From 41b258bd15926b769f51cac1f645e73f7db051bf Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Wed, 19 Nov 2025 04:09:19 +0900 Subject: [PATCH 20/46] Chore: Update .gitignore --- .gitignore | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 43a1d59..7a7b395 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ HELP.md .gradle build/ -!gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ @@ -37,9 +36,12 @@ out/ .vscode/ *.pem -.env +*.env +### 추가가 필요한 파일은 예외로 추가하기 ### *.yml +!ci.yml +!cd.yml *.properties !gradle/wrapper/gradle-wrapper.jar From ed9cf43a53131fb507fc7339053be8b970e37a33 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Wed, 19 Nov 2025 04:27:17 +0900 Subject: [PATCH 21/46] Chore: Add ci workflow --- .github/workflows/ci.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1b8fa37 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,39 @@ +name: CEOS vote CI - Build & Push to ECR + +on: + push: + branches: + - storix + +jobs: + build-and-push: + name: Build and Push to ECR + runs-on: ubuntu-24.04 + + steps: + - name: Checkout GitHub repository + uses: actions/checkout@v3 + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-region: ${{ secrets.AWS_REGION }} + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + + - name: Login to AWS ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + + - name: Build & push image to ECR + env: + IMAGE_NAME: ${{ secrets.ECR_REGISTRY }}/${{ secrets.ECR_REPOSITORY }} + IMAGE_TAG: ${{ github.sha }} + + run: | + docker build -t $IMAGE_NAME:$IMAGE_TAG . + docker push $IMAGE_NAME:$IMAGE_TAG + + # latest tag + docker tag $IMAGE_NAME:$IMAGE_TAG $IMAGE_NAME:latest + docker push $IMAGE_NAME:latest \ No newline at end of file From 941222b7214eb3eefc7dd05d3195329e6d287253 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Wed, 19 Nov 2025 04:27:25 +0900 Subject: [PATCH 22/46] Chore: Add cd workflow --- .github/workflows/cd.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 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..850e577 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,39 @@ +name: CEOS vote CD - Deploy to EC2 + +on: + workflow_run: + workflows: + - "CEOS vote CI - Build & Push to ECR" + types: + - completed + +jobs: + deploy-to-ec2: + name: Deploy to EC2 + runs-on: self-hosted + env: + AWS_REGION: ${{ secrets.AWS_REGION }} + ECR_REGISTRY: ${{ secrets.ECR_REGISTRY }} + + if: ${{ github.event.workflow_run.conclusion == 'success' }} + + steps: + - name: Deploy on EC2 Instance + run: | + cd ~/storix + test -f docker-compose.yml || { echo "ERORR: docker-compose.yml not found"; exit 1; } + test -f .env || { echo "ERROR: .env not found"; exit 1; } + + echo ">>> Logging in to ECR..." + aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $ECR_REGISTRY + + echo ">>> Pulling latest image from ECR..." + docker compose pull app + + echo ">>> Starting new container..." + docker compose up -d --no-deps app + + echo ">>> Pruning old images..." + docker image prune -af + + echo "✅ Deployment successful!" \ No newline at end of file From 1257aff28c193079953808c8efd85557c1089440 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Wed, 19 Nov 2025 04:46:46 +0900 Subject: [PATCH 23/46] Chore: change instance repo name --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 850e577..c649c59 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Deploy on EC2 Instance run: | - cd ~/storix + cd ~/ceos-vote test -f docker-compose.yml || { echo "ERORR: docker-compose.yml not found"; exit 1; } test -f .env || { echo "ERROR: .env not found"; exit 1; } From 45f790288a9459c70f861e562ba25e40727b9038 Mon Sep 17 00:00:00 2001 From: Immmii Date: Wed, 19 Nov 2025 15:30:30 +0900 Subject: [PATCH 24/46] =?UTF-8?q?Feat:=20Team,=20Part=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20api=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/auth/AuthController.java | 28 +++++++++++---- .../api/auth/dto/PartResponse.java | 12 +++++++ .../api/auth/dto/TeamResponse.java | 12 +++++++ .../api/auth/usecase/DropDownUseCase.java | 35 +++++++++++++++++++ 4 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/PartResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/TeamResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/DropDownUseCase.java diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java index 7b77a81..0c282c0 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java @@ -1,26 +1,40 @@ package com.storix.spring_vote_22nd.api.auth; -import com.storix.spring_vote_22nd.api.auth.dto.LoginRequest; -import com.storix.spring_vote_22nd.api.auth.dto.LogoutRequest; -import com.storix.spring_vote_22nd.api.auth.dto.SignupRequest; +import com.storix.spring_vote_22nd.api.auth.dto.*; import com.storix.spring_vote_22nd.api.auth.usecase.AuthUseCase; +import com.storix.spring_vote_22nd.api.auth.usecase.DropDownUseCase; import com.storix.spring_vote_22nd.api.auth.usecase.LoginUseCase; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; 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.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/api/v1/auth") @RequiredArgsConstructor public class AuthController { + private final DropDownUseCase dropDownUseCase; + private final AuthUseCase authUseCase; private final LoginUseCase loginUseCase; + @Operation(summary = "팀 조회용 api 입니다.") + @GetMapping("/user/team") + public ResponseEntity viewTeams() { + return ResponseEntity.ok() + .body(dropDownUseCase.getTeams()); + } + + @Operation(summary = "파트 조회용 api 입니다.") + @GetMapping("/user/part") + public ResponseEntity viewParts() { + return ResponseEntity.ok() + .body(dropDownUseCase.getParts()); + } + @Operation(summary = "회원 가입용 api 입니다.") @PostMapping("/user/signup") public ResponseEntity signup(@RequestBody SignupRequest req){ diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/PartResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/PartResponse.java new file mode 100644 index 0000000..61bfa90 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/PartResponse.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.Part; + +public record PartResponse( + String code, + String label +) { + public static PartResponse from(Part part) { + return new PartResponse(part.name(), part.getValue()); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/TeamResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/TeamResponse.java new file mode 100644 index 0000000..c4c9161 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/TeamResponse.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.Team; + +public record TeamResponse( + String code, + String label +) { + public static TeamResponse from(Team team) { + return new TeamResponse(team.name(), team.getValue()); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/DropDownUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/DropDownUseCase.java new file mode 100644 index 0000000..de676e9 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/DropDownUseCase.java @@ -0,0 +1,35 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.PartResponse; +import com.storix.spring_vote_22nd.api.auth.dto.TeamResponse; +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +import java.util.Arrays; +import java.util.List; + +@UseCase +@RequiredArgsConstructor +public class DropDownUseCase { + + public CustomResponse> getTeams() { + List result = Arrays.stream(Team.values()) + .map(TeamResponse::from) + .toList(); + + return CustomResponse.onSuccess(SuccessCode.SUCCESS, result); + } + + public CustomResponse> getParts() { + List result = Arrays.stream(Part.values()) + .map(PartResponse::from) + .toList(); + + return CustomResponse.onSuccess(SuccessCode.SUCCESS, result); + } + +} From 7447408fcf785914e29b7ee5aa5551078a824cd2 Mon Sep 17 00:00:00 2001 From: Immmii Date: Wed, 19 Nov 2025 16:22:56 +0900 Subject: [PATCH 25/46] =?UTF-8?q?Feat:=20=EB=A7=8C=EB=A3=8C=EB=90=9C=20Acc?= =?UTF-8?q?essToken=20=EC=9E=AC=EB=B0=9C=EA=B8=89=20api=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/auth/AuthController.java | 16 +++++++++++-- .../api/auth/dto/AuthorizationResponse.java | 6 +++++ .../api/auth/dto/RefreshTokenRequest.java | 6 +++++ .../auth/usecase/AuthorizationUseCase.java | 22 +++++++++++++++++ .../api/auth/usecase/LoginUseCase.java | 2 +- .../user/adaptor/TokenGenerateHelper.java | 24 +++++++++++++++---- .../domains/user/adaptor/UserAdaptor.java | 9 +++++++ .../user}/dto/LoginWithTokenResponse.java | 5 +--- .../global/apiPayload/code/SuccessCode.java | 5 +++- 9 files changed, 82 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/AuthorizationResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/dto/RefreshTokenRequest.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthorizationUseCase.java rename src/main/java/com/storix/spring_vote_22nd/{api/auth => domains/user}/dto/LoginWithTokenResponse.java (54%) diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java index 0c282c0..dcb4fc7 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java @@ -2,6 +2,7 @@ import com.storix.spring_vote_22nd.api.auth.dto.*; import com.storix.spring_vote_22nd.api.auth.usecase.AuthUseCase; +import com.storix.spring_vote_22nd.api.auth.usecase.AuthorizationUseCase; import com.storix.spring_vote_22nd.api.auth.usecase.DropDownUseCase; import com.storix.spring_vote_22nd.api.auth.usecase.LoginUseCase; import io.swagger.v3.oas.annotations.Operation; @@ -9,8 +10,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("/api/v1/auth") @RequiredArgsConstructor @@ -21,6 +20,9 @@ public class AuthController { private final AuthUseCase authUseCase; private final LoginUseCase loginUseCase; + private final AuthorizationUseCase authorizationUseCase; + + // DropDownUseCase @Operation(summary = "팀 조회용 api 입니다.") @GetMapping("/user/team") public ResponseEntity viewTeams() { @@ -35,6 +37,7 @@ public ResponseEntity viewParts() { .body(dropDownUseCase.getParts()); } + // AuthUseCase @Operation(summary = "회원 가입용 api 입니다.") @PostMapping("/user/signup") public ResponseEntity signup(@RequestBody SignupRequest req){ @@ -42,6 +45,7 @@ public ResponseEntity signup(@RequestBody SignupRequest req){ .body(authUseCase.signup(req)); } + // LoginUseCase @Operation(summary = "로그인용 api 입니다.") @PostMapping("/user/login") public ResponseEntity login(@RequestBody LoginRequest req){ @@ -55,4 +59,12 @@ public ResponseEntity logout(@RequestBody LogoutRequest req) { return ResponseEntity.ok() .body(loginUseCase.userLogoutWithRefreshToken(req)); } + + // AuthorizationUseCase + @Operation(summary = "만료된 accessToken을 재발급해주기 위해서 refreshToken을 받는 api 입니다.") + @PostMapping("/refresh_token") + public ResponseEntity reissueAccessToken(@RequestBody RefreshTokenRequest req){ + return ResponseEntity.ok() + .body(authorizationUseCase.getAccessTokenWithRefreshToken(req)); + } } diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/AuthorizationResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/AuthorizationResponse.java new file mode 100644 index 0000000..3d82da6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/AuthorizationResponse.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record AuthorizationResponse( + String accessToken +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/RefreshTokenRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/RefreshTokenRequest.java new file mode 100644 index 0000000..5c74630 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/RefreshTokenRequest.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record RefreshTokenRequest( + String refreshToken +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthorizationUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthorizationUseCase.java new file mode 100644 index 0000000..63aebd6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthorizationUseCase.java @@ -0,0 +1,22 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.AuthorizationResponse; +import com.storix.spring_vote_22nd.api.auth.dto.RefreshTokenRequest; +import com.storix.spring_vote_22nd.domains.user.adaptor.TokenGenerateHelper; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +@UseCase +@RequiredArgsConstructor +public class AuthorizationUseCase { + + private final TokenGenerateHelper tokenGenerateHelper; + + public CustomResponse getAccessTokenWithRefreshToken(RefreshTokenRequest req) { + String accessToken = tokenGenerateHelper.reissueAccessTokenWithRefreshToken(req.refreshToken()); + AuthorizationResponse result = new AuthorizationResponse(accessToken); + return CustomResponse.onSuccess(SuccessCode.SUCCESS_REISSUE_ACCESSTOKEN, result); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java index 0c0b37b..5faf76d 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java @@ -2,7 +2,7 @@ import com.storix.spring_vote_22nd.UseCase; import com.storix.spring_vote_22nd.api.auth.dto.LoginRequest; -import com.storix.spring_vote_22nd.api.auth.dto.LoginWithTokenResponse; +import com.storix.spring_vote_22nd.domains.user.dto.LoginWithTokenResponse; import com.storix.spring_vote_22nd.api.auth.dto.LogoutRequest; import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; import com.storix.spring_vote_22nd.domains.user.adaptor.TokenGenerateHelper; diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java index 23c9bef..b484b95 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java @@ -1,7 +1,10 @@ package com.storix.spring_vote_22nd.domains.user.adaptor; -import com.storix.spring_vote_22nd.api.auth.dto.LoginWithTokenResponse; +import com.storix.spring_vote_22nd.domains.user.domain.Role; +import com.storix.spring_vote_22nd.domains.user.dto.AuthorizationWithTokenResponse; +import com.storix.spring_vote_22nd.domains.user.dto.LoginWithTokenResponse; import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import com.storix.spring_vote_22nd.global.apiPayload.exception.InvalidTokenException; import com.storix.spring_vote_22nd.global.security.TokenProvider; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; @@ -15,6 +18,7 @@ public class TokenGenerateHelper { private final TokenProvider tokenProvider; private final RefreshTokenAdaptor refreshTokenAdaptor; + private final UserAdaptor userAdaptor; @Transactional public LoginWithTokenResponse generateLoginWithToken(AuthUserDetails userDetails) { @@ -34,9 +38,19 @@ public LoginWithTokenResponse generateLoginWithToken(AuthUserDetails userDetails .build(); refreshTokenAdaptor.save(newRefreshToken); - return LoginWithTokenResponse.builder() - .accessToken(accessToken) - .refreshToken(refreshToken) - .build(); + return new LoginWithTokenResponse(accessToken, refreshToken); + } + + @Transactional + public String reissueAccessTokenWithRefreshToken(String refreshToken) { + + if (!tokenProvider.isRefreshToken(refreshToken)) { + throw InvalidTokenException.EXCEPTION; + } + + Long userId = tokenProvider.parseRefreshToken(refreshToken); + Role role = userAdaptor.findUserRoleByUserId(userId); + + return tokenProvider.createAccessToken(String.valueOf(userId), String.valueOf(role)); } } diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java index 45a38cc..aab21a5 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java @@ -1,5 +1,6 @@ package com.storix.spring_vote_22nd.domains.user.adaptor; +import com.storix.spring_vote_22nd.domains.user.domain.Role; import com.storix.spring_vote_22nd.domains.user.domain.User; import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; import com.storix.spring_vote_22nd.domains.user.repository.UserRepository; @@ -18,6 +19,14 @@ public class UserAdaptor { private final UserRepository userRepository; + public Role findUserRoleByUserId(Long userId) { + Optional user = userRepository.findById(userId); + if (user.isPresent()) { + return user.get().getRole(); + } + throw UnknownUserException.EXCEPTION; + } + public Long findUserIdByLoginId(String loginId){ Optional user = userRepository.findUserByLoginId(loginId); if(user.isPresent()){ diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginWithTokenResponse.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginWithTokenResponse.java similarity index 54% rename from src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginWithTokenResponse.java rename to src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginWithTokenResponse.java index 144288e..d11bbd8 100644 --- a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginWithTokenResponse.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginWithTokenResponse.java @@ -1,8 +1,5 @@ -package com.storix.spring_vote_22nd.api.auth.dto; +package com.storix.spring_vote_22nd.domains.user.dto; -import lombok.Builder; - -@Builder public record LoginWithTokenResponse( String accessToken, String refreshToken diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java index 2db66c2..7177acd 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java @@ -13,7 +13,10 @@ public enum SuccessCode { // login success VALID_LOGIN(HttpStatus.OK, "AUTH_SUCCESS_001", "로그인에 성공했습니다."), - VALID_LOGOUT(HttpStatus.OK, "AUTH_SUCCESS_002", "로그아웃에 성공했습니다."); + VALID_LOGOUT(HttpStatus.OK, "AUTH_SUCCESS_002", "로그아웃에 성공했습니다."), + + // authorization success + SUCCESS_REISSUE_ACCESSTOKEN(HttpStatus.CREATED, "AUTHORIZATION_SUCCESS_001", "엑세스 토큰 재발급에 성공했습니다."); private final HttpStatus httpStatus; From b1780651b5929760d88c29378db895bd8e5e39d9 Mon Sep 17 00:00:00 2001 From: Immmii Date: Wed, 19 Nov 2025 16:23:54 +0900 Subject: [PATCH 26/46] =?UTF-8?q?Chore:=20TokenGenerateHelper=20import=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/user/adaptor/TokenGenerateHelper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java index b484b95..e538453 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java @@ -1,7 +1,6 @@ package com.storix.spring_vote_22nd.domains.user.adaptor; import com.storix.spring_vote_22nd.domains.user.domain.Role; -import com.storix.spring_vote_22nd.domains.user.dto.AuthorizationWithTokenResponse; import com.storix.spring_vote_22nd.domains.user.dto.LoginWithTokenResponse; import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; import com.storix.spring_vote_22nd.global.apiPayload.exception.InvalidTokenException; From 3e4cc9037ca77d062b7df80ae66042fd8551d0ba Mon Sep 17 00:00:00 2001 From: Immmii Date: Thu, 20 Nov 2025 20:02:28 +0900 Subject: [PATCH 27/46] =?UTF-8?q?Chore:=20GlobalExceptionHandler=20?= =?UTF-8?q?=EB=A1=9C=EA=B9=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/GlobalExceptionHandler.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java index f2e5394..11a7585 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java @@ -2,6 +2,7 @@ import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -10,10 +11,23 @@ @RestControllerAdvice public class GlobalExceptionHandler { + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception ex) { + log.error("[UNHANDLED_EXCEPTION] 발생", ex); + + ErrorResponse response = new ErrorResponse(ErrorCode.INTERNAL_SERVER_ERROR); + + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(response); + } + @ExceptionHandler(STORIXCodeException.class) public ResponseEntity STORIXCodeExceptionHandler (STORIXCodeException ex) { ErrorCode errorCode = ex.getErrorCode(); + log.warn("[STORIX_CODE_EXCEPTION] code={}, message={}", + errorCode.getCode(), errorCode.getMessage(), ex); ErrorResponse response = new ErrorResponse(errorCode); return ResponseEntity From 128f42d823578cdec751796b0f8795d7b1adb645 Mon Sep 17 00:00:00 2001 From: Immmii Date: Thu, 20 Nov 2025 20:49:59 +0900 Subject: [PATCH 28/46] =?UTF-8?q?Fix:=20GlobalExceptionHandler=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B8=EB=93=A4=EB=A7=81=20=EC=88=9C=EC=84=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/GlobalExceptionHandler.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java index 11a7585..c412eb9 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java @@ -11,17 +11,6 @@ @RestControllerAdvice public class GlobalExceptionHandler { - @ExceptionHandler(Exception.class) - public ResponseEntity handleException(Exception ex) { - log.error("[UNHANDLED_EXCEPTION] 발생", ex); - - ErrorResponse response = new ErrorResponse(ErrorCode.INTERNAL_SERVER_ERROR); - - return ResponseEntity - .status(HttpStatus.INTERNAL_SERVER_ERROR) - .body(response); - } - @ExceptionHandler(STORIXCodeException.class) public ResponseEntity STORIXCodeExceptionHandler (STORIXCodeException ex) { @@ -35,5 +24,16 @@ public ResponseEntity STORIXCodeExceptionHandler (STORIXCodeExcep .body(response); } + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception ex) { + log.error("[UNHANDLED_EXCEPTION] 발생", ex); + + ErrorResponse response = new ErrorResponse(ErrorCode.INTERNAL_SERVER_ERROR); + + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(response); + } + } \ No newline at end of file From 5d294dd44e624d63a5c09e093b1d8453cd72edde Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Thu, 18 Dec 2025 02:37:29 +0900 Subject: [PATCH 29/46] =?UTF-8?q?Chore:=20RedisConfig=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/config/RedisConfig.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/global/config/RedisConfig.java diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/RedisConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisConfig.java new file mode 100644 index 0000000..58470de --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisConfig.java @@ -0,0 +1,24 @@ +package com.storix.spring_vote_22nd.global.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory); + + redisTemplate.setKeySerializer(new StringRedisSerializer()); + redisTemplate.setValueSerializer(new StringRedisSerializer()); + redisTemplate.setHashKeySerializer(new StringRedisSerializer()); + redisTemplate.setHashValueSerializer(new StringRedisSerializer()); + + return redisTemplate; + } +} From aad448cbbc91c9f47af43804b9af23d141d1d603 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:24:40 +0900 Subject: [PATCH 30/46] =?UTF-8?q?Feat:=20=ED=9B=84=EB=B3=B4=EC=9E=90=20?= =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/vote/domain/Candidate.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/Candidate.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/Candidate.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/Candidate.java new file mode 100644 index 0000000..6e31481 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/Candidate.java @@ -0,0 +1,47 @@ +package com.storix.spring_vote_22nd.domains.vote.domain; + +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; +import com.storix.spring_vote_22nd.global.model.BaseTimeEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Candidate extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(length = 50, nullable = false) + private String name; // 파트장 후보명 or 팀명 + + // 투표수 + @Column(nullable = false) + private Integer voteCount = 0; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private VoteCategory category; + + @Enumerated(EnumType.STRING) + private Part part; + + @Enumerated(EnumType.STRING) + private Team team; + + public void updateVoteCount(Integer newCount) { + this.voteCount = newCount; + } + + public Candidate(String name, VoteCategory category, Part part, Team team) { + this.name = name; + this.category = category; + this.part = part; + this.team = team; + } +} From e7c65d7b91bdabfae785610e0c7f0e3b54335d9c Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:25:03 +0900 Subject: [PATCH 31/46] =?UTF-8?q?Feat:=20=ED=88=AC=ED=91=9C=20dto=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/vote/dto/CandidateResponse.java | 17 +++++++++++++++++ .../domains/vote/dto/VoteRequest.java | 6 ++++++ 2 files changed, 23 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/CandidateResponse.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/VoteRequest.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/CandidateResponse.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/CandidateResponse.java new file mode 100644 index 0000000..90e7b66 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/CandidateResponse.java @@ -0,0 +1,17 @@ +package com.storix.spring_vote_22nd.domains.vote.dto; + +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; + +public record CandidateResponse( + Long id, + String name, + String description, // 파트명 or 팀명 + Long voteCount +) { + public static CandidateResponse of(Candidate candidate, Long voteCount) { + String desc = (candidate.getPart() != null) ? candidate.getPart().getValue() + : (candidate.getTeam() != null) ? candidate.getTeam().getValue() : ""; + + return new CandidateResponse(candidate.getId(), candidate.getName(), desc, voteCount); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/VoteRequest.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/VoteRequest.java new file mode 100644 index 0000000..83d9645 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/VoteRequest.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.domains.vote.dto; + +public record VoteRequest( + Long candidateId +) { +} \ No newline at end of file From 25dab6e106fa6d6e89718b7150a03ef9d5d58d0b Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:25:48 +0900 Subject: [PATCH 32/46] =?UTF-8?q?Feat:=20=ED=88=AC=ED=91=9C=20repository?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/vote/repository/CandidateRepository.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/repository/CandidateRepository.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/repository/CandidateRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/repository/CandidateRepository.java new file mode 100644 index 0000000..07d41cd --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/repository/CandidateRepository.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.domains.vote.repository; + +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface CandidateRepository extends JpaRepository { + + List findAllByCategory(VoteCategory category); +} From c4656147af4cdd055db691cd43b7b37c35743a78 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:26:23 +0900 Subject: [PATCH 33/46] =?UTF-8?q?Feat:=20=ED=88=AC=ED=91=9C=20service=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domains/user/adaptor/UserAdaptor.java | 6 +++ .../domains/vote/service/VoteService.java | 49 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteService.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java index aab21a5..01ddd69 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java @@ -71,4 +71,10 @@ public User saveUser(CreateUserCommand cmd) { User user = userRepository.save(cmd.toEntity()); return userRepository.save(user); } + + // User 엔티티 전체 반환 + public User findUserById(Long userId) { + return userRepository.findById(userId) + .orElseThrow(() -> UnknownUserException.EXCEPTION); + } } \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteService.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteService.java new file mode 100644 index 0000000..9d68fef --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteService.java @@ -0,0 +1,49 @@ +package com.storix.spring_vote_22nd.domains.vote.service; + +import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; +import com.storix.spring_vote_22nd.domains.user.domain.User; +import com.storix.spring_vote_22nd.domains.vote.adaptor.VoteAdaptor; +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import com.storix.spring_vote_22nd.global.apiPayload.exception.STORIXCodeException; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class VoteService { + + private final VoteAdaptor voteAdaptor; + private final UserAdaptor userAdaptor; + + @Transactional + public void castVote(Long userId, Long candidateId) { + User user = userAdaptor.findUserById(userId); + Candidate candidate = voteAdaptor.findCandidateById(candidateId); + + validatePermissions(user, candidate); + + boolean isFirstVote = voteAdaptor.setVoteHistoryIfAbsent(userId, candidate.getCategory()); + if (!isFirstVote) { + throw new STORIXCodeException(ErrorCode.ALREADY_VOTED); + } + + voteAdaptor.addVoteCount(candidate.getCategory(), candidateId); + } + + private void validatePermissions(User user, Candidate candidate) { + if (candidate.getCategory() == VoteCategory.PART_LEADER) { + // 파트장 투표: 본인 파트의 후보에게만 투표 가능 + if (user.getPart() != candidate.getPart()) { + throw new STORIXCodeException(ErrorCode.FORBIDDEN); + } + } else if (candidate.getCategory() == VoteCategory.DEMO_DAY) { + // 데모데이 투표: 본인 팀을 제외하고 투표 가능 + if (user.getTeam() == candidate.getTeam()) { + throw new STORIXCodeException(ErrorCode.FORBIDDEN); + } + } + } +} \ No newline at end of file From 8f28fa98597bcc469897be33b63d4407fa01b5b8 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:26:44 +0900 Subject: [PATCH 34/46] =?UTF-8?q?Feat:=20=ED=88=AC=ED=91=9C=20adaptor=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 --- .../domains/vote/adaptor/VoteAdaptor.java | 69 +++++++++++++++++++ .../domains/vote/domain/VoteCategory.java | 13 ++++ 2 files changed, 82 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/adaptor/VoteAdaptor.java create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/VoteCategory.java diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/adaptor/VoteAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/adaptor/VoteAdaptor.java new file mode 100644 index 0000000..beafa03 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/adaptor/VoteAdaptor.java @@ -0,0 +1,69 @@ +package com.storix.spring_vote_22nd.domains.vote.adaptor; + +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.repository.CandidateRepository; +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import com.storix.spring_vote_22nd.global.apiPayload.exception.STORIXCodeException; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +@Component +@RequiredArgsConstructor +public class VoteAdaptor { + + private final CandidateRepository candidateRepository; + private final RedisTemplate redisTemplate; + + + public Candidate findCandidateById(Long candidateId) { + return candidateRepository.findById(candidateId) + .orElseThrow(() -> new STORIXCodeException(ErrorCode.NOT_FOUND)); + } + + public List findAllCandidatesByCategory(VoteCategory category) { + return candidateRepository.findAllByCategory(category); + } + + // Redis Key 생성 메서드 + private String getRankKey(VoteCategory category) { + return "vote:rank:" + category.name(); + } + + private String getHistoryKey(Long userId, VoteCategory category) { + return "vote:history:" + category.name() + ":" + userId; + } + + // true: 첫 투표(성공) / false: 중복 + public boolean setVoteHistoryIfAbsent(Long userId, VoteCategory category) { + String key = getHistoryKey(userId, category); + Boolean success = redisTemplate.opsForValue().setIfAbsent(key, "VOTED"); + + if (Boolean.TRUE.equals(success)) { + redisTemplate.expire(key, 24, TimeUnit.HOURS); + } + return Boolean.TRUE.equals(success); + } + + // 득표수 증가 (ZSET) + public void addVoteCount(VoteCategory category, Long candidateId) { + redisTemplate.opsForZSet().incrementScore(getRankKey(category), candidateId.toString(), 1.0); + } + + // 스케줄러용: 해당 카테고리의 모든 후보자 득표수 조회 + public Set> getAllVoteScores(VoteCategory category) { + return redisTemplate.opsForZSet().rangeWithScores(getRankKey(category), 0, -1); + } + + // 특정 후보의 득표수 조회 + public Long getVoteCount(VoteCategory category, Long candidateId) { + Double score = redisTemplate.opsForZSet().score(getRankKey(category), candidateId.toString()); + return score != null ? score.longValue() : 0L; + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/VoteCategory.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/VoteCategory.java new file mode 100644 index 0000000..c321855 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/VoteCategory.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd.domains.vote.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum VoteCategory { + PART_LEADER("파트장 투표"), + DEMO_DAY("데모데이 투표"); + + private final String description; +} \ No newline at end of file From b2c52f3a97132bd219e83c369cb3f8125bbd7115 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:26:49 +0900 Subject: [PATCH 35/46] =?UTF-8?q?Feat:=20=ED=88=AC=ED=91=9C=20usecase=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 --- .../api/vote/usecase/VoteUseCase.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/vote/usecase/VoteUseCase.java diff --git a/src/main/java/com/storix/spring_vote_22nd/api/vote/usecase/VoteUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/vote/usecase/VoteUseCase.java new file mode 100644 index 0000000..b4885b0 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/vote/usecase/VoteUseCase.java @@ -0,0 +1,46 @@ +package com.storix.spring_vote_22nd.api.vote.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.domains.vote.adaptor.VoteAdaptor; +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.dto.CandidateResponse; +import com.storix.spring_vote_22nd.domains.vote.dto.VoteRequest; +import com.storix.spring_vote_22nd.domains.vote.service.VoteService; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +@UseCase +@RequiredArgsConstructor +public class VoteUseCase { + + private final VoteService voteService; + private final VoteAdaptor voteAdaptor; + + public CustomResponse vote(Long userId, VoteRequest req) { + voteService.castVote(userId, req.candidateId()); + return CustomResponse.onSuccess(SuccessCode.CREATED, "투표 완료"); + } + + // 후보 목록 조회 (득표순) + public CustomResponse> getCandidates(VoteCategory category) { + List candidates = voteAdaptor.findAllCandidatesByCategory(category); + + List result = candidates.stream() + .map(candidate -> { + // Redis에서 실시간 득표수 조회 + Long votes = voteAdaptor.getVoteCount(category, candidate.getId()); + return CandidateResponse.of(candidate, votes); + }) + // 득표수 기준 내림차순 정렬 + .sorted(Comparator.comparing(CandidateResponse::voteCount).reversed()) + .collect(Collectors.toList()); + + return CustomResponse.onSuccess(SuccessCode.SUCCESS, result); + } +} \ No newline at end of file From 0350abb6cfe8ad406a21fea69f891aa0d395ea08 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:26:55 +0900 Subject: [PATCH 36/46] =?UTF-8?q?Feat:=20=ED=88=AC=ED=91=9C=20controller?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/vote/VoteController.java | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/api/vote/VoteController.java diff --git a/src/main/java/com/storix/spring_vote_22nd/api/vote/VoteController.java b/src/main/java/com/storix/spring_vote_22nd/api/vote/VoteController.java new file mode 100644 index 0000000..83bd751 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/vote/VoteController.java @@ -0,0 +1,44 @@ +package com.storix.spring_vote_22nd.api.vote; + +import com.storix.spring_vote_22nd.api.vote.usecase.VoteUseCase; +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.dto.VoteRequest; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/v1/votes") +@RequiredArgsConstructor +public class VoteController { + + private final VoteUseCase voteUseCase; + + @Operation(summary = "투표하기 API (로그인 필요)") + @PostMapping + public ResponseEntity vote( + @AuthenticationPrincipal AuthUserDetails authUser, + @RequestBody VoteRequest req + ) { + if (authUser == null) { + return ResponseEntity.status(401).build(); + } + Long userId = Long.parseLong(authUser.getUserId()); + return ResponseEntity.ok(voteUseCase.vote(userId, req)); + } + + @Operation(summary = "파트장 투표 후보 목록 조회 (득표순 정렬)") + @GetMapping("/part-leader") + public ResponseEntity getPartLeaderCandidates() { + return ResponseEntity.ok(voteUseCase.getCandidates(VoteCategory.PART_LEADER)); + } + + @Operation(summary = "데모데이 투표 후보 목록 조회 (득표순 정렬)") + @GetMapping("/demo-day") + public ResponseEntity getDemoDayCandidates() { + return ResponseEntity.ok(voteUseCase.getCandidates(VoteCategory.DEMO_DAY)); + } +} \ No newline at end of file From 6e546af927e54e4ef6ae8c6d42ee083bf1e051bc Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:27:13 +0900 Subject: [PATCH 37/46] =?UTF-8?q?Feat:=20db=20=EC=8A=A4=EC=BC=80=EC=A4=84?= =?UTF-8?q?=EB=9F=AC=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringVote22ndApplication.java | 2 + .../domains/vote/service/VoteScheduler.java | 56 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteScheduler.java diff --git a/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java b/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java index e928365..768994e 100644 --- a/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java +++ b/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java @@ -2,7 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; +@EnableScheduling @SpringBootApplication public class SpringVote22ndApplication { diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteScheduler.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteScheduler.java new file mode 100644 index 0000000..6c6cd08 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteScheduler.java @@ -0,0 +1,56 @@ +package com.storix.spring_vote_22nd.domains.vote.service; + +import com.storix.spring_vote_22nd.domains.vote.adaptor.VoteAdaptor; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.repository.CandidateRepository; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Set; + +@Component +@RequiredArgsConstructor +@Slf4j +public class VoteScheduler { + + private final VoteAdaptor voteAdaptor; + private final CandidateRepository candidateRepository; + + @Scheduled(fixedDelay = 60000) // 1분 + @Transactional + public void syncVoteCountsFromRedis() { + for (VoteCategory category : VoteCategory.values()) { + syncCategoryVotes(category); + } + } + + private void syncCategoryVotes(VoteCategory category) { + // Redis ZSET에서 해당 카테고리의 모든 (후보자ID, 점수) 가져옴 + Set> scores = voteAdaptor.getAllVoteScores(category); + + if (scores == null || scores.isEmpty()) return; + + for (ZSetOperations.TypedTuple tuple : scores) { + try { + Long candidateId = Long.parseLong(tuple.getValue()); // 후보자 id + Double voteCountDouble = tuple.getScore(); // 득표수 + int redisVoteCount = (voteCountDouble != null) ? voteCountDouble.intValue() : 0; + + // db 업데이트 - Dirty Checking + candidateRepository.findById(candidateId).ifPresent(candidate -> { + if (candidate.getVoteCount() != redisVoteCount) { + candidate.updateVoteCount(redisVoteCount); + log.info("[Sync] {} - ID:{}, DB:{}, Redis:{}", + category, candidateId, candidate.getVoteCount(), redisVoteCount); + } + }); + } catch (Exception e) { + log.error("동기화 에러 - Category: {}, Tuple: {}", category, tuple.getValue(), e); + } + } + } +} \ No newline at end of file From 240635c7377af5391175810e73125fcec898ad4f Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:27:23 +0900 Subject: [PATCH 38/46] =?UTF-8?q?Chore:=20=EC=98=A4=EB=A5=98=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring_vote_22nd/global/apiPayload/code/ErrorCode.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java index 73ac4a6..bb9e957 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java @@ -25,7 +25,10 @@ public enum ErrorCode { DUPLICATE_EMIAL_SIGNUP(HttpStatus.BAD_REQUEST, "AUTH_ERROR_004", "이미 가입 중인 이메일입니다."), // Login error - FAILED_LOGIN(HttpStatus.UNAUTHORIZED, "AUTH_ERROR_002", "회원 아이디와 비밀번호가 일치하지 않습니다. 다시 로그인 해주세요."); + FAILED_LOGIN(HttpStatus.UNAUTHORIZED, "AUTH_ERROR_002", "회원 아이디와 비밀번호가 일치하지 않습니다. 다시 로그인 해주세요."), + + // Duplicated vote error + ALREADY_VOTED(HttpStatus.BAD_REQUEST, "VOTE_ERROR_001", "이미 투표했습니다."); private final HttpStatus httpStatus; private final String code; From 3188c4dec44630cd25de804b27fd64aa99bd9d57 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:28:33 +0900 Subject: [PATCH 39/46] =?UTF-8?q?Chore:=20=EB=B0=B0=ED=8F=AC=EC=9A=A9=20fl?= =?UTF-8?q?yway=20=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle b/build.gradle index 3b01c2b..45c6bb8 100644 --- a/build.gradle +++ b/build.gradle @@ -53,6 +53,10 @@ dependencies { // Redis implementation 'org.springframework.boot:spring-boot-starter-data-redis' implementation 'org.springframework.boot:spring-boot-starter-cache' + + // Flyway + implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-mysql' } tasks.named('test') { From a27abcf85d4e7f963d283aaf83e1e1f7c8b7dd82 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Fri, 19 Dec 2025 02:38:25 +0900 Subject: [PATCH 40/46] =?UTF-8?q?Chore:=20=EC=B4=88=EA=B8=B0=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=BF=BC=EB=A6=AC=20=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 | 28 +++++++++++-------- src/main/resources/db/migration/V1__init.sql | 25 +++++++++++++++++ .../resources/db/migration/V2__seed_data.sql | 17 +++++++++++ 3 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/db/migration/V1__init.sql create mode 100644 src/main/resources/db/migration/V2__seed_data.sql diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c649c59..0215030 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -20,20 +20,26 @@ jobs: steps: - name: Deploy on EC2 Instance run: | - cd ~/ceos-vote - test -f docker-compose.yml || { echo "ERORR: docker-compose.yml not found"; exit 1; } - test -f .env || { echo "ERROR: .env not found"; exit 1; } + cd ~/ceos-vote || { echo "Directory not found"; exit 1; } - echo ">>> Logging in to ECR..." - aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $ECR_REGISTRY + echo "Creating .env file..." + echo "DB_USERNAME=${{ secrets.DB_USERNAME }}" > .env + echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env + echo "DB_ROOT_PASSWORD=${{ secrets.DB_ROOT_PASSWORD }}" >> .env + echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}" >> .env + echo "JWT_ACCESS_TOKEN_VALIDITY_MS=${{ secrets.JWT_ACCESS_TOKEN_VALIDITY_MS }}" >> .env + echo "JWT_REFRESH_TOKEN_VALIDITY_MS=${{ secrets.JWT_REFRESH_TOKEN_VALIDITY_MS }}" >> .env - echo ">>> Pulling latest image from ECR..." - docker compose pull app - - echo ">>> Starting new container..." - docker compose up -d --no-deps app + echo "Logging in to ECR..." + aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username AWS --password-stdin ${{ secrets.ECR_REGISTRY }} - echo ">>> Pruning old images..." + echo "Pulling latest image..." + docker compose pull app + + echo "Restarting services..." + docker compose up -d app + + echo "Cleaning up..." docker image prune -af echo "✅ Deployment successful!" \ No newline at end of file diff --git a/src/main/resources/db/migration/V1__init.sql b/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..b9c46c2 --- /dev/null +++ b/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,25 @@ +CREATE TABLE IF NOT EXISTS candidate ( + id BIGINT NOT NULL AUTO_INCREMENT, + name VARCHAR(50) NOT NULL, + category VARCHAR(20) NOT NULL, + part VARCHAR(10), + team VARCHAR(20), + vote_count INTEGER NOT NULL DEFAULT 0, + created_at DATETIME(6), + updated_at DATETIME(6), + PRIMARY KEY (id) +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS user ( + id BIGINT NOT NULL AUTO_INCREMENT, + login_id VARCHAR(255), + password VARCHAR(255), + name VARCHAR(255), + email VARCHAR(255), + role TINYINT, + part TINYINT, + team TINYINT, + PRIMARY KEY (id), + CONSTRAINT UK_email UNIQUE (email), + CONSTRAINT UK_login_id UNIQUE (login_id) +) ENGINE=InnoDB; \ No newline at end of file diff --git a/src/main/resources/db/migration/V2__seed_data.sql b/src/main/resources/db/migration/V2__seed_data.sql new file mode 100644 index 0000000..8608de0 --- /dev/null +++ b/src/main/resources/db/migration/V2__seed_data.sql @@ -0,0 +1,17 @@ +-- 데모데이 후보 +INSERT INTO candidate (name, category, team, vote_count, created_at, updated_at) VALUES + ('DiggIndie', 'DEMO_DAY', 'DIGGINDIE', 0, NOW(), NOW()), + ('STORIX', 'DEMO_DAY', 'STORIX', 0, NOW(), NOW()), + ('Catch Up', 'DEMO_DAY', 'CATCHUP', 0, NOW(), NOW()), + ('GroomEasy', 'DEMO_DAY', 'GROOMEASY', 0, NOW(), NOW()), + ('Modelly', 'DEMO_DAY', 'MODELLY', 0, NOW(), NOW()); + +-- 파트장 후보 (BE) +INSERT INTO candidate (name, category, part, team, vote_count, created_at, updated_at) VALUES + ('서가영', 'PART_LEADER', 'BE', 'DIGGINDIE', 0, NOW(), NOW()), + ('이수아', 'PART_LEADER', 'BE', 'STORIX', 0, NOW(), NOW()); + +-- 파트장 후보 (FE) +INSERT INTO candidate (name, category, part, team, vote_count, created_at, updated_at) VALUES + ('김윤성', 'PART_LEADER', 'FE', 'CATCHUP', 0, NOW(), NOW()), + ('이채연', 'PART_LEADER', 'FE', 'GROOMEASY', 0, NOW(), NOW()); \ No newline at end of file From a78beb4fe188047d3a8a6b8eef61252623e3a138 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Sat, 20 Dec 2025 23:10:40 +0900 Subject: [PATCH 41/46] =?UTF-8?q?Chore:=20cors=20&=20swagger=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/config/SecurityConfig.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java index 736a6e2..71af353 100644 --- a/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java @@ -41,8 +41,15 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Except (requests) -> requests .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() - // TODO: endpoint 결정 시 기본 api 추가 (일단 전부 허용) - .anyRequest().permitAll() + .requestMatchers( + "/api/v1/auth/user/signup", + "/api/v1/auth/user/login", + "/api/v1/auth/refresh_token", + "/api/v1/auth/user/team", + "/api/v1/auth/user/part" + ).permitAll() + .requestMatchers(HttpMethod.GET, "/api/v1/votes/part-leader", "/api/v1/votes/demo-day").permitAll() + .anyRequest().authenticated() ) // JWT 설정 @@ -56,7 +63,10 @@ CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); - // TODO : 프론트 서버 주소 추가 + config.setAllowedOriginPatterns(List.of( + "http://localhost:3000", + "https://*.vercel.app" + )); config.setAllowedOriginPatterns(List.of("*")); config.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); config.setAllowedHeaders(List.of("*")); From a3ba00897c7a4bd0468d7e4f5bce55307ab08e6f Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Sun, 21 Dec 2025 02:23:19 +0900 Subject: [PATCH 42/46] =?UTF-8?q?Chore:=20=EC=8B=9C=EB=93=9C=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V2__seed_data.sql | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/src/main/resources/db/migration/V2__seed_data.sql b/src/main/resources/db/migration/V2__seed_data.sql index 8608de0..2748f9d 100644 --- a/src/main/resources/db/migration/V2__seed_data.sql +++ b/src/main/resources/db/migration/V2__seed_data.sql @@ -1,17 +1,33 @@ --- 데모데이 후보 -INSERT INTO candidate (name, category, team, vote_count, created_at, updated_at) VALUES - ('DiggIndie', 'DEMO_DAY', 'DIGGINDIE', 0, NOW(), NOW()), - ('STORIX', 'DEMO_DAY', 'STORIX', 0, NOW(), NOW()), - ('Catch Up', 'DEMO_DAY', 'CATCHUP', 0, NOW(), NOW()), - ('GroomEasy', 'DEMO_DAY', 'GROOMEASY', 0, NOW(), NOW()), - ('Modelly', 'DEMO_DAY', 'MODELLY', 0, NOW(), NOW()); +-- 1. 파트장 후보 (FE) : ID 1 ~ 10 +INSERT INTO candidate (id, team, name, part, category, vote_count, created_at, updated_at) VALUES + (1, 'STORIX', '김윤성', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (2, 'STORIX', '이채연', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (3, 'DiggIndie', '백승선', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (4, 'DiggIndie', '조성아', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (5, 'CatchUp', '장자윤', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (6, 'CatchUp', '정성훈', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (7, 'Modelly', '손주완', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (8, 'Modelly', '정윤지', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (9, 'Menual', '신용섭', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (10, 'Menual', '최무현', 'FE', 'PART_LEADER', 0, NOW(), NOW()); --- 파트장 후보 (BE) -INSERT INTO candidate (name, category, part, team, vote_count, created_at, updated_at) VALUES - ('서가영', 'PART_LEADER', 'BE', 'DIGGINDIE', 0, NOW(), NOW()), - ('이수아', 'PART_LEADER', 'BE', 'STORIX', 0, NOW(), NOW()); +-- 2. 파트장 후보 (BE) : ID 11 ~ 20 +INSERT INTO candidate (id, team, name, part, category, vote_count, created_at, updated_at) VALUES + (11, 'STORIX', '서가영', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (12, 'STORIX', '이수아', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (13, 'DiggIndie', '변호영', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (14, 'DiggIndie', '이윤지', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (15, 'CatchUp', '배승식', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (16, 'CatchUp', '신혁', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (17, 'Modelly', '이연호', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (18, 'Modelly', '이준영', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (19, 'Menual', '이지원', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (20, 'Menual', '변하영', 'BE', 'PART_LEADER', 0, NOW(), NOW()); --- 파트장 후보 (FE) -INSERT INTO candidate (name, category, part, team, vote_count, created_at, updated_at) VALUES - ('김윤성', 'PART_LEADER', 'FE', 'CATCHUP', 0, NOW(), NOW()), - ('이채연', 'PART_LEADER', 'FE', 'GROOMEASY', 0, NOW(), NOW()); \ No newline at end of file +-- 3. 데모데이 팀 후보 : ID 101 ~ 105 (프론트 요청 반영) +INSERT INTO candidate (id, team, name, part, category, vote_count, created_at, updated_at) VALUES + (101, 'STORIX', 'STORIX', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (102, 'DiggIndie', 'DiggIndie', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (103, 'CatchUp', 'CatchUp', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (104, 'Modelly', 'Modelly', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (105, 'Menual', 'Menual', NULL, 'DEMO_DAY', 0, NOW(), NOW()); \ No newline at end of file From 7efff211122a242ed764e1ed795a111ae020790a Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Sun, 21 Dec 2025 02:34:56 +0900 Subject: [PATCH 43/46] =?UTF-8?q?Fix:=20=ED=8C=80=EB=AA=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring_vote_22nd/domains/user/domain/Team.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java index bb7b4fa..b5e6475 100644 --- a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java @@ -6,11 +6,12 @@ @AllArgsConstructor @Getter public enum Team { - DIGGINDIE("DiggIndie"), - MODELLY("Modelly"), - CATCHUP("Catch Up"), - GROOMEASY("GroomEasy"), - STORIX("STORIX"),; + + DiggIndie("DiggIndie"), + Modelly("Modelly"), + CatchUp("CatchUp"), + Menual("Menual"), + STORIX("STORIX"); private String value; } From 0efd46da5068a67f97e4d27d13287b372c3626a2 Mon Sep 17 00:00:00 2001 From: caminobelllo Date: Sun, 21 Dec 2025 02:36:36 +0900 Subject: [PATCH 44/46] =?UTF-8?q?Chore:=20dependency=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 45c6bb8..889602b 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,9 @@ dependencies { // Flyway implementation 'org.flywaydb:flyway-core' implementation 'org.flywaydb:flyway-mysql' + + // validation + implementation 'org.springframework.boot:spring-boot-starter-validation' } tasks.named('test') { From 1202302dfef77025468441452bf64e13661ddd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=9C=EA=B0=80=EC=98=81?= Date: Mon, 22 Dec 2025 15:16:47 +0900 Subject: [PATCH 45/46] Docs: create README.md --- README.md | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7f5d396..90f0f56 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,40 @@ -# spring-vote-22nd -ceos back-end 22nd voting service project +# 투표 서비스 합동 과제 - STORIX + +## 1️⃣ 기술 스택 +- Spring Boot & Java 17 +- Redis (ZSET, String) +- MySQL 8.0 +- Flyway : DB 형상 관리 도구. 배포 시마다 테이블이 초기화되는 것을 막고 스키마 변경 이력을 코드단에서 관리 +- GitHub Actions (Self-hosted) : EC2 리소스가 제한적인 프리티어 환경에서, 외부 빌드 서버의 결과물을 안전하고 빠르게 가져오고 배포 스크립트를 단순화하기 위함 +- Swagger (OpenAPI 3.0) + +
+ + +## 2️⃣ 기술 고려 사항 + +### 1. Write-Back 패턴을 통한 성능 최적화 + +- 🚀 **문제 상황: RDB의 I/O 병목 현상** + - 단시간에 많은 write 요청을 가정. 기존의 RDB 방식은 투표가 발생할 때마다 UPDATE 쿼리를 실행하여 Row-Level Lock을 유발하고, 이로 인해 대기 시간이 길어지며 DB 커넥션 풀 고갈 위험 + +- 💡 **해결책: Redis를 활용한 Write-Back 전략 도입** + - 이를 해결하기 위해 인메모리 기반의 Redis를 1차 저장소로 활용하는 Write-Back(Write-Behind) 패턴을 도입 + + - **실시간 집계 (ZSET)**: 후보자별 득표수는 순위 산정이 필요 -> 정렬된 집합 자료구조인 Sorted Set (ZSET)을 사용 + - 중복 투표 방지 (SET): 빠른 조회 가능 + +- ✅ 결과: DB에 직접 쿼리를 날리는 대신 Redis에서 메모리 연산으로 처리 + + +### 2. 데이터 정합성과 영속성 보장 + +- 🚀 **문제 상황: 인메모리 데이터의 휘발성 위험** + - Redis는 메모리에 데이터를 저장하므로, 투표 데이터 유실 위험 + - Redis와 MySQL 간의 정합성 문제 + +- 💡 **해결책 1: Redis AOF 적용**: 데이터 유실 방지를 위해 Redis의 영속성 옵션 중 AOF 방식을 사용 + - AOF 선택 이유: 스냅샷(RDB) 방식은 특정 주기마다 저장하므로 마지막 저장 이후의 데이터가 유실될 수 있음. 반면, AOF는 모든 쓰기 연산 명령어를 로그 파일에 기록하므로, 서버 재시작 시 로그를 재실행하여 데이터 복구하기 때문에 투표 데이터 보존에 더 적합하다고 판단 + +- 💡 **해결책 2: 주기적인 RDB 동기화 (Scheduler)**: Redis <-> RDB간 동기화 로직을 구현 + - 스케줄러 활용: Spring Scheduler를 이용해 일정 주기마다 Redis의 투표 데이터를 읽어 MySQL에 일괄 업데이트 수행 From a969db891c824948e7534690cab63640ab801855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=84=9C=EA=B0=80=EC=98=81?= Date: Mon, 22 Dec 2025 17:11:56 +0900 Subject: [PATCH 46/46] Docs: update README.md --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 90f0f56..8ff627b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,14 @@ ## 2️⃣ 기술 고려 사항 -### 1. Write-Back 패턴을 통한 성능 최적화 +### 1. 로그인 & 회원가입 +• Spring Security + JWT 기반 Stateless 인증 방식을 구현 +• RefreshToken은 Redis(Hash)로 캐싱하고 재발급 및 로그아웃 기능을 구현 +• JwtAuthenticationFilter로 토큰이 전달되면 인증 객체를 생성하여 SecurityContext에 저장하도록 구현 + +• 회원 도메인 아이디·이메일에 Unique 제약조건을 적용하여 중복 가입 방지 및 에러 핸들링을 구현 + +### 2. Write-Back 패턴을 통한 성능 최적화 - 🚀 **문제 상황: RDB의 I/O 병목 현상** - 단시간에 많은 write 요청을 가정. 기존의 RDB 방식은 투표가 발생할 때마다 UPDATE 쿼리를 실행하여 Row-Level Lock을 유발하고, 이로 인해 대기 시간이 길어지며 DB 커넥션 풀 고갈 위험 @@ -27,7 +34,7 @@ - ✅ 결과: DB에 직접 쿼리를 날리는 대신 Redis에서 메모리 연산으로 처리 -### 2. 데이터 정합성과 영속성 보장 +### 3. 데이터 정합성과 영속성 보장 - 🚀 **문제 상황: 인메모리 데이터의 휘발성 위험** - Redis는 메모리에 데이터를 저장하므로, 투표 데이터 유실 위험