diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..08c72df --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,13 @@ +## #️⃣ 연관된 이슈 +ex) #이슈번호, #이슈번호 + +--- +## 📝 작업 내용 +이번 PR에서 작업한 내용을 간략히 설명해주세요. + +--- +## 💬 리뷰 요구사항 +리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요. + +--- +## 🔗 레퍼런스 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..4b61eab --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,61 @@ +name: deploy dev server + +on: + push: + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + # 레포지토리 브랜치 체크아웃 + - uses: actions/checkout@v4 + + # JDK 설정 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # gradle 빌드 + - name: Build with Gradle + run: ./gradlew bootJar + + # 이미지 빌드 및 Docker Hub 업로드 + - name: web docker build and push + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + docker build -t ${{ secrets.DOCKER_USERNAME }}/ceos:latest . + docker push ${{ secrets.DOCKER_USERNAME }}/ceos:latest + + # EC2 서버에 접속해 Docker 컨테이너 실행 + - name: executing remote ssh commands + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} # EC2 public DNS + username: ec2-user + key: ${{ secrets.KEY }} # .pem key + script: | + # 원하는 경로로 이동 + mkdir -p /home/ec2-user/app + cd /home/ec2-user/app + + # .env 파일 생성 (필요한 환경 변수 설정) + sudo touch .env + echo "${{ secrets.ENV_VARS }}" | sudo tee .env > /dev/null + + # 기존 컨테이너가 있다면 중지 후 제거 + sudo docker stop app-container || true + sudo docker rm app-container || true + + # Docker 이미지 다운로드 + echo "${{ secrets.DOCKER_PASSWORD }}" | sudo docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos:latest + + # 새로운 Docker 컨테이너 실행 + sudo docker run -d --name app-container --env-file .env -p 80:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..badf06b --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ +.env + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ +.DS_Store +dump.rdb \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..21c0708 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:17 +ARG JAR_FILE=/build/libs/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java","-jar", "/app.jar"] \ No newline at end of file diff --git a/README.md b/README.md index 76efd88..d6e8c80 100644 --- a/README.md +++ b/README.md @@ -1 +1,144 @@ -# spring_vote_20th \ No newline at end of file +# spring_vote_20th +--- +## DB 설계 +**BaseEntity** + - createdAt: 생성 날짜/시간 (LocalDateTime) + - updatedAt: 수정 날짜/시간 (LocalDateTime) + - deletedAt + +**Member** + +- memberId (PK) +- loginId +- password +- email +- name (이름) +- part(ENUM) +- team(ENUM) +- createdAt + +**Part(ENUM)** + +```sql +public enum Part { + FRONT(Arrays.asList("A", "B", "C")), + BACK(Arrays.asList("D", "E", "F")); + + private final List partMembers; +} +``` + +**Team(ENUM)** + +```sql +public enum Team { + PHOTO_GROUND, + ANGEL_BRIDGE, + PEDAL_GENIE, + CAKE_WAY, + COFFEE_DEAL +} +``` + +**Vote (추상클래스)** + +- voteId (PK) +- memberId (FK - 투표한 사용자ID) +- createdAt + +**LeaderVote** + +- part(ENUM) +- partMember(String) + +**TeamVote** + +- team (ENUM) +- editedAt + + +--- +## API 명세서 & 테스트 + + + +### **1) 회원 가입** + +**201 - 회원가입 성공** + +스크린샷 2025-01-06 13 37 40 + +**409 - 아이디 중복 가입 시도하는 경우** + +스크린샷 2025-01-06 13 38 27 + +### **2) 로그인** + +스크린샷 2025-01-06 13 39 42 + +### **3) 회원 프로필 조회** + +스크린샷 2025-01-06 13 42 01 + +### **4) 후보 조회** + +**팀 조회** + +스크린샷 2025-01-06 13 43 39 + +**파트별 조회** + +스크린샷 2025-01-06 13 44 09 + +스크린샷 2025-01-06 13 44 28 + + +### **5) 투표 생성** + +**팀 투표** + +**201 - 생성 성공** + +스크린샷 2025-01-06 13 45 50 + +**400 - 자신의 팀에 투표 시도** + +스크린샷 2025-01-06 13 46 37 + + +**409 - 중복 투표 시도** + +스크린샷 2025-01-06 13 47 05 + + +**파트 리더 투표** + +**201 - 생성 성공** + +스크린샷 2025-01-06 13 49 00 + +**400 - 다른 파트에 투표 시도** + +스크린샷 2025-01-06 13 47 57 + + +**400 - 해당 파트에 속하지 않는 구성원에 투표 시도** + +스크린샷 2025-01-06 13 48 24 + +**409 - 중복 투표 시도** + +스크린샷 2025-01-06 13 49 18 + +### 6) 투표 결과 조회 +**1. 팀 투표 결과 조회** + +스크린샷 2025-01-06 13 50 57 + + +**2. 파트 투표 결과 조회** + +스크린샷 2025-01-06 13 51 21 + + +스크린샷 2025-01-06 13 53 00 diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e3d2212 --- /dev/null +++ b/build.gradle @@ -0,0 +1,53 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.0' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'com.pedalgenie' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + // 검증 의존 + implementation 'org.springframework.boot:spring-boot-starter-validation' + // API 문서 의존 + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // 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' + + // spring security + implementation 'org.springframework.boot:spring-boot-starter-security' + + +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 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..e2847c8 --- /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.11.1-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..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/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 +' "$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=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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, 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" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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..9d21a21 --- /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=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +: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..bfce6e0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'vote' diff --git a/src/main/java/com/pedalgenie/vote/VoteApplication.java b/src/main/java/com/pedalgenie/vote/VoteApplication.java new file mode 100644 index 0000000..2107a65 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/VoteApplication.java @@ -0,0 +1,15 @@ +package com.pedalgenie.vote; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@EnableJpaAuditing +@SpringBootApplication +public class VoteApplication { + + public static void main(String[] args) { + SpringApplication.run(VoteApplication.class, args); + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java new file mode 100644 index 0000000..e0e8be2 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java @@ -0,0 +1,60 @@ +package com.pedalgenie.vote.domain.auth; + +import com.pedalgenie.vote.domain.member.entity.Member; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.ArrayList; +import java.util.Collection; + +@RequiredArgsConstructor +public class CustomUserDetails implements UserDetails { + + private final Member member; + + // 권한 객체 목록을 반환 + @Override + public Collection getAuthorities(){ + // 권한 목록 + Collection authorities = new ArrayList<>(); + // 권한 추가 + authorities.add(new SimpleGrantedAuthority("ROLE_USER")); + return authorities; + } + @Override + public String getPassword(){ + return member.getPassword(); + } + @Override + public String getUsername() { + return member.getLoginId(); // 로그인 아이디 리턴 + } + + // memberId 얻는 메서드 추가 + public Long getMemberId(){ + return member.getMemberId(); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java new file mode 100644 index 0000000..46965f1 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java @@ -0,0 +1,26 @@ +package com.pedalgenie.vote.domain.auth; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final MemberRepository memberRepository; + + public UserDetails loadUserByUsername(final String loginId) throws UsernameNotFoundException{ + final Member member= memberRepository.findByLoginId(loginId) + .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); + + return new CustomUserDetails(member); + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java b/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java new file mode 100644 index 0000000..53a9b48 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java @@ -0,0 +1,64 @@ +package com.pedalgenie.vote.domain.jwt; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + +import java.nio.charset.StandardCharsets; +import java.util.Date; + +import static io.jsonwebtoken.SignatureAlgorithm.HS256; + + +@Component +public class JwtUtil { + + private final SecretKey secretKey; + + public JwtUtil(@Value("${jwt.secret}")final String secret) { +// final String algorithm = HS256.getValue(); + this.secretKey = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8),"HmacSHA256"); + } + + public String createJwt(final String category,final String loginId, Long expiredMs){ + return Jwts.builder() + .claim("category", category) + .claim("loginId", loginId) + .setIssuedAt(new Date(System.currentTimeMillis())) // 발급 시간 + .setExpiration(new Date(System.currentTimeMillis()+ expiredMs)) // 만료 시간 + .signWith(secretKey, HS256) + .compact(); + } + + // 토큰에서 로그인 아이디 추출 메서드 + public String getLoginId(final String token){ + Claims claims= getPayload(token); + return claims.get("loginId", String.class); + } + + // 토큰에서 카테고리(액세스, 리프레시) 추출 메서드 + public String getCategory(final String token){ + Claims claims= getPayload(token); + return claims.get("category", String.class); + } + + // 토큰 만료 검사 메서드 + public boolean isExpired(final String token){ + return getPayload(token) + .getExpiration() + .before(new Date()); + } + + // 토큰 페이로드 메서드 + private Claims getPayload(final String token){ + return Jwts.parserBuilder() + .setSigningKey(secretKey) + .build() + .parseClaimsJws(token) + .getBody(); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/TokenValidator.java b/src/main/java/com/pedalgenie/vote/domain/jwt/TokenValidator.java new file mode 100644 index 0000000..fe34c07 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/TokenValidator.java @@ -0,0 +1,20 @@ +package com.pedalgenie.vote.domain.jwt; + +import io.jsonwebtoken.ExpiredJwtException; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class TokenValidator { + private final JwtUtil jwtUtil; + + // 토큰 만료 여부 확인 + public void validateTokenExpired(final String token){ + try{ + jwtUtil.isExpired(token); + }catch (ExpiredJwtException e){ + throw new IllegalArgumentException(jwtUtil.getCategory(token)+" 토큰 만료"); + } + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java new file mode 100644 index 0000000..4afced7 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java @@ -0,0 +1,107 @@ +package com.pedalgenie.vote.domain.jwt.filter; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.member.dto.LoginRequest; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.util.StreamUtils; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends UsernamePasswordAuthenticationFilter { + + private final AuthenticationManager authenticationManager; + private final JwtUtil jwtUtil; + private final MemberRepository memberRepository; + + @PostConstruct + public void init() { + setAuthenticationManager(authenticationManager); // 명시적으로 AuthenticationManager 설정 + } + + @Override + public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) + throws AuthenticationException { + + LoginRequest loginRequest; + + try { + ObjectMapper objectMapper=new ObjectMapper(); + + // JSON 요청 본문을 읽어 LoginRequestDto 객체로 변환 + ServletInputStream inputStream = request.getInputStream(); + String messageBody = StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8); + loginRequest = objectMapper.readValue(messageBody, LoginRequest.class); + + + // 스프링 시큐리티에서 사용자의 인증 정보(loginId, password)를 검증하기 위해서는 token(dto)에 담아야 함 + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = + new UsernamePasswordAuthenticationToken(loginRequest.loginId(), loginRequest.password()); + + // token에 담은 값들의 검증을 위해 AuthenticationManager로 전달 -> 검증 진행 + return authenticationManager.authenticate(usernamePasswordAuthenticationToken); + + } catch (IOException e) { + throw new RuntimeException("요청 바디 파싱 에러"); + } + } + + // 로그인 성공 시 실행하는 메서드 (JWT 토큰 발급) + @Override + protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response, + final FilterChain filterChain, final Authentication authResult) + throws IOException, ServletException{ + + // CustomUserDetails의 메서드에서 추출한 값 + final String loginId = authResult.getName(); + + // 토큰 생성 + String access = jwtUtil.createJwt("access", loginId,1000L * 60 * 60 * 2); // 2시간 + + // 응답 설정: 헤더 key 값을 access로 설정 + response.setHeader("access", access); + response.setStatus(HttpStatus.OK.value()); + + // 프론트에 넘겨주기 위한 JSON 응답 + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write("{\"result\": \"로그인이 성공적으로 완료되었습니다.\"}"); + + // 시큐리티 컨텍스트 홀더에 저장 + SecurityContextHolder.getContext().setAuthentication(authResult); + + } + + // 로그인 실패 시 + @Override + protected void unsuccessfulAuthentication(HttpServletRequest request,HttpServletResponse response, + AuthenticationException failed) throws IOException, ServletException { + +// super.unsuccessfulAuthentication(request, response, failed); + + // 프론트에 넘겨주기 위한 JSON 응답 + response.setStatus(401); + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write("{\"result\": \"로그인에 실패하였습니다.\"}"); + } + + +} + diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java new file mode 100644 index 0000000..3903cdc --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java @@ -0,0 +1,75 @@ +package com.pedalgenie.vote.domain.jwt.filter; + +import com.pedalgenie.vote.domain.auth.CustomUserDetails; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.jwt.TokenValidator; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@RequiredArgsConstructor +public class JwtValidationFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + private final TokenValidator tokenValidator; + private final MemberRepository memberRepository; + + @Override + protected void doFilterInternal(final HttpServletRequest request, + final HttpServletResponse response, + final FilterChain filterChain) + throws ServletException, IOException{ + + // 헤더에서 access 키에 담긴 토큰을 꺼냄 + String accessToken = request.getHeader("access"); + + // 토큰이 없다면 다음 필터로 넘김 + if(!StringUtils.hasText(accessToken)){ + filterChain.doFilter(request,response); + return; + } + // 토큰 만료 여부 확인, 만료 시 다음 필터로 넘기지 않음 + tokenValidator.validateTokenExpired(accessToken); + + // 인증 정보 저장 + setAuthentication(accessToken); + + filterChain.doFilter(request, response); + + } + + // jwt 토큰 사용해서 사용자 인증, SecurityContext 에 인증 정보 설정 + private void setAuthentication(String accessToken){ + + // 토큰에서 유저 아이디 추출 + String loginId = jwtUtil.getLoginId(accessToken); + + // 유저 디비에서 이름 찾기 + Member member = memberRepository.findByLoginId(loginId) + .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); + + // 해당 유저 정보 로드 + CustomUserDetails userDetails = new CustomUserDetails(member); + + + // 인증 객체 생성(principal, credentials), 비밀번호는 인증 후 더 이상 필요하지 않으므로 null + Authentication authToken = + new UsernamePasswordAuthenticationToken(userDetails,null, userDetails.getAuthorities()); + + // 인증 정보 저장 + SecurityContextHolder.getContext().setAuthentication(authToken); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/controller/AuthController.java b/src/main/java/com/pedalgenie/vote/domain/member/controller/AuthController.java new file mode 100644 index 0000000..6f1ee16 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/controller/AuthController.java @@ -0,0 +1,31 @@ +package com.pedalgenie.vote.domain.member.controller; + +import com.pedalgenie.vote.domain.member.dto.SignUpRequest; +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.service.AuthService; +import com.pedalgenie.vote.global.ResponseTemplate; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/auth") +@RequiredArgsConstructor +public class AuthController { + + private final AuthService memberService; + + @Operation(summary="회원가입") + @PostMapping + public ResponseEntity> signUp(@RequestBody final SignUpRequest request){ + SignUpResponse signUpResponse = memberService.signUp(request); + return ResponseTemplate.createTemplate(HttpStatus.CREATED,true,"회원가입 성공",signUpResponse); + } + + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java b/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java new file mode 100644 index 0000000..2d6c602 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java @@ -0,0 +1,32 @@ +package com.pedalgenie.vote.domain.member.controller; + +import com.pedalgenie.vote.domain.auth.CustomUserDetails; +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.service.MemberService; +import com.pedalgenie.vote.global.ResponseTemplate; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/members") +public class MemberController { + private final MemberService memberService; + + @Operation(summary="회원 정보 조회") + @GetMapping + public ResponseEntity> memberInfo(@AuthenticationPrincipal CustomUserDetails userDetails){ + + Long memberId = userDetails.getMemberId(); + SignUpResponse signUpResponse = memberService.getMemberInfo(memberId); + return ResponseTemplate.createTemplate(HttpStatus.OK,true,"회원 정보 조회 성공", signUpResponse); + } + + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java new file mode 100644 index 0000000..7bd889f --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java @@ -0,0 +1,4 @@ +package com.pedalgenie.vote.domain.member.dto; + +public record LoginRequest(String loginId, String password) { +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpRequest.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpRequest.java new file mode 100644 index 0000000..7c6ed5a --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpRequest.java @@ -0,0 +1,26 @@ +package com.pedalgenie.vote.domain.member.dto; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.member.entity.Team; +import org.springframework.security.crypto.password.PasswordEncoder; + +public record SignUpRequest( + String loginId, + String password, + String email, + String username, + Part part, + Team team +) { + public Member toEntity(PasswordEncoder passwordEncoder){ + return Member.builder() + .loginId(loginId) + .password(passwordEncoder.encode(password)) + .email(email) + .username(username) + .part(part) + .team(team) + .build(); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java new file mode 100644 index 0000000..d1786b3 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java @@ -0,0 +1,18 @@ +package com.pedalgenie.vote.domain.member.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.member.entity.Team; + +@JsonInclude(JsonInclude.Include.NON_NULL) // null인 필드 json에서 제외 +public record SignUpResponse( + String loginId, + String username, + Part part, + Team team +) { + public static SignUpResponse from(Member member){ + return new SignUpResponse(member.getLoginId(),member.getUsername(), member.getPart(), member.getTeam()); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java new file mode 100644 index 0000000..c2cfcec --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java @@ -0,0 +1,49 @@ +package com.pedalgenie.vote.domain.member.entity; + +import com.pedalgenie.vote.global.BaseTimeEntity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Table(name = "member") +public class Member extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="member_id") + private Long memberId; + + @NotNull + @Column(nullable = false, unique = true) + private String loginId; + + @NotNull + private String username; + + @NotNull + private String email; + + @NotNull + private String password; + + @Enumerated(EnumType.STRING) + private Part part; + + @Enumerated(EnumType.STRING) + private Team team; + + @Builder + public Member(String loginId, String username, String email, String password, Part part, Team team) { + this.loginId = loginId; + this.username = username; + this.email = email; + this.password = password; + this.part = part; + this.team = team; + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java new file mode 100644 index 0000000..4d2f901 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java @@ -0,0 +1,18 @@ +package com.pedalgenie.vote.domain.member.entity; + +import java.util.List; + +public enum Part { + FRONT(List.of("강다혜", "권혜인", "김류원", "박지수", "송유선", "윤영준", "이가빈", "이희원", "지민재", "최지원")), + BACK(List.of("김연수", "남승현", "나혜인", "문서영", "임가현", "이한슬", "이채원", "유지민", "황서아", "최서지")); + + private final List members; + + Part(List members) { + this.members = members; + } + public List getMembers() { + return members; + } +} + diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Team.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Team.java new file mode 100644 index 0000000..c6886a1 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Team.java @@ -0,0 +1,9 @@ +package com.pedalgenie.vote.domain.member.entity; + +public enum Team { + PHOTO_GROUND, + ANGEL_BRIDGE, + PEDAL_GENIE, + CAKE_WAY, + COFFEE_DEAL +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java new file mode 100644 index 0000000..8e0e5c8 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java @@ -0,0 +1,17 @@ +package com.pedalgenie.vote.domain.member.repostiory; + +import com.pedalgenie.vote.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +public interface MemberRepository extends JpaRepository { + + boolean existsByLoginId(final String loginId); + boolean existsByEmail(final String email); + +// Optional findByUsername(String username); + + Optional findByLoginId(String loginId); +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/service/AuthService.java b/src/main/java/com/pedalgenie/vote/domain/member/service/AuthService.java new file mode 100644 index 0000000..4c86e7c --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/service/AuthService.java @@ -0,0 +1,45 @@ +package com.pedalgenie.vote.domain.member.service; + +import com.pedalgenie.vote.domain.auth.CustomUserDetailsService; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.member.dto.SignUpRequest; +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +@RequiredArgsConstructor +public class AuthService { + + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + private final CustomUserDetailsService customUserDetailsService; + private final JwtUtil jwtUtil; + + + // 회원 가입 + public SignUpResponse signUp(final SignUpRequest request){ + + // 로그인 아이디 중복 검사 + if(memberRepository.existsByLoginId(request.loginId())){ + throw new CustomException(ErrorCode.ALREADY_REGISTERED_LOGIN_ID); + } + // 이메일 중복 검사 + if(memberRepository.existsByEmail(request.email())){ + throw new CustomException(ErrorCode.ALREADY_REGISTERED_MEMBER_EMAIL); + } + final Member member = request.toEntity(passwordEncoder); + memberRepository.save(member); + + return SignUpResponse.from(member); + + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/service/MemberService.java b/src/main/java/com/pedalgenie/vote/domain/member/service/MemberService.java new file mode 100644 index 0000000..4dac4fe --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/service/MemberService.java @@ -0,0 +1,26 @@ +package com.pedalgenie.vote.domain.member.service; + +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Service +@Transactional(readOnly = true) +@RequiredArgsConstructor +public class MemberService { + private final MemberRepository memberRepository; + + // 회원 조회 메서드 + public SignUpResponse getMemberInfo(Long memberId){ + Member member = memberRepository.findById(memberId) + .orElseThrow(()->new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); + return SignUpResponse.from(member); + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java new file mode 100644 index 0000000..d3cb1f4 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java @@ -0,0 +1,68 @@ +package com.pedalgenie.vote.domain.vote.controller; + +import com.pedalgenie.vote.domain.auth.CustomUserDetails; +import com.pedalgenie.vote.domain.vote.dto.VoteResultDto; +import com.pedalgenie.vote.domain.vote.service.VoteService; +import com.pedalgenie.vote.domain.vote.dto.VoteRequestDto; +import com.pedalgenie.vote.domain.vote.dto.VoteResponseDto; +import com.pedalgenie.vote.global.ResponseTemplate; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@Tag(name = "Vote Controller", description="투표 API \n 생성, 조회 로직을 포함합니다.") +public class VoteController { + private final VoteService voteService; + + // 투표 생성 + @Operation(summary = "투표 생성") + @PostMapping("/votes") + public ResponseEntity> createVote( + @RequestParam String type, + @RequestParam(required = false) String part, + @RequestParam String voted, + @AuthenticationPrincipal CustomUserDetails userDetails + ) { + Long memberId = userDetails.getMemberId(); // 인증 정보로 변경 + + VoteRequestDto requestDto = VoteRequestDto.builder() + .type(type) + .part(part) + .voted(voted) + .build(); + VoteResponseDto voteDto = voteService.createVote(requestDto, memberId); + + return ResponseTemplate.createTemplate(HttpStatus.CREATED, true, "투표 생성 성공", voteDto); + } + + // 후보 조회 + @Operation(summary = "후보 조회") + @GetMapping("/api/votes/candidates") + public ResponseEntity>> getCandidates( + @RequestParam String type, + @RequestParam(required = false) String part + ){ + + List candidateList = voteService.getCandidates(type, part); + return ResponseTemplate.createTemplate(HttpStatus.OK, true, "후보 조회 성공", candidateList); + } + + // 투표 결과 조회 + @Operation(summary = "투표 결과 조회") + @GetMapping("/api/votes/results") + public ResponseEntity>> getResults( + @RequestParam String type, + @RequestParam(required = false) String part + ){ + List resultList = voteService.getResults(type, part); + return ResponseTemplate.createTemplate(HttpStatus.OK, true, "투표 결과 조회 성공", resultList); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteRequestDto.java b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteRequestDto.java new file mode 100644 index 0000000..c183f09 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteRequestDto.java @@ -0,0 +1,25 @@ +package com.pedalgenie.vote.domain.vote.dto; + +import com.pedalgenie.vote.domain.member.entity.Part; +import lombok.Builder; +import lombok.Getter; + +@Getter +public class VoteRequestDto { + private String type; + private Part part; + private String voted; + + @Builder + public VoteRequestDto(String type, String part, String voted) { + this.type = type; + this.voted = voted; + + if (part != null) { + this.part = Part.valueOf(part); + } else { + this.part = null; + } + } +} + diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResponseDto.java b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResponseDto.java new file mode 100644 index 0000000..7d48d55 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResponseDto.java @@ -0,0 +1,11 @@ +package com.pedalgenie.vote.domain.vote.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class VoteResponseDto { + private String voter; // 투표한 사람 이름 + private String voted; // 투표 받은 사람 이름 +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResultDto.java b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResultDto.java new file mode 100644 index 0000000..ea0de3a --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResultDto.java @@ -0,0 +1,14 @@ +package com.pedalgenie.vote.domain.vote.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +public class VoteResultDto { + private String name; + private String team; + private int votes; +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/entity/LeaderVote.java b/src/main/java/com/pedalgenie/vote/domain/vote/entity/LeaderVote.java new file mode 100644 index 0000000..07fbfec --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/entity/LeaderVote.java @@ -0,0 +1,31 @@ +package com.pedalgenie.vote.domain.vote.entity; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class LeaderVote extends Vote{ + @Enumerated(EnumType.STRING) + @NotNull + private Part part; + + @NotNull + private String partMember; + + @Builder + public LeaderVote(Member member, Part part, String partMember){ + super(member); + this.part = part; + this.partMember = partMember; + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/entity/TeamVote.java b/src/main/java/com/pedalgenie/vote/domain/vote/entity/TeamVote.java new file mode 100644 index 0000000..2d2fb99 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/entity/TeamVote.java @@ -0,0 +1,27 @@ +package com.pedalgenie.vote.domain.vote.entity; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Team; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class TeamVote extends Vote{ + @Enumerated(EnumType.STRING) + @NotNull + private Team team; + + @Builder + public TeamVote(Member member, Team team){ + super(member); + this.team = team; + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/entity/Vote.java b/src/main/java/com/pedalgenie/vote/domain/vote/entity/Vote.java new file mode 100644 index 0000000..8fd9be5 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/entity/Vote.java @@ -0,0 +1,28 @@ +package com.pedalgenie.vote.domain.vote.entity; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.global.BaseTimeEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@MappedSuperclass +public abstract class Vote extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "vote_id") + private Long voteId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + protected Vote(Member member) { + this.member = member; + } +} + diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java b/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java new file mode 100644 index 0000000..3555b84 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java @@ -0,0 +1,21 @@ +package com.pedalgenie.vote.domain.vote.repository; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.vote.entity.LeaderVote; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + + +public interface LeaderVoteRepository extends JpaRepository { + boolean existsByMember(Member member); + + @Query("SELECT lv.partMember, COUNT(lv) " + + "FROM LeaderVote lv " + + "WHERE lv.part = :part " + + "GROUP BY lv.partMember") + List countVotesByPart(@Param("part") Part part); +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/repository/TeamVoteRepository.java b/src/main/java/com/pedalgenie/vote/domain/vote/repository/TeamVoteRepository.java new file mode 100644 index 0000000..435c3d0 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/repository/TeamVoteRepository.java @@ -0,0 +1,14 @@ +package com.pedalgenie.vote.domain.vote.repository; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.vote.entity.TeamVote; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface TeamVoteRepository extends JpaRepository { + boolean existsByMember(Member member); + @Query("SELECT t.team, COUNT(t) FROM TeamVote t GROUP BY t.team") + List countVotesByTeam(); +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java b/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java new file mode 100644 index 0000000..9d4842f --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java @@ -0,0 +1,201 @@ +package com.pedalgenie.vote.domain.vote.service; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.member.entity.Team; +import com.pedalgenie.vote.domain.vote.dto.VoteResultDto; +import com.pedalgenie.vote.domain.vote.repository.LeaderVoteRepository; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.domain.vote.dto.VoteRequestDto; +import com.pedalgenie.vote.domain.vote.dto.VoteResponseDto; +import com.pedalgenie.vote.domain.vote.entity.LeaderVote; +import com.pedalgenie.vote.domain.vote.entity.TeamVote; +import com.pedalgenie.vote.domain.vote.repository.TeamVoteRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class VoteService { + private final MemberRepository memberRepository; + private final TeamVoteRepository teamVoteRepository; + private final LeaderVoteRepository leaderVoteRepository; + + // 투표 생성 메서드 + @Transactional + public VoteResponseDto createVote(VoteRequestDto requestDto, Long memberId) { + Member voter = memberRepository.findById(memberId) + .orElseThrow(() -> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); + + if ("leader".equalsIgnoreCase(requestDto.getType())) { + return createLeaderVote(voter, requestDto); + } else if ("team".equalsIgnoreCase(requestDto.getType())) { + return createTeamVote(voter, requestDto); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + private VoteResponseDto createLeaderVote(Member voter, VoteRequestDto requestDto) { + // 유저가 이미 투표한 경우 예외 처리 + boolean hasVoted = leaderVoteRepository.existsByMember(voter); + if (hasVoted) { + throw new CustomException(ErrorCode.ALREADY_VOTED); + } + + Part part = requestDto.getPart(); // 투표받는 파트 + String partMember = requestDto.getVoted(); // 투표받는 후보자 + + // 투표자가 속하지 않은 파트에 투표를 시도하는 경우 예외처리 + if (!voter.getPart().equals(part)) { + throw new CustomException(ErrorCode.CANNOT_VOTE_FOR_ANOTHER_PART); + } + + // 투표받는 후보자가 해당 파트에 속하지 않는 경우 예외처리 + if (!part.getMembers().contains(partMember)) { + throw new CustomException(ErrorCode.NOT_EXISTS_PART_MEMBER); + } + + LeaderVote leaderVote = LeaderVote.builder() + .member(voter) + .part(part) + .partMember(partMember) + .build(); + + leaderVoteRepository.save(leaderVote); + + return VoteResponseDto.builder() + .voter(voter.getUsername()) + .voted(partMember) + .build(); + } + + private VoteResponseDto createTeamVote(Member voter, VoteRequestDto requestDto) { + // 유저가 이미 투표한 경우 예외 처리 + boolean hasVoted = teamVoteRepository.existsByMember(voter); + if (hasVoted) { + throw new CustomException(ErrorCode.ALREADY_VOTED); + } + + String votedTeam = requestDto.getVoted(); // 투표받는 팀 + Team voterTeam = voter.getTeam(); // 투표자가 속한 팀 + + // 자신이 속한 팀에 투표할 경우 예외처리 + if (voterTeam.name().equals(votedTeam)) { + throw new CustomException(ErrorCode.CANNOT_VOTE_FOR_OWN_TEAM); + } + + TeamVote teamVote = TeamVote.builder() + .member(voter) + .team(Team.valueOf(votedTeam)) + .build(); + + teamVoteRepository.save(teamVote); + + return VoteResponseDto.builder() + .voter(voter.getUsername()) + .voted(votedTeam) + .build(); + } + + // 후보 조회 메서드 + public List getCandidates(String type, String part) { + if (type.equalsIgnoreCase("leader")) { + return getPartCandidates(part); + } else if (type.equalsIgnoreCase("team")) { + return getTeamCandidates(); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + // 파트별 후보 조회 메서드 + private List getPartCandidates(String partName) { + if (partName == null || partName.trim().isEmpty()) { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + + if (partName.equalsIgnoreCase("FRONT")) { + return Part.FRONT.getMembers(); + } else if (partName.equalsIgnoreCase("BACK")) { + return Part.BACK.getMembers(); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + // 팀별 후보 조회 메서드 + private List getTeamCandidates(){ + return List.of(Team.PHOTO_GROUND.name(), Team.ANGEL_BRIDGE.name(), Team.PEDAL_GENIE.name(), + Team.CAKE_WAY.name(), Team.COFFEE_DEAL.name()); + } + + // 투표 결과 조회 메서드 + public List getResults(String type, String partName) { + if (type.equalsIgnoreCase("leader")) { + return getPartVoteResults(partName); + } else if (type.equalsIgnoreCase("team")) { + return getTeamVoteResults(); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + // 팀별 결과 조회 메서드 + public List getTeamVoteResults() { + // 모든 팀 조회 + List teams = Arrays.asList(Team.values()); + + // 투표 결과 조회 및 map 생성 + List results = teamVoteRepository.countVotesByTeam(); + Map teamVotesMap = results.stream() + .collect(Collectors.toMap(result -> (Team) result[0], result -> ((Number) result[1]).longValue())); + + // 모든 팀에 대해 결과 생성, 없으면 0표로 처리 + return teams.stream() + .map(team -> VoteResultDto.builder() + .name(team.name()) + .votes(teamVotesMap.getOrDefault(team, 0L).intValue()) + .build()) + .sorted((r1, r2) -> Integer.compare(r2.getVotes(), r1.getVotes())) // 내림차순 정렬 + .collect(Collectors.toList()); + } + + + + // 파트별 결과 조회 메서드 + public List getPartVoteResults(String partName) { + Part part = Part.valueOf(partName.toUpperCase()); + + // 파트별 투표 결과 조회 + List results = leaderVoteRepository.countVotesByPart(part); + + // 투표 결과를 map으로 변환 + Map voteCountMap = results.stream() + .collect(Collectors.toMap( + result -> (String) result[0], // 후보 이름 + result -> ((Number) result[1]).intValue() // 투표 수 + )); + + // 모든 후보에 대해 결과 생성, 없으면 0표로 처리 + return part.getMembers().stream() + .map(member -> VoteResultDto.builder() + .name(member) + .team(part.name()) + .votes(voteCountMap.getOrDefault(member, 0)) + .build()) + .sorted(Comparator.comparingInt(VoteResultDto::getVotes).reversed() + .thenComparing(VoteResultDto::getName)) // 투표 수 내림차순, 이름순 정렬 + .collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/pedalgenie/vote/global/BaseTimeEntity.java b/src/main/java/com/pedalgenie/vote/global/BaseTimeEntity.java new file mode 100644 index 0000000..4317c3c --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/BaseTimeEntity.java @@ -0,0 +1,27 @@ +package com.pedalgenie.vote.global; + +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +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 +@SuperBuilder +@NoArgsConstructor (access = AccessLevel.PROTECTED) +@EntityListeners(AuditingEntityListener.class) + +public abstract class BaseTimeEntity { + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime modifiedAt; +} diff --git a/src/main/java/com/pedalgenie/vote/global/ResponseTemplate.java b/src/main/java/com/pedalgenie/vote/global/ResponseTemplate.java new file mode 100644 index 0000000..b1b85a1 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/ResponseTemplate.java @@ -0,0 +1,28 @@ +package com.pedalgenie.vote.global; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Builder; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +@JsonInclude(JsonInclude.Include.NON_NULL) // null인 필드는 제외 +@Builder +public class ResponseTemplate { + public int status; + public boolean success; + public String message; + public T data; + + public static ResponseEntity> createTemplate(HttpStatus status, boolean success, String message, T data) { + ResponseTemplate responseTemplate = ResponseTemplate.builder() + .status(status.value()) + .success(success) + .message(message) + .data(data) + .build(); + + return ResponseEntity + .status(status) + .body(responseTemplate); + } +} diff --git a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java new file mode 100644 index 0000000..96e9955 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java @@ -0,0 +1,116 @@ +package com.pedalgenie.vote.global.config; + +import com.pedalgenie.vote.domain.jwt.filter.JwtAuthenticationFilter; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.jwt.filter.JwtValidationFilter; +import com.pedalgenie.vote.domain.jwt.TokenValidator; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +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.configuration.WebSecurityCustomizer; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configurers.HttpBasicConfigurer; +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.Arrays; +import java.util.List; + +import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + private final AuthenticationConfiguration authenticationConfiguration; + private final JwtUtil jwtUtil; + private final TokenValidator tokenValidator; + private final MemberRepository memberRepository; + + // 허용된 URI 목록 + private static final List ALLOWED_URIS = Arrays.asList( + "/swagger-ui/index.html", + "/swagger-ui.html", + "/swagger-ui/**", + "/v3/api-docs/**", + "/swagger-resources/**", + "/webjars/**", + "/api/**", + "http://localhost:3000/**" + ); + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ + + http + .cors(cors -> cors.configurationSource(corsConfigurationSource())) + .csrf(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .httpBasic(HttpBasicConfigurer::disable); + + http + // 접근 허용된 URI + .authorizeHttpRequests(auth -> auth + .requestMatchers(ALLOWED_URIS.toArray(new String[0])).permitAll() + .anyRequest().authenticated()); + + // AuthenticationManager 생성 + AuthenticationManager authenticationManager = authenticationManager(authenticationConfiguration); + + // JwtAuthenticationFilter 설정 + JwtAuthenticationFilter jwtAuthenticationFilter = new JwtAuthenticationFilter(authenticationManager, jwtUtil,memberRepository); + jwtAuthenticationFilter.setFilterProcessesUrl("/api/login"); // 로그인 URL 설정 + + // 필터 추가 + http + .addFilterBefore(new JwtValidationFilter(jwtUtil, tokenValidator,memberRepository), JwtAuthenticationFilter.class) + .addFilterAt(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); + + http + .sessionManagement((session)->session.sessionCreationPolicy(STATELESS)); + + return http.build(); + } + + + protected CorsConfigurationSource corsConfigurationSource() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", getDefaultCorsConfiguration()); + return source; + } + + private CorsConfiguration getDefaultCorsConfiguration() { + CorsConfiguration config = new CorsConfiguration(); + config.addAllowedOrigin("http://localhost:3000"); + config.addAllowedOrigin("http://localhost:8080"); + // 프론트 배포 url 추가 필요 + config.addAllowedMethod("*"); + config.addAllowedHeader("*"); + config.setAllowCredentials(true); + config.setMaxAge(3600L); + config.addExposedHeader("access"); // 헤더 추가 + return config; + } + + // AuthenticationManager 빈 등록 + @Bean + public AuthenticationManager authenticationManager(AuthenticationConfiguration configuration) throws Exception { + return configuration.getAuthenticationManager(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/com/pedalgenie/vote/global/config/SwaggerConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SwaggerConfig.java new file mode 100644 index 0000000..d764e65 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/config/SwaggerConfig.java @@ -0,0 +1,24 @@ +package com.pedalgenie.vote.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 org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .components(new Components()) + .info(apiInfo()); + } + + private Info apiInfo() { + return new Info() + .title("PedalGenie API") + .description("PedalGenie API Doc") + .version("1.0.0"); + } +} \ No newline at end of file diff --git a/src/main/java/com/pedalgenie/vote/global/exception/CustomException.java b/src/main/java/com/pedalgenie/vote/global/exception/CustomException.java new file mode 100644 index 0000000..0e5d13c --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/exception/CustomException.java @@ -0,0 +1,12 @@ +package com.pedalgenie.vote.global.exception; +import lombok.Getter; + +@Getter +public class CustomException extends RuntimeException { + private final ErrorCode errorCode; + + public CustomException(ErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } +} diff --git a/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java new file mode 100644 index 0000000..36b9f79 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java @@ -0,0 +1,48 @@ +package com.pedalgenie.vote.global.exception; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ErrorCode { + // 400 + BAD_REQUEST(HttpStatus.BAD_REQUEST, 400, "잘못된 요청입니다."), + PASSWORD_MISMATCH(HttpStatus.BAD_REQUEST, 400, "비밀번호가 일치하지 않습니다."), + NOT_EXISTS_PART_MEMBER(HttpStatus.BAD_REQUEST, 400, "해당 파트의 구성원이 아닙니다."), + CANNOT_VOTE_FOR_ANOTHER_PART(HttpStatus.BAD_REQUEST, 400, "다른 파트의 후보를 투표할 수 없습니다."), + CANNOT_VOTE_FOR_OWN_TEAM(HttpStatus.BAD_REQUEST, 400, "자신의 팀을 투표할 수 없습니다."), + + // 401 + AUTHENTICATION_FAILED(HttpStatus.UNAUTHORIZED, 401, "인증에 실패했습니다."), + TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, 401, "토큰이 만료되었습니다."), + NOT_VALID_TOKEN(HttpStatus.UNAUTHORIZED, 401, "토큰이 유효하지 않습니다."), + NOT_EXISTS_AUTHORIZATION(HttpStatus.UNAUTHORIZED, 401, "Authorization 헤더가 비어 있습니다."), + NOT_VALID_BEARER_GRANT_TYPE(HttpStatus.UNAUTHORIZED, 401, "인증 타입이 Bearer 타입이 아닙니다."), + REFRESH_TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, 401, "refresh token이 존재하지 않습니다."), + REFRESH_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, 401, "refresh token이 만료되었습니다."), + NOT_ACCESS_TOKEN_TYPE(HttpStatus.UNAUTHORIZED, 401, "해당 토큰은 ACCESS TOKEN이 아닙니다."), + + // 403 + NO_PERMISSION(HttpStatus.FORBIDDEN, 403, "권한이 없습니다."), + FORBIDDEN_ROLE(HttpStatus.FORBIDDEN, 403, "허용되지 않은 역할을 가진 유저의 요청입니다."), + + // 404 + NOT_EXISTS_MEMBER_ID(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 아이디입니다."), + NOT_EXISTS_MEMBER_NAME(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 이름입니다."), + NOT_EXISTS_MEMBER_EMAIL(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 이메일입니다."), + + + // 409 + ALREADY_REGISTERED_MEMBER_EMAIL(HttpStatus.CONFLICT, 409, "이미 가입된 이메일입니다."), + ALREADY_REGISTERED_LOGIN_ID(HttpStatus.CONFLICT,409,"이미 가입된 아이디입니다."), + ALREADY_VOTED(HttpStatus.CONFLICT, 409, "이미 투표한 유저의 요청입니다."), + + // 500 + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 500, "서버 오류가 발생했습니다."); + + private final HttpStatus httpStatus; + private final int code; + private final String message; +} \ No newline at end of file diff --git a/src/main/java/com/pedalgenie/vote/global/exception/GlobalExceptionHandler.java b/src/main/java/com/pedalgenie/vote/global/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..008a160 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/exception/GlobalExceptionHandler.java @@ -0,0 +1,36 @@ +package com.pedalgenie.vote.global.exception; + +import com.pedalgenie.vote.global.ResponseTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(CustomException.class) + public ResponseEntity> handleCustomException(CustomException exception) { + ErrorCode errorCode = exception.getErrorCode(); + + return ResponseTemplate.createTemplate( + errorCode.getHttpStatus(), + false, + errorCode.getMessage(), + null + ); + } + + // 정의한 예외 외에는 500 서버 에러처리 + @ExceptionHandler(Exception.class) + public ResponseEntity> handleGeneralException(Exception ex) { + // 로그 출력 + ex.printStackTrace(); + + return ResponseTemplate.createTemplate( + HttpStatus.INTERNAL_SERVER_ERROR, + false, + "서버 오류가 발생했습니다..", + null + ); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..0ed83d7 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,24 @@ +spring: + config: + import: optional:file:.env[.properties] + datasource: + url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 + username: ${DB_USER} + password: ${DB_PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver + jpa: + hibernate: + ddl-auto: update + properties: + show-sql: true + format_sql: true + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + dialect: org.hibernate.dialect.MySQL8Dialect # 이 항목 추가 +jwt: + secret: ${JWT} + +#----필요시 사용------ +#redis: +# host: ${REDIS_HOST} +# port: ${REDIS_PORT} diff --git a/src/test/java/com/pedalgenie/vote/TestController.java b/src/test/java/com/pedalgenie/vote/TestController.java new file mode 100644 index 0000000..c8fb377 --- /dev/null +++ b/src/test/java/com/pedalgenie/vote/TestController.java @@ -0,0 +1,12 @@ +package com.pedalgenie.vote; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestController { + + @GetMapping("/test") + public String testPage() { + return "git hub actions CI/CD 테스트, ec2 도커 설치 후 버전"; + } +} diff --git a/src/test/java/com/pedalgenie/vote/VoteApplicationTests.java b/src/test/java/com/pedalgenie/vote/VoteApplicationTests.java new file mode 100644 index 0000000..ee3102f --- /dev/null +++ b/src/test/java/com/pedalgenie/vote/VoteApplicationTests.java @@ -0,0 +1,13 @@ +package com.pedalgenie.vote; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VoteApplicationTests { + + @Test + void contextLoads() { + } + +}