diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..c62891b --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,65 @@ +name: Deploy Development Server + +## develop 브랜치에 push가 되면 실행됩니다 +on: + push: + branches: [ "master" ] + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + steps: + + - name: checkout + uses: actions/checkout@v3 + + ## 여러분이 사용하는 버전을 사용하세요 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + ## gradle build + - name: Build with Gradle + run: | + chmod +x ./gradlew + ./gradlew bootJar + + + ## 웹 이미지 빌드 및 도커허브에 push + - name: web docker build and push + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + docker build -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }} . + docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }} + + - name: executing remote ssh commands using password + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} + username: ubuntu + key: ${{ secrets.KEY }} + script: | + + ## 여러분이 원하는 경로로 이동합니다. + cd /home/ubuntu/ + + ## .env 파일을 생성합니다. + sudo touch .env + echo "${{ secrets.ENV_VARS }}" | sudo tee .env > /dev/null + cat .env + source .env + ## docker-compose.yaml 파일을 생성합니다. + sudo touch docker-compose.yaml + echo -e "${{ secrets.DOCKER_COMPOSE }}" | sudo tee docker-compose.yaml > /dev/null + + ## docker-compose를 실행합니다. + sudo chmod 666 /var/run/docker.sock + sudo docker rm -f $(docker ps -qa) + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }} + docker-compose -f docker-compose.yaml --env-file ./.env up -d + docker image prune -f \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d0e3ef5 --- /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/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +.env +.env.prod 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..c15aeb4 100644 --- a/README.md +++ b/README.md @@ -1 +1,48 @@ -# spring_vote_20th \ No newline at end of file +# spring_vote_20th +http://43.200.25.35:8080/swagger-ui/index.html +## ERD +![image](https://github.com/user-attachments/assets/50231b13-ebb9-462c-b70b-75c93e553f27) +![image](https://github.com/user-attachments/assets/8163a159-8fe8-414e-b9b0-dcda4a305250) +![image](https://github.com/user-attachments/assets/cb010888-c7ed-41c6-8508-4a54c8ec0f5b) + + +## API 명세서 +![image](https://github.com/user-attachments/assets/fe0377d9-743d-4575-8a85-c9c3ab850a33) + +## 포스트맨 테스트 +- 회원가입 + ![image](https://github.com/user-attachments/assets/42e53e1a-9e71-4f17-b056-999b07e65dd1) + +- 로그인 + ![image](https://github.com/user-attachments/assets/f7736514-51af-4417-82b4-2d831f71ece1) + +- 유저 정보 조회 + ![image](https://github.com/user-attachments/assets/ec5cd6bc-f411-40fb-bbf2-8cf38d3bfee0) + +- 파트장 후보 조회 + ![image](https://github.com/user-attachments/assets/d4195e52-1106-44f8-a466-323ee2dcbd65) + ![image](https://github.com/user-attachments/assets/373362c5-ad73-4268-8ebb-f19b163e6b95) + +- 파트장 투표 + ![image](https://github.com/user-attachments/assets/5e2fbc9c-9378-40d2-aaa0-1c416c68d908) + 다른 파트 사람을 투표할 경우 오류 발생..! + ![image](https://github.com/user-attachments/assets/6763d21c-f059-4958-9798-881c547f96d0) + +- 프론트 파트장 투표결과 조회 + ![image](https://github.com/user-attachments/assets/1cfb13c3-1535-4aad-a5d6-cee8d412cc91) + +- 백 파트장 투표 결과 조회 + ![image](https://github.com/user-attachments/assets/862bdcc1-559b-4e5b-99fb-e40f83e6a103) + +- 데모데이 후보팀 조회 + ![image](https://github.com/user-attachments/assets/955ce575-f5ed-495f-b252-481fb6263bc3) + +- 데모데이 투표 post + ![image](https://github.com/user-attachments/assets/f9c6dfdf-4e40-48bd-b339-2e876c38c3dc) + 현재 속해있는 팀을 뽑을 경우..! + ![image](https://github.com/user-attachments/assets/6e7d7399-b55b-413c-8f8f-f99a360237bb) + +- 데모데이 투표결과 조회 + ![image](https://github.com/user-attachments/assets/18bf6c1b-1655-4c4a-8ea6-0d48c9d71bc5) + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..821cb22 --- /dev/null +++ b/build.gradle @@ -0,0 +1,50 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.example' +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-jpa' + implementation 'mysql:mysql-connector-java:8.0.33' + + implementation 'org.springframework.boot:spring-boot-starter-security' + + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.2.0' + + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // JWT 라이브러리 + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' // JSON 처리 +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..9e01d7b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,52 @@ +version: '3.8' + +services: + database: + container_name: mysql + image: mysql:8.0 + environment: + MYSQL_ROOT_PASSWORD: ${DB_PASSWORD} + MYSQL_DATABASE: ${DB_NAME} + TZ: 'Asia/Seoul' + volumes: + - dbdata:/var/lib/mysql + ports: + - 3306:3306 + restart: always + networks: + - network + healthcheck: + test: [ "CMD-SHELL", "mysqladmin ping -h 127.0.0.1 -proot1234 --silent" ] + interval: 30s + retries: 5 + + web: + container_name: vote + build: + dockerfile: Dockerfile + ports: + - "8080:8080" + depends_on: + database: + condition: service_healthy + + environment: + SPRING_DATASOURCE_URL: ${DB_URL} + SPRING_DATASOURCE_USERNAME: ${DB_USERNAME} + SPRING_DATASOURCE_PASSWORD: ${DB_PASSWORD} + + restart: always + volumes: + - app:/app + networks: + - network + env_file: + - .env + +volumes: + dbdata: + app: + +networks: + network: + driver: bridge \ No newline at end of file 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 100644 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/nginx/conf.d/nginx.conf b/nginx/conf.d/nginx.conf new file mode 100644 index 0000000..0f045da --- /dev/null +++ b/nginx/conf.d/nginx.conf @@ -0,0 +1,15 @@ +server { + listen 80; + server_name *.compute.amazonaws.com; + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + location / { + proxy_pass http://web:8080; + proxy_set_header Host $host:$server_port; + proxy_set_header X-Forwarded-Host $server_name; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} \ No newline at end of file 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/example/vote/VoteApplication.java b/src/main/java/com/example/vote/VoteApplication.java new file mode 100644 index 0000000..4b0a5dd --- /dev/null +++ b/src/main/java/com/example/vote/VoteApplication.java @@ -0,0 +1,13 @@ +package com.example.vote; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class VoteApplication { + + public static void main(String[] args) { + SpringApplication.run(VoteApplication.class, args); + } + +} diff --git a/src/main/java/com/example/vote/config/SecurityConfig.java b/src/main/java/com/example/vote/config/SecurityConfig.java new file mode 100644 index 0000000..8fecb4d --- /dev/null +++ b/src/main/java/com/example/vote/config/SecurityConfig.java @@ -0,0 +1,42 @@ +package com.example.vote.config; + +import com.example.vote.security.JwtAuthenticationFilter; +import com.example.vote.security.JwtTokenProvider; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +@RequiredArgsConstructor +public class SecurityConfig { + + private final JwtTokenProvider jwtTokenProvider; // JwtTokenProvider 주입 + private final UserDetailsService userDetailsService; // UserDetailsService 주입 + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + JwtAuthenticationFilter jwtAuthenticationFilter = new JwtAuthenticationFilter(jwtTokenProvider); // 필터 수동 생성 + + http + .authorizeHttpRequests(auth -> auth + .requestMatchers("/", "/auth/**", "/swagger-ui/**", "/v3/api-docs/**").permitAll() + .anyRequest().authenticated() + ) + .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) // JWT 필터 추가 + .formLogin(form -> form.disable()) + .httpBasic(httpBasic -> httpBasic.disable()) + .csrf(csrf -> csrf.disable()); + + return http.build(); + } + + @Bean + public BCryptPasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/com/example/vote/config/SwaggerConfig.java b/src/main/java/com/example/vote/config/SwaggerConfig.java new file mode 100644 index 0000000..689c9b5 --- /dev/null +++ b/src/main/java/com/example/vote/config/SwaggerConfig.java @@ -0,0 +1,19 @@ +package com.example.vote.config; + +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 customOpenAPI() { + return new OpenAPI() + .info(new Info() + .title("Vote API Documentation") + .version("1.0") + .description("API documentation for the Vote System project.")); + } +} diff --git a/src/main/java/com/example/vote/config/WebConfig.java b/src/main/java/com/example/vote/config/WebConfig.java new file mode 100644 index 0000000..912cfe9 --- /dev/null +++ b/src/main/java/com/example/vote/config/WebConfig.java @@ -0,0 +1,18 @@ +package com.example.vote.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("http://localhost:3000") // Next.js 도메인 + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") + .allowedHeaders("*") + .allowCredentials(true); + } +} diff --git a/src/main/java/com/example/vote/controller/AuthController.java b/src/main/java/com/example/vote/controller/AuthController.java new file mode 100644 index 0000000..0d58103 --- /dev/null +++ b/src/main/java/com/example/vote/controller/AuthController.java @@ -0,0 +1,22 @@ +package com.example.vote.controller; + +import com.example.vote.dto.LoginRequestDTO; +import com.example.vote.dto.LoginResponseDTO; +import com.example.vote.service.AuthService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/auth") +public class AuthController { + + private final AuthService authService; + + @PostMapping("/login") + public ResponseEntity login(@RequestBody LoginRequestDTO loginRequestDTO) { + LoginResponseDTO responseDTO = authService.login(loginRequestDTO); + return ResponseEntity.ok(responseDTO); + } +} diff --git a/src/main/java/com/example/vote/controller/CandidateController.java b/src/main/java/com/example/vote/controller/CandidateController.java new file mode 100644 index 0000000..d3a0e44 --- /dev/null +++ b/src/main/java/com/example/vote/controller/CandidateController.java @@ -0,0 +1,29 @@ +package com.example.vote.controller; + +import com.example.vote.domain.Candidate; +import com.example.vote.domain.Member; +import com.example.vote.dto.CandidateResponseDto; +import com.example.vote.service.CandidateService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/leader") +public class CandidateController { + + private final CandidateService candidateService; + + //part별 후보자 리스트 조회 + @GetMapping("/{part}") + public ResponseEntity> getLeader(@PathVariable Member.Part part) { + final List responseDtos = candidateService.getLeader(part); + return ResponseEntity.ok().body(responseDtos); + } +} diff --git a/src/main/java/com/example/vote/controller/DemoCandiController.java b/src/main/java/com/example/vote/controller/DemoCandiController.java new file mode 100644 index 0000000..cb21b9b --- /dev/null +++ b/src/main/java/com/example/vote/controller/DemoCandiController.java @@ -0,0 +1,27 @@ +package com.example.vote.controller; + +import com.example.vote.domain.Member; +import com.example.vote.dto.CandidateResponseDto; +import com.example.vote.dto.DemoCandidateResponseDto; +import com.example.vote.service.DemoCandiService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/team") +public class DemoCandiController { + private final DemoCandiService demoCandiService; + + @GetMapping("") + public ResponseEntity> getTeams() { + final List responseDtos = demoCandiService.getTeams(); + return ResponseEntity.ok().body(responseDtos); + } +} diff --git a/src/main/java/com/example/vote/controller/DemoVoteController.java b/src/main/java/com/example/vote/controller/DemoVoteController.java new file mode 100644 index 0000000..8ec66ba --- /dev/null +++ b/src/main/java/com/example/vote/controller/DemoVoteController.java @@ -0,0 +1,37 @@ +package com.example.vote.controller; + +import com.example.vote.domain.Member; +import com.example.vote.dto.DemoVoteResponseDto; +import com.example.vote.dto.VoteResponseDto; +import com.example.vote.security.CustomUserDetails; +import com.example.vote.service.DemoVoteService; +import com.example.vote.service.MemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/demoday") +public class DemoVoteController { + + private final DemoVoteService demoVoteService; + private final MemberService memberService; + + // 데모데이 투표 + @PostMapping("/{id}") + public ResponseEntity> vote(@AuthenticationPrincipal CustomUserDetails userDetails, @PathVariable Long id) { + final List responseDto = demoVoteService.vote(userDetails, id); + return ResponseEntity.ok().body(responseDto); + } + + // 결과 조회 + @GetMapping("") + public ResponseEntity getResult() { + final List resposneDto = demoVoteService.getResult(); + return ResponseEntity.ok().body(resposneDto); + } +} diff --git a/src/main/java/com/example/vote/controller/MemberController.java b/src/main/java/com/example/vote/controller/MemberController.java new file mode 100644 index 0000000..1562b30 --- /dev/null +++ b/src/main/java/com/example/vote/controller/MemberController.java @@ -0,0 +1,36 @@ +package com.example.vote.controller; + +import com.example.vote.dto.SignupRequestDTO; +import com.example.vote.dto.SignupResponseDTO; +import com.example.vote.dto.UserInfoDto; +import com.example.vote.security.CustomUserDetails; +import com.example.vote.service.MemberService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/auth") +@Tag(name = "Authentication API", description = "APIs for user authentication") +public class MemberController { + + private final MemberService memberService; + + @PostMapping("/signup") + @Operation(summary = "Sign up a new user", description = "Register a new user with username, password, email, part, and team.") + public ResponseEntity signup(@RequestBody SignupRequestDTO signupRequestDTO) { + SignupResponseDTO responseDTO = memberService.signup(signupRequestDTO); + return ResponseEntity.ok(responseDTO); + } + + @GetMapping("/user") + public ResponseEntity getUserInfo(@AuthenticationPrincipal CustomUserDetails userDetails) { + UserInfoDto infoDto = memberService.getUserInfo(userDetails); + return ResponseEntity.ok(infoDto); + } +} diff --git a/src/main/java/com/example/vote/controller/VoteController.java b/src/main/java/com/example/vote/controller/VoteController.java new file mode 100644 index 0000000..a4edd62 --- /dev/null +++ b/src/main/java/com/example/vote/controller/VoteController.java @@ -0,0 +1,36 @@ +package com.example.vote.controller; + +import com.example.vote.domain.Member; +import com.example.vote.dto.VoteResponseDto; +import com.example.vote.security.CustomUserDetails; +import com.example.vote.service.MemberService; +import com.example.vote.service.VoteService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/vote") +public class VoteController { + + private final VoteService voteService; + private final MemberService memberService; + + // 후보자 투표 + @PostMapping("/{id}") + public ResponseEntity> vote(@AuthenticationPrincipal CustomUserDetails userDetails, @PathVariable Long id) { + final List responseDto = voteService.vote(userDetails, id); + return ResponseEntity.ok().body(responseDto); + } + + // 결과 조회 + @GetMapping("/{part}") + public ResponseEntity getResult(@PathVariable Member.Part part) { + final List resposneDto = voteService.getResult(part); + return ResponseEntity.ok().body(resposneDto); + } +} diff --git a/src/main/java/com/example/vote/domain/Candidate.java b/src/main/java/com/example/vote/domain/Candidate.java new file mode 100644 index 0000000..aaa6bac --- /dev/null +++ b/src/main/java/com/example/vote/domain/Candidate.java @@ -0,0 +1,60 @@ +package com.example.vote.domain; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.ColumnDefault; + +@Entity +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "candidate") +public class Candidate { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + @ColumnDefault("0") + private Integer voteCount; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Member.Part part; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Name name; + + public enum Name { + 이희원, + 최지원, + 지민재, + 김류원, + 송유선, + 강다혜, + 권혜인, + 이가빈, + 박지수, + 윤영준, + 나혜인, + 유지민, + 황서아, + 임가현, + 최서지, + 김연수, + 이채원, + 이한슬, + 남승현, + 문서영 + } + + public void increaseVoteCount() { + voteCount++; + } + +} diff --git a/src/main/java/com/example/vote/domain/DemoCandi.java b/src/main/java/com/example/vote/domain/DemoCandi.java new file mode 100644 index 0000000..a6b77aa --- /dev/null +++ b/src/main/java/com/example/vote/domain/DemoCandi.java @@ -0,0 +1,32 @@ +package com.example.vote.domain; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.ColumnDefault; + +@Entity +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "democandi") +public class DemoCandi { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + @ColumnDefault("0") + private Integer voteCount; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Member.Team team; + + public void increaseVoteCount() { + voteCount++; + } +} diff --git a/src/main/java/com/example/vote/domain/DemoVote.java b/src/main/java/com/example/vote/domain/DemoVote.java new file mode 100644 index 0000000..57a386b --- /dev/null +++ b/src/main/java/com/example/vote/domain/DemoVote.java @@ -0,0 +1,25 @@ +package com.example.vote.domain; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Table(name = "demovote") +public class DemoVote { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + private DemoCandi demoCandi; +} diff --git a/src/main/java/com/example/vote/domain/Member.java b/src/main/java/com/example/vote/domain/Member.java new file mode 100644 index 0000000..fe54665 --- /dev/null +++ b/src/main/java/com/example/vote/domain/Member.java @@ -0,0 +1,53 @@ +package com.example.vote.domain; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "member") +public class Member { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, unique = true) + private String username; // 아이디 + + @Column(nullable = false) + private String password; + + @Column(nullable = false, unique = true) + private String email; + + @Column(nullable = false) + private String name; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Part part; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Team team; + + public enum Part { + FRONTEND, + BACKEND + } + + public enum Team { + PHOTOGROUND, + ANGELBRIDGE, + PEDALGENIE, + CAKEWAY, + COFFEEDILL + } +} diff --git a/src/main/java/com/example/vote/domain/Vote.java b/src/main/java/com/example/vote/domain/Vote.java new file mode 100644 index 0000000..47a585b --- /dev/null +++ b/src/main/java/com/example/vote/domain/Vote.java @@ -0,0 +1,27 @@ +package com.example.vote.domain; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Table(name = "vote") +public class Vote { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + private Candidate candidate; + + +} diff --git a/src/main/java/com/example/vote/dto/CandidateResponseDto.java b/src/main/java/com/example/vote/dto/CandidateResponseDto.java new file mode 100644 index 0000000..1cdfe87 --- /dev/null +++ b/src/main/java/com/example/vote/dto/CandidateResponseDto.java @@ -0,0 +1,17 @@ +package com.example.vote.dto; + +import com.example.vote.domain.Candidate; +import com.example.vote.domain.Member; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class CandidateResponseDto { + private Long id; + private Candidate.Name name; +} diff --git a/src/main/java/com/example/vote/dto/DemoCandidateResponseDto.java b/src/main/java/com/example/vote/dto/DemoCandidateResponseDto.java new file mode 100644 index 0000000..b8c2c42 --- /dev/null +++ b/src/main/java/com/example/vote/dto/DemoCandidateResponseDto.java @@ -0,0 +1,16 @@ +package com.example.vote.dto; + +import com.example.vote.domain.Member; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DemoCandidateResponseDto { + private Long id; + private Member.Team team; +} diff --git a/src/main/java/com/example/vote/dto/DemoVoteResponseDto.java b/src/main/java/com/example/vote/dto/DemoVoteResponseDto.java new file mode 100644 index 0000000..1f36c53 --- /dev/null +++ b/src/main/java/com/example/vote/dto/DemoVoteResponseDto.java @@ -0,0 +1,17 @@ +package com.example.vote.dto; + +import com.example.vote.domain.DemoCandi; +import com.example.vote.domain.Member; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DemoVoteResponseDto { + private int voteCount; + private Member.Team team; +} diff --git a/src/main/java/com/example/vote/dto/LoginRequestDTO.java b/src/main/java/com/example/vote/dto/LoginRequestDTO.java new file mode 100644 index 0000000..48925a7 --- /dev/null +++ b/src/main/java/com/example/vote/dto/LoginRequestDTO.java @@ -0,0 +1,12 @@ +package com.example.vote.dto; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class LoginRequestDTO { + private String username; + private String password; +} diff --git a/src/main/java/com/example/vote/dto/LoginResponseDTO.java b/src/main/java/com/example/vote/dto/LoginResponseDTO.java new file mode 100644 index 0000000..e867c0d --- /dev/null +++ b/src/main/java/com/example/vote/dto/LoginResponseDTO.java @@ -0,0 +1,12 @@ +package com.example.vote.dto; + +import lombok.*; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class LoginResponseDTO { + private String username; + private String token; +} diff --git a/src/main/java/com/example/vote/dto/SignupRequestDTO.java b/src/main/java/com/example/vote/dto/SignupRequestDTO.java new file mode 100644 index 0000000..00cfa8f --- /dev/null +++ b/src/main/java/com/example/vote/dto/SignupRequestDTO.java @@ -0,0 +1,19 @@ +package com.example.vote.dto; + +import com.example.vote.domain.Member.Part; +import com.example.vote.domain.Member.Team; +import lombok.*; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SignupRequestDTO { + private String username; + private String password; + private String email; + private String name; + private Part part; + private Team team; +} diff --git a/src/main/java/com/example/vote/dto/SignupResponseDTO.java b/src/main/java/com/example/vote/dto/SignupResponseDTO.java new file mode 100644 index 0000000..5c99426 --- /dev/null +++ b/src/main/java/com/example/vote/dto/SignupResponseDTO.java @@ -0,0 +1,12 @@ +package com.example.vote.dto; + +import lombok.*; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SignupResponseDTO { + private String message; +} diff --git a/src/main/java/com/example/vote/dto/UserInfoDto.java b/src/main/java/com/example/vote/dto/UserInfoDto.java new file mode 100644 index 0000000..7b4db47 --- /dev/null +++ b/src/main/java/com/example/vote/dto/UserInfoDto.java @@ -0,0 +1,18 @@ +package com.example.vote.dto; + +import com.example.vote.domain.Member; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class UserInfoDto { + private String username; + private Member.Part part; + private Member.Team team; + +} diff --git a/src/main/java/com/example/vote/dto/VoteResponseDto.java b/src/main/java/com/example/vote/dto/VoteResponseDto.java new file mode 100644 index 0000000..20c7e9f --- /dev/null +++ b/src/main/java/com/example/vote/dto/VoteResponseDto.java @@ -0,0 +1,16 @@ +package com.example.vote.dto; + +import com.example.vote.domain.Candidate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class VoteResponseDto { + private int voteCount; + private Candidate.Name candidateName; +} diff --git a/src/main/java/com/example/vote/repository/CandidateRepository.java b/src/main/java/com/example/vote/repository/CandidateRepository.java new file mode 100644 index 0000000..a6383bc --- /dev/null +++ b/src/main/java/com/example/vote/repository/CandidateRepository.java @@ -0,0 +1,11 @@ +package com.example.vote.repository; + +import com.example.vote.domain.Candidate; +import com.example.vote.domain.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface CandidateRepository extends JpaRepository { + List findByPart(Member.Part part); +} diff --git a/src/main/java/com/example/vote/repository/DemoCandiRepository.java b/src/main/java/com/example/vote/repository/DemoCandiRepository.java new file mode 100644 index 0000000..a1f71fe --- /dev/null +++ b/src/main/java/com/example/vote/repository/DemoCandiRepository.java @@ -0,0 +1,12 @@ +package com.example.vote.repository; + +import com.example.vote.domain.Candidate; +import com.example.vote.domain.DemoCandi; +import com.example.vote.domain.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface DemoCandiRepository extends JpaRepository { + List findByTeam(Member.Team team); +} diff --git a/src/main/java/com/example/vote/repository/DemoVoteRepository.java b/src/main/java/com/example/vote/repository/DemoVoteRepository.java new file mode 100644 index 0000000..b7c7b5f --- /dev/null +++ b/src/main/java/com/example/vote/repository/DemoVoteRepository.java @@ -0,0 +1,13 @@ +package com.example.vote.repository; + +import com.example.vote.domain.DemoCandi; +import com.example.vote.domain.DemoVote; +import com.example.vote.domain.Member; +import com.example.vote.domain.Vote; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; + +public interface DemoVoteRepository extends JpaRepository { + List findByDemoCandi(DemoCandi demoCandi); +} diff --git a/src/main/java/com/example/vote/repository/MemberRepository.java b/src/main/java/com/example/vote/repository/MemberRepository.java new file mode 100644 index 0000000..110fb53 --- /dev/null +++ b/src/main/java/com/example/vote/repository/MemberRepository.java @@ -0,0 +1,11 @@ +package com.example.vote.repository; + +import com.example.vote.domain.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface MemberRepository extends JpaRepository { + Optional findByUsername(String username); + Optional findByEmail(String email); +} diff --git a/src/main/java/com/example/vote/repository/VoteRepository.java b/src/main/java/com/example/vote/repository/VoteRepository.java new file mode 100644 index 0000000..928aabc --- /dev/null +++ b/src/main/java/com/example/vote/repository/VoteRepository.java @@ -0,0 +1,12 @@ +package com.example.vote.repository; + +import com.example.vote.domain.Member; +import com.example.vote.domain.Vote; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface VoteRepository extends JpaRepository { + //List findByPart(Member.Part part); +} diff --git a/src/main/java/com/example/vote/security/CustomUserDetails.java b/src/main/java/com/example/vote/security/CustomUserDetails.java new file mode 100644 index 0000000..e4fc039 --- /dev/null +++ b/src/main/java/com/example/vote/security/CustomUserDetails.java @@ -0,0 +1,59 @@ +package com.example.vote.security; + +import com.example.vote.domain.Member; +import jakarta.servlet.http.Part; +import lombok.Getter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; + +@Getter +public class CustomUserDetails implements UserDetails { + + private final Member member; + + public CustomUserDetails(Member member) { + this.member = member; + } + + @Override + public Collection getAuthorities() { + // 권한 설정 필요 시 추가 + return null; + } + + @Override + public String getPassword() { + return member.getPassword(); + } + + @Override + public String getUsername() { + return member.getUsername(); + } + + public Member.Part getPart() { return member.getPart(); } + + public Member.Team getTeam() { return member.getTeam(); } + + @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/example/vote/security/JwtAuthenticationFilter.java b/src/main/java/com/example/vote/security/JwtAuthenticationFilter.java new file mode 100644 index 0000000..0fcc8d5 --- /dev/null +++ b/src/main/java/com/example/vote/security/JwtAuthenticationFilter.java @@ -0,0 +1,37 @@ +package com.example.vote.security; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final JwtTokenProvider jwtTokenProvider; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + + String token = getTokenFromRequest(request); + + if (token != null && jwtTokenProvider.validateToken(token)) { + Authentication auth = jwtTokenProvider.getAuthentication(token); + SecurityContextHolder.getContext().setAuthentication(auth); + } + + filterChain.doFilter(request, response); + } + + private String getTokenFromRequest(HttpServletRequest request) { + String bearerToken = request.getHeader("Authorization"); + return (bearerToken != null && bearerToken.startsWith("Bearer ")) ? bearerToken.substring(7) : null; + } +} diff --git a/src/main/java/com/example/vote/security/JwtAuthenticationToken.java b/src/main/java/com/example/vote/security/JwtAuthenticationToken.java new file mode 100644 index 0000000..771593e --- /dev/null +++ b/src/main/java/com/example/vote/security/JwtAuthenticationToken.java @@ -0,0 +1,28 @@ +package com.example.vote.security; + +import org.springframework.security.authentication.AbstractAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; + +public class JwtAuthenticationToken extends AbstractAuthenticationToken { + + private final UserDetails principal; + + public JwtAuthenticationToken(UserDetails principal, Collection authorities) { + super(authorities); + this.principal = principal; + super.setAuthenticated(true); // 인증 상태로 설정 + } + + @Override + public Object getCredentials() { + return null; // JWT에서는 비밀번호가 필요 없으므로 null 반환 + } + + @Override + public Object getPrincipal() { + return principal; // 인증된 사용자 반환 + } +} diff --git a/src/main/java/com/example/vote/security/JwtTokenProvider.java b/src/main/java/com/example/vote/security/JwtTokenProvider.java new file mode 100644 index 0000000..ad2a1a9 --- /dev/null +++ b/src/main/java/com/example/vote/security/JwtTokenProvider.java @@ -0,0 +1,59 @@ +package com.example.vote.security; + +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Component +public class JwtTokenProvider { + + @Value("${spring.jwt.secret-key}") + private String secretKey; + + @Value("${spring.jwt.expiration-ms}") + private long expirationMs; + + private final UserDetailsService userDetailsService; + + public JwtTokenProvider(UserDetailsService userDetailsService) { + this.userDetailsService = userDetailsService; + } + + public String createToken(String username) { + Date now = new Date(); + Date expiryDate = new Date(now.getTime() + expirationMs); + + return Jwts.builder() + .setSubject(username) + .setIssuedAt(now) + .setExpiration(expiryDate) + .signWith(SignatureAlgorithm.HS256, secretKey) + .compact(); + } + + public boolean validateToken(String token) { + try { + Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token); + return true; + } catch (Exception e) { + return false; + } + } + + public String getUsernameFromToken(String token) { + return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().getSubject(); + } + + public Authentication getAuthentication(String token) { + String username = getUsernameFromToken(token); + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + } +} diff --git a/src/main/java/com/example/vote/service/AuthService.java b/src/main/java/com/example/vote/service/AuthService.java new file mode 100644 index 0000000..0ba62e4 --- /dev/null +++ b/src/main/java/com/example/vote/service/AuthService.java @@ -0,0 +1,41 @@ +package com.example.vote.service; + +import com.example.vote.domain.Member; +import com.example.vote.dto.LoginRequestDTO; +import com.example.vote.dto.LoginResponseDTO; +import com.example.vote.repository.MemberRepository; +import com.example.vote.security.JwtTokenProvider; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AuthService { + + private final MemberRepository memberRepository; + private final BCryptPasswordEncoder passwordEncoder; + private final JwtTokenProvider jwtTokenProvider; // JWT 생성 로직을 위한 클래스 + + public LoginResponseDTO login(LoginRequestDTO loginRequestDTO) { + // 1. 사용자 정보 확인 + Member member = memberRepository.findByUsername(loginRequestDTO.getUsername()) + .orElseThrow(() -> new IllegalArgumentException("Invalid username or password")); + + // 2. 비밀번호 비교 + if (!passwordEncoder.matches(loginRequestDTO.getPassword(), member.getPassword())) { + throw new IllegalArgumentException("Invalid username or password"); + } + + // 3. JWT 토큰 생성 + String token = jwtTokenProvider.createToken(member.getUsername()); + + // 디버깅: 토큰이 생성되지 않았다면 로그 출력 + if (token == null || token.isEmpty()) { + throw new IllegalStateException("JWT Token generation failed"); + } + + // 4. 응답 반환 + return new LoginResponseDTO(member.getUsername(), token); + } +} diff --git a/src/main/java/com/example/vote/service/CandidateService.java b/src/main/java/com/example/vote/service/CandidateService.java new file mode 100644 index 0000000..f842cea --- /dev/null +++ b/src/main/java/com/example/vote/service/CandidateService.java @@ -0,0 +1,37 @@ +package com.example.vote.service; + +import com.example.vote.domain.Candidate; +import com.example.vote.domain.Member; +import com.example.vote.dto.CandidateResponseDto; +import com.example.vote.repository.CandidateRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class CandidateService { + private final CandidateRepository candidateRepository; + + public List getLeader(Member.Part part) { + List candidates = candidateRepository.findByPart(part); + + List candidateResponseDtos = new ArrayList<>(); + + for (Candidate candidate : candidates) { + CandidateResponseDto candidateResponseDto = CandidateResponseDto.builder() + .name(candidate.getName()) + .id(candidate.getId()) + .build(); + + candidateResponseDtos.add(candidateResponseDto); + } + + candidateResponseDtos = candidateResponseDtos.stream().sorted(Comparator.comparing(CandidateResponseDto::getName)).collect(Collectors.toList()); + return candidateResponseDtos; + } +} diff --git a/src/main/java/com/example/vote/service/CustomUserDetailsService.java b/src/main/java/com/example/vote/service/CustomUserDetailsService.java new file mode 100644 index 0000000..c838d1b --- /dev/null +++ b/src/main/java/com/example/vote/service/CustomUserDetailsService.java @@ -0,0 +1,24 @@ +package com.example.vote.service; + +import com.example.vote.domain.Member; +import com.example.vote.repository.MemberRepository; +import com.example.vote.security.CustomUserDetails; +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; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + Member member = memberRepository.findByUsername(username) + .orElseThrow(() -> new UsernameNotFoundException("User not found: " + username)); + return new CustomUserDetails(member); + } +} \ No newline at end of file diff --git a/src/main/java/com/example/vote/service/DemoCandiService.java b/src/main/java/com/example/vote/service/DemoCandiService.java new file mode 100644 index 0000000..7a591ba --- /dev/null +++ b/src/main/java/com/example/vote/service/DemoCandiService.java @@ -0,0 +1,40 @@ +package com.example.vote.service; + +import com.example.vote.domain.Candidate; +import com.example.vote.domain.DemoCandi; +import com.example.vote.domain.Member; +import com.example.vote.dto.CandidateResponseDto; +import com.example.vote.dto.DemoCandidateResponseDto; +import com.example.vote.repository.CandidateRepository; +import com.example.vote.repository.DemoCandiRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class DemoCandiService { + private final DemoCandiRepository demoCandiRepository; + + public List getTeams() { + List candidates = demoCandiRepository.findAll(); + + List demoCandidateResponseDtos = new ArrayList<>(); + + for (DemoCandi candidate : candidates) { + DemoCandidateResponseDto candidateResponseDto = DemoCandidateResponseDto.builder() + .team(candidate.getTeam()) + .id(candidate.getId()) + .build(); + + demoCandidateResponseDtos.add(candidateResponseDto); + } + + demoCandidateResponseDtos = demoCandidateResponseDtos.stream().sorted(Comparator.comparing(DemoCandidateResponseDto::getTeam)).collect(Collectors.toList()); + return demoCandidateResponseDtos; + } +} diff --git a/src/main/java/com/example/vote/service/DemoVoteService.java b/src/main/java/com/example/vote/service/DemoVoteService.java new file mode 100644 index 0000000..911cf21 --- /dev/null +++ b/src/main/java/com/example/vote/service/DemoVoteService.java @@ -0,0 +1,70 @@ +package com.example.vote.service; + +import com.example.vote.domain.*; +import com.example.vote.dto.DemoVoteResponseDto; +import com.example.vote.dto.VoteResponseDto; +import com.example.vote.repository.DemoCandiRepository; +import com.example.vote.repository.DemoVoteRepository; +import com.example.vote.repository.MemberRepository; +import com.example.vote.repository.VoteRepository; +import com.example.vote.security.CustomUserDetails; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class DemoVoteService { + private final DemoVoteRepository demoVoteRepository; + private final MemberRepository memberRepository; + private final DemoCandiRepository demoCandiRepository; + + public List getResult() { + List demoCandies = demoCandiRepository.findAll(); + + List demoVoteResponseDtos = new ArrayList(); + + for (DemoCandi candi : demoCandies) { + DemoVoteResponseDto voteResponseDto = DemoVoteResponseDto.builder() + .voteCount(candi.getVoteCount()) + .team(candi.getTeam()) + .build(); + + demoVoteResponseDtos.add(voteResponseDto); + } + + demoVoteResponseDtos = demoVoteResponseDtos.stream().sorted(Comparator.comparing(DemoVoteResponseDto::getVoteCount).reversed()).collect(Collectors.toList()); + + return demoVoteResponseDtos; + + } + + public List vote(CustomUserDetails userDetails, Long id){ + final Member member = memberRepository.findByUsername(userDetails.getUsername()).orElseThrow( + () -> new IllegalArgumentException("Member not found")); + + final DemoCandi candidate = demoCandiRepository.findById(id).orElseThrow( + () -> new IllegalArgumentException("Candidate not found")); + + if (userDetails.getTeam() == candidate.getTeam()) { + throw new IllegalArgumentException("Cannot vote same team"); + } + + // 투표 저장 + final DemoVote vote = DemoVote.builder() + .member(member) + .demoCandi(candidate). + build(); + demoVoteRepository.save(vote); + + // 후보자 득표수 증가 + candidate.increaseVoteCount(); + demoCandiRepository.save(candidate); + + return getResult(); + } +} diff --git a/src/main/java/com/example/vote/service/MemberService.java b/src/main/java/com/example/vote/service/MemberService.java new file mode 100644 index 0000000..257ff54 --- /dev/null +++ b/src/main/java/com/example/vote/service/MemberService.java @@ -0,0 +1,59 @@ +package com.example.vote.service; + +import com.example.vote.domain.Member; +import com.example.vote.dto.SignupRequestDTO; +import com.example.vote.dto.SignupResponseDTO; +import com.example.vote.dto.UserInfoDto; +import com.example.vote.repository.MemberRepository; +import com.example.vote.security.CustomUserDetails; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; + private final BCryptPasswordEncoder passwordEncoder; // 주입받기 + + public SignupResponseDTO signup(SignupRequestDTO signupRequestDTO) { + // 중복 체크 + if (memberRepository.findByUsername(signupRequestDTO.getUsername()).isPresent()) { + throw new IllegalArgumentException("Username already exists."); + } + if (memberRepository.findByEmail(signupRequestDTO.getEmail()).isPresent()) { + throw new IllegalArgumentException("Email already exists."); + } + + // 비밀번호 해싱 + String encodedPassword = passwordEncoder.encode(signupRequestDTO.getPassword()); + + // Member 엔티티 생성 및 저장 + Member member = Member.builder() + .username(signupRequestDTO.getUsername()) + .password(encodedPassword) + .email(signupRequestDTO.getEmail()) + .name(signupRequestDTO.getName()) + .part(signupRequestDTO.getPart()) + .team(signupRequestDTO.getTeam()) + .build(); + + memberRepository.save(member); + + return SignupResponseDTO.builder() + .message("Signup successful!") + .build(); + } + + public UserInfoDto getUserInfo(CustomUserDetails userDetails) { + UserInfoDto userInfoDto = UserInfoDto.builder() + .username(userDetails.getUsername()) + .part(userDetails.getPart()) + .team(userDetails.getTeam()) + .build(); + + return userInfoDto; + } +} diff --git a/src/main/java/com/example/vote/service/VoteService.java b/src/main/java/com/example/vote/service/VoteService.java new file mode 100644 index 0000000..2e5df18 --- /dev/null +++ b/src/main/java/com/example/vote/service/VoteService.java @@ -0,0 +1,71 @@ +package com.example.vote.service; + +import com.example.vote.domain.Candidate; +import com.example.vote.domain.Member; +import com.example.vote.domain.Vote; +import com.example.vote.dto.VoteResponseDto; +import com.example.vote.repository.CandidateRepository; +import com.example.vote.repository.MemberRepository; +import com.example.vote.repository.VoteRepository; +import com.example.vote.security.CustomUserDetails; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class VoteService { + private final MemberRepository memberRepository; + private final CandidateRepository candidateRepository; + private final VoteRepository voteRepository; + + public List getResult(Member.Part part) { + List candidates = candidateRepository.findByPart(part); + + List voteResponseDtos = new ArrayList(); + + for (Candidate candidate : candidates) { + VoteResponseDto voteResponseDto = VoteResponseDto.builder() + .voteCount(candidate.getVoteCount()) + .candidateName(candidate.getName()) + .build(); + + voteResponseDtos.add(voteResponseDto); + } + + voteResponseDtos = voteResponseDtos.stream().sorted(Comparator.comparing(VoteResponseDto::getVoteCount).reversed()).collect(Collectors.toList()); + + return voteResponseDtos; + + } + + public List vote(CustomUserDetails userDetails, Long id){ + final Member member = memberRepository.findByUsername(userDetails.getUsername()).orElseThrow( + () -> new IllegalArgumentException("Member not found")); + + final Candidate candidate = candidateRepository.findById(id).orElseThrow( + () -> new IllegalArgumentException("Candidate not found")); + + if (userDetails.getPart() != candidate.getPart()) { + throw new IllegalArgumentException("Part not match"); + } + + // 투표 저장 + final Vote vote = Vote.builder() + .member(member) + .candidate(candidate). + build(); + voteRepository.save(vote); + + // 후보자 득표수 증가 + candidate.increaseVoteCount(); + candidateRepository.save(candidate); + + return getResult(member.getPart()); + } +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..7dd759b --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,33 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + jpa: + database: mysql + database-platform: org.hibernate.dialect.MySQLDialect + hibernate: + ddl-auto: update + properties: + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + database-platform: org.hibernate.dialect.MySQLDialect + show_sql: true + format_sql: true + + security: + cors: + allow-origins: "http://localhost:3000" + allowed-methods: GET, POST, PUT, DELETE, OPTIONS + + jwt: + secret-key: ${JWT_SECRET_KEY} + expiration-ms: 86400000 # 1일 (밀리초 단위) + + +logging: + level: + org.hibernate.SQL: debug # Hibernate SQL ?? ?? (??? ??) + org.hibernate.orm.jdbc.bind: trace # Hibernate ???? ?? ?? (???? ??) + com.ceos19.everytime: debug # ???? ??? ???? ?? ??? ?? \ No newline at end of file diff --git a/src/test/java/com/example/vote/VoteApplicationTests.java b/src/test/java/com/example/vote/VoteApplicationTests.java new file mode 100644 index 0000000..13123c5 --- /dev/null +++ b/src/test/java/com/example/vote/VoteApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.vote; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VoteApplicationTests { + + @Test + void contextLoads() { + } + +}