From 03a6411a709f689b6a7a546f74a5fc6afb586066 Mon Sep 17 00:00:00 2001 From: Yeonho Lee Date: Tue, 11 Nov 2025 00:15:44 +0900 Subject: [PATCH 01/26] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..439b2a0 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# vote-BE \ No newline at end of file From 0c5d0357df1dddb729ef2d35545a995e7aa1395a Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Tue, 11 Nov 2025 01:24:42 +0900 Subject: [PATCH 02/26] =?UTF-8?q?chore:=20=EC=B4=88=EA=B8=B0=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/chore-request.md | 20 ++ .github/ISSUE_TEMPLATE/feature-request.md | 20 ++ .github/ISSUE_TEMPLATE/fix-request.md | 20 ++ .github/PULL_REQUEST_TEMPLATE.md | 18 ++ .gitignore | 41 +++ HELP.md | 22 ++ build.gradle | 42 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + src/.DS_Store | Bin 0 -> 6148 bytes .../java/vote/vote_be/VoteBeApplication.java | 13 + .../vote/vote_be/VoteBeApplicationTests.java | 13 + 15 files changed, 562 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/chore-request.md create mode 100644 .github/ISSUE_TEMPLATE/feature-request.md create mode 100644 .github/ISSUE_TEMPLATE/fix-request.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .gitignore create mode 100644 HELP.md 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/.DS_Store create mode 100644 src/main/java/vote/vote_be/VoteBeApplication.java create mode 100644 src/test/java/vote/vote_be/VoteBeApplicationTests.java diff --git a/.github/ISSUE_TEMPLATE/chore-request.md b/.github/ISSUE_TEMPLATE/chore-request.md new file mode 100644 index 0000000..74306fd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/chore-request.md @@ -0,0 +1,20 @@ +--- +name: Chore request +about: 환경 세팅 이슈 +title: "[chore]" +labels: "⚙️ chore" +assignees: '' + +--- + +## 🍒 IssueName +> 이슈 명을 작성해주세요. + +## 📝 Description +> 이슈에 대해 간결하게 설명해주세요. + +## 🌱 Todo +> - [ ] 진행 예정 +> - [x] 진행 완료 +> +> 위의 방식으로 Task를 정리해주세요. diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md new file mode 100644 index 0000000..6e62682 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature-request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: 기능 개발 이슈 +title: "[feat]" +labels: "✨ feature" +assignees: '' + +--- + +## 🍒 IssueName +> 이슈 명을 작성해주세요. + +## 📝 Description +> 이슈에 대해 간결하게 설명해주세요. + +## 🌱 Todo +> - [ ] 진행 예정 +> - [x] 진행 완료 +> +> 위의 방식으로 Task를 정리해주세요. diff --git a/.github/ISSUE_TEMPLATE/fix-request.md b/.github/ISSUE_TEMPLATE/fix-request.md new file mode 100644 index 0000000..2df438b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/fix-request.md @@ -0,0 +1,20 @@ +--- +name: Fix request +about: 에러 수정 이슈 +title: "[fix]" +labels: "\U0001F41B fix" +assignees: '' + +--- + +## 🍒 IssueName +> 이슈 명을 작성해주세요. + +## 📝 Description +> 이슈에 대해 간결하게 설명해주세요. + +## 🌱 Todo +> - [ ] 진행 예정 +> - [x] 진행 완료 +> +> 위의 방식으로 Task를 정리해주세요. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..e59867a --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,18 @@ +## #️⃣연관된 이슈 + +> close #이슈번호, #이슈번호 + +## 📝작업 내용 + +> 이번 PR에서 작업한 내용을 간략히 설명해주세요(이미지 첨부 가능) + +- [ ] 작업 내용 1 +- [ ] 작업 내용 2 + +### 스크린샷 (선택) + +## 💬리뷰 요구사항(선택) + +> 리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요 +> +> ex) 메서드 XXX의 이름을 더 잘 짓고 싶은데 혹시 좋은 명칭이 있을까요? diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8ce01e --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +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/ + +### yml ### +application.yml +application.yaml \ No newline at end of file diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..0bb779a --- /dev/null +++ b/HELP.md @@ -0,0 +1,22 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.5.7/gradle-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/3.5.7/gradle-plugin/packaging-oci-image.html) +* [Spring Web](https://docs.spring.io/spring-boot/3.5.7/reference/web/servlet.html) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) + +### Additional Links +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9f8bb38 --- /dev/null +++ b/build.gradle @@ -0,0 +1,42 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.7' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'vote' +version = '0.0.1-SNAPSHOT' +description = 'FE, BE joint project' + +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-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/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..5eed7ee --- /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..648ae7f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'vote_be' diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d57debe1dc71024346f6280c4013dd8fd3d706ef GIT binary patch literal 6148 zcmeHKy-ou$47TBhN-P~2!z1(!LUlYrHzrz&0IA1SYFRqv?Yi(#eEtDl#FY^tu%+a4 z>^Q#rP8TOc#PiqnjA%+k6Er~N@ku;$&H4^Eg}F_uY16k>6^PXK$#ZB|Xzi z{rr48^mTpPt~UJ&Hi*Lmq}=sTI$W4r!DUia5| z<zCJ)TAR@B&_rZj5d{KWOEFMOF$S`aT&mOj aNp$$LV= Date: Tue, 11 Nov 2025 01:36:59 +0900 Subject: [PATCH 03/26] =?UTF-8?q?chore:=20=EC=8A=A4=EC=9B=A8=EA=B1=B0=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 ++ .../vote_be/global/config/SwaggerConfig.java | 42 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/main/java/vote/vote_be/global/config/SwaggerConfig.java diff --git a/build.gradle b/build.gradle index 9f8bb38..c721fb0 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,9 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + //Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0' } tasks.named('test') { diff --git a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java new file mode 100644 index 0000000..ecf59a8 --- /dev/null +++ b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java @@ -0,0 +1,42 @@ +package vote.vote_be.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.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Value("${server.servlet.context-path:/}") + private String contextPath; + + @Bean + public OpenAPI voteAPI() { + Info info = new Info() + .title("Vote API") + .description("Vote API 명세서") + .version("1.0.0"); + + String jwtSchemeName = "JWT TOKEN"; + + SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwtSchemeName); + + Components components = new Components() + .addSecuritySchemes(jwtSchemeName, new SecurityScheme() + .name(jwtSchemeName) + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .addServersItem(new Server().url(contextPath)) + .info(info) + .addSecurityItem(securityRequirement) + .components(components); + } +} From c300f0efa3466cf1781be3ab6681c54e227d40f3 Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 01:59:15 +0900 Subject: [PATCH 04/26] =?UTF-8?q?[chore]=20=EB=B0=B0=ED=8F=AC=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=9E=91=EC=84=B1=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 61 ++++++++++++++++++++++++++++++++++++ src/main/resources/.gitkeep | 0 2 files changed, 61 insertions(+) create mode 100644 .github/workflows/deploy.yml create mode 100644 src/main/resources/.gitkeep diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..5d625be --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,61 @@ +name: CI/CD Pipeline + +on: + push: + branches: [ develop ] # develop 브랜치에 push가 일어날 때 실행 + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + + steps: + # 저장소 코드 체크아웃 + - uses: actions/checkout@v3 + + # JDK 17 설정 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + distribution: 'adopt' + java-version: '17' + + # application.yml 파일 생성 + - name: Make application.yml + run: | + cd ./src/main/resources + touch ./application.yml + echo "${{ secrets.APPLICATION }}" > ./application.yml + shell: bash + + # Gradle로 빌드 + - name: Build with Gradle + run: | + chmod +x ./gradlew + ./gradlew clean build -x test + + # Docker 이미지 빌드 및 푸시 (🚨 `--build-arg` 추가!) + - name: Docker build & push to Docker Hub + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + docker build --no-cache -t ${{ secrets.DOCKER_REPO }}:latest . + docker push ${{ secrets.DOCKER_REPO }}:latest + + # 서버 배포 + - name: Deploy to server with Docker + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + script: | + sudo docker-compose down + sudo docker pull ${{ secrets.DOCKER_REPO }} + sudo docker-compose -f docker-compose.yml up -d + sudo docker image prune -f + # jar 파일명 확인 + - name: Show built files + run: | + ls -alh build/libs \ No newline at end of file diff --git a/src/main/resources/.gitkeep b/src/main/resources/.gitkeep new file mode 100644 index 0000000..e69de29 From 19e0eff2ae9a9e6c82ca7ac031a49e040bebbecf Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 02:08:07 +0900 Subject: [PATCH 05/26] =?UTF-8?q?[chore]=20health-check=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/vote/vote_be/HealthCheckController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/vote/vote_be/HealthCheckController.java diff --git a/src/main/java/vote/vote_be/HealthCheckController.java b/src/main/java/vote/vote_be/HealthCheckController.java new file mode 100644 index 0000000..224112d --- /dev/null +++ b/src/main/java/vote/vote_be/HealthCheckController.java @@ -0,0 +1,14 @@ +package vote.vote_be; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HealthCheckController { + + + @GetMapping("/health-check") + public String healthCheck() { + return "Server is running!"; + } +} From 42b51ab9fcd96e9d9cceb6fe8636b8a5145c5eb3 Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 02:22:34 +0900 Subject: [PATCH 06/26] =?UTF-8?q?[chore]=20=EB=8F=84=EC=BB=A4=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=B6=94=EA=B0=80=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 4 ++-- Dockerfile | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 Dockerfile diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5d625be..7b97bc6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -40,8 +40,8 @@ jobs: - name: Docker build & push to Docker Hub run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build --no-cache -t ${{ secrets.DOCKER_REPO }}:latest . - docker push ${{ secrets.DOCKER_REPO }}:latest + docker build --no-cache -t ${{ secrets.DOCKER_REPO }}:${{ github.sha }} . + docker push ${{ secrets.DOCKER_REPO }}:${{ github.sha }} # 서버 배포 - name: Deploy to server with Docker diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..569a675 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM eclipse-temurin:17-jdk +ARG JAR_FILE=/build/libs/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar", "/app.jar"] \ No newline at end of file From e24b1380704097b23107520a167797e8d46b9cc9 Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Tue, 11 Nov 2025 03:19:13 +0900 Subject: [PATCH 07/26] =?UTF-8?q?feat:=20JWT=20=EC=9D=B8=EC=A6=9D/?= =?UTF-8?q?=EC=9D=B8=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 12 ++ .../auth/controller/AuthController.java | 75 +++++++++ .../domain/auth/dto/request/LoginRequest.java | 15 ++ .../auth/dto/request/SignupRequest.java | 29 ++++ .../dto/response/DuplicateCheckResponse.java | 20 +++ .../auth/dto/response/LoginResponse.java | 30 ++++ .../auth/dto/response/SignupResponse.java | 21 +++ .../dto/response/TokenValidationResponse.java | 21 +++ .../domain/auth/service/AuthService.java | 146 ++++++++++++++++++ .../vote/vote_be/domain/user/entity/Part.java | 6 + .../vote/vote_be/domain/user/entity/Team.java | 9 ++ .../vote/vote_be/domain/user/entity/User.java | 43 ++++++ .../vote_be/domain/user/entity/UserRole.java | 6 + .../user/repository/UserRepository.java | 12 ++ .../global/apiPayload/ApiResponse.java | 36 +++++ .../global/apiPayload/code/BaseCode.java | 6 + .../global/apiPayload/code/BaseErrorCode.java | 6 + .../apiPayload/code/ErrorReasonDTO.java | 23 +++ .../global/apiPayload/code/ReasonDTO.java | 23 +++ .../apiPayload/code/SimpleMessageDTO.java | 10 ++ .../apiPayload/code/status/ErrorStatus.java | 62 ++++++++ .../apiPayload/code/status/SuccessStatus.java | 39 +++++ .../exception/GeneralException.java | 23 +++ .../handler/GlobalExceptionHandler.java | 121 +++++++++++++++ .../vote_be/global/config/RedisConfig.java | 54 +++++++ .../vote_be/global/config/SecurityConfig.java | 85 ++++++++++ .../vote_be/global/config/SwaggerConfig.java | 2 +- .../vote_be/global/entity/BaseEntity.java | 32 ++++ .../vote_be/global/redis/RedisService.java | 63 ++++++++ .../vote_be/global/security/AuthDetails.java | 52 +++++++ .../global/security/AuthDetailsService.java | 33 ++++ .../global/security/dto/TokenResponse.java | 25 +++ .../global/security/entity/RefreshToken.java | 18 +++ .../global/security/entity/TokenStatus.java | 8 + .../security/jwt/JwtAuthenticationFilter.java | 68 ++++++++ .../security/jwt/JwtExceptionFilter.java | 48 ++++++ .../global/security/jwt/TokenProvider.java | 140 +++++++++++++++++ .../repository/RefreshTokenRepository.java | 7 + 38 files changed, 1428 insertions(+), 1 deletion(-) create mode 100644 src/main/java/vote/vote_be/domain/auth/controller/AuthController.java create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/request/LoginRequest.java create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/request/SignupRequest.java create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/response/DuplicateCheckResponse.java create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/response/SignupResponse.java create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/response/TokenValidationResponse.java create mode 100644 src/main/java/vote/vote_be/domain/auth/service/AuthService.java create mode 100644 src/main/java/vote/vote_be/domain/user/entity/Part.java create mode 100644 src/main/java/vote/vote_be/domain/user/entity/Team.java create mode 100644 src/main/java/vote/vote_be/domain/user/entity/User.java create mode 100644 src/main/java/vote/vote_be/domain/user/entity/UserRole.java create mode 100644 src/main/java/vote/vote_be/domain/user/repository/UserRepository.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/ApiResponse.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/code/BaseCode.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/code/BaseErrorCode.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/code/ErrorReasonDTO.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/code/ReasonDTO.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/code/SimpleMessageDTO.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/code/status/SuccessStatus.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/exception/GeneralException.java create mode 100644 src/main/java/vote/vote_be/global/apiPayload/exception/handler/GlobalExceptionHandler.java create mode 100644 src/main/java/vote/vote_be/global/config/RedisConfig.java create mode 100644 src/main/java/vote/vote_be/global/config/SecurityConfig.java create mode 100644 src/main/java/vote/vote_be/global/entity/BaseEntity.java create mode 100644 src/main/java/vote/vote_be/global/redis/RedisService.java create mode 100644 src/main/java/vote/vote_be/global/security/AuthDetails.java create mode 100644 src/main/java/vote/vote_be/global/security/AuthDetailsService.java create mode 100644 src/main/java/vote/vote_be/global/security/dto/TokenResponse.java create mode 100644 src/main/java/vote/vote_be/global/security/entity/RefreshToken.java create mode 100644 src/main/java/vote/vote_be/global/security/entity/TokenStatus.java create mode 100644 src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java create mode 100644 src/main/java/vote/vote_be/global/security/jwt/JwtExceptionFilter.java create mode 100644 src/main/java/vote/vote_be/global/security/jwt/TokenProvider.java create mode 100644 src/main/java/vote/vote_be/global/security/repository/RefreshTokenRepository.java diff --git a/build.gradle b/build.gradle index c721fb0..8db42f7 100644 --- a/build.gradle +++ b/build.gradle @@ -38,6 +38,18 @@ dependencies { //Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0' + + // Redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' + implementation 'org.springframework.session:spring-session-data-redis' + + // 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' + + //Security + implementation 'org.springframework.boot:spring-boot-starter-security' } tasks.named('test') { diff --git a/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java new file mode 100644 index 0000000..f7d52cc --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java @@ -0,0 +1,75 @@ +package vote.vote_be.domain.auth.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import vote.vote_be.domain.auth.dto.request.LoginRequest; +import vote.vote_be.domain.auth.dto.request.SignupRequest; +import vote.vote_be.domain.auth.dto.response.DuplicateCheckResponse; +import vote.vote_be.domain.auth.dto.response.LoginResponse; +import vote.vote_be.domain.auth.dto.response.SignupResponse; +import vote.vote_be.domain.auth.dto.response.TokenValidationResponse; +import vote.vote_be.domain.auth.service.AuthService; +import vote.vote_be.global.apiPayload.ApiResponse; +import vote.vote_be.global.apiPayload.code.SimpleMessageDTO; +import vote.vote_be.global.apiPayload.code.status.SuccessStatus; +import vote.vote_be.global.security.dto.TokenResponse; + + +@RestController +@RequiredArgsConstructor +public class AuthController { + + private final AuthService authService; + + @Operation(summary = "회원가입", description = "회원가입 완료 메시지, loginId, 이름을 반환합니다.") + @PostMapping("/auth/signup") + public ApiResponse signup(@RequestBody @Valid SignupRequest req) { + return ApiResponse.of(SuccessStatus.CREATED,authService.signup(req)); + } + + /* 로그인 */ + @Operation(summary = "로그인", description = "Access/Refresh 토큰을 포함한 로그인 응답을 반환합니다.") + @PostMapping("/auth/login") + public ApiResponse login(@RequestBody @Valid LoginRequest req) { + return ApiResponse.onSuccess(authService.login(req)); + } + + /* 로그아웃 */ + @Operation(summary = "로그아웃", description = "사용자의 Refresh Token을 Redis에서 삭제합니다.") + @PostMapping("/auth/logout") + public ApiResponse logout(HttpServletRequest request) { + return ApiResponse.onSuccess(authService.logout(request)); + } + + /* 토큰 재발급 */ + @Operation(summary = "Access Token 재발급", description = "사용자의 Access Token만 재발급합니다.") + @PostMapping("/auth/refresh") + public ApiResponse newAccessToken(@RequestHeader("X-Refresh-Token") String refreshToken) { + return ApiResponse.onSuccess(authService.newAccessToken(refreshToken)); + } + + /* Access Token 만료 기간 확인 */ + @Operation(summary = "Access Token 만료 확인", description = "사용자의 Access Token의 만료 여부를 확인합니다.") + @GetMapping("/auth/validate") + public ApiResponse validate(HttpServletRequest request) { + return ApiResponse.onSuccess(authService.isValidAccess(request)); + } + + /* 로그인 아이디 중복 체크 */ + @Operation(summary = "아이디 중복 체크", description = "available = true면 중복 X") + @GetMapping("/check/login-id") + public ApiResponse checkLoginId(@RequestParam("value") String value) { + return ApiResponse.onSuccess(authService.checkLoginId(value)); + } + + /* 이메일 중복 체크 */ + @Operation(summary = "이메일 중복 체크", description = "available = true면 중복 X") + @GetMapping("/check/email") + public ApiResponse checkEmail(@RequestParam("value") String value) { + return ApiResponse.onSuccess(authService.checkEmail(value)); + } +} diff --git a/src/main/java/vote/vote_be/domain/auth/dto/request/LoginRequest.java b/src/main/java/vote/vote_be/domain/auth/dto/request/LoginRequest.java new file mode 100644 index 0000000..23398b2 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/request/LoginRequest.java @@ -0,0 +1,15 @@ +package vote.vote_be.domain.auth.dto.request; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class LoginRequest { + @NotBlank + private String loginId; + + @NotBlank + private String password; +} diff --git a/src/main/java/vote/vote_be/domain/auth/dto/request/SignupRequest.java b/src/main/java/vote/vote_be/domain/auth/dto/request/SignupRequest.java new file mode 100644 index 0000000..edfd0e0 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/request/SignupRequest.java @@ -0,0 +1,29 @@ +package vote.vote_be.domain.auth.dto.request; + +import jakarta.validation.constraints.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import vote.vote_be.domain.user.entity.Part; +import vote.vote_be.domain.user.entity.Team; + +@Getter +@NoArgsConstructor +public class SignupRequest { + @NotBlank + private String loginId; + + @NotBlank + private String password; + + @Email @NotBlank + private String email; + + @NotNull + private Part part; // FRONTEND / BACKEND + + @NotBlank + private String name; + + @NotNull + private Team team; // MODELLY / DIGGINDIE / CATCHUP / MENUAL / STORIX +} \ No newline at end of file diff --git a/src/main/java/vote/vote_be/domain/auth/dto/response/DuplicateCheckResponse.java b/src/main/java/vote/vote_be/domain/auth/dto/response/DuplicateCheckResponse.java new file mode 100644 index 0000000..748151f --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/response/DuplicateCheckResponse.java @@ -0,0 +1,20 @@ +package vote.vote_be.domain.auth.dto.response; + +import lombok.AccessLevel; +import lombok.*; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class DuplicateCheckResponse { + private String field; // loginId or email + private String value; + private boolean available; // true(중복 X) + + public static DuplicateCheckResponse of(String field, String value, boolean available) { + DuplicateCheckResponse response = new DuplicateCheckResponse(); + response.field = field; + response.value = value; + response.available = available; + return response; + } +} diff --git a/src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java b/src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java new file mode 100644 index 0000000..64a8a59 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java @@ -0,0 +1,30 @@ +package vote.vote_be.domain.auth.dto.response; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import vote.vote_be.domain.user.entity.Part; +import vote.vote_be.domain.user.entity.Team; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class LoginResponse { + private Long userId; + private String name; + private Part part; + private Team team; + private String accessToken; + private String refreshToken; + + public static LoginResponse of (Long userId, String name, Part part, Team team, String accessToken, String refreshToken) { + LoginResponse loginResponse = new LoginResponse(); + loginResponse.userId = userId; + loginResponse.name = name; + loginResponse.part = part; + loginResponse.team = team; + loginResponse.accessToken = accessToken; + loginResponse.refreshToken = refreshToken; + + return loginResponse; + } +} diff --git a/src/main/java/vote/vote_be/domain/auth/dto/response/SignupResponse.java b/src/main/java/vote/vote_be/domain/auth/dto/response/SignupResponse.java new file mode 100644 index 0000000..ef6b5c0 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/response/SignupResponse.java @@ -0,0 +1,21 @@ +package vote.vote_be.domain.auth.dto.response; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class SignupResponse { + private String message; + private String loginId; + private String name; + + public static SignupResponse of(String message, String loginId, String name) { + SignupResponse signupResponse = new SignupResponse(); + signupResponse.message = message; + signupResponse.loginId = loginId; + signupResponse.name = name; + return signupResponse; + } +} diff --git a/src/main/java/vote/vote_be/domain/auth/dto/response/TokenValidationResponse.java b/src/main/java/vote/vote_be/domain/auth/dto/response/TokenValidationResponse.java new file mode 100644 index 0000000..1f6766f --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/response/TokenValidationResponse.java @@ -0,0 +1,21 @@ +package vote.vote_be.domain.auth.dto.response; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import vote.vote_be.global.security.entity.TokenStatus; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class TokenValidationResponse { + private String message; + private TokenStatus isValid; // 유효 여부 + + public static TokenValidationResponse of(String message, TokenStatus isValid) { + TokenValidationResponse response = new TokenValidationResponse(); + response.message = message; + response.isValid = isValid; + return response; + } + +} diff --git a/src/main/java/vote/vote_be/domain/auth/service/AuthService.java b/src/main/java/vote/vote_be/domain/auth/service/AuthService.java new file mode 100644 index 0000000..0150db8 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/service/AuthService.java @@ -0,0 +1,146 @@ +package vote.vote_be.domain.auth.service; + +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import vote.vote_be.domain.auth.dto.request.LoginRequest; +import vote.vote_be.domain.auth.dto.request.SignupRequest; +import vote.vote_be.domain.auth.dto.response.DuplicateCheckResponse; +import vote.vote_be.domain.auth.dto.response.LoginResponse; +import vote.vote_be.domain.auth.dto.response.SignupResponse; +import vote.vote_be.domain.auth.dto.response.TokenValidationResponse; +import vote.vote_be.domain.user.entity.*; +import vote.vote_be.domain.user.repository.UserRepository; +import vote.vote_be.global.apiPayload.code.SimpleMessageDTO; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; +import vote.vote_be.global.redis.RedisService; +import vote.vote_be.global.security.dto.TokenResponse; +import vote.vote_be.global.security.entity.TokenStatus; +import vote.vote_be.global.security.jwt.TokenProvider; + +@Service +@RequiredArgsConstructor +public class AuthService { + + private static final String RT_KEY_PREFIX = "refresh-token:"; + + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + private final TokenProvider tokenProvider; + private final RedisService redisService; + + /* 회원가입 */ + @Transactional + public SignupResponse signup(SignupRequest req) { + + User user = User.builder() + .loginId(req.getLoginId()) + .password(passwordEncoder.encode(req.getPassword())) + .email(req.getEmail()) + .part(req.getPart()) + .name(req.getName()) + .team(req.getTeam()) + .userRole(UserRole.USER) + .build(); + + userRepository.save(user); + + return SignupResponse.of("회원가입이 완료되었습니다.", user.getLoginId(), user.getName()); + } + + /* 로그인 */ + @Transactional(readOnly = true) + public LoginResponse login(LoginRequest req) { + // LoginId 존재 여부 확인 + User user = userRepository.findByLoginId(req.getLoginId()) + .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_FOUND_LOGIN_ID)); + + if (!passwordEncoder.matches(req.getPassword(), user.getPassword())) + throw new GeneralException(ErrorStatus.LOGIN_FAIL); + + TokenResponse tokens = tokenProvider.createToken(user); + + // userId 기준으로 레디스에 refresh token 저장(TTL=refresh 남은 시간) + long ttlSec = tokenProvider.getRemainingSeconds(tokens.getRefreshToken()); + redisService.setRefreshToken(RT_KEY_PREFIX + user.getId(), tokens.getRefreshToken(), ttlSec); + + return LoginResponse.of(user.getId(), user.getName(), user.getPart(), user.getTeam(), tokens.getAccessToken(), tokens.getRefreshToken()); + } + + @Transactional + public SimpleMessageDTO logout(HttpServletRequest request) { + String accessToken = tokenProvider.resolveToken(request); + + if (accessToken == null || accessToken.isBlank()) + throw new GeneralException(ErrorStatus.TOKEN_INVALID); + + String userId = tokenProvider.getUserIdFromToken(accessToken); + redisService.deleteValue(RT_KEY_PREFIX + userId); + + return new SimpleMessageDTO("로그아웃이 완료되었습니다."); + } + + + @Transactional(readOnly = true) + public TokenResponse newAccessToken(String refreshToken) { // 프론트에서 Authorization 헤더를 빼고 전송해줘야함. + + // refresh 토큰 검증 + TokenStatus tokenStatus = tokenProvider.validateToken(refreshToken); + if(tokenStatus == TokenStatus.EXPIRED){ + throw new GeneralException(ErrorStatus.REFRESH_TOKEN_EXPIRED); + } + if(tokenStatus == TokenStatus.INVALID || tokenStatus == TokenStatus.MISSING){ + throw new GeneralException(ErrorStatus.TOKEN_INVALID); + } + + // user 확인 + String userId = tokenProvider.getUserIdFromToken(refreshToken); + + // Redis의 refresh 토큰과 비교 + String key = RT_KEY_PREFIX + userId; + String stored = redisService.getValue(key); + if (stored.isEmpty()) { + // 만료/로그아웃 등으로 없는 상태 + throw new GeneralException(ErrorStatus.REFRESH_TOKEN_EXPIRED); + } + if (!stored.equals(refreshToken)) { + // 탈취 등으로 일치하지 않는 상태 + throw new GeneralException(ErrorStatus.TOKEN_INVALID); + } + + // user 조회 + User user = userRepository.findById(Long.valueOf(userId)) + .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_FOUND_USER)); + + // AccessToken만 새로 발급 + String newAccess = tokenProvider.createAccessToken(user); + + return TokenResponse.of(newAccess, refreshToken); + } + + /* 로그인 아이디 중복 체크 */ + @Transactional(readOnly = true) + public DuplicateCheckResponse checkLoginId(String value) { + boolean available = !userRepository.existsByLoginId(value); + return DuplicateCheckResponse.of("loginId", value, available); + } + + /* 이메일 중복 체크 */ + @Transactional(readOnly = true) + public DuplicateCheckResponse checkEmail(String value) { + boolean available = !userRepository.existsByEmail(value); + return DuplicateCheckResponse.of("email", value, available); + } + + // Access Token의 유효성 확인 + @Transactional(readOnly = true) + public TokenValidationResponse isValidAccess(HttpServletRequest request) { + // 유효성 검사는 JwtAuthenticationFilter에서 처리 + String accessToken = tokenProvider.resolveToken(request); + TokenStatus status = tokenProvider.validateToken(accessToken); + return TokenValidationResponse.of("Access Token이 유효합니다.", status); + } +} diff --git a/src/main/java/vote/vote_be/domain/user/entity/Part.java b/src/main/java/vote/vote_be/domain/user/entity/Part.java new file mode 100644 index 0000000..4090cd7 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/user/entity/Part.java @@ -0,0 +1,6 @@ +package vote.vote_be.domain.user.entity; + +public enum Part { + FRONTEND, + BACKEND +} diff --git a/src/main/java/vote/vote_be/domain/user/entity/Team.java b/src/main/java/vote/vote_be/domain/user/entity/Team.java new file mode 100644 index 0000000..bcb7588 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/user/entity/Team.java @@ -0,0 +1,9 @@ +package vote.vote_be.domain.user.entity; + +public enum Team { + MODELLY, // 최고의 팀 + DIGGINDIE, + CATCHUP, + MENUAL, + STORIX +} \ No newline at end of file diff --git a/src/main/java/vote/vote_be/domain/user/entity/User.java b/src/main/java/vote/vote_be/domain/user/entity/User.java new file mode 100644 index 0000000..6614b38 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/user/entity/User.java @@ -0,0 +1,43 @@ +package vote.vote_be.domain.user.entity; + +import jakarta.persistence.*; +import lombok.*; +import vote.vote_be.global.entity.BaseEntity; + +@Entity +@Table(name = "users") +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class User extends BaseEntity { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "user_id") + private Long id; + + @Column(name = "login_id", length = 20, nullable = false, unique = true) // VARCHAR(20) + private String loginId; + + @Column(name = "password", length = 255, nullable = false) // VARCHAR(255) + private String password; + + @Column(name = "email", length = 50, nullable = false, unique = true) // VARCHAR(50) + private String email; + + @Column(name = "name", length = 20, nullable = false) // VARCHAR(20) + private String name; + + @Enumerated(EnumType.STRING) + @Column(name = "part", nullable = false) + private Part part; + + @Enumerated(EnumType.STRING) + @Column(name = "team", nullable = false) + private Team team; + + // 일단 UserRole 도입. + @Enumerated(EnumType.STRING) + @Builder.Default + @Column(name = "user_role", nullable = false) + private UserRole userRole = UserRole.USER; +} diff --git a/src/main/java/vote/vote_be/domain/user/entity/UserRole.java b/src/main/java/vote/vote_be/domain/user/entity/UserRole.java new file mode 100644 index 0000000..7d356a8 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/user/entity/UserRole.java @@ -0,0 +1,6 @@ +package vote.vote_be.domain.user.entity; + +public enum UserRole { + USER, + ADMIN +} diff --git a/src/main/java/vote/vote_be/domain/user/repository/UserRepository.java b/src/main/java/vote/vote_be/domain/user/repository/UserRepository.java new file mode 100644 index 0000000..1c48273 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/user/repository/UserRepository.java @@ -0,0 +1,12 @@ +package vote.vote_be.domain.user.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import vote.vote_be.domain.user.entity.User; + +import java.util.Optional; + +public interface UserRepository extends JpaRepository { + Optional findByLoginId(String loginId); + boolean existsByLoginId(String loginId); + boolean existsByEmail(String email); +} \ No newline at end of file diff --git a/src/main/java/vote/vote_be/global/apiPayload/ApiResponse.java b/src/main/java/vote/vote_be/global/apiPayload/ApiResponse.java new file mode 100644 index 0000000..0362704 --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/ApiResponse.java @@ -0,0 +1,36 @@ +package vote.vote_be.global.apiPayload; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; +import vote.vote_be.global.apiPayload.code.BaseCode; +import vote.vote_be.global.apiPayload.code.status.SuccessStatus; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + private final String code; + private final String message; + @JsonInclude(JsonInclude.Include.NON_NULL) + private T result; + + // 성공한 경우 응답 생성 + public static ApiResponse onSuccess(T result){ + return new ApiResponse<>(true, SuccessStatus.OK.getCode(), SuccessStatus.OK.getMessage(), result); + } + + public static ApiResponse of(BaseCode code, T result){ + return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result); + } + + // 실패한 경우 응답 생성 + public static ApiResponse onFailure(String code, String message, T data){ + return new ApiResponse<>(false, code, message, data); + } +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/BaseCode.java b/src/main/java/vote/vote_be/global/apiPayload/code/BaseCode.java new file mode 100644 index 0000000..6d4c485 --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/code/BaseCode.java @@ -0,0 +1,6 @@ +package vote.vote_be.global.apiPayload.code; + +public interface BaseCode { + public ReasonDTO getReason(); + public ReasonDTO getReasonHttpStatus(); +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/BaseErrorCode.java b/src/main/java/vote/vote_be/global/apiPayload/code/BaseErrorCode.java new file mode 100644 index 0000000..4e8ad52 --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/code/BaseErrorCode.java @@ -0,0 +1,6 @@ +package vote.vote_be.global.apiPayload.code; + +public interface BaseErrorCode { + public ErrorReasonDTO getReason(); + public ErrorReasonDTO getReasonHttpStatus(); +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/ErrorReasonDTO.java b/src/main/java/vote/vote_be/global/apiPayload/code/ErrorReasonDTO.java new file mode 100644 index 0000000..5961133 --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/code/ErrorReasonDTO.java @@ -0,0 +1,23 @@ +package vote.vote_be.global.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public class ErrorReasonDTO { + + private final Boolean isSuccess; + private final String code; + private final String message; + + private final HttpStatus httpStatus; + + @Builder + public ErrorReasonDTO(Boolean isSuccess, String code, String message, HttpStatus httpStatus) { + this.isSuccess = isSuccess; + this.code = code; + this.message = message; + this.httpStatus = httpStatus; + } +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/ReasonDTO.java b/src/main/java/vote/vote_be/global/apiPayload/code/ReasonDTO.java new file mode 100644 index 0000000..b0c1e18 --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/code/ReasonDTO.java @@ -0,0 +1,23 @@ +package vote.vote_be.global.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public class ReasonDTO { + + private final Boolean isSuccess; + private final String code; + private final String message; + + private final HttpStatus httpStatus; + + @Builder + public ReasonDTO(Boolean isSuccess, String code, String message, HttpStatus httpStatus) { + this.isSuccess = isSuccess; + this.code = code; + this.message = message; + this.httpStatus = httpStatus; + } +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/SimpleMessageDTO.java b/src/main/java/vote/vote_be/global/apiPayload/code/SimpleMessageDTO.java new file mode 100644 index 0000000..ed266da --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/code/SimpleMessageDTO.java @@ -0,0 +1,10 @@ +package vote.vote_be.global.apiPayload.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class SimpleMessageDTO { + private String message; +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java new file mode 100644 index 0000000..79830e3 --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java @@ -0,0 +1,62 @@ +package vote.vote_be.global.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import vote.vote_be.global.apiPayload.code.BaseErrorCode; +import vote.vote_be.global.apiPayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public enum ErrorStatus implements BaseErrorCode { + + // 일반적인 응답 + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST,"COMMON400","잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"COMMON401","인증이 필요합니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), + + // 레디스 설정 오류 + REDIS_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "REDIS_ERROR", "Redis 설정에 오류가 발생했습니다."), + + // User + NOT_FOUND_USER(HttpStatus.NOT_FOUND, "USER404", "해당 유저를 찾을 수 없습니다."), + + // Token/JWT + NOT_FOUND_TOKEN(HttpStatus.NOT_FOUND,"TOKEN404","토큰을 찾을 수 없습니다."), + TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "TOKEN401", "토큰이 유효하지 않습니다."), + ACCESS_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "TOKEN401", "Access Token이 만료되었습니다."), + REFRESH_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "TOKEN401", "Refresh Token이 만료되었습니다."), + + // Auth(로그인, 회원가입 관련) + NOT_FOUND_LOGIN_ID(HttpStatus.NOT_FOUND, "AUTH404", "존재하지 않는 로그인 아이디입니다."), + DUPLICATE_LOGIN_ID(HttpStatus.CONFLICT, "AUTH409", "이미 사용 중인 아이디입니다."), + DUPLICATE_EMAIL(HttpStatus.CONFLICT, "AUTH409", "이미 사용 중인 이메일입니다."), + DESIGNER_FIELDS_REQUIRED(HttpStatus.BAD_REQUEST, "AUTH400", "디자이너 회원가입에 필요한 정보가 누락되었습니다."), + LOGIN_FAIL(HttpStatus.UNAUTHORIZED, "AUTH401", "아이디 또는 비밀번호가 잘못 되었습니다."), + ; + + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ErrorReasonDTO getReason() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .build(); + } + + @Override + public ErrorReasonDTO getReasonHttpStatus() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .httpStatus(httpStatus) + .build(); + } +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/status/SuccessStatus.java b/src/main/java/vote/vote_be/global/apiPayload/code/status/SuccessStatus.java new file mode 100644 index 0000000..a4a520f --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/code/status/SuccessStatus.java @@ -0,0 +1,39 @@ +package vote.vote_be.global.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import vote.vote_be.global.apiPayload.code.BaseCode; +import vote.vote_be.global.apiPayload.code.ReasonDTO; + +@Getter +@AllArgsConstructor +public enum SuccessStatus implements BaseCode { + + // 가장 일반적인 응답 + OK(HttpStatus.OK, "200", "요청이 성공했습니다."), + CREATED(HttpStatus.CREATED, "201", "생성이 완료되었습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ReasonDTO getReason() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .build(); + } + + @Override + public ReasonDTO getReasonHttpStatus() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .httpStatus(httpStatus) + .build(); + } +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/exception/GeneralException.java b/src/main/java/vote/vote_be/global/apiPayload/exception/GeneralException.java new file mode 100644 index 0000000..a78812f --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/exception/GeneralException.java @@ -0,0 +1,23 @@ +package vote.vote_be.global.apiPayload.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import vote.vote_be.global.apiPayload.code.BaseErrorCode; +import vote.vote_be.global.apiPayload.code.ErrorReasonDTO; + + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private BaseErrorCode code; + + public ErrorReasonDTO getErrorReason() { + return this.code.getReason(); + } + + public ErrorReasonDTO getErrorReasonHttpStatus(){ + return this.code.getReasonHttpStatus(); + } + +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/exception/handler/GlobalExceptionHandler.java b/src/main/java/vote/vote_be/global/apiPayload/exception/handler/GlobalExceptionHandler.java new file mode 100644 index 0000000..bff93ec --- /dev/null +++ b/src/main/java/vote/vote_be/global/apiPayload/exception/handler/GlobalExceptionHandler.java @@ -0,0 +1,121 @@ +package vote.vote_be.global.apiPayload.exception.handler; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import vote.vote_be.global.apiPayload.ApiResponse; +import vote.vote_be.global.apiPayload.code.ErrorReasonDTO; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; + +@Slf4j +@RestControllerAdvice(annotations = {RestController.class}) +public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { + + + @ExceptionHandler + public ResponseEntity validation(ConstraintViolationException e, WebRequest request) { + String errorMessage = e.getConstraintViolations().stream() + .map(ConstraintViolation::getMessage) + .findFirst() + .orElseThrow(() -> new RuntimeException("ConstraintViolationException 추출 도중 에러 발생")); + + return handleExceptionInternalConstraint(e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY,request); + } + + @Override + public ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + + Map errors = new LinkedHashMap<>(); + + e.getBindingResult().getFieldErrors() + .forEach(fieldError -> { + String fieldName = fieldError.getField(); + String errorMessage = Optional.ofNullable(fieldError.getDefaultMessage()).orElse(""); + errors.merge(fieldName, errorMessage, (existingErrorMessage, newErrorMessage) -> existingErrorMessage + ", " + newErrorMessage); + }); + + return handleExceptionInternalArgs(e,HttpHeaders.EMPTY,ErrorStatus.valueOf("_BAD_REQUEST"),request,errors); + } + + @ExceptionHandler + public ResponseEntity exception(Exception e, WebRequest request) { + + return handleExceptionInternalFalse(e, ErrorStatus._INTERNAL_SERVER_ERROR, HttpHeaders.EMPTY, ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(),request, e.getMessage()); + } + + @ExceptionHandler(value = GeneralException.class) + public ResponseEntity onThrowException(GeneralException generalException, HttpServletRequest request) { + ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); + return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request); + } + + private ResponseEntity handleExceptionInternal(Exception e, ErrorReasonDTO reason, + HttpHeaders headers, HttpServletRequest request) { + + ApiResponse body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null); + + WebRequest webRequest = new ServletWebRequest(request); + HttpHeaders headersToUse = (headers != null) ? headers : new HttpHeaders(); + return super.handleExceptionInternal( + e, + body, + headersToUse, + reason.getHttpStatus(), + webRequest + ); + } + + private ResponseEntity handleExceptionInternalFalse(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, HttpStatus status, WebRequest request, String errorPoint) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorPoint); + return super.handleExceptionInternal( + e, + body, + headers, + status, + request + ); + } + + private ResponseEntity handleExceptionInternalArgs(Exception e, HttpHeaders headers, ErrorStatus errorCommonStatus, + WebRequest request, Map errorArgs) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorArgs); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } + + private ResponseEntity handleExceptionInternalConstraint(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, WebRequest request) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(), errorCommonStatus.getMessage(), null); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } +} diff --git a/src/main/java/vote/vote_be/global/config/RedisConfig.java b/src/main/java/vote/vote_be/global/config/RedisConfig.java new file mode 100644 index 0000000..08bc7e5 --- /dev/null +++ b/src/main/java/vote/vote_be/global/config/RedisConfig.java @@ -0,0 +1,54 @@ +package vote.vote_be.global.config; + + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.repository.configuration.EnableRedisRepositories; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +@EnableRedisRepositories // Redis 저장소 기능 활성화 +public class RedisConfig { + + // application.yml에서 host, port 값을 주입하기 + @Value("${spring.data.redis.host}") + private String host; + + @Value("${spring.data.redis.port}") + private int port; + + // Redis 연결 팩토리 설정(Lettuce 기반) + @Bean + public RedisConnectionFactory redisConnectionFactory() { + RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration(); + redisStandaloneConfiguration.setHostName(host); + redisStandaloneConfiguration.setPort(port); + return new LettuceConnectionFactory(redisStandaloneConfiguration); + } + + // RedisTemplate 설정 + @Bean + public RedisTemplate redisTemplate() { + RedisTemplate redisTemplate = new RedisTemplate<>(); + + redisTemplate.setConnectionFactory(redisConnectionFactory()); + redisTemplate.setDefaultSerializer(new GenericJackson2JsonRedisSerializer()); + + // key, value에 대한 직렬화 방법 설정 + redisTemplate.setKeySerializer(new StringRedisSerializer()); + redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer()); + + // hash key, hash value에 대한 직렬화 방법 설정 + redisTemplate.setHashKeySerializer(new StringRedisSerializer()); + redisTemplate.setHashValueSerializer(new GenericJackson2JsonRedisSerializer()); + + return redisTemplate; + } +} + diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java new file mode 100644 index 0000000..017e269 --- /dev/null +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -0,0 +1,85 @@ +package vote.vote_be.global.config; + + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.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.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler; +import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import vote.vote_be.global.security.jwt.JwtAuthenticationFilter; +import vote.vote_be.global.security.jwt.JwtExceptionFilter; + +import java.util.List; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final JwtAuthenticationFilter jwtAuthenticationFilter; + private final JwtExceptionFilter jwtExceptionFilter; + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http + .csrf(csrf -> csrf.disable()) // 세션 방식 안쓰니 필요 x + .cors(cors -> cors.configurationSource(corsConfigurationSource())) + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) //세션 생성 x + .formLogin(AbstractHttpConfigurer::disable) // login 폼 페이지 + .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) + .addFilterBefore(jwtExceptionFilter, JwtAuthenticationFilter.class) + .logout(logout -> logout + .logoutUrl("/logout") + .logoutSuccessUrl("/login?logout") + .logoutSuccessHandler(logoutSuccessHandler()) + .clearAuthentication(true) + .permitAll() + ) + .authorizeHttpRequests(auth -> auth + .requestMatchers( + "/api", + "/api/swagger-ui/**" + ).permitAll() + //.requestMatchers().authenticated() + .anyRequest().permitAll() + ); + + return http.build(); + } + + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + configuration.addAllowedOriginPattern("http://localhost:8080"); // 로컬 도메인 허용(나중에 프론트 도메인으로 교체 필요) + configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")); + configuration.addAllowedHeader("*"); + configuration.setAllowCredentials(true); // 쿠키 인증 정보 허용 + configuration.addExposedHeader("Authorization"); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } + + // 비밀번호 인코더 + @Bean + public PasswordEncoder passwordEncoder(){ + return new BCryptPasswordEncoder(); + } + + @Bean + public LogoutSuccessHandler logoutSuccessHandler() { + return new HttpStatusReturningLogoutSuccessHandler(); + } +} diff --git a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java index ecf59a8..92b255f 100644 --- a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java +++ b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java @@ -22,7 +22,7 @@ public OpenAPI voteAPI() { .description("Vote API 명세서") .version("1.0.0"); - String jwtSchemeName = "JWT TOKEN"; + String jwtSchemeName = "Bearer Authentication"; SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwtSchemeName); diff --git a/src/main/java/vote/vote_be/global/entity/BaseEntity.java b/src/main/java/vote/vote_be/global/entity/BaseEntity.java new file mode 100644 index 0000000..4a3a475 --- /dev/null +++ b/src/main/java/vote/vote_be/global/entity/BaseEntity.java @@ -0,0 +1,32 @@ +package vote.vote_be.global.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public class BaseEntity { + + @CreatedDate + @Column(name = "created_at", columnDefinition = "TIMESTAMP") + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at", columnDefinition = "TIMESTAMP") + private LocalDateTime updatedAt; + + @Column(name = "deleted_at", columnDefinition = "TIMESTAMP") + private LocalDateTime deletedAt; + + public void markAsDeleted() { + this.deletedAt = LocalDateTime.now(); + } +} diff --git a/src/main/java/vote/vote_be/global/redis/RedisService.java b/src/main/java/vote/vote_be/global/redis/RedisService.java new file mode 100644 index 0000000..ddfa983 --- /dev/null +++ b/src/main/java/vote/vote_be/global/redis/RedisService.java @@ -0,0 +1,63 @@ +package vote.vote_be.global.redis; + +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Component; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +import java.time.Duration; + +@Component +@RequiredArgsConstructor +public class RedisService { + // Redis 연결 + private final RedisTemplate redisTemplate; + +// @Value("${jwt.token.refresh-expiration-time}") +// private long refreshTokenExpirationTime; +// +// @Value("${jwt.token.access-expiration-time}") +// private long accessExpirationTime; + + // RefreshToken TTL 설정 + public void setRefreshToken(String key, String value, long ttlSeconds) { + try { + ValueOperations values = redisTemplate.opsForValue(); + values.set(key, value, Duration.ofSeconds(ttlSeconds)); + } catch (Exception e) { + throw new GeneralException(ErrorStatus.REDIS_ERROR); + } + } + + // 값 조회(없으면 빈 문자열) + public String getValue(String key) { + try { + ValueOperations values = redisTemplate.opsForValue(); + Object value = values.get(key); + return value == null ? "" : value.toString(); + } catch (Exception e) { + throw new GeneralException(ErrorStatus.REDIS_ERROR); + } + } + + // 키 삭제 + public void deleteValue(String key) { + try { + redisTemplate.delete(key); + } catch (Exception e) { + throw new GeneralException(ErrorStatus.REDIS_ERROR); + } + } + + // 해당 키가 Redis에 존재하는지 확인 + public boolean checkExistsValue(String key) { + try { + return redisTemplate.hasKey(key); + } catch (Exception e) { + throw new GeneralException(ErrorStatus.REDIS_ERROR); + } + } + +} diff --git a/src/main/java/vote/vote_be/global/security/AuthDetails.java b/src/main/java/vote/vote_be/global/security/AuthDetails.java new file mode 100644 index 0000000..54366f2 --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/AuthDetails.java @@ -0,0 +1,52 @@ +package vote.vote_be.global.security; + + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import vote.vote_be.domain.user.entity.User; + +import java.util.Collection; +import java.util.List; + +public record AuthDetails(User user) implements UserDetails { + + public AuthDetails(User user) { + this.user = user; + } + + @Override + public Collection getAuthorities() { + return List.of(new SimpleGrantedAuthority(user.getUserRole().toString())); + } + + @Override + public String getPassword() { + return user.getPassword(); + } + + @Override + public String getUsername() { + return user.getLoginId(); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return user.getDeletedAt() == null; + } +} diff --git a/src/main/java/vote/vote_be/global/security/AuthDetailsService.java b/src/main/java/vote/vote_be/global/security/AuthDetailsService.java new file mode 100644 index 0000000..afd60bf --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/AuthDetailsService.java @@ -0,0 +1,33 @@ +package vote.vote_be.global.security; + +import lombok.RequiredArgsConstructor; +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; +import org.springframework.transaction.annotation.Transactional; +import vote.vote_be.domain.user.entity.User; +import vote.vote_be.domain.user.repository.UserRepository; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +@Service +@Transactional(readOnly = true) +@RequiredArgsConstructor +public class AuthDetailsService implements UserDetailsService { + + private final UserRepository userRepository; + + // 사용자 정보 필요로 할 때 호출 + @Override + public UserDetails loadUserByUsername(String userId) throws UsernameNotFoundException { + try { + Long id = Long.valueOf(userId); + User user = userRepository.findById(id) + .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_FOUND_USER)); + return new AuthDetails(user); + } catch (NumberFormatException e){ + throw new GeneralException(ErrorStatus.TOKEN_INVALID); + } + } +} diff --git a/src/main/java/vote/vote_be/global/security/dto/TokenResponse.java b/src/main/java/vote/vote_be/global/security/dto/TokenResponse.java new file mode 100644 index 0000000..ef4349d --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/dto/TokenResponse.java @@ -0,0 +1,25 @@ +package vote.vote_be.global.security.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class TokenResponse { + + @Schema(description = "Access Token") + private String accessToken; + + @Schema(description = "Refresh Token") + private String refreshToken; + + public static TokenResponse of (String accessToken, String refreshToken) { + TokenResponse tokenResponse = new TokenResponse(); + tokenResponse.accessToken = accessToken; + tokenResponse.refreshToken = refreshToken; + + return tokenResponse; + } +} diff --git a/src/main/java/vote/vote_be/global/security/entity/RefreshToken.java b/src/main/java/vote/vote_be/global/security/entity/RefreshToken.java new file mode 100644 index 0000000..7e4f3d3 --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/entity/RefreshToken.java @@ -0,0 +1,18 @@ +package vote.vote_be.global.security.entity; + +import lombok.Getter; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; + +@Getter +@RedisHash(value = "refreshToken", timeToLive = 604800000) +public class RefreshToken { + @Id + private String refreshToken; + private Long userId; + + public RefreshToken(String refreshToken, Long userId) { + this.refreshToken = refreshToken; + this.userId = userId; + } +} diff --git a/src/main/java/vote/vote_be/global/security/entity/TokenStatus.java b/src/main/java/vote/vote_be/global/security/entity/TokenStatus.java new file mode 100644 index 0000000..1633ea4 --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/entity/TokenStatus.java @@ -0,0 +1,8 @@ +package vote.vote_be.global.security.entity; + +public enum TokenStatus { + VALID, + EXPIRED, + INVALID, + MISSING +} diff --git a/src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java b/src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java new file mode 100644 index 0000000..b7cd6cd --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java @@ -0,0 +1,68 @@ +package vote.vote_be.global.security.jwt; + +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.UnsupportedJwtException; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.NonNull; +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 vote.vote_be.global.apiPayload.code.status.ErrorStatus; + +import java.io.IOException; + + +@Component +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + public final TokenProvider tokenProvider; + + @Override + protected void doFilterInternal(@NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain) throws ServletException, IOException { + + String token = tokenProvider.resolveToken(request); + + if (token != null) { + try{ + // Authentication 생성 + Authentication authentication = tokenProvider.getAuthentication(token); + + if (authentication != null) { + // SecurityContext에 인증 정보 저장 + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } catch (ExpiredJwtException e) { + handleException(response, ErrorStatus.ACCESS_TOKEN_EXPIRED); + return; + } catch (SecurityException | MalformedJwtException | + UnsupportedJwtException | IllegalArgumentException e) { + handleException(response, ErrorStatus.TOKEN_INVALID); + return; + } + } + filterChain.doFilter(request, response); + } + + private void handleException(HttpServletResponse response, ErrorStatus status) throws IOException { + response.setStatus(status.getHttpStatus().value()); + response.setContentType("application/json;charset=UTF-8"); + + String body = String.format( + "{\"isSuccess\":false,\"code\":\"%s\",\"message\":\"%s\"}", + status.getCode(), + status.getMessage() + ); + response.getWriter().write(body); + } + +} diff --git a/src/main/java/vote/vote_be/global/security/jwt/JwtExceptionFilter.java b/src/main/java/vote/vote_be/global/security/jwt/JwtExceptionFilter.java new file mode 100644 index 0000000..ddd7877 --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/jwt/JwtExceptionFilter.java @@ -0,0 +1,48 @@ +package vote.vote_be.global.security.jwt; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +import java.io.IOException; +import java.util.Map; + +@Component +@RequiredArgsConstructor +public class JwtExceptionFilter extends OncePerRequestFilter { + + private final ObjectMapper objectMapper; + + @Override + protected void doFilterInternal(@NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain) throws ServletException, IOException { + + try { + filterChain.doFilter(request, response); + } catch (GeneralException e) { + setErrorResponse(response,e.getErrorReasonHttpStatus().getHttpStatus().value(),e.getErrorReasonHttpStatus().getCode(),e.getErrorReasonHttpStatus().getMessage()); + } + } + + private void setErrorResponse(HttpServletResponse response, int status, String code, String message) throws IOException { + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + response.setStatus(status); + + String json = objectMapper.writeValueAsString(Map.of( + "isSuccess", false, + "code", code, + "message", message + )); + + response.getWriter().write(json); + } +} diff --git a/src/main/java/vote/vote_be/global/security/jwt/TokenProvider.java b/src/main/java/vote/vote_be/global/security/jwt/TokenProvider.java new file mode 100644 index 0000000..46c48aa --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/jwt/TokenProvider.java @@ -0,0 +1,140 @@ +package vote.vote_be.global.security.jwt; + +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.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import vote.vote_be.global.security.dto.TokenResponse; +import vote.vote_be.global.security.entity.TokenStatus; +import vote.vote_be.domain.user.entity.User; + +import java.security.Key; +import java.util.Date; + + +@Component +@RequiredArgsConstructor +public class TokenProvider implements InitializingBean { + + @Value("${jwt.secret}") + private String secretKey; + private Key key; + + @Value("${jwt.token.access-expiration-time}") + private long accessExpirationTime; + + @Value("${jwt.token.refresh-expiration-time}") + private long refreshExpirationTime; + + private final UserDetailsService userDetailsService; + + // key 초기화 + @Override + public void afterPropertiesSet(){ + byte[] keyBytes = Decoders.BASE64.decode(secretKey); + this.key = Keys.hmacShaKeyFor(keyBytes); + } + + // Access Token 생성 + public String createAccessToken(User user) { + Date now = new Date(); + Date expiration = new Date(now.getTime() + accessExpirationTime); + + return Jwts.builder() + .setSubject(String.valueOf(user.getId())) // 사용자 ID + .setIssuedAt(now) // 발급 시각 + .setExpiration(expiration) // 만료 시각 + .signWith(key, SignatureAlgorithm.HS512) // 암호화 알고리즘 + .compact(); + } + + // RefreshToken 생성 + public String createRefreshToken(User user) { + Date now = new Date(); + Date expiration = new Date(now.getTime() + refreshExpirationTime); + + return Jwts.builder() + .setSubject(String.valueOf(user.getId())) + .setIssuedAt(now) + .setExpiration(expiration) + .signWith(key,SignatureAlgorithm.HS256) + .compact(); + } + + // access, refresh token 반환 + public TokenResponse createToken(User user) { + return TokenResponse.of(createAccessToken(user), createRefreshToken(user)); + } + + // 토큰 만료 시간 조회 + public Long getExpirationTime(String token) { + return Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token) + .getBody() + .getExpiration() + .getTime(); + } + + // 요청 헤더에서 토큰 꺼내기 + public String resolveToken(HttpServletRequest request){ + String token = request.getHeader("Authorization"); + if (StringUtils.hasText(token) && token.startsWith("Bearer ")) { + return token.substring(7); + } + return null; + } + + //userId 추출 + public String getUserIdFromToken(String token){ + Claims claims = Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token) + .getBody(); + return claims.getSubject(); + } + + // 토큰 -> 인증 객체 변환 + public Authentication getAuthentication(String token){ + UserDetails userDetails = + (UserDetails) userDetailsService.loadUserByUsername(getUserIdFromToken(token)); + return new UsernamePasswordAuthenticationToken( + userDetails, token, userDetails.getAuthorities()); + } + + // 토큰 유효성 검사(TokenStatus를 도입한게 의미가 있나..? -> 리팩토링 고려) + public TokenStatus validateToken(String token) { + if (token == null) return TokenStatus.MISSING; + try { + Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token); + return TokenStatus.VALID; + } catch (ExpiredJwtException ex) { + return TokenStatus.EXPIRED; + } catch (SecurityException | MalformedJwtException | UnsupportedJwtException | IllegalArgumentException ex) { + return TokenStatus.INVALID; + } + } + + public long getRemainingMillis(String token) { + return getExpirationTime(token) - System.currentTimeMillis(); + } + + public long getRemainingSeconds(String token) { + return Math.max(1, getRemainingMillis(token) / 1000); + } + +} diff --git a/src/main/java/vote/vote_be/global/security/repository/RefreshTokenRepository.java b/src/main/java/vote/vote_be/global/security/repository/RefreshTokenRepository.java new file mode 100644 index 0000000..532b5dd --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/repository/RefreshTokenRepository.java @@ -0,0 +1,7 @@ +package vote.vote_be.global.security.repository; + +import org.springframework.data.repository.CrudRepository; +import vote.vote_be.global.security.entity.RefreshToken; + +public interface RefreshTokenRepository extends CrudRepository { +} From 503309c3c6b4723824b143ebdc66545536d09657 Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Tue, 11 Nov 2025 03:46:31 +0900 Subject: [PATCH 08/26] =?UTF-8?q?[chore]=20swagger=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B2=88=EA=B2=BD=20(#7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/vote/vote_be/global/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java index 017e269..0983cb5 100644 --- a/src/main/java/vote/vote_be/global/config/SecurityConfig.java +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -49,7 +49,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti .authorizeHttpRequests(auth -> auth .requestMatchers( "/api", - "/api/swagger-ui/**" + "/api/swagger-ui/**", + "/v3/api-docs/**" ).permitAll() //.requestMatchers().authenticated() .anyRequest().permitAll() From 55f2b46bb2a34e0bd5ee462aa88ee427b66c35fe Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Tue, 11 Nov 2025 04:06:30 +0900 Subject: [PATCH 09/26] =?UTF-8?q?chore:=20swagger=20config=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 --- src/main/java/vote/vote_be/global/config/SwaggerConfig.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java index 92b255f..a18f3d0 100644 --- a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java +++ b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java @@ -34,7 +34,6 @@ public OpenAPI voteAPI() { .bearerFormat("JWT")); return new OpenAPI() - .addServersItem(new Server().url(contextPath)) .info(info) .addSecurityItem(securityRequirement) .components(components); From dc6d1d0fa571184e3e719c0825244204c86c520e Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 12:01:24 +0900 Subject: [PATCH 10/26] =?UTF-8?q?[chore]=20contextPath=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 --- src/main/java/vote/vote_be/global/config/SecurityConfig.java | 2 +- src/main/java/vote/vote_be/global/config/SwaggerConfig.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java index 0983cb5..f354c1c 100644 --- a/src/main/java/vote/vote_be/global/config/SecurityConfig.java +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -62,7 +62,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); - configuration.addAllowedOriginPattern("http://localhost:8080"); // 로컬 도메인 허용(나중에 프론트 도메인으로 교체 필요) + configuration.setAllowedOrigins(List.of("http://localhost:8080","http://localhost:3000")); // 로컬 도메인 허용(나중에 프론트 도메인으로 교체 필요) configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")); configuration.addAllowedHeader("*"); configuration.setAllowCredentials(true); // 쿠키 인증 정보 허용 diff --git a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java index a18f3d0..92b255f 100644 --- a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java +++ b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java @@ -34,6 +34,7 @@ public OpenAPI voteAPI() { .bearerFormat("JWT")); return new OpenAPI() + .addServersItem(new Server().url(contextPath)) .info(info) .addSecurityItem(securityRequirement) .components(components); From 458201587b04fa77769bfcbae4c06efd73b831c5 Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Tue, 11 Nov 2025 12:25:20 +0900 Subject: [PATCH 11/26] =?UTF-8?q?[chore]=20application.yml=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/vote/vote_be/global/config/SecurityConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java index f354c1c..96cbe74 100644 --- a/src/main/java/vote/vote_be/global/config/SecurityConfig.java +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -48,6 +48,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti ) .authorizeHttpRequests(auth -> auth .requestMatchers( + // 추후 변경 필요 "/api", "/api/swagger-ui/**", "/v3/api-docs/**" From 9dc03780be9c1f7f3f5b4ea704ac582f34037fe0 Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Tue, 11 Nov 2025 12:36:38 +0900 Subject: [PATCH 12/26] =?UTF-8?q?[chore]=20application.yml=20DB=20url=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 --- src/main/java/vote/vote_be/global/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java index 96cbe74..a1dbf2f 100644 --- a/src/main/java/vote/vote_be/global/config/SecurityConfig.java +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -48,7 +48,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti ) .authorizeHttpRequests(auth -> auth .requestMatchers( - // 추후 변경 필요 + // 변경 필요 "/api", "/api/swagger-ui/**", "/v3/api-docs/**" From 8e5fce2cf8dd2c5afca736d303163408ebb510fd Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 12:40:52 +0900 Subject: [PATCH 13/26] =?UTF-8?q?[fix]=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95=20(#3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7b97bc6..27e271b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,13 +46,16 @@ jobs: # 서버 배포 - name: Deploy to server with Docker uses: appleboy/ssh-action@master + env: + IMAGE_TAG: ${{ github.sha }} with: host: ${{ secrets.EC2_HOST }} username: ${{ secrets.EC2_USERNAME }} key: ${{ secrets.EC2_SSH_KEY }} + envs: IMAGE_TAG script: | sudo docker-compose down - sudo docker pull ${{ secrets.DOCKER_REPO }} + sudo docker pull ${{ secrets.DOCKER_REPO }}:$IMAGE_TAG sudo docker-compose -f docker-compose.yml up -d sudo docker image prune -f # jar 파일명 확인 From 0c744df672c07e75bf6f997c54b7bc2fd5a3d1e1 Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 12:59:37 +0900 Subject: [PATCH 14/26] =?UTF-8?q?chore:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 27e271b..94186d8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -56,7 +56,7 @@ jobs: script: | sudo docker-compose down sudo docker pull ${{ secrets.DOCKER_REPO }}:$IMAGE_TAG - sudo docker-compose -f docker-compose.yml up -d + sudo IMAGE_TAG=$IMAGE_TAG docker-compose -f docker-compose.yml up -d sudo docker image prune -f # jar 파일명 확인 - name: Show built files From 61dcc0625d33f2d4e3fe664931f2ec6f753dff36 Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 13:35:41 +0900 Subject: [PATCH 15/26] =?UTF-8?q?chore:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 94186d8..16b47c0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -56,7 +56,8 @@ jobs: script: | sudo docker-compose down sudo docker pull ${{ secrets.DOCKER_REPO }}:$IMAGE_TAG - sudo IMAGE_TAG=$IMAGE_TAG docker-compose -f docker-compose.yml up -d + export IMAGE_TAG=$IMAGE_TAG + sudo -E docker-compose up -d sudo docker image prune -f # jar 파일명 확인 - name: Show built files From 27b5bfb45b267ec025e0e9906f7f7e5985f1e4fd Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Tue, 11 Nov 2025 13:52:22 +0900 Subject: [PATCH 16/26] =?UTF-8?q?chore:=20=ED=99=98=EA=B2=BD=EB=B3=80?= =?UTF-8?q?=EC=88=98=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 16b47c0..25149a3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -54,10 +54,10 @@ jobs: key: ${{ secrets.EC2_SSH_KEY }} envs: IMAGE_TAG script: | - sudo docker-compose down sudo docker pull ${{ secrets.DOCKER_REPO }}:$IMAGE_TAG - export IMAGE_TAG=$IMAGE_TAG - sudo -E docker-compose up -d + cd /root + docker compose down --remove-orphans -v || true + IMAGE_TAG=$IMAGE_TAG docker compose up -d --force-recreate sudo docker image prune -f # jar 파일명 확인 - name: Show built files From ba733c05b9edb658809ba9be76309fb1ee7df21c Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Thu, 13 Nov 2025 01:34:45 +0900 Subject: [PATCH 17/26] =?UTF-8?q?feat:=20HttpOnly=20cookie=EB=A1=9C=20refr?= =?UTF-8?q?esh=20token=20=EC=A0=84=EB=8B=AC=20=EB=B0=A9=EC=8B=9D=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 --- .../auth/controller/AuthController.java | 43 +++++++++++++------ .../domain/auth/dto/internal/LoginResult.java | 23 ++++++++++ .../dto/response/AccessTokenResponse.java | 15 +++++++ .../auth/dto/response/LoginResponse.java | 4 +- .../domain/auth/service/AuthService.java | 34 +++++++++------ .../vote_be/global/config/SwaggerConfig.java | 1 + .../global/security/jwt/CookieUtil.java | 43 +++++++++++++++++++ .../security/jwt/JwtAuthenticationFilter.java | 7 ++- 8 files changed, 138 insertions(+), 32 deletions(-) create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/internal/LoginResult.java create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/response/AccessTokenResponse.java create mode 100644 src/main/java/vote/vote_be/global/security/jwt/CookieUtil.java diff --git a/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java index f7d52cc..cc3f91b 100644 --- a/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java +++ b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java @@ -1,23 +1,20 @@ package vote.vote_be.domain.auth.controller; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.security.SecurityRequirement; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import vote.vote_be.domain.auth.dto.internal.LoginResult; import vote.vote_be.domain.auth.dto.request.LoginRequest; import vote.vote_be.domain.auth.dto.request.SignupRequest; -import vote.vote_be.domain.auth.dto.response.DuplicateCheckResponse; -import vote.vote_be.domain.auth.dto.response.LoginResponse; -import vote.vote_be.domain.auth.dto.response.SignupResponse; -import vote.vote_be.domain.auth.dto.response.TokenValidationResponse; +import vote.vote_be.domain.auth.dto.response.*; import vote.vote_be.domain.auth.service.AuthService; import vote.vote_be.global.apiPayload.ApiResponse; import vote.vote_be.global.apiPayload.code.SimpleMessageDTO; import vote.vote_be.global.apiPayload.code.status.SuccessStatus; -import vote.vote_be.global.security.dto.TokenResponse; - +import jakarta.servlet.http.HttpServletResponse; +import vote.vote_be.global.security.jwt.CookieUtil; @RestController @RequiredArgsConstructor @@ -27,28 +24,47 @@ public class AuthController { @Operation(summary = "회원가입", description = "회원가입 완료 메시지, loginId, 이름을 반환합니다.") @PostMapping("/auth/signup") - public ApiResponse signup(@RequestBody @Valid SignupRequest req) { - return ApiResponse.of(SuccessStatus.CREATED,authService.signup(req)); + public ApiResponse signup(@RequestBody @Valid SignupRequest request) { + return ApiResponse.of(SuccessStatus.CREATED,authService.signup(request)); } /* 로그인 */ @Operation(summary = "로그인", description = "Access/Refresh 토큰을 포함한 로그인 응답을 반환합니다.") @PostMapping("/auth/login") - public ApiResponse login(@RequestBody @Valid LoginRequest req) { - return ApiResponse.onSuccess(authService.login(req)); + public ApiResponse login(@RequestBody @Valid LoginRequest request, HttpServletResponse response) { + LoginResult result = authService.login(request); + + var cookie = CookieUtil.buildRefreshCookie( + result.getRefreshToken(), + result.getRefreshTtlSec(), + "", + false, + "LAX" + ); + response.addHeader("Set-Cookie", cookie.toString()); + + return ApiResponse.onSuccess(result.getLoginResponse()); } /* 로그아웃 */ @Operation(summary = "로그아웃", description = "사용자의 Refresh Token을 Redis에서 삭제합니다.") @PostMapping("/auth/logout") - public ApiResponse logout(HttpServletRequest request) { + public ApiResponse logout(HttpServletRequest request, HttpServletResponse response) { + + var del = CookieUtil.deleteRefreshCookie( + "", + false, + "Lax" + ); + response.addHeader("Set-Cookie", del.toString()); + return ApiResponse.onSuccess(authService.logout(request)); } /* 토큰 재발급 */ @Operation(summary = "Access Token 재발급", description = "사용자의 Access Token만 재발급합니다.") @PostMapping("/auth/refresh") - public ApiResponse newAccessToken(@RequestHeader("X-Refresh-Token") String refreshToken) { + public ApiResponse newAccessToken(@CookieValue(name = CookieUtil.REFRESH_COOKIE, required = false) String refreshToken) { return ApiResponse.onSuccess(authService.newAccessToken(refreshToken)); } @@ -72,4 +88,5 @@ public ApiResponse checkLoginId(@RequestParam("value") S public ApiResponse checkEmail(@RequestParam("value") String value) { return ApiResponse.onSuccess(authService.checkEmail(value)); } + } diff --git a/src/main/java/vote/vote_be/domain/auth/dto/internal/LoginResult.java b/src/main/java/vote/vote_be/domain/auth/dto/internal/LoginResult.java new file mode 100644 index 0000000..aeac929 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/internal/LoginResult.java @@ -0,0 +1,23 @@ +package vote.vote_be.domain.auth.dto.internal; + +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import vote.vote_be.domain.auth.dto.response.LoginResponse; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class LoginResult { + // login 컨트롤러에서 사용할 정보를 전달하는 DTO + private LoginResponse loginResponse; + private String refreshToken; + private long refreshTtlSec; + + public static LoginResult of(LoginResponse loginResponse, String refreshToken, long refreshTtlSec) { + LoginResult result = new LoginResult(); + result.loginResponse = loginResponse; + result.refreshToken = refreshToken; + result.refreshTtlSec = refreshTtlSec; + return result; + } +} diff --git a/src/main/java/vote/vote_be/domain/auth/dto/response/AccessTokenResponse.java b/src/main/java/vote/vote_be/domain/auth/dto/response/AccessTokenResponse.java new file mode 100644 index 0000000..2c2d824 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/response/AccessTokenResponse.java @@ -0,0 +1,15 @@ +package vote.vote_be.domain.auth.dto.response; + +import lombok.*; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class AccessTokenResponse { + private String accessToken; + + public static AccessTokenResponse of(String accessToken) { + AccessTokenResponse response = new AccessTokenResponse(); + response.accessToken = accessToken; + return response; + } +} diff --git a/src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java b/src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java index 64a8a59..85c9712 100644 --- a/src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java +++ b/src/main/java/vote/vote_be/domain/auth/dto/response/LoginResponse.java @@ -14,16 +14,14 @@ public class LoginResponse { private Part part; private Team team; private String accessToken; - private String refreshToken; - public static LoginResponse of (Long userId, String name, Part part, Team team, String accessToken, String refreshToken) { + public static LoginResponse of (Long userId, String name, Part part, Team team, String accessToken) { LoginResponse loginResponse = new LoginResponse(); loginResponse.userId = userId; loginResponse.name = name; loginResponse.part = part; loginResponse.team = team; loginResponse.accessToken = accessToken; - loginResponse.refreshToken = refreshToken; return loginResponse; } diff --git a/src/main/java/vote/vote_be/domain/auth/service/AuthService.java b/src/main/java/vote/vote_be/domain/auth/service/AuthService.java index 0150db8..690aede 100644 --- a/src/main/java/vote/vote_be/domain/auth/service/AuthService.java +++ b/src/main/java/vote/vote_be/domain/auth/service/AuthService.java @@ -5,12 +5,10 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import vote.vote_be.domain.auth.dto.internal.LoginResult; import vote.vote_be.domain.auth.dto.request.LoginRequest; import vote.vote_be.domain.auth.dto.request.SignupRequest; -import vote.vote_be.domain.auth.dto.response.DuplicateCheckResponse; -import vote.vote_be.domain.auth.dto.response.LoginResponse; -import vote.vote_be.domain.auth.dto.response.SignupResponse; -import vote.vote_be.domain.auth.dto.response.TokenValidationResponse; +import vote.vote_be.domain.auth.dto.response.*; import vote.vote_be.domain.user.entity.*; import vote.vote_be.domain.user.repository.UserRepository; import vote.vote_be.global.apiPayload.code.SimpleMessageDTO; @@ -53,7 +51,7 @@ public SignupResponse signup(SignupRequest req) { /* 로그인 */ @Transactional(readOnly = true) - public LoginResponse login(LoginRequest req) { + public LoginResult login(LoginRequest req) { // LoginId 존재 여부 확인 User user = userRepository.findByLoginId(req.getLoginId()) .orElseThrow(() -> new GeneralException(ErrorStatus.NOT_FOUND_LOGIN_ID)); @@ -63,11 +61,23 @@ public LoginResponse login(LoginRequest req) { TokenResponse tokens = tokenProvider.createToken(user); - // userId 기준으로 레디스에 refresh token 저장(TTL=refresh 남은 시간) - long ttlSec = tokenProvider.getRemainingSeconds(tokens.getRefreshToken()); - redisService.setRefreshToken(RT_KEY_PREFIX + user.getId(), tokens.getRefreshToken(), ttlSec); + // refresh token + String refreshToken = tokens.getRefreshToken(); - return LoginResponse.of(user.getId(), user.getName(), user.getPart(), user.getTeam(), tokens.getAccessToken(), tokens.getRefreshToken()); + // userId 기준으로 레디스에 refresh token 저장(TTL=refresh 남은 시간) + long ttlSec = tokenProvider.getRemainingSeconds(refreshToken); + redisService.setRefreshToken(RT_KEY_PREFIX + user.getId(), refreshToken, ttlSec); + + // 로그인 응답 생성 + LoginResponse loginResponse = LoginResponse.of( + user.getId(), + user.getName(), + user.getPart(), + user.getTeam(), + tokens.getAccessToken() + ); + + return LoginResult.of(loginResponse, refreshToken, ttlSec); } @Transactional @@ -85,7 +95,7 @@ public SimpleMessageDTO logout(HttpServletRequest request) { @Transactional(readOnly = true) - public TokenResponse newAccessToken(String refreshToken) { // 프론트에서 Authorization 헤더를 빼고 전송해줘야함. + public AccessTokenResponse newAccessToken(String refreshToken) { // 프론트에서 Authorization 헤더를 빼고 전송해줘야함. // refresh 토큰 검증 TokenStatus tokenStatus = tokenProvider.validateToken(refreshToken); @@ -102,7 +112,7 @@ public TokenResponse newAccessToken(String refreshToken) { // 프론트에서 Au // Redis의 refresh 토큰과 비교 String key = RT_KEY_PREFIX + userId; String stored = redisService.getValue(key); - if (stored.isEmpty()) { + if (stored == null || stored.isEmpty()) { // 만료/로그아웃 등으로 없는 상태 throw new GeneralException(ErrorStatus.REFRESH_TOKEN_EXPIRED); } @@ -118,7 +128,7 @@ public TokenResponse newAccessToken(String refreshToken) { // 프론트에서 Au // AccessToken만 새로 발급 String newAccess = tokenProvider.createAccessToken(user); - return TokenResponse.of(newAccess, refreshToken); + return AccessTokenResponse.of(newAccess); } /* 로그인 아이디 중복 체크 */ diff --git a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java index 92b255f..b882f75 100644 --- a/src/main/java/vote/vote_be/global/config/SwaggerConfig.java +++ b/src/main/java/vote/vote_be/global/config/SwaggerConfig.java @@ -33,6 +33,7 @@ public OpenAPI voteAPI() { .scheme("bearer") .bearerFormat("JWT")); + return new OpenAPI() .addServersItem(new Server().url(contextPath)) .info(info) diff --git a/src/main/java/vote/vote_be/global/security/jwt/CookieUtil.java b/src/main/java/vote/vote_be/global/security/jwt/CookieUtil.java new file mode 100644 index 0000000..4390903 --- /dev/null +++ b/src/main/java/vote/vote_be/global/security/jwt/CookieUtil.java @@ -0,0 +1,43 @@ +package vote.vote_be.global.security.jwt; +import org.springframework.http.ResponseCookie; + +public final class CookieUtil { + + public static final String REFRESH_COOKIE = "refresh_token"; + + private CookieUtil() {} + + /* 리프레시 토큰 쿠키 생성 */ + public static ResponseCookie buildRefreshCookie( + String value, + long maxAgeSec, + String domain, + boolean secure, + String sameSite + ) { + ResponseCookie.ResponseCookieBuilder builder = ResponseCookie.from(REFRESH_COOKIE, value) + .httpOnly(true) + .path("/") + .maxAge(maxAgeSec); + + if (domain != null && !domain.isBlank()) builder.domain(domain); + if (sameSite != null && !sameSite.isBlank()) builder.sameSite(sameSite); + builder.secure(secure); + + return builder.build(); + } + + /* 리프레시 토큰 쿠키 제거 */ + public static ResponseCookie deleteRefreshCookie(String domain, boolean secure, String sameSite) { + ResponseCookie.ResponseCookieBuilder builder = ResponseCookie.from(REFRESH_COOKIE, "") + .httpOnly(true) + .path("/") + .maxAge(0); + + if (domain != null && !domain.isBlank()) builder.domain(domain); + if (sameSite != null && !sameSite.isBlank()) builder.sameSite(sameSite); + builder.secure(secure); + + return builder.build(); + } +} diff --git a/src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java b/src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java index b7cd6cd..9d6af3c 100644 --- a/src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java +++ b/src/main/java/vote/vote_be/global/security/jwt/JwtAuthenticationFilter.java @@ -31,7 +31,6 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull FilterChain filterChain) throws ServletException, IOException { String token = tokenProvider.resolveToken(request); - if (token != null) { try{ // Authentication 생성 @@ -42,18 +41,18 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, SecurityContextHolder.getContext().setAuthentication(authentication); } } catch (ExpiredJwtException e) { - handleException(response, ErrorStatus.ACCESS_TOKEN_EXPIRED); + handleJwtException(response, ErrorStatus.ACCESS_TOKEN_EXPIRED); return; } catch (SecurityException | MalformedJwtException | UnsupportedJwtException | IllegalArgumentException e) { - handleException(response, ErrorStatus.TOKEN_INVALID); + handleJwtException(response, ErrorStatus.TOKEN_INVALID); return; } } filterChain.doFilter(request, response); } - private void handleException(HttpServletResponse response, ErrorStatus status) throws IOException { + private void handleJwtException(HttpServletResponse response, ErrorStatus status) throws IOException { response.setStatus(status.getHttpStatus().value()); response.setContentType("application/json;charset=UTF-8"); From 47d1b8578af19319b6ce2de6b9f2eb99653a6265 Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Thu, 13 Nov 2025 03:40:29 +0900 Subject: [PATCH 18/26] =?UTF-8?q?refactor:=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=ED=95=B8=EB=93=A4=EB=A7=81=20=EB=A1=9C=EC=A7=81=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20email=20=EC=A4=91=EB=B3=B5=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20request=20=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/auth/controller/AuthController.java | 7 ++++--- .../domain/auth/dto/request/EmailCheckRequest.java | 14 ++++++++++++++ .../vote_be/domain/auth/service/AuthService.java | 12 ++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 src/main/java/vote/vote_be/domain/auth/dto/request/EmailCheckRequest.java diff --git a/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java index cc3f91b..af75415 100644 --- a/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java +++ b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java @@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import vote.vote_be.domain.auth.dto.internal.LoginResult; +import vote.vote_be.domain.auth.dto.request.EmailCheckRequest; import vote.vote_be.domain.auth.dto.request.LoginRequest; import vote.vote_be.domain.auth.dto.request.SignupRequest; import vote.vote_be.domain.auth.dto.response.*; @@ -84,9 +85,9 @@ public ApiResponse checkLoginId(@RequestParam("value") S /* 이메일 중복 체크 */ @Operation(summary = "이메일 중복 체크", description = "available = true면 중복 X") - @GetMapping("/check/email") - public ApiResponse checkEmail(@RequestParam("value") String value) { - return ApiResponse.onSuccess(authService.checkEmail(value)); + @PostMapping("/check/email") + public ApiResponse checkEmail(@RequestBody @Valid EmailCheckRequest request) { + return ApiResponse.onSuccess(authService.checkEmail(request.getValue())); } } diff --git a/src/main/java/vote/vote_be/domain/auth/dto/request/EmailCheckRequest.java b/src/main/java/vote/vote_be/domain/auth/dto/request/EmailCheckRequest.java new file mode 100644 index 0000000..f1b0ee5 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/auth/dto/request/EmailCheckRequest.java @@ -0,0 +1,14 @@ +package vote.vote_be.domain.auth.dto.request; + +import jakarta.persistence.Column; +import jakarta.validation.constraints.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class EmailCheckRequest { + @NotBlank + @Email(message = "이메일 형식이 올바르지 않습니다.") + private String value; +} diff --git a/src/main/java/vote/vote_be/domain/auth/service/AuthService.java b/src/main/java/vote/vote_be/domain/auth/service/AuthService.java index 690aede..92d95e5 100644 --- a/src/main/java/vote/vote_be/domain/auth/service/AuthService.java +++ b/src/main/java/vote/vote_be/domain/auth/service/AuthService.java @@ -34,6 +34,13 @@ public class AuthService { @Transactional public SignupResponse signup(SignupRequest req) { + // 중복 체크(login_id, email) + if (userRepository.existsByLoginId(req.getLoginId())) + throw new GeneralException(ErrorStatus.DUPLICATE_LOGIN_ID); + + if (req.getEmail() != null && userRepository.existsByEmail(req.getEmail())) + throw new GeneralException(ErrorStatus.DUPLICATE_EMAIL); + User user = User.builder() .loginId(req.getLoginId()) .password(passwordEncoder.encode(req.getPassword())) @@ -151,6 +158,11 @@ public TokenValidationResponse isValidAccess(HttpServletRequest request) { // 유효성 검사는 JwtAuthenticationFilter에서 처리 String accessToken = tokenProvider.resolveToken(request); TokenStatus status = tokenProvider.validateToken(accessToken); + + if (status == TokenStatus.MISSING) { + throw new GeneralException(ErrorStatus.TOKEN_INVALID); + } + return TokenValidationResponse.of("Access Token이 유효합니다.", status); } } From 39e4b06f3752d79fce0931f2f6fa5470230d359f Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Sat, 15 Nov 2025 15:43:56 +0900 Subject: [PATCH 19/26] =?UTF-8?q?fix:=20Securiy=20=EB=B0=8F=20=EC=BF=A0?= =?UTF-8?q?=ED=82=A4=20cors=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/auth/controller/AuthController.java | 12 ++++++------ .../vote/vote_be/global/config/SecurityConfig.java | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java index cc3f91b..7793507 100644 --- a/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java +++ b/src/main/java/vote/vote_be/domain/auth/controller/AuthController.java @@ -37,9 +37,9 @@ public ApiResponse login(@RequestBody @Valid LoginRequest request var cookie = CookieUtil.buildRefreshCookie( result.getRefreshToken(), result.getRefreshTtlSec(), - "", - false, - "LAX" + null, + true, + "None" ); response.addHeader("Set-Cookie", cookie.toString()); @@ -52,9 +52,9 @@ public ApiResponse login(@RequestBody @Valid LoginRequest request public ApiResponse logout(HttpServletRequest request, HttpServletResponse response) { var del = CookieUtil.deleteRefreshCookie( - "", - false, - "Lax" + null, + true, + "None" ); response.addHeader("Set-Cookie", del.toString()); diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java index a1dbf2f..fbabc05 100644 --- a/src/main/java/vote/vote_be/global/config/SecurityConfig.java +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -63,11 +63,12 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); - configuration.setAllowedOrigins(List.of("http://localhost:8080","http://localhost:3000")); // 로컬 도메인 허용(나중에 프론트 도메인으로 교체 필요) + configuration.setAllowedOrigins(List.of("http://localhost:8080","http://localhost:3000","https://vote-fe-mu.vercel.app")); // 로컬 도메인 허용(나중에 프론트 도메인으로 교체 필요) configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")); configuration.addAllowedHeader("*"); configuration.setAllowCredentials(true); // 쿠키 인증 정보 허용 configuration.addExposedHeader("Authorization"); + configuration.addExposedHeader("Set-Cookie"); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", configuration); From 1cb61de8565c55e8f42b51a7f1af15e1625e619a Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Mon, 15 Dec 2025 22:03:44 +0900 Subject: [PATCH 20/26] =?UTF-8?q?feat:=20=ED=8C=8C=ED=8A=B8=EC=9E=A5=20?= =?UTF-8?q?=ED=88=AC=ED=91=9C=20=EA=B4=80=EB=A0=A8=20API=EB=93=A4=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 --- .../vote/controller/LeaderVoteController.java | 49 ++++++++++++ .../domain/vote/dto/CandidateComponent.java | 7 ++ .../vote/dto/request/VoteRequestDto.java | 6 ++ .../response/CandidateListResponseDto.java | 7 ++ .../response/VoteResultListResponseDto.java | 15 ++++ .../vote_be/domain/vote/entity/Candidate.java | 27 +++++++ .../vote/vote_be/domain/vote/entity/Vote.java | 31 ++++++++ .../domain/vote/entity/VoteCategory.java | 11 +++ .../vote/repository/CandidateRepository.java | 26 +++++++ .../vote/repository/VoteRepository.java | 20 +++++ .../domain/vote/service/CandidateService.java | 33 ++++++++ .../vote/service/LeaderVoteService.java | 76 +++++++++++++++++++ .../domain/vote/service/VoteService.java | 34 +++++++++ .../apiPayload/code/status/ErrorStatus.java | 6 +- 14 files changed, 347 insertions(+), 1 deletion(-) create mode 100644 src/main/java/vote/vote_be/domain/vote/controller/LeaderVoteController.java create mode 100644 src/main/java/vote/vote_be/domain/vote/dto/CandidateComponent.java create mode 100644 src/main/java/vote/vote_be/domain/vote/dto/request/VoteRequestDto.java create mode 100644 src/main/java/vote/vote_be/domain/vote/dto/response/CandidateListResponseDto.java create mode 100644 src/main/java/vote/vote_be/domain/vote/dto/response/VoteResultListResponseDto.java create mode 100644 src/main/java/vote/vote_be/domain/vote/entity/Candidate.java create mode 100644 src/main/java/vote/vote_be/domain/vote/entity/Vote.java create mode 100644 src/main/java/vote/vote_be/domain/vote/entity/VoteCategory.java create mode 100644 src/main/java/vote/vote_be/domain/vote/repository/CandidateRepository.java create mode 100644 src/main/java/vote/vote_be/domain/vote/repository/VoteRepository.java create mode 100644 src/main/java/vote/vote_be/domain/vote/service/CandidateService.java create mode 100644 src/main/java/vote/vote_be/domain/vote/service/LeaderVoteService.java create mode 100644 src/main/java/vote/vote_be/domain/vote/service/VoteService.java diff --git a/src/main/java/vote/vote_be/domain/vote/controller/LeaderVoteController.java b/src/main/java/vote/vote_be/domain/vote/controller/LeaderVoteController.java new file mode 100644 index 0000000..4efcde4 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/controller/LeaderVoteController.java @@ -0,0 +1,49 @@ +package vote.vote_be.domain.vote.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; +import vote.vote_be.domain.vote.dto.request.VoteRequestDto; +import vote.vote_be.domain.vote.dto.response.CandidateListResponseDto; +import vote.vote_be.domain.vote.dto.response.VoteResultListResponseDto; +import vote.vote_be.domain.vote.service.LeaderVoteService; +import vote.vote_be.global.apiPayload.ApiResponse; +import vote.vote_be.global.security.AuthDetails; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@Tag(name = "파트장 투표관련 API") +public class LeaderVoteController { + + private final LeaderVoteService leaderVoteService; + + @GetMapping("/votes") + @Operation(summary = "파트장 후보자 명단 조회 API", description = "파트장 후보자 명단 조회 시에 사용하는 API입니다.") + public ApiResponse> getCandidateList(@AuthenticationPrincipal AuthDetails authDetails) { + List responseDtos = leaderVoteService.getCandidateList(authDetails.user()); + + return ApiResponse.onSuccess(responseDtos); + } + + @PostMapping("/votes/leader") + @Operation(summary = "파트장 투표 API", description = "파트장 투표 시에 사용하는 API입니다.") + public ApiResponse votePartLeader(@AuthenticationPrincipal AuthDetails authDetails, @RequestBody VoteRequestDto requestDto) { + + leaderVoteService.votePartLeader(authDetails.user(), requestDto); + + return ApiResponse.onSuccess("파트장 투표가 완료되었습니다."); + } + + @GetMapping("/votes/leader-result") + @Operation(summary = "파트장 투표 결과 조회 API", description = "파트장 투표 결과 조회 시에 사용하는 API입니다.") + public ApiResponse getPartLeaderVoteResult(@AuthenticationPrincipal AuthDetails authDetails) { + VoteResultListResponseDto result = leaderVoteService.getPartLeaderVoteResult(authDetails.user()); + + return ApiResponse.onSuccess(result); + } + +} diff --git a/src/main/java/vote/vote_be/domain/vote/dto/CandidateComponent.java b/src/main/java/vote/vote_be/domain/vote/dto/CandidateComponent.java new file mode 100644 index 0000000..b1ef6ab --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/dto/CandidateComponent.java @@ -0,0 +1,7 @@ +package vote.vote_be.domain.vote.dto; + +public record CandidateComponent( + String candidateName, + long voteCount +) { +} diff --git a/src/main/java/vote/vote_be/domain/vote/dto/request/VoteRequestDto.java b/src/main/java/vote/vote_be/domain/vote/dto/request/VoteRequestDto.java new file mode 100644 index 0000000..96b5fc8 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/dto/request/VoteRequestDto.java @@ -0,0 +1,6 @@ +package vote.vote_be.domain.vote.dto.request; + +public record VoteRequestDto( + Long candidateId +) { +} diff --git a/src/main/java/vote/vote_be/domain/vote/dto/response/CandidateListResponseDto.java b/src/main/java/vote/vote_be/domain/vote/dto/response/CandidateListResponseDto.java new file mode 100644 index 0000000..2336878 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/dto/response/CandidateListResponseDto.java @@ -0,0 +1,7 @@ +package vote.vote_be.domain.vote.dto.response; + +public record CandidateListResponseDto( + String candidateName, + Long candidateId +) { +} diff --git a/src/main/java/vote/vote_be/domain/vote/dto/response/VoteResultListResponseDto.java b/src/main/java/vote/vote_be/domain/vote/dto/response/VoteResultListResponseDto.java new file mode 100644 index 0000000..8a066b7 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/dto/response/VoteResultListResponseDto.java @@ -0,0 +1,15 @@ +package vote.vote_be.domain.vote.dto.response; + +import vote.vote_be.domain.vote.dto.CandidateComponent; + +import java.util.List; + +public record VoteResultListResponseDto( + List candidateList, + int totalVoteCount +) { + + public static VoteResultListResponseDto from(List candidateList, int totalVoteCount) { + return new VoteResultListResponseDto(candidateList, totalVoteCount); + } +} diff --git a/src/main/java/vote/vote_be/domain/vote/entity/Candidate.java b/src/main/java/vote/vote_be/domain/vote/entity/Candidate.java new file mode 100644 index 0000000..6e69781 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/entity/Candidate.java @@ -0,0 +1,27 @@ +package vote.vote_be.domain.vote.entity; + +import jakarta.persistence.*; +import lombok.*; +import vote.vote_be.domain.user.entity.Part; +import vote.vote_be.domain.user.entity.Team; +import vote.vote_be.global.entity.BaseEntity; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Candidate extends BaseEntity { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private VoteCategory voteCategory; + + private String name; + + @Enumerated(EnumType.STRING) + private Team team; + +} diff --git a/src/main/java/vote/vote_be/domain/vote/entity/Vote.java b/src/main/java/vote/vote_be/domain/vote/entity/Vote.java new file mode 100644 index 0000000..851dcec --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/entity/Vote.java @@ -0,0 +1,31 @@ +package vote.vote_be.domain.vote.entity; + +import jakarta.persistence.*; +import lombok.*; +import vote.vote_be.domain.user.entity.User; +import vote.vote_be.global.entity.BaseEntity; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@Table(name = "vote", + uniqueConstraints = + @UniqueConstraint(columnNames = {"user_id", "vote_category"})) +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Vote extends BaseEntity { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Column(name = "vote_category", nullable = false) + private VoteCategory voteCategory; + + @ManyToOne + @JoinColumn(name = "candidate_id", nullable = false) + private Candidate candidate; + + @ManyToOne + @JoinColumn(name = "user_id", nullable = false) + private User user; +} diff --git a/src/main/java/vote/vote_be/domain/vote/entity/VoteCategory.java b/src/main/java/vote/vote_be/domain/vote/entity/VoteCategory.java new file mode 100644 index 0000000..5c47daf --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/entity/VoteCategory.java @@ -0,0 +1,11 @@ +package vote.vote_be.domain.vote.entity; + +public enum VoteCategory { + FRONTEND_PART_LEADER("프론트엔드 파트장 투표"), + BACKEND_PART_LEADER("백엔드 파트장 투표"), + DEMODAY("데모데이 투표"); + + public final String description; + + VoteCategory(String description) {this.description = description;} +} diff --git a/src/main/java/vote/vote_be/domain/vote/repository/CandidateRepository.java b/src/main/java/vote/vote_be/domain/vote/repository/CandidateRepository.java new file mode 100644 index 0000000..f498c6d --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/repository/CandidateRepository.java @@ -0,0 +1,26 @@ +package vote.vote_be.domain.vote.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import vote.vote_be.domain.vote.dto.CandidateComponent; +import vote.vote_be.domain.vote.dto.response.CandidateListResponseDto; +import vote.vote_be.domain.vote.entity.Candidate; +import vote.vote_be.domain.vote.entity.VoteCategory; + +import java.util.List; + +public interface CandidateRepository extends JpaRepository { + @Query("select c.name, count(v.id) " + + "from Candidate c " + + "left join Vote v on v.candidate = c " + + "where c.voteCategory = :voteCategory " + + "group by c.id, c.name " + + "order by count (v.id) desc, c.id desc " + + "limit 3 ") + List findVoteResultsByVoteCategory(VoteCategory voteCategory); + + @Query("select c.name, c.id " + + "from Candidate c " + + "where c.voteCategory = :voteCategory ") + List findAllByVoteCategory(VoteCategory voteCategory); +} diff --git a/src/main/java/vote/vote_be/domain/vote/repository/VoteRepository.java b/src/main/java/vote/vote_be/domain/vote/repository/VoteRepository.java new file mode 100644 index 0000000..c22848f --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/repository/VoteRepository.java @@ -0,0 +1,20 @@ +package vote.vote_be.domain.vote.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import vote.vote_be.domain.user.entity.User; +import vote.vote_be.domain.vote.dto.CandidateComponent; +import vote.vote_be.domain.vote.entity.Vote; +import vote.vote_be.domain.vote.entity.VoteCategory; + +import java.util.List; + +public interface VoteRepository extends JpaRepository { + boolean existsByUserAndVoteCategory(User user, VoteCategory voteCategory); + + + @Query("select count(v.id) " + + "from Vote v " + + "where v.voteCategory = :voteCategory") + int countsByVoteCategory(VoteCategory voteCategory); +} diff --git a/src/main/java/vote/vote_be/domain/vote/service/CandidateService.java b/src/main/java/vote/vote_be/domain/vote/service/CandidateService.java new file mode 100644 index 0000000..5b32730 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/service/CandidateService.java @@ -0,0 +1,33 @@ +package vote.vote_be.domain.vote.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import vote.vote_be.domain.vote.dto.CandidateComponent; +import vote.vote_be.domain.vote.dto.response.CandidateListResponseDto; +import vote.vote_be.domain.vote.entity.Candidate; +import vote.vote_be.domain.vote.entity.VoteCategory; +import vote.vote_be.domain.vote.repository.CandidateRepository; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class CandidateService { + + private final CandidateRepository candidateRepository; + + public Candidate getById(Long candidateId) { + return candidateRepository.findById(candidateId) + .orElseThrow(()-> new GeneralException(ErrorStatus.NOT_FOUND_CANDIDATE)); + } + + public List getAllByVoteCategory(VoteCategory voteCategory) { + return candidateRepository.findAllByVoteCategory(voteCategory); + } + + public List getVoteResultByVoteCategory(VoteCategory voteCategory) { + return candidateRepository.findVoteResultsByVoteCategory(voteCategory); + } +} diff --git a/src/main/java/vote/vote_be/domain/vote/service/LeaderVoteService.java b/src/main/java/vote/vote_be/domain/vote/service/LeaderVoteService.java new file mode 100644 index 0000000..72ffdc1 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/service/LeaderVoteService.java @@ -0,0 +1,76 @@ +package vote.vote_be.domain.vote.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import vote.vote_be.domain.user.entity.Part; +import vote.vote_be.domain.user.entity.User; +import vote.vote_be.domain.vote.dto.CandidateComponent; +import vote.vote_be.domain.vote.dto.request.VoteRequestDto; +import vote.vote_be.domain.vote.dto.response.CandidateListResponseDto; +import vote.vote_be.domain.vote.dto.response.VoteResultListResponseDto; +import vote.vote_be.domain.vote.entity.Candidate; +import vote.vote_be.domain.vote.entity.Vote; +import vote.vote_be.domain.vote.entity.VoteCategory; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class LeaderVoteService { + + private final CandidateService candidateService; + private final VoteService voteService; + + @Transactional + public void votePartLeader(User user, VoteRequestDto requestDto) { + Candidate candidate = candidateService.getById(requestDto.candidateId()); + + //파트 확인 + if ( !((user.getPart() == Part.FRONTEND && candidate.getVoteCategory() == VoteCategory.FRONTEND_PART_LEADER) || + (user.getPart() == Part.BACKEND && candidate.getVoteCategory() == VoteCategory.BACKEND_PART_LEADER))){ + throw new GeneralException(ErrorStatus.MISMATCH_PART); + } + + //중복투표인지 확인 + voteService.existAlreadyVote(user, candidate.getVoteCategory()); + + Vote vote = Vote.builder() + .voteCategory(candidate.getVoteCategory()) + .user(user) + .candidate(candidate) + .build(); + + voteService.save(vote); + } + + @Transactional(readOnly = true) + public VoteResultListResponseDto getPartLeaderVoteResult(User user) { + List candidateComponentList; + int totalVotes; + + if (user.getPart() == Part.FRONTEND) { + candidateComponentList = candidateService.getVoteResultByVoteCategory(VoteCategory.FRONTEND_PART_LEADER); + totalVotes = voteService.getTotalVotes(VoteCategory.FRONTEND_PART_LEADER); + } else { + candidateComponentList = candidateService.getVoteResultByVoteCategory(VoteCategory.BACKEND_PART_LEADER); + totalVotes = voteService.getTotalVotes(VoteCategory.BACKEND_PART_LEADER); + } + + return VoteResultListResponseDto.from(candidateComponentList, totalVotes); + } + + @Transactional(readOnly = true) + public List getCandidateList(User user) { + List candidateListResponseDtos; + if (user.getPart() == Part.FRONTEND) { + candidateListResponseDtos = candidateService.getAllByVoteCategory(VoteCategory.FRONTEND_PART_LEADER); + } else { + candidateListResponseDtos = candidateService.getAllByVoteCategory(VoteCategory.BACKEND_PART_LEADER); + } + + return candidateListResponseDtos; + } +} diff --git a/src/main/java/vote/vote_be/domain/vote/service/VoteService.java b/src/main/java/vote/vote_be/domain/vote/service/VoteService.java new file mode 100644 index 0000000..94c6187 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/service/VoteService.java @@ -0,0 +1,34 @@ +package vote.vote_be.domain.vote.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import vote.vote_be.domain.user.entity.User; +import vote.vote_be.domain.vote.dto.CandidateComponent; +import vote.vote_be.domain.vote.entity.Vote; +import vote.vote_be.domain.vote.entity.VoteCategory; +import vote.vote_be.domain.vote.repository.VoteRepository; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class VoteService { + + private final VoteRepository voteRepository; + + public void existAlreadyVote(User user, VoteCategory voteCategory) { + if (voteRepository.existsByUserAndVoteCategory(user, voteCategory)){ + throw new GeneralException(ErrorStatus.DUPLICATE_VOTE); + } + } + + public void save(Vote vote) { + voteRepository.save(vote); + } + + public int getTotalVotes(VoteCategory voteCategory) { + return voteRepository.countsByVoteCategory(voteCategory); + } +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java index 79830e3..f95ad57 100644 --- a/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java +++ b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java @@ -34,7 +34,11 @@ public enum ErrorStatus implements BaseErrorCode { DUPLICATE_EMAIL(HttpStatus.CONFLICT, "AUTH409", "이미 사용 중인 이메일입니다."), DESIGNER_FIELDS_REQUIRED(HttpStatus.BAD_REQUEST, "AUTH400", "디자이너 회원가입에 필요한 정보가 누락되었습니다."), LOGIN_FAIL(HttpStatus.UNAUTHORIZED, "AUTH401", "아이디 또는 비밀번호가 잘못 되었습니다."), - ; + + //Candidate + NOT_FOUND_CANDIDATE(HttpStatus.NOT_FOUND, "CANDIDATE404", "후보자를 찾을 수 없습니다."), + MISMATCH_PART(HttpStatus.BAD_REQUEST, "VOTE400", "자신이 속한 파트의 파트장 투표만 가능합니다."), + DUPLICATE_VOTE(HttpStatus.CONFLICT, "VOTE409", "중복 투표는 불가능합니다."); private final HttpStatus httpStatus; From ac368ea2d22c7d959ce95b41ca14b0bc9a3c6683 Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Mon, 15 Dec 2025 22:09:42 +0900 Subject: [PATCH 21/26] =?UTF-8?q?feat:=20=EC=A0=91=EA=B7=BC=20=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/vote/vote_be/global/config/SecurityConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java index bc2a89c..db15d40 100644 --- a/src/main/java/vote/vote_be/global/config/SecurityConfig.java +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -52,7 +52,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti "/api/swagger-ui/**", "/v3/api-docs/**" ).permitAll() - //.requestMatchers().authenticated() + .requestMatchers( + "/votes/**" + ).authenticated() .anyRequest().permitAll() ); From ea22b8f5926bfd2177d0c88a558b4721cc28448c Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Tue, 16 Dec 2025 23:53:59 +0900 Subject: [PATCH 22/26] =?UTF-8?q?feat:=20=EB=8D=B0=EB=AA=A8=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=20=ED=88=AC=ED=91=9C=20API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DemodayVoteController.java | 51 +++++++++++++++++ .../vote/service/DemodayVoteService.java | 57 +++++++++++++++++++ .../apiPayload/code/status/ErrorStatus.java | 4 +- 3 files changed, 110 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vote/vote_be/domain/vote/controller/DemodayVoteController.java create mode 100644 src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java diff --git a/src/main/java/vote/vote_be/domain/vote/controller/DemodayVoteController.java b/src/main/java/vote/vote_be/domain/vote/controller/DemodayVoteController.java new file mode 100644 index 0000000..6ec4ab4 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/controller/DemodayVoteController.java @@ -0,0 +1,51 @@ +package vote.vote_be.domain.vote.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; +import vote.vote_be.domain.vote.dto.request.VoteRequestDto; +import vote.vote_be.domain.vote.dto.response.CandidateListResponseDto; +import vote.vote_be.domain.vote.dto.response.VoteResultListResponseDto; +import vote.vote_be.domain.vote.service.DemodayVoteService; +import vote.vote_be.global.apiPayload.ApiResponse; +import vote.vote_be.global.security.AuthDetails; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@Tag(name = "데모데이 투표관련 API") +public class DemodayVoteController { + + private final DemodayVoteService demodayVoteService; + + @GetMapping("/votes/demoday") + @Operation(summary = "데모데이 후보(팀) 목록 조회", description = "데모데이 팀 조회 시에 사용하는 API입니다.") + public ApiResponse> getDemodayCandidates( + @AuthenticationPrincipal AuthDetails authDetails + ) { + authDetails.user(); //jwt 인증 용도 + return ApiResponse.onSuccess(demodayVoteService.getDemodayCandidateList()); + } + + @PostMapping("/votes/demoday") + @Operation(summary = "데모데이 투표", description = "데모데이 투표 시에 사용하는 API입니다.") + public ApiResponse voteDemoday( + @AuthenticationPrincipal AuthDetails authDetails, + @RequestBody VoteRequestDto requestDto + ) { + demodayVoteService.voteDemoday(authDetails.user(), requestDto); + return ApiResponse.onSuccess("데모데이 투표가 완료되었습니다."); + } + + @GetMapping("/votes/demoday-result") + @Operation(summary = "데모데이 투표 결과 조회", description = "데모데이 투표 결과 조회 시에 사용하는 API입니다.") + public ApiResponse getDemodayResult( + @AuthenticationPrincipal AuthDetails authDetails + ) { + authDetails.user(); //jwt 인증 용도 + return ApiResponse.onSuccess(demodayVoteService.getDemodayVoteResult()); + } +} diff --git a/src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java b/src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java new file mode 100644 index 0000000..f49eb06 --- /dev/null +++ b/src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java @@ -0,0 +1,57 @@ +package vote.vote_be.domain.vote.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import vote.vote_be.domain.user.entity.User; +import vote.vote_be.domain.vote.dto.CandidateComponent; +import vote.vote_be.domain.vote.dto.request.VoteRequestDto; +import vote.vote_be.domain.vote.dto.response.CandidateListResponseDto; +import vote.vote_be.domain.vote.dto.response.VoteResultListResponseDto; +import vote.vote_be.domain.vote.entity.Candidate; +import vote.vote_be.domain.vote.entity.Vote; +import vote.vote_be.domain.vote.entity.VoteCategory; +import vote.vote_be.global.apiPayload.code.status.ErrorStatus; +import vote.vote_be.global.apiPayload.exception.GeneralException; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class DemodayVoteService { + + private final CandidateService candidateService; + private final VoteService voteService; + + @Transactional(readOnly = true) + public List getDemodayCandidateList() { + return candidateService.getAllByVoteCategory(VoteCategory.DEMODAY); + } + + @Transactional + public void voteDemoday(User user, VoteRequestDto requestDto) { + Candidate candidate = candidateService.getById(requestDto.candidateId()); + + if (candidate.getVoteCategory() != VoteCategory.DEMODAY) { + throw new GeneralException(ErrorStatus.NOT_FOUND_DEMODAY); + } + + voteService.existAlreadyVote(user, VoteCategory.DEMODAY); + + Vote vote = Vote.builder() + .voteCategory(VoteCategory.DEMODAY) + .user(user) + .candidate(candidate) + .build(); + + voteService.save(vote); + } + + @Transactional(readOnly = true) + public VoteResultListResponseDto getDemodayVoteResult() { + List results = candidateService.getVoteResultByVoteCategory(VoteCategory.DEMODAY); + int totalVotes = voteService.getTotalVotes(VoteCategory.DEMODAY); + + return VoteResultListResponseDto.from(results, totalVotes); + } +} diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java index f95ad57..daf8977 100644 --- a/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java +++ b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java @@ -38,8 +38,8 @@ public enum ErrorStatus implements BaseErrorCode { //Candidate NOT_FOUND_CANDIDATE(HttpStatus.NOT_FOUND, "CANDIDATE404", "후보자를 찾을 수 없습니다."), MISMATCH_PART(HttpStatus.BAD_REQUEST, "VOTE400", "자신이 속한 파트의 파트장 투표만 가능합니다."), - DUPLICATE_VOTE(HttpStatus.CONFLICT, "VOTE409", "중복 투표는 불가능합니다."); - + DUPLICATE_VOTE(HttpStatus.CONFLICT, "VOTE409", "중복 투표는 불가능합니다."), + NOT_FOUND_DEMODAY(HttpStatus.NOT_FOUND, "CANDIDATE404", "데모데이 팀을 찾을 수 없습니다."); private final HttpStatus httpStatus; private final String code; From 190b79a6921bd7c34502a02940f7e79d07d312aa Mon Sep 17 00:00:00 2001 From: Junyoung Lee Date: Wed, 17 Dec 2025 00:20:29 +0900 Subject: [PATCH 23/26] =?UTF-8?q?feat:=20=EB=B3=B8=EC=9D=B8=ED=8C=80=20?= =?UTF-8?q?=ED=88=AC=ED=91=9C=20=EC=97=90=EB=9F=AC=ED=95=B8=EB=93=A4?= =?UTF-8?q?=EB=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/vote_be/domain/vote/service/DemodayVoteService.java | 4 ++++ .../vote_be/global/apiPayload/code/status/ErrorStatus.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java b/src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java index f49eb06..bd4dfb9 100644 --- a/src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java +++ b/src/main/java/vote/vote_be/domain/vote/service/DemodayVoteService.java @@ -36,6 +36,10 @@ public void voteDemoday(User user, VoteRequestDto requestDto) { throw new GeneralException(ErrorStatus.NOT_FOUND_DEMODAY); } + if (user.getTeam() == candidate.getTeam()) { + throw new GeneralException(ErrorStatus.CANNOT_VOTE_OWN_TEAM); + } + voteService.existAlreadyVote(user, VoteCategory.DEMODAY); Vote vote = Vote.builder() diff --git a/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java index daf8977..11d9fdd 100644 --- a/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java +++ b/src/main/java/vote/vote_be/global/apiPayload/code/status/ErrorStatus.java @@ -39,7 +39,9 @@ public enum ErrorStatus implements BaseErrorCode { NOT_FOUND_CANDIDATE(HttpStatus.NOT_FOUND, "CANDIDATE404", "후보자를 찾을 수 없습니다."), MISMATCH_PART(HttpStatus.BAD_REQUEST, "VOTE400", "자신이 속한 파트의 파트장 투표만 가능합니다."), DUPLICATE_VOTE(HttpStatus.CONFLICT, "VOTE409", "중복 투표는 불가능합니다."), - NOT_FOUND_DEMODAY(HttpStatus.NOT_FOUND, "CANDIDATE404", "데모데이 팀을 찾을 수 없습니다."); + NOT_FOUND_DEMODAY(HttpStatus.NOT_FOUND, "CANDIDATE404", "데모데이 팀을 찾을 수 없습니다."), + CANNOT_VOTE_OWN_TEAM(HttpStatus.BAD_REQUEST, "VOTE400", "자신이 속한 팀은 투표할 수 없습니다.") + ; private final HttpStatus httpStatus; private final String code; From 8e57b0cfa23ae92ad0a0b4f21f1ef633f2219555 Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Wed, 17 Dec 2025 21:01:25 +0900 Subject: [PATCH 24/26] =?UTF-8?q?fix:=20security=20config=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 --- src/main/java/vote/vote_be/global/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vote/vote_be/global/config/SecurityConfig.java b/src/main/java/vote/vote_be/global/config/SecurityConfig.java index db15d40..7b5a33d 100644 --- a/src/main/java/vote/vote_be/global/config/SecurityConfig.java +++ b/src/main/java/vote/vote_be/global/config/SecurityConfig.java @@ -64,7 +64,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); - configuration.setAllowedOrigins(List.of("http://localhost:8080","http://localhost:3000","https://vote-fe-mu.vercel.app")); // 로컬 도메인 허용(나중에 프론트 도메인으로 교체 필요) + configuration.setAllowedOrigins(List.of("http://localhost:8080","http://localhost:3000","https://next-vote-22nd-eight.vercel.app")); configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")); configuration.addAllowedHeader("*"); configuration.setAllowCredentials(true); // 쿠키 인증 정보 허용 From 3686109013f206f55a03743bea34ff2c36f3d110 Mon Sep 17 00:00:00 2001 From: dldusgh318 Date: Sat, 20 Dec 2025 21:15:20 +0900 Subject: [PATCH 25/26] =?UTF-8?q?docs:=20README=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 439b2a0..6c73410 100644 --- a/README.md +++ b/README.md @@ -1 +1,16 @@ -# vote-BE \ No newline at end of file +# 프백 합동 과제 - Modelly 팀 + +### 1. 서비스 소개 / 시연 + +해당 과제는 CEOS의 차기 파트장이나 데모데이 우수팀을 투표하는 서비스입니다. + +1. 중복 투표는 불가능하다. +2. 데모데이 투표 시 본인이 속한 팀에는 투표할 수 없다. +3. 파트장 투표 시, 자신이 해당하는 파트의 파트장 투표만 가능하다. +4. 로그인을 하지 않은 사람은 투표할 수 없다. + +서비스 링크: https://next-vote-22nd-eight.vercel.app/ + +**ERD** + +Image From 04cfcd20f8fc4f283f0608d3b4c3f3fb1ab83f16 Mon Sep 17 00:00:00 2001 From: Yeonho Lee Date: Sat, 20 Dec 2025 21:17:05 +0900 Subject: [PATCH 26/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c73410..ab673ee 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ **ERD** -Image +image