diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..45cd0ed --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +.idea +*.iml +*.ipr +*.iws +.gradle +.git +*.log +.DS_Store \ No newline at end of file diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000..0215030 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,45 @@ +name: CEOS vote CD - Deploy to EC2 + +on: + workflow_run: + workflows: + - "CEOS vote CI - Build & Push to ECR" + types: + - completed + +jobs: + deploy-to-ec2: + name: Deploy to EC2 + runs-on: self-hosted + env: + AWS_REGION: ${{ secrets.AWS_REGION }} + ECR_REGISTRY: ${{ secrets.ECR_REGISTRY }} + + if: ${{ github.event.workflow_run.conclusion == 'success' }} + + steps: + - name: Deploy on EC2 Instance + run: | + cd ~/ceos-vote || { echo "Directory not found"; exit 1; } + + echo "Creating .env file..." + echo "DB_USERNAME=${{ secrets.DB_USERNAME }}" > .env + echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env + echo "DB_ROOT_PASSWORD=${{ secrets.DB_ROOT_PASSWORD }}" >> .env + echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}" >> .env + echo "JWT_ACCESS_TOKEN_VALIDITY_MS=${{ secrets.JWT_ACCESS_TOKEN_VALIDITY_MS }}" >> .env + echo "JWT_REFRESH_TOKEN_VALIDITY_MS=${{ secrets.JWT_REFRESH_TOKEN_VALIDITY_MS }}" >> .env + + echo "Logging in to ECR..." + aws ecr get-login-password --region ${{ secrets.AWS_REGION }} | docker login --username AWS --password-stdin ${{ secrets.ECR_REGISTRY }} + + echo "Pulling latest image..." + docker compose pull app + + echo "Restarting services..." + docker compose up -d app + + echo "Cleaning up..." + docker image prune -af + + echo "✅ Deployment successful!" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..1b8fa37 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,39 @@ +name: CEOS vote CI - Build & Push to ECR + +on: + push: + branches: + - storix + +jobs: + build-and-push: + name: Build and Push to ECR + runs-on: ubuntu-24.04 + + steps: + - name: Checkout GitHub repository + uses: actions/checkout@v3 + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v2 + with: + aws-region: ${{ secrets.AWS_REGION }} + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + + - name: Login to AWS ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + + - name: Build & push image to ECR + env: + IMAGE_NAME: ${{ secrets.ECR_REGISTRY }}/${{ secrets.ECR_REPOSITORY }} + IMAGE_TAG: ${{ github.sha }} + + run: | + docker build -t $IMAGE_NAME:$IMAGE_TAG . + docker push $IMAGE_NAME:$IMAGE_TAG + + # latest tag + docker tag $IMAGE_NAME:$IMAGE_TAG $IMAGE_NAME:latest + docker push $IMAGE_NAME:latest \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a7b395 --- /dev/null +++ b/.gitignore @@ -0,0 +1,48 @@ +HELP.md +.gradle +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +*.pem +*.env + +### 추가가 필요한 파일은 예외로 추가하기 ### +*.yml +!ci.yml +!cd.yml +*.properties + +!gradle/wrapper/gradle-wrapper.jar +!gradle/wrapper/gradle-wrapper.properties \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1ea972c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +# 1. Build Stage +FROM amazoncorretto:17-alpine-jdk AS builder + +ENV TZ=Asia/Seoul +WORKDIR /app + +COPY gradlew ./gradlew +COPY gradle ./gradle +COPY build.gradle ./ +COPY settings.gradle ./ + +RUN ./gradlew dependencies + +COPY . . + +RUN ./gradlew build -x test --no-daemon + + +# 2. Run Stage +FROM amazoncorretto:17-alpine-jdk + +ENV TZ=Asia/Seoul +WORKDIR /app + +COPY --from=builder /app/build/libs/*.jar app.jar + +ENTRYPOINT ["java","-Duser.timezone=Asia/Seoul","-jar","app.jar"] \ No newline at end of file diff --git a/README.md b/README.md index 7f5d396..8ff627b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,47 @@ -# spring-vote-22nd -ceos back-end 22nd voting service project +# 투표 서비스 합동 과제 - STORIX + +## 1️⃣ 기술 스택 +- Spring Boot & Java 17 +- Redis (ZSET, String) +- MySQL 8.0 +- Flyway : DB 형상 관리 도구. 배포 시마다 테이블이 초기화되는 것을 막고 스키마 변경 이력을 코드단에서 관리 +- GitHub Actions (Self-hosted) : EC2 리소스가 제한적인 프리티어 환경에서, 외부 빌드 서버의 결과물을 안전하고 빠르게 가져오고 배포 스크립트를 단순화하기 위함 +- Swagger (OpenAPI 3.0) + +
+ + +## 2️⃣ 기술 고려 사항 + +### 1. 로그인 & 회원가입 +• Spring Security + JWT 기반 Stateless 인증 방식을 구현 +• RefreshToken은 Redis(Hash)로 캐싱하고 재발급 및 로그아웃 기능을 구현 +• JwtAuthenticationFilter로 토큰이 전달되면 인증 객체를 생성하여 SecurityContext에 저장하도록 구현 + +• 회원 도메인 아이디·이메일에 Unique 제약조건을 적용하여 중복 가입 방지 및 에러 핸들링을 구현 + +### 2. Write-Back 패턴을 통한 성능 최적화 + +- 🚀 **문제 상황: RDB의 I/O 병목 현상** + - 단시간에 많은 write 요청을 가정. 기존의 RDB 방식은 투표가 발생할 때마다 UPDATE 쿼리를 실행하여 Row-Level Lock을 유발하고, 이로 인해 대기 시간이 길어지며 DB 커넥션 풀 고갈 위험 + +- 💡 **해결책: Redis를 활용한 Write-Back 전략 도입** + - 이를 해결하기 위해 인메모리 기반의 Redis를 1차 저장소로 활용하는 Write-Back(Write-Behind) 패턴을 도입 + + - **실시간 집계 (ZSET)**: 후보자별 득표수는 순위 산정이 필요 -> 정렬된 집합 자료구조인 Sorted Set (ZSET)을 사용 + - 중복 투표 방지 (SET): 빠른 조회 가능 + +- ✅ 결과: DB에 직접 쿼리를 날리는 대신 Redis에서 메모리 연산으로 처리 + + +### 3. 데이터 정합성과 영속성 보장 + +- 🚀 **문제 상황: 인메모리 데이터의 휘발성 위험** + - Redis는 메모리에 데이터를 저장하므로, 투표 데이터 유실 위험 + - Redis와 MySQL 간의 정합성 문제 + +- 💡 **해결책 1: Redis AOF 적용**: 데이터 유실 방지를 위해 Redis의 영속성 옵션 중 AOF 방식을 사용 + - AOF 선택 이유: 스냅샷(RDB) 방식은 특정 주기마다 저장하므로 마지막 저장 이후의 데이터가 유실될 수 있음. 반면, AOF는 모든 쓰기 연산 명령어를 로그 파일에 기록하므로, 서버 재시작 시 로그를 재실행하여 데이터 복구하기 때문에 투표 데이터 보존에 더 적합하다고 판단 + +- 💡 **해결책 2: 주기적인 RDB 동기화 (Scheduler)**: Redis <-> RDB간 동기화 로직을 구현 + - 스케줄러 활용: Spring Scheduler를 이용해 일정 주기마다 Redis의 투표 데이터를 읽어 MySQL에 일괄 업데이트 수행 diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..889602b --- /dev/null +++ b/build.gradle @@ -0,0 +1,67 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.7' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.storix' +version = '0.0.1-SNAPSHOT' +description = 'Demo project for Spring Boot' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // Lombok + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + // MySQL + runtimeOnly 'com.mysql:mysql-connector-j' + + // Spring Security + implementation 'org.springframework.boot:spring-boot-starter-security' + testImplementation 'org.springframework.security:spring-security-test' + + // jwt + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.7.0' + + // Redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' + implementation 'org.springframework.boot:spring-boot-starter-cache' + + // Flyway + implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-mysql' + + // validation + implementation 'org.springframework.boot:spring-boot-starter-validation' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d4a6f3c --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'spring-vote-22nd' diff --git a/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java b/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java new file mode 100644 index 0000000..768994e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/SpringVote22ndApplication.java @@ -0,0 +1,15 @@ +package com.storix.spring_vote_22nd; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; + +@EnableScheduling +@SpringBootApplication +public class SpringVote22ndApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringVote22ndApplication.class, args); + } + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/UseCase.java b/src/main/java/com/storix/spring_vote_22nd/UseCase.java new file mode 100644 index 0000000..eb15850 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/UseCase.java @@ -0,0 +1,20 @@ +package com.storix.spring_vote_22nd; + +import org.springframework.core.annotation.AliasFor; +import org.springframework.stereotype.Component; + +import java.lang.annotation.*; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Component +public @interface UseCase { + + /** + * Alias for {@link Component#value}. + */ + @AliasFor(annotation = Component.class) + String value() default ""; + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java new file mode 100644 index 0000000..dcb4fc7 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/AuthController.java @@ -0,0 +1,70 @@ +package com.storix.spring_vote_22nd.api.auth; + +import com.storix.spring_vote_22nd.api.auth.dto.*; +import com.storix.spring_vote_22nd.api.auth.usecase.AuthUseCase; +import com.storix.spring_vote_22nd.api.auth.usecase.AuthorizationUseCase; +import com.storix.spring_vote_22nd.api.auth.usecase.DropDownUseCase; +import com.storix.spring_vote_22nd.api.auth.usecase.LoginUseCase; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/v1/auth") +@RequiredArgsConstructor +public class AuthController { + + private final DropDownUseCase dropDownUseCase; + + private final AuthUseCase authUseCase; + private final LoginUseCase loginUseCase; + + private final AuthorizationUseCase authorizationUseCase; + + // DropDownUseCase + @Operation(summary = "팀 조회용 api 입니다.") + @GetMapping("/user/team") + public ResponseEntity viewTeams() { + return ResponseEntity.ok() + .body(dropDownUseCase.getTeams()); + } + + @Operation(summary = "파트 조회용 api 입니다.") + @GetMapping("/user/part") + public ResponseEntity viewParts() { + return ResponseEntity.ok() + .body(dropDownUseCase.getParts()); + } + + // AuthUseCase + @Operation(summary = "회원 가입용 api 입니다.") + @PostMapping("/user/signup") + public ResponseEntity signup(@RequestBody SignupRequest req){ + return ResponseEntity.ok() + .body(authUseCase.signup(req)); + } + + // LoginUseCase + @Operation(summary = "로그인용 api 입니다.") + @PostMapping("/user/login") + public ResponseEntity login(@RequestBody LoginRequest req){ + return ResponseEntity.ok() + .body(loginUseCase.userLoginWithLoginId(req)); + } + + @Operation(summary = "로그아웃용 api 입니다.") + @PostMapping("/user/logout") + public ResponseEntity logout(@RequestBody LogoutRequest req) { + return ResponseEntity.ok() + .body(loginUseCase.userLogoutWithRefreshToken(req)); + } + + // AuthorizationUseCase + @Operation(summary = "만료된 accessToken을 재발급해주기 위해서 refreshToken을 받는 api 입니다.") + @PostMapping("/refresh_token") + public ResponseEntity reissueAccessToken(@RequestBody RefreshTokenRequest req){ + return ResponseEntity.ok() + .body(authorizationUseCase.getAccessTokenWithRefreshToken(req)); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/AuthorizationResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/AuthorizationResponse.java new file mode 100644 index 0000000..3d82da6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/AuthorizationResponse.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record AuthorizationResponse( + String accessToken +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginRequest.java new file mode 100644 index 0000000..eb62142 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LoginRequest.java @@ -0,0 +1,7 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record LoginRequest( + String loginId, + String password +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LogoutRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LogoutRequest.java new file mode 100644 index 0000000..86eec14 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/LogoutRequest.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record LogoutRequest( + String refreshToken +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/PartResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/PartResponse.java new file mode 100644 index 0000000..61bfa90 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/PartResponse.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.Part; + +public record PartResponse( + String code, + String label +) { + public static PartResponse from(Part part) { + return new PartResponse(part.name(), part.getValue()); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/RefreshTokenRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/RefreshTokenRequest.java new file mode 100644 index 0000000..5c74630 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/RefreshTokenRequest.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record RefreshTokenRequest( + String refreshToken +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupRequest.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupRequest.java new file mode 100644 index 0000000..4fa0fa4 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupRequest.java @@ -0,0 +1,14 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; + +public record SignupRequest( + String loginId, + String password, + String email, + Part part, + String name, + Team team +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupResponse.java new file mode 100644 index 0000000..eeb5835 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/SignupResponse.java @@ -0,0 +1,8 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +public record SignupResponse( + Long userId, + String loginId, + String name +) { +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/TeamResponse.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/TeamResponse.java new file mode 100644 index 0000000..c4c9161 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/dto/TeamResponse.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.api.auth.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.Team; + +public record TeamResponse( + String code, + String label +) { + public static TeamResponse from(Team team) { + return new TeamResponse(team.name(), team.getValue()); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthUseCase.java new file mode 100644 index 0000000..a913cc6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthUseCase.java @@ -0,0 +1,22 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.SignupRequest; +import com.storix.spring_vote_22nd.api.auth.dto.SignupResponse; +import com.storix.spring_vote_22nd.domains.user.service.AuthService; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +@UseCase +@RequiredArgsConstructor +public class AuthUseCase { + + private final AuthService authService; + + public CustomResponse signup(SignupRequest req) { + Long userId = authService.signUp(req); + return CustomResponse.onSuccess(SuccessCode.SUCCESS, + new SignupResponse(userId, req.loginId(), req.name())); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthorizationUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthorizationUseCase.java new file mode 100644 index 0000000..63aebd6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/AuthorizationUseCase.java @@ -0,0 +1,22 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.AuthorizationResponse; +import com.storix.spring_vote_22nd.api.auth.dto.RefreshTokenRequest; +import com.storix.spring_vote_22nd.domains.user.adaptor.TokenGenerateHelper; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +@UseCase +@RequiredArgsConstructor +public class AuthorizationUseCase { + + private final TokenGenerateHelper tokenGenerateHelper; + + public CustomResponse getAccessTokenWithRefreshToken(RefreshTokenRequest req) { + String accessToken = tokenGenerateHelper.reissueAccessTokenWithRefreshToken(req.refreshToken()); + AuthorizationResponse result = new AuthorizationResponse(accessToken); + return CustomResponse.onSuccess(SuccessCode.SUCCESS_REISSUE_ACCESSTOKEN, result); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/DropDownUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/DropDownUseCase.java new file mode 100644 index 0000000..de676e9 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/DropDownUseCase.java @@ -0,0 +1,35 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.PartResponse; +import com.storix.spring_vote_22nd.api.auth.dto.TeamResponse; +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +import java.util.Arrays; +import java.util.List; + +@UseCase +@RequiredArgsConstructor +public class DropDownUseCase { + + public CustomResponse> getTeams() { + List result = Arrays.stream(Team.values()) + .map(TeamResponse::from) + .toList(); + + return CustomResponse.onSuccess(SuccessCode.SUCCESS, result); + } + + public CustomResponse> getParts() { + List result = Arrays.stream(Part.values()) + .map(PartResponse::from) + .toList(); + + return CustomResponse.onSuccess(SuccessCode.SUCCESS, result); + } + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java new file mode 100644 index 0000000..5faf76d --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/auth/usecase/LoginUseCase.java @@ -0,0 +1,32 @@ +package com.storix.spring_vote_22nd.api.auth.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.api.auth.dto.LoginRequest; +import com.storix.spring_vote_22nd.domains.user.dto.LoginWithTokenResponse; +import com.storix.spring_vote_22nd.api.auth.dto.LogoutRequest; +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.domains.user.adaptor.TokenGenerateHelper; +import com.storix.spring_vote_22nd.domains.user.service.LoginService; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +@UseCase +@RequiredArgsConstructor +public class LoginUseCase { + + private final LoginService loginService; + private final TokenGenerateHelper tokenGenerateHelper; + + public CustomResponse userLoginWithLoginId(LoginRequest req) { + loginService.validateUserLogin(req.loginId(), req.password()); + AuthUserDetails userDetails = loginService.loadUserByUsername(req.loginId()); + LoginWithTokenResponse loginWithTokenResponse = tokenGenerateHelper.generateLoginWithToken(userDetails); + return CustomResponse.onSuccess(SuccessCode.VALID_LOGIN, loginWithTokenResponse); + } + + public CustomResponse userLogoutWithRefreshToken(LogoutRequest req) { + loginService.logoutByRefreshToken(req.refreshToken()); + return CustomResponse.onSuccess(SuccessCode.VALID_LOGOUT); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/api/vote/VoteController.java b/src/main/java/com/storix/spring_vote_22nd/api/vote/VoteController.java new file mode 100644 index 0000000..83bd751 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/vote/VoteController.java @@ -0,0 +1,44 @@ +package com.storix.spring_vote_22nd.api.vote; + +import com.storix.spring_vote_22nd.api.vote.usecase.VoteUseCase; +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.dto.VoteRequest; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/v1/votes") +@RequiredArgsConstructor +public class VoteController { + + private final VoteUseCase voteUseCase; + + @Operation(summary = "투표하기 API (로그인 필요)") + @PostMapping + public ResponseEntity vote( + @AuthenticationPrincipal AuthUserDetails authUser, + @RequestBody VoteRequest req + ) { + if (authUser == null) { + return ResponseEntity.status(401).build(); + } + Long userId = Long.parseLong(authUser.getUserId()); + return ResponseEntity.ok(voteUseCase.vote(userId, req)); + } + + @Operation(summary = "파트장 투표 후보 목록 조회 (득표순 정렬)") + @GetMapping("/part-leader") + public ResponseEntity getPartLeaderCandidates() { + return ResponseEntity.ok(voteUseCase.getCandidates(VoteCategory.PART_LEADER)); + } + + @Operation(summary = "데모데이 투표 후보 목록 조회 (득표순 정렬)") + @GetMapping("/demo-day") + public ResponseEntity getDemoDayCandidates() { + return ResponseEntity.ok(voteUseCase.getCandidates(VoteCategory.DEMO_DAY)); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/api/vote/usecase/VoteUseCase.java b/src/main/java/com/storix/spring_vote_22nd/api/vote/usecase/VoteUseCase.java new file mode 100644 index 0000000..b4885b0 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/api/vote/usecase/VoteUseCase.java @@ -0,0 +1,46 @@ +package com.storix.spring_vote_22nd.api.vote.usecase; + +import com.storix.spring_vote_22nd.UseCase; +import com.storix.spring_vote_22nd.domains.vote.adaptor.VoteAdaptor; +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.dto.CandidateResponse; +import com.storix.spring_vote_22nd.domains.vote.dto.VoteRequest; +import com.storix.spring_vote_22nd.domains.vote.service.VoteService; +import com.storix.spring_vote_22nd.global.apiPayload.CustomResponse; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.RequiredArgsConstructor; + +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +@UseCase +@RequiredArgsConstructor +public class VoteUseCase { + + private final VoteService voteService; + private final VoteAdaptor voteAdaptor; + + public CustomResponse vote(Long userId, VoteRequest req) { + voteService.castVote(userId, req.candidateId()); + return CustomResponse.onSuccess(SuccessCode.CREATED, "투표 완료"); + } + + // 후보 목록 조회 (득표순) + public CustomResponse> getCandidates(VoteCategory category) { + List candidates = voteAdaptor.findAllCandidatesByCategory(category); + + List result = candidates.stream() + .map(candidate -> { + // Redis에서 실시간 득표수 조회 + Long votes = voteAdaptor.getVoteCount(category, candidate.getId()); + return CandidateResponse.of(candidate, votes); + }) + // 득표수 기준 내림차순 정렬 + .sorted(Comparator.comparing(CandidateResponse::voteCount).reversed()) + .collect(Collectors.toList()); + + return CustomResponse.onSuccess(SuccessCode.SUCCESS, result); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/AuthUserDetails.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/AuthUserDetails.java new file mode 100644 index 0000000..b02548f --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/AuthUserDetails.java @@ -0,0 +1,34 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.Collections; + +@Getter +@AllArgsConstructor +public class AuthUserDetails implements UserDetails { + + private String userId; + + private String role; + + @Override + public Collection getAuthorities() { + return Collections.singletonList( + new SimpleGrantedAuthority("ROLE_" + role) + ); + } + + @Override + public String getPassword() { return null; } + + @Override + public String getUsername() { return userId; } + +} + diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java new file mode 100644 index 0000000..8ee9e8e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/RefreshTokenAdaptor.java @@ -0,0 +1,33 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import com.storix.spring_vote_22nd.domains.user.repository.RefreshTokenRepository; +import com.storix.spring_vote_22nd.global.apiPayload.exception.InvalidTokenException; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class RefreshTokenAdaptor { + + private final RefreshTokenRepository refreshTokenRepository; + + public Long findUserIdByRefreshToken(String refreshToken) { + Optional refreshTokenInfo = refreshTokenRepository.findByRefreshToken(refreshToken); + if (!refreshTokenInfo.isPresent()) { + throw InvalidTokenException.EXCEPTION; + } + + return Long.valueOf(refreshTokenInfo.get().getId()); + } + + public RefreshToken save(RefreshToken refreshToken) { + return refreshTokenRepository.save(refreshToken); + } + + public void deleteByUserId(Long userId) { + refreshTokenRepository.deleteById(userId.toString()); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java new file mode 100644 index 0000000..e538453 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/TokenGenerateHelper.java @@ -0,0 +1,55 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import com.storix.spring_vote_22nd.domains.user.domain.Role; +import com.storix.spring_vote_22nd.domains.user.dto.LoginWithTokenResponse; +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import com.storix.spring_vote_22nd.global.apiPayload.exception.InvalidTokenException; +import com.storix.spring_vote_22nd.global.security.TokenProvider; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import static com.storix.spring_vote_22nd.global.apiPayload.STORIX_voteStatic.MILLI_TO_SECOND; + +@Service +@RequiredArgsConstructor +public class TokenGenerateHelper { + + private final TokenProvider tokenProvider; + private final RefreshTokenAdaptor refreshTokenAdaptor; + private final UserAdaptor userAdaptor; + + @Transactional + public LoginWithTokenResponse generateLoginWithToken(AuthUserDetails userDetails) { + + String userId = userDetails.getUserId(); + String role = userDetails.getRole(); + + String accessToken = tokenProvider.createAccessToken(userId, role); + String refreshToken = tokenProvider.createRefreshToken(userId); + + // redis 저장 + long ttlSeconds = tokenProvider.getRefreshTokenValidityMs() * MILLI_TO_SECOND; + RefreshToken newRefreshToken = RefreshToken.builder() + .id(userId) + .refreshToken(refreshToken) + .ttl(ttlSeconds) + .build(); + refreshTokenAdaptor.save(newRefreshToken); + + return new LoginWithTokenResponse(accessToken, refreshToken); + } + + @Transactional + public String reissueAccessTokenWithRefreshToken(String refreshToken) { + + if (!tokenProvider.isRefreshToken(refreshToken)) { + throw InvalidTokenException.EXCEPTION; + } + + Long userId = tokenProvider.parseRefreshToken(refreshToken); + Role role = userAdaptor.findUserRoleByUserId(userId); + + return tokenProvider.createAccessToken(String.valueOf(userId), String.valueOf(role)); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java new file mode 100644 index 0000000..01ddd69 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/adaptor/UserAdaptor.java @@ -0,0 +1,80 @@ +package com.storix.spring_vote_22nd.domains.user.adaptor; + +import com.storix.spring_vote_22nd.domains.user.domain.Role; +import com.storix.spring_vote_22nd.domains.user.domain.User; +import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; +import com.storix.spring_vote_22nd.domains.user.repository.UserRepository; +import com.storix.spring_vote_22nd.domains.user.dto.CreateUserCommand; +import com.storix.spring_vote_22nd.global.apiPayload.exception.*; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@Transactional +@RequiredArgsConstructor +public class UserAdaptor { + + private final UserRepository userRepository; + + public Role findUserRoleByUserId(Long userId) { + Optional user = userRepository.findById(userId); + if (user.isPresent()) { + return user.get().getRole(); + } + throw UnknownUserException.EXCEPTION; + } + + public Long findUserIdByLoginId(String loginId){ + Optional user = userRepository.findUserByLoginId(loginId); + if(user.isPresent()){ + return user.get().getId(); + } + throw UnknownUserException.EXCEPTION; + } + + public LoginInfo findUserLoginInfoByLoginI(String loginId){ + Optional user = userRepository.findUserByLoginId(loginId); + if(!user.isPresent()) { + throw LoginException.EXCEPTION; + } + + LoginInfo loginInfo = new LoginInfo(user.get().getLoginId(), user.get().getPassword()); + return loginInfo; + } + + public AuthUserDetails findUserIdAndRoleByLoginId(String loginId){ + Optional user = userRepository.findUserByLoginId(loginId); + if(user.isPresent()){ + return new AuthUserDetails(String.valueOf(user.get().getId()), String.valueOf(user.get().getRole())); + } + throw UnknownUserException.EXCEPTION; + } + + public void validateLoginId(String loginId) { + Optional user = userRepository.findUserByLoginId(loginId); + if (user.isPresent()) { + throw DuplicateLoginIdException.EXCEPTION; + } + } + + public void validateEmail(String email) { + Optional user = userRepository.findUserByEmail(email); + if (user.isPresent()) { + throw DuplicateEmailException.EXCEPTION; + } + } + + public User saveUser(CreateUserCommand cmd) { + User user = userRepository.save(cmd.toEntity()); + return userRepository.save(user); + } + + // User 엔티티 전체 반환 + public User findUserById(Long userId) { + return userRepository.findById(userId) + .orElseThrow(() -> UnknownUserException.EXCEPTION); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Part.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Part.java new file mode 100644 index 0000000..c282a29 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Part.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd.domains.user.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum Part { + FE("프론트엔드"), + BE("백엔드"); + + private String value; +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/RefreshToken.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/RefreshToken.java new file mode 100644 index 0000000..97f363c --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/RefreshToken.java @@ -0,0 +1,28 @@ +package com.storix.spring_vote_22nd.domains.user.domain; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.TimeToLive; +import org.springframework.data.redis.core.index.Indexed; + +@RedisHash(value = "refreshToken") +@Getter +public class RefreshToken { + @Id + private String id; + + @Indexed + private String refreshToken; + + @TimeToLive + private Long ttl; + + @Builder + public RefreshToken(String id, String refreshToken, Long ttl) { + this.id = id; + this.refreshToken = refreshToken; + this.ttl = ttl; + } + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Role.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Role.java new file mode 100644 index 0000000..63595f3 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Role.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd.domains.user.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum Role { + USER("USER"), + ADMIN("ADMIN"); + + private String value; +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java new file mode 100644 index 0000000..b5e6475 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/Team.java @@ -0,0 +1,17 @@ +package com.storix.spring_vote_22nd.domains.user.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum Team { + + DiggIndie("DiggIndie"), + Modelly("Modelly"), + CatchUp("CatchUp"), + Menual("Menual"), + STORIX("STORIX"); + + private String value; +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/User.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/User.java new file mode 100644 index 0000000..b26df79 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/domain/User.java @@ -0,0 +1,39 @@ +package com.storix.spring_vote_22nd.domains.user.domain; + +import jakarta.persistence.*; +import lombok.Builder; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Entity +@Getter +@RequiredArgsConstructor +public class User { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // 계정 정보 + @Column(unique = true) + private String loginId; + private String password; + + @Column(unique = true) + private String email; + + private Part part; + private String name; + private Team team; + + private Role role = Role.USER; + + @Builder + public User(String loginId, String password, String email, Part part, String name, Team team) { + this.loginId = loginId; + this.password = password; + this.email = email; + this.part = part; + this.name = name; + this.team = team; + } + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/CreateUserCommand.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/CreateUserCommand.java new file mode 100644 index 0000000..601690e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/CreateUserCommand.java @@ -0,0 +1,26 @@ +package com.storix.spring_vote_22nd.domains.user.dto; + +import com.storix.spring_vote_22nd.domains.user.domain.User; +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; + +public record CreateUserCommand( + String loginId, + String password, + String email, + Part part, + String name, + Team team +) { + + public User toEntity() { + return new User( + loginId, + password, + email, + part, + name, + team + ); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginInfo.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginInfo.java new file mode 100644 index 0000000..f28d2dd --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginInfo.java @@ -0,0 +1,7 @@ +package com.storix.spring_vote_22nd.domains.user.dto; + +public record LoginInfo( + String loginId, + String password +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginWithTokenResponse.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginWithTokenResponse.java new file mode 100644 index 0000000..d11bbd8 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/dto/LoginWithTokenResponse.java @@ -0,0 +1,7 @@ +package com.storix.spring_vote_22nd.domains.user.dto; + +public record LoginWithTokenResponse( + String accessToken, + String refreshToken +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/RefreshTokenRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/RefreshTokenRepository.java new file mode 100644 index 0000000..97a28fa --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/RefreshTokenRepository.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.domains.user.repository; + +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface RefreshTokenRepository extends CrudRepository { + Optional findByRefreshToken(String refreshToken); +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java new file mode 100644 index 0000000..e2edb51 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/repository/UserRepository.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.domains.user.repository; + +import com.storix.spring_vote_22nd.domains.user.domain.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface UserRepository extends JpaRepository { + Optional findUserByLoginId(String loginId); + + Optional findUserByEmail(String email); +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java new file mode 100644 index 0000000..172dc8e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/AuthService.java @@ -0,0 +1,38 @@ +package com.storix.spring_vote_22nd.domains.user.service; + + +import com.storix.spring_vote_22nd.api.auth.dto.SignupRequest; +import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; +import com.storix.spring_vote_22nd.domains.user.dto.CreateUserCommand; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AuthService { + + private final UserAdaptor userAdaptor; + private final PasswordEncoder passwordEncoder; + + @Transactional + public Long signUp(SignupRequest req) { + userAdaptor.validateLoginId(req.loginId()); + userAdaptor.validateEmail(req.email()); + + CreateUserCommand m = new CreateUserCommand( + req.loginId(), + passwordEncoder.encode(req.password()), + req.email(), + req.part(), + req.name(), + req.team() + ); + + userAdaptor.saveUser(m); + Long userId = userAdaptor.findUserIdByLoginId(req.loginId()); + + return userId; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java new file mode 100644 index 0000000..c79e579 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/user/service/LoginService.java @@ -0,0 +1,43 @@ +package com.storix.spring_vote_22nd.domains.user.service; + +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.domains.user.adaptor.RefreshTokenAdaptor; +import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; +import com.storix.spring_vote_22nd.domains.user.domain.RefreshToken; +import com.storix.spring_vote_22nd.domains.user.dto.LoginInfo; +import com.storix.spring_vote_22nd.global.apiPayload.exception.LoginException; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@Transactional +@RequiredArgsConstructor +public class LoginService implements UserDetailsService { + + private final UserAdaptor userAdaptor; + private final PasswordEncoder passwordEncoder; + private final RefreshTokenAdaptor refreshTokenAdaptor; + + @Override + public AuthUserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + return userAdaptor.findUserIdAndRoleByLoginId(username); + } + + public void validateUserLogin(String loginId, String password) { + LoginInfo artistUserLoginInfo = userAdaptor.findUserLoginInfoByLoginI(loginId); + + if (!passwordEncoder.matches(password, artistUserLoginInfo.password())) { + throw LoginException.EXCEPTION; + } + } + + public void logoutByRefreshToken(String refreshToken) { + Long userId = refreshTokenAdaptor.findUserIdByRefreshToken(refreshToken); + refreshTokenAdaptor.deleteByUserId(userId); + } +} + diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/adaptor/VoteAdaptor.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/adaptor/VoteAdaptor.java new file mode 100644 index 0000000..beafa03 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/adaptor/VoteAdaptor.java @@ -0,0 +1,69 @@ +package com.storix.spring_vote_22nd.domains.vote.adaptor; + +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.repository.CandidateRepository; +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import com.storix.spring_vote_22nd.global.apiPayload.exception.STORIXCodeException; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +@Component +@RequiredArgsConstructor +public class VoteAdaptor { + + private final CandidateRepository candidateRepository; + private final RedisTemplate redisTemplate; + + + public Candidate findCandidateById(Long candidateId) { + return candidateRepository.findById(candidateId) + .orElseThrow(() -> new STORIXCodeException(ErrorCode.NOT_FOUND)); + } + + public List findAllCandidatesByCategory(VoteCategory category) { + return candidateRepository.findAllByCategory(category); + } + + // Redis Key 생성 메서드 + private String getRankKey(VoteCategory category) { + return "vote:rank:" + category.name(); + } + + private String getHistoryKey(Long userId, VoteCategory category) { + return "vote:history:" + category.name() + ":" + userId; + } + + // true: 첫 투표(성공) / false: 중복 + public boolean setVoteHistoryIfAbsent(Long userId, VoteCategory category) { + String key = getHistoryKey(userId, category); + Boolean success = redisTemplate.opsForValue().setIfAbsent(key, "VOTED"); + + if (Boolean.TRUE.equals(success)) { + redisTemplate.expire(key, 24, TimeUnit.HOURS); + } + return Boolean.TRUE.equals(success); + } + + // 득표수 증가 (ZSET) + public void addVoteCount(VoteCategory category, Long candidateId) { + redisTemplate.opsForZSet().incrementScore(getRankKey(category), candidateId.toString(), 1.0); + } + + // 스케줄러용: 해당 카테고리의 모든 후보자 득표수 조회 + public Set> getAllVoteScores(VoteCategory category) { + return redisTemplate.opsForZSet().rangeWithScores(getRankKey(category), 0, -1); + } + + // 특정 후보의 득표수 조회 + public Long getVoteCount(VoteCategory category, Long candidateId) { + Double score = redisTemplate.opsForZSet().score(getRankKey(category), candidateId.toString()); + return score != null ? score.longValue() : 0L; + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/Candidate.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/Candidate.java new file mode 100644 index 0000000..6e31481 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/Candidate.java @@ -0,0 +1,47 @@ +package com.storix.spring_vote_22nd.domains.vote.domain; + +import com.storix.spring_vote_22nd.domains.user.domain.Part; +import com.storix.spring_vote_22nd.domains.user.domain.Team; +import com.storix.spring_vote_22nd.global.model.BaseTimeEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Candidate extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(length = 50, nullable = false) + private String name; // 파트장 후보명 or 팀명 + + // 투표수 + @Column(nullable = false) + private Integer voteCount = 0; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private VoteCategory category; + + @Enumerated(EnumType.STRING) + private Part part; + + @Enumerated(EnumType.STRING) + private Team team; + + public void updateVoteCount(Integer newCount) { + this.voteCount = newCount; + } + + public Candidate(String name, VoteCategory category, Part part, Team team) { + this.name = name; + this.category = category; + this.part = part; + this.team = team; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/VoteCategory.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/VoteCategory.java new file mode 100644 index 0000000..c321855 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/domain/VoteCategory.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd.domains.vote.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum VoteCategory { + PART_LEADER("파트장 투표"), + DEMO_DAY("데모데이 투표"); + + private final String description; +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/CandidateResponse.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/CandidateResponse.java new file mode 100644 index 0000000..90e7b66 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/CandidateResponse.java @@ -0,0 +1,17 @@ +package com.storix.spring_vote_22nd.domains.vote.dto; + +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; + +public record CandidateResponse( + Long id, + String name, + String description, // 파트명 or 팀명 + Long voteCount +) { + public static CandidateResponse of(Candidate candidate, Long voteCount) { + String desc = (candidate.getPart() != null) ? candidate.getPart().getValue() + : (candidate.getTeam() != null) ? candidate.getTeam().getValue() : ""; + + return new CandidateResponse(candidate.getId(), candidate.getName(), desc, voteCount); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/VoteRequest.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/VoteRequest.java new file mode 100644 index 0000000..83d9645 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/dto/VoteRequest.java @@ -0,0 +1,6 @@ +package com.storix.spring_vote_22nd.domains.vote.dto; + +public record VoteRequest( + Long candidateId +) { +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/repository/CandidateRepository.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/repository/CandidateRepository.java new file mode 100644 index 0000000..07d41cd --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/repository/CandidateRepository.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.domains.vote.repository; + +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface CandidateRepository extends JpaRepository { + + List findAllByCategory(VoteCategory category); +} diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteScheduler.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteScheduler.java new file mode 100644 index 0000000..6c6cd08 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteScheduler.java @@ -0,0 +1,56 @@ +package com.storix.spring_vote_22nd.domains.vote.service; + +import com.storix.spring_vote_22nd.domains.vote.adaptor.VoteAdaptor; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.domains.vote.repository.CandidateRepository; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.redis.core.ZSetOperations; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Set; + +@Component +@RequiredArgsConstructor +@Slf4j +public class VoteScheduler { + + private final VoteAdaptor voteAdaptor; + private final CandidateRepository candidateRepository; + + @Scheduled(fixedDelay = 60000) // 1분 + @Transactional + public void syncVoteCountsFromRedis() { + for (VoteCategory category : VoteCategory.values()) { + syncCategoryVotes(category); + } + } + + private void syncCategoryVotes(VoteCategory category) { + // Redis ZSET에서 해당 카테고리의 모든 (후보자ID, 점수) 가져옴 + Set> scores = voteAdaptor.getAllVoteScores(category); + + if (scores == null || scores.isEmpty()) return; + + for (ZSetOperations.TypedTuple tuple : scores) { + try { + Long candidateId = Long.parseLong(tuple.getValue()); // 후보자 id + Double voteCountDouble = tuple.getScore(); // 득표수 + int redisVoteCount = (voteCountDouble != null) ? voteCountDouble.intValue() : 0; + + // db 업데이트 - Dirty Checking + candidateRepository.findById(candidateId).ifPresent(candidate -> { + if (candidate.getVoteCount() != redisVoteCount) { + candidate.updateVoteCount(redisVoteCount); + log.info("[Sync] {} - ID:{}, DB:{}, Redis:{}", + category, candidateId, candidate.getVoteCount(), redisVoteCount); + } + }); + } catch (Exception e) { + log.error("동기화 에러 - Category: {}, Tuple: {}", category, tuple.getValue(), e); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteService.java b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteService.java new file mode 100644 index 0000000..9d68fef --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/domains/vote/service/VoteService.java @@ -0,0 +1,49 @@ +package com.storix.spring_vote_22nd.domains.vote.service; + +import com.storix.spring_vote_22nd.domains.user.adaptor.UserAdaptor; +import com.storix.spring_vote_22nd.domains.user.domain.User; +import com.storix.spring_vote_22nd.domains.vote.adaptor.VoteAdaptor; +import com.storix.spring_vote_22nd.domains.vote.domain.Candidate; +import com.storix.spring_vote_22nd.domains.vote.domain.VoteCategory; +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import com.storix.spring_vote_22nd.global.apiPayload.exception.STORIXCodeException; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class VoteService { + + private final VoteAdaptor voteAdaptor; + private final UserAdaptor userAdaptor; + + @Transactional + public void castVote(Long userId, Long candidateId) { + User user = userAdaptor.findUserById(userId); + Candidate candidate = voteAdaptor.findCandidateById(candidateId); + + validatePermissions(user, candidate); + + boolean isFirstVote = voteAdaptor.setVoteHistoryIfAbsent(userId, candidate.getCategory()); + if (!isFirstVote) { + throw new STORIXCodeException(ErrorCode.ALREADY_VOTED); + } + + voteAdaptor.addVoteCount(candidate.getCategory(), candidateId); + } + + private void validatePermissions(User user, Candidate candidate) { + if (candidate.getCategory() == VoteCategory.PART_LEADER) { + // 파트장 투표: 본인 파트의 후보에게만 투표 가능 + if (user.getPart() != candidate.getPart()) { + throw new STORIXCodeException(ErrorCode.FORBIDDEN); + } + } else if (candidate.getCategory() == VoteCategory.DEMO_DAY) { + // 데모데이 투표: 본인 팀을 제외하고 투표 가능 + if (user.getTeam() == candidate.getTeam()) { + throw new STORIXCodeException(ErrorCode.FORBIDDEN); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/CustomResponse.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/CustomResponse.java new file mode 100644 index 0000000..43e463b --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/CustomResponse.java @@ -0,0 +1,37 @@ +package com.storix.spring_vote_22nd.global.apiPayload; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.storix.spring_vote_22nd.global.apiPayload.code.SuccessCode; +import lombok.Builder; + +import java.time.LocalDateTime; + +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +public record CustomResponse ( + Boolean isSuccess, + String code, + String message, + T result, + LocalDateTime timestamp +) { + + public static CustomResponse onSuccess(SuccessCode successCode) { + return CustomResponse.builder() + .isSuccess(true) + .code(successCode.getCode()) + .message(successCode.getMessage()) + .timestamp(LocalDateTime.now()) + .build(); + } + + public static CustomResponse onSuccess(SuccessCode successCode, T result) { + return CustomResponse.builder() + .isSuccess(true) + .code(successCode.getCode()) + .message(successCode.getMessage()) + .result(result) + .timestamp(LocalDateTime.now()) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/STORIX_voteStatic.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/STORIX_voteStatic.java new file mode 100644 index 0000000..39de43d --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/STORIX_voteStatic.java @@ -0,0 +1,14 @@ +package com.storix.spring_vote_22nd.global.apiPayload; + +public class STORIX_voteStatic { + public static final String AUTH_HEADER = "Authorization"; + public static final String BEARER = "Bearer "; + public static final String TOKEN_TYPE = "type"; + public static final String TOKEN_ROLE = "role"; + public static final String TOKEN_ISSUR = "STORIX_vote"; + public static final String ACCESS_TOKEN = "access_token"; + public static final String REFRESH_TOKEN = "refresh_token"; + + public static final int MILLI_TO_SECOND = 1000; + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java new file mode 100644 index 0000000..bb9e957 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/ErrorCode.java @@ -0,0 +1,42 @@ +package com.storix.spring_vote_22nd.global.apiPayload.code; + +import lombok.Getter; +import lombok.ToString; +import org.springframework.http.HttpStatus; + +@Getter +@ToString +public enum ErrorCode { + + // Common Error + BAD_REQUEST(HttpStatus.BAD_REQUEST, "COMMON_ERROR_001", "잘못된 요청입니다"), + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "COMMON_ERROR_002", "인증이 필요합니다"), + FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON_ERROR_003", "접근이 금지되었습니다"), + NOT_FOUND(HttpStatus.NOT_FOUND, "COMMON_ERROR_004", "요청한 자원을 찾을 수 없습니다"), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON_ERROR_005", "서버 내부 오류가 발생했습니다"), + + // Token error + INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "AUTH_ERROR_001", "잘못된 토큰입니다"), + TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "AUTH_401_001", "토큰이 만료되었습니다. 토큰을 재 발급 해주세요"), + REFRESH_TOKEN_EXPIRED(HttpStatus.FORBIDDEN, "AUTH_403_001", "토큰이 만료되었습니다. 재로그인 해주세요"), + + // Signup error + DUPLICATE_LOGINID_SIGNUP(HttpStatus.BAD_REQUEST, "AUTH_ERROR_003", "중복된 아이디입니다."), + DUPLICATE_EMIAL_SIGNUP(HttpStatus.BAD_REQUEST, "AUTH_ERROR_004", "이미 가입 중인 이메일입니다."), + + // Login error + FAILED_LOGIN(HttpStatus.UNAUTHORIZED, "AUTH_ERROR_002", "회원 아이디와 비밀번호가 일치하지 않습니다. 다시 로그인 해주세요."), + + // Duplicated vote error + ALREADY_VOTED(HttpStatus.BAD_REQUEST, "VOTE_ERROR_001", "이미 투표했습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + ErrorCode(HttpStatus httpStatus, String code, String message) { + this.httpStatus = httpStatus; + this.code = code; + this.message = message; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java new file mode 100644 index 0000000..7177acd --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/code/SuccessCode.java @@ -0,0 +1,31 @@ +package com.storix.spring_vote_22nd.global.apiPayload.code; + +import lombok.Getter; +import lombok.ToString; +import org.springframework.http.HttpStatus; + +@Getter +@ToString +public enum SuccessCode { + + SUCCESS(HttpStatus.OK, "COMMON_SUCCESS_001", "정상적인 요청입니다."), + CREATED(HttpStatus.CREATED, "COMMON_SUCCESS_002", "정상적으로 생성되었습니다."), + + // login success + VALID_LOGIN(HttpStatus.OK, "AUTH_SUCCESS_001", "로그인에 성공했습니다."), + VALID_LOGOUT(HttpStatus.OK, "AUTH_SUCCESS_002", "로그아웃에 성공했습니다."), + + // authorization success + SUCCESS_REISSUE_ACCESSTOKEN(HttpStatus.CREATED, "AUTHORIZATION_SUCCESS_001", "엑세스 토큰 재발급에 성공했습니다."); + + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + SuccessCode(HttpStatus httpStatus, String code, String message) { + this.httpStatus = httpStatus; + this.code = code; + this.message = message; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateEmailException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateEmailException.java new file mode 100644 index 0000000..16b3ad2 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateEmailException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class DuplicateEmailException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new DuplicateEmailException(); + + private DuplicateEmailException() { super(ErrorCode.DUPLICATE_EMIAL_SIGNUP); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateLoginIdException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateLoginIdException.java new file mode 100644 index 0000000..6d689b5 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/DuplicateLoginIdException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class DuplicateLoginIdException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new DuplicateLoginIdException(); + + private DuplicateLoginIdException() { super(ErrorCode.DUPLICATE_LOGINID_SIGNUP); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ErrorResponse.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ErrorResponse.java new file mode 100644 index 0000000..72118bc --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ErrorResponse.java @@ -0,0 +1,20 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import lombok.Builder; + +import java.time.LocalDateTime; + +@Builder +public record ErrorResponse ( + Boolean isSuccess, + String code, + String message, + LocalDateTime timestamp +) { + + public ErrorResponse(ErrorCode errorCode) { + this(false, errorCode.getCode(), errorCode.getMessage(), LocalDateTime.now()); + } + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredRefreshTokenException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredRefreshTokenException.java new file mode 100644 index 0000000..49c4fb1 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredRefreshTokenException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class ExpiredRefreshTokenException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new ExpiredRefreshTokenException(); + + private ExpiredRefreshTokenException() { super(ErrorCode.TOKEN_EXPIRED); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredTokenException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredTokenException.java new file mode 100644 index 0000000..4bea5fb --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/ExpiredTokenException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class ExpiredTokenException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new ExpiredTokenException(); + + private ExpiredTokenException() { super(ErrorCode.TOKEN_EXPIRED); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..c412eb9 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/GlobalExceptionHandler.java @@ -0,0 +1,39 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(STORIXCodeException.class) + public ResponseEntity STORIXCodeExceptionHandler (STORIXCodeException ex) { + + ErrorCode errorCode = ex.getErrorCode(); + log.warn("[STORIX_CODE_EXCEPTION] code={}, message={}", + errorCode.getCode(), errorCode.getMessage(), ex); + ErrorResponse response = new ErrorResponse(errorCode); + + return ResponseEntity + .status(errorCode.getHttpStatus()) + .body(response); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception ex) { + log.error("[UNHANDLED_EXCEPTION] 발생", ex); + + ErrorResponse response = new ErrorResponse(ErrorCode.INTERNAL_SERVER_ERROR); + + return ResponseEntity + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(response); + } + + +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/InvalidTokenException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/InvalidTokenException.java new file mode 100644 index 0000000..6f0a819 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/InvalidTokenException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class InvalidTokenException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new InvalidTokenException(); + + private InvalidTokenException() { super(ErrorCode.INVALID_TOKEN); } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/LoginException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/LoginException.java new file mode 100644 index 0000000..13ef0b6 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/LoginException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class LoginException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new LoginException(); + + private LoginException() { super(ErrorCode.FAILED_LOGIN); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/STORIXCodeException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/STORIXCodeException.java new file mode 100644 index 0000000..8f85bc0 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/STORIXCodeException.java @@ -0,0 +1,12 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class STORIXCodeException extends RuntimeException { + public ErrorCode errorCode; +} + diff --git a/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/UnknownUserException.java b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/UnknownUserException.java new file mode 100644 index 0000000..9afc270 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/apiPayload/exception/UnknownUserException.java @@ -0,0 +1,10 @@ +package com.storix.spring_vote_22nd.global.apiPayload.exception; + +import com.storix.spring_vote_22nd.global.apiPayload.code.ErrorCode; + +public class UnknownUserException extends STORIXCodeException { + + public static final STORIXCodeException EXCEPTION = new UnknownUserException(); + + private UnknownUserException() { super(ErrorCode.NOT_FOUND); } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/RedisCacheConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisCacheConfig.java new file mode 100644 index 0000000..99550eb --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisCacheConfig.java @@ -0,0 +1,38 @@ +package com.storix.spring_vote_22nd.global.config; + +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +import java.time.Duration; + +@EnableCaching +@Configuration +public class RedisCacheConfig { + + @Bean + public CacheManager redisCacheManager(RedisConnectionFactory redisConnectionFactory) { + + RedisCacheConfiguration redisCacheConfiguration + = RedisCacheConfiguration.defaultCacheConfig() + .serializeKeysWith( + RedisSerializationContext.SerializationPair.fromSerializer( + new StringRedisSerializer())) + .serializeValuesWith( + RedisSerializationContext.SerializationPair.fromSerializer( + new GenericJackson2JsonRedisSerializer())) + .entryTtl(Duration.ofHours(3)); + + return RedisCacheManager.RedisCacheManagerBuilder + .fromConnectionFactory(redisConnectionFactory) + .cacheDefaults(redisCacheConfiguration) + .build(); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/RedisConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisConfig.java new file mode 100644 index 0000000..58470de --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/RedisConfig.java @@ -0,0 +1,24 @@ +package com.storix.spring_vote_22nd.global.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory); + + redisTemplate.setKeySerializer(new StringRedisSerializer()); + redisTemplate.setValueSerializer(new StringRedisSerializer()); + redisTemplate.setHashKeySerializer(new StringRedisSerializer()); + redisTemplate.setHashValueSerializer(new StringRedisSerializer()); + + return redisTemplate; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java new file mode 100644 index 0000000..71af353 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/SecurityConfig.java @@ -0,0 +1,84 @@ +package com.storix.spring_vote_22nd.global.config; + +import com.storix.spring_vote_22nd.global.security.JwtAuthenticationFilter; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + + private final JwtAuthenticationFilter jwtFilter; + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + + http + .cors(Customizer.withDefaults()) + .csrf(AbstractHttpConfigurer::disable) + .httpBasic(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + + .authorizeHttpRequests( + (requests) -> requests + .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll() + .requestMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll() + .requestMatchers( + "/api/v1/auth/user/signup", + "/api/v1/auth/user/login", + "/api/v1/auth/refresh_token", + "/api/v1/auth/user/team", + "/api/v1/auth/user/part" + ).permitAll() + .requestMatchers(HttpMethod.GET, "/api/v1/votes/part-leader", "/api/v1/votes/demo-day").permitAll() + .anyRequest().authenticated() + ) + + // JWT 설정 + .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class); + + return http.build(); + } + + @Bean + CorsConfigurationSource corsConfigurationSource() { + + CorsConfiguration config = new CorsConfiguration(); + + config.setAllowedOriginPatterns(List.of( + "http://localhost:3000", + "https://*.vercel.app" + )); + config.setAllowedOriginPatterns(List.of("*")); + config.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); + config.setAllowedHeaders(List.of("*")); + config.setAllowCredentials(true); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", config); + return source; + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/config/SwaggerConfig.java b/src/main/java/com/storix/spring_vote_22nd/global/config/SwaggerConfig.java new file mode 100644 index 0000000..66e33bb --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/config/SwaggerConfig.java @@ -0,0 +1,41 @@ +package com.storix.spring_vote_22nd.global.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI openAPI() { + + Info info = new Info().title("CEOS 투표 서비스 API 명세서") + .description("합동 과제를 위한 Swagger UI입니다.") + .version("0.0.1"); + + String securityScheme = "JWT TOKEN"; + + SecurityRequirement securityRequirement = new SecurityRequirement().addList(securityScheme); + + Components components = new Components() + .addSecuritySchemes(securityScheme, new SecurityScheme() + .name(securityScheme) + .type(SecurityScheme.Type.HTTP) + .scheme("Bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .info(info) + .addServersItem(new Server().url("/")) + .addSecurityItem(securityRequirement) + .components(components); + + } + +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/model/BaseTimeEntity.java b/src/main/java/com/storix/spring_vote_22nd/global/model/BaseTimeEntity.java new file mode 100644 index 0000000..bd6d17e --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/model/BaseTimeEntity.java @@ -0,0 +1,25 @@ +package com.storix.spring_vote_22nd.global.model; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseTimeEntity { + + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column + private LocalDateTime updatedAt; +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java new file mode 100644 index 0000000..c852e3a --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/JwtAuthenticationFilter.java @@ -0,0 +1,58 @@ +package com.storix.spring_vote_22nd.global.security; + +import com.storix.spring_vote_22nd.domains.user.adaptor.AuthUserDetails; +import com.storix.spring_vote_22nd.global.security.dto.AccessTokenInfo; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +import static com.storix.spring_vote_22nd.global.apiPayload.STORIX_voteStatic.BEARER; + +@Component +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final TokenProvider tokenProvider; + + @Override + protected void doFilterInternal( + HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + String token = resolveToken(request); + + if (StringUtils.hasText(token) && tokenProvider.isAccessToken(token)) { + Authentication authentication = getAuthentication(token); + SecurityContextHolder.getContext().setAuthentication(authentication); + } + + filterChain.doFilter(request, response); + } + + public String resolveToken(HttpServletRequest request) { + String bearerToken = request.getHeader(HttpHeaders.AUTHORIZATION); + if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(BEARER)) { + return bearerToken.substring(7); + } + return null; + } + + public Authentication getAuthentication(String token) { + AccessTokenInfo accessTokenInfo = tokenProvider.parseAccessToken(token); + + AuthUserDetails userDetails = new AuthUserDetails( + accessTokenInfo.getUserId().toString(), accessTokenInfo.getRole()); + return new UsernamePasswordAuthenticationToken( + userDetails, "user", userDetails.getAuthorities()); + } +} \ No newline at end of file diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java new file mode 100644 index 0000000..9e9d4df --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/TokenProvider.java @@ -0,0 +1,115 @@ +package com.storix.spring_vote_22nd.global.security; + +import com.storix.spring_vote_22nd.domains.user.adaptor.RefreshTokenAdaptor; +import com.storix.spring_vote_22nd.global.apiPayload.exception.ExpiredRefreshTokenException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.ExpiredTokenException; +import com.storix.spring_vote_22nd.global.apiPayload.exception.InvalidTokenException; +import com.storix.spring_vote_22nd.global.security.dto.AccessTokenInfo; +import io.jsonwebtoken.*; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.security.Key; +import java.util.Date; + +import static com.storix.spring_vote_22nd.global.apiPayload.STORIX_voteStatic.*; + +@Component +@RequiredArgsConstructor +public class TokenProvider implements InitializingBean { + + private final RefreshTokenAdaptor refreshTokenAdaptor; + + @Value("${JWT_SECRET_KEY}") private String secretKey; + @Value("${JWT_ACCESS_TOKEN_VALIDITY_MS}") private long accessTokenValidityMs; + @Value(("${JWT_REFRESH_TOKEN_VALIDITY_MS}")) private long refreshTokenValidityMs; + + + private Key key; + + @Override + public void afterPropertiesSet() { + byte[] keyBytes = Decoders.BASE64.decode(secretKey); + this.key = Keys.hmacShaKeyFor(keyBytes); // HMAC-SHA + } + + private Jws getJws(String token) { + try { + return Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); + } catch (ExpiredJwtException e) { + throw ExpiredTokenException.EXCEPTION; + } catch (Exception e) { + throw InvalidTokenException.EXCEPTION; + } + } + + public String createAccessToken(String userId, String role) { + + final Date issuedAt = new Date(); + final Date expiredAt = new Date(issuedAt.getTime() + accessTokenValidityMs); + + return Jwts.builder() + .setIssuer(TOKEN_ISSUR) + .setSubject(userId) + .claim(TOKEN_TYPE, ACCESS_TOKEN) + .claim(TOKEN_ROLE, role) + .setIssuedAt(issuedAt) + .setExpiration(expiredAt) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + + public String createRefreshToken(String userId) { + + final Date issuedAt = new Date(); + final Date expiredAt = new Date(issuedAt.getTime() + refreshTokenValidityMs); + + return Jwts.builder() + .setIssuer(TOKEN_ISSUR) + .setSubject(userId) + .claim(TOKEN_TYPE, REFRESH_TOKEN) + .setIssuedAt(issuedAt) + .setExpiration(expiredAt) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + + public boolean isAccessToken(String token) { + return getJws(token).getBody().get(TOKEN_TYPE).equals(ACCESS_TOKEN); + } + + public boolean isRefreshToken(String token) { + return getJws(token).getBody().get(TOKEN_TYPE).equals(REFRESH_TOKEN); + } + + public AccessTokenInfo parseAccessToken(String token) { + if (isAccessToken(token)) { + Claims claims = getJws(token).getBody(); + return AccessTokenInfo.builder() + .userId(Long.parseLong(claims.getSubject())) + .role((String) claims.get(TOKEN_ROLE)) + .build(); + } + throw InvalidTokenException.EXCEPTION; + } + + public Long parseRefreshToken(String token) { + try { + if (isRefreshToken(token)) { + Claims claims = getJws(token).getBody(); + return Long.parseLong(claims.getSubject()); + } + } catch (ExpiredTokenException e) { + throw ExpiredRefreshTokenException.EXCEPTION; + } + throw InvalidTokenException.EXCEPTION; + } + + public Long getRefreshTokenValidityMs() { + return refreshTokenValidityMs; + } +} diff --git a/src/main/java/com/storix/spring_vote_22nd/global/security/dto/AccessTokenInfo.java b/src/main/java/com/storix/spring_vote_22nd/global/security/dto/AccessTokenInfo.java new file mode 100644 index 0000000..517eac8 --- /dev/null +++ b/src/main/java/com/storix/spring_vote_22nd/global/security/dto/AccessTokenInfo.java @@ -0,0 +1,11 @@ +package com.storix.spring_vote_22nd.global.security.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class AccessTokenInfo { + private final Long userId; + private final String role; +} \ No newline at end of file diff --git a/src/main/resources/db/migration/V1__init.sql b/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..b9c46c2 --- /dev/null +++ b/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,25 @@ +CREATE TABLE IF NOT EXISTS candidate ( + id BIGINT NOT NULL AUTO_INCREMENT, + name VARCHAR(50) NOT NULL, + category VARCHAR(20) NOT NULL, + part VARCHAR(10), + team VARCHAR(20), + vote_count INTEGER NOT NULL DEFAULT 0, + created_at DATETIME(6), + updated_at DATETIME(6), + PRIMARY KEY (id) +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS user ( + id BIGINT NOT NULL AUTO_INCREMENT, + login_id VARCHAR(255), + password VARCHAR(255), + name VARCHAR(255), + email VARCHAR(255), + role TINYINT, + part TINYINT, + team TINYINT, + PRIMARY KEY (id), + CONSTRAINT UK_email UNIQUE (email), + CONSTRAINT UK_login_id UNIQUE (login_id) +) ENGINE=InnoDB; \ No newline at end of file diff --git a/src/main/resources/db/migration/V2__seed_data.sql b/src/main/resources/db/migration/V2__seed_data.sql new file mode 100644 index 0000000..2748f9d --- /dev/null +++ b/src/main/resources/db/migration/V2__seed_data.sql @@ -0,0 +1,33 @@ +-- 1. 파트장 후보 (FE) : ID 1 ~ 10 +INSERT INTO candidate (id, team, name, part, category, vote_count, created_at, updated_at) VALUES + (1, 'STORIX', '김윤성', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (2, 'STORIX', '이채연', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (3, 'DiggIndie', '백승선', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (4, 'DiggIndie', '조성아', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (5, 'CatchUp', '장자윤', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (6, 'CatchUp', '정성훈', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (7, 'Modelly', '손주완', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (8, 'Modelly', '정윤지', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (9, 'Menual', '신용섭', 'FE', 'PART_LEADER', 0, NOW(), NOW()), + (10, 'Menual', '최무현', 'FE', 'PART_LEADER', 0, NOW(), NOW()); + +-- 2. 파트장 후보 (BE) : ID 11 ~ 20 +INSERT INTO candidate (id, team, name, part, category, vote_count, created_at, updated_at) VALUES + (11, 'STORIX', '서가영', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (12, 'STORIX', '이수아', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (13, 'DiggIndie', '변호영', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (14, 'DiggIndie', '이윤지', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (15, 'CatchUp', '배승식', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (16, 'CatchUp', '신혁', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (17, 'Modelly', '이연호', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (18, 'Modelly', '이준영', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (19, 'Menual', '이지원', 'BE', 'PART_LEADER', 0, NOW(), NOW()), + (20, 'Menual', '변하영', 'BE', 'PART_LEADER', 0, NOW(), NOW()); + +-- 3. 데모데이 팀 후보 : ID 101 ~ 105 (프론트 요청 반영) +INSERT INTO candidate (id, team, name, part, category, vote_count, created_at, updated_at) VALUES + (101, 'STORIX', 'STORIX', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (102, 'DiggIndie', 'DiggIndie', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (103, 'CatchUp', 'CatchUp', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (104, 'Modelly', 'Modelly', NULL, 'DEMO_DAY', 0, NOW(), NOW()), + (105, 'Menual', 'Menual', NULL, 'DEMO_DAY', 0, NOW(), NOW()); \ No newline at end of file diff --git a/src/test/java/com/storix/spring_vote_22nd/SpringVote22ndApplicationTests.java b/src/test/java/com/storix/spring_vote_22nd/SpringVote22ndApplicationTests.java new file mode 100644 index 0000000..1739550 --- /dev/null +++ b/src/test/java/com/storix/spring_vote_22nd/SpringVote22ndApplicationTests.java @@ -0,0 +1,13 @@ +package com.storix.spring_vote_22nd; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SpringVote22ndApplicationTests { + + @Test + void contextLoads() { + } + +}