From 52525a820f54f2ff72bf795f202a53ec59c6565c Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Mon, 24 Nov 2025 15:53:13 +0900 Subject: [PATCH 01/26] =?UTF-8?q?chore:=20spring=20boot=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 39 +++ build.gradle | 46 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45633 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 93 +++++++ settings.gradle | 1 + .../VotingSystemApplication.java | 13 + src/main/resources/application.yml | 15 ++ .../VotingSystemApplicationTests.java | 13 + 11 files changed, 478 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/ceos22nd/voting_system/VotingSystemApplication.java create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/ceos22nd/voting_system/VotingSystemApplicationTests.java 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/.gitignore b/.gitignore new file mode 100644 index 0000000..4c75e42 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +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 \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..bc380c2 --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.7' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.ceos22nd' +version = '0.0.1-SNAPSHOT' +description = 'ceos 22nd voting system' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-webmvc' + + compileOnly 'org.projectlombok:lombok' + + runtimeOnly 'com.mysql:mysql-connector-j' + + annotationProcessor 'org.projectlombok:lombok' + + testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test' + testImplementation 'org.springframework.boot:spring-boot-starter-security-test' + testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f8e1ee3125fe0768e9a76ee977ac089eb657005e GIT binary patch literal 45633 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�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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..23449a2 --- /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-9.2.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..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# 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" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@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 + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b6edb01 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'voting-system' diff --git a/src/main/java/com/ceos22nd/voting_system/VotingSystemApplication.java b/src/main/java/com/ceos22nd/voting_system/VotingSystemApplication.java new file mode 100644 index 0000000..4976305 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/VotingSystemApplication.java @@ -0,0 +1,13 @@ +package com.ceos22nd.voting_system; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class VotingSystemApplication { + + public static void main(String[] args) { + SpringApplication.run(VotingSystemApplication.class, args); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..731351a --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${SPRING_DATASOURCE_URL} + username: ${SPRING_DATASOURCE_USERNAME} + password: ${SPRING_DATASOURCE_PASSWORD} + + jpa: + hibernate: + ddl-auto: ${JPA_HIBERNATE_DDL_AUTO} + database-platform: org.hibernate.dialect.MySQLDialect + show-sql: true + properties: + hibernate: + format_sql: true \ No newline at end of file diff --git a/src/test/java/com/ceos22nd/voting_system/VotingSystemApplicationTests.java b/src/test/java/com/ceos22nd/voting_system/VotingSystemApplicationTests.java new file mode 100644 index 0000000..e474963 --- /dev/null +++ b/src/test/java/com/ceos22nd/voting_system/VotingSystemApplicationTests.java @@ -0,0 +1,13 @@ +package com.ceos22nd.voting_system; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VotingSystemApplicationTests { + + @Test + void contextLoads() { + } + +} From 987110330e82da5247b423dc5812783585b7a14a Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Mon, 24 Nov 2025 16:30:04 +0900 Subject: [PATCH 02/26] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index bc380c2..20eafd1 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-webmvc' + implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' @@ -35,9 +35,9 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test' - testImplementation 'org.springframework.boot:spring-boot-starter-security-test' - testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } From f33b6f644188fdd831d5a3aca4aeddb614c3a806 Mon Sep 17 00:00:00 2001 From: hxxukii <81512847+gilbert09031@users.noreply.github.com> Date: Mon, 24 Nov 2025 18:04:02 +0900 Subject: [PATCH 03/26] =?UTF-8?q?feat=20:=20=ED=8C=8C=EC=9D=BC=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/controller/AuthController.java | 4 ++++ .../ceos22nd/voting_system/domain/member/entity/Member.java | 4 ++++ .../domain/member/repository/MemberRepoisitory.java | 4 ++++ .../voting_system/domain/member/service/AuthService.java | 4 ++++ .../voting_system/domain/vote/controller/VoteController.java | 4 ++++ .../voting_system/domain/vote/entity/PartLeadVote.java | 4 ++++ .../ceos22nd/voting_system/domain/vote/entity/TeamVote.java | 4 ++++ .../domain/vote/repository/PartLeadRepository.java | 4 ++++ .../domain/vote/repository/TeamVoteRepository.java | 4 ++++ .../voting_system/domain/vote/service/VoteService.java | 4 ++++ 10 files changed, 40 insertions(+) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java new file mode 100644 index 0000000..1e4af47 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.member.controller; + +public class AuthController { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java new file mode 100644 index 0000000..02302f4 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.member.entity; + +public class Member { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java new file mode 100644 index 0000000..92729ed --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.member.repository; + +public interface MemberRepoisitory { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java b/src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java new file mode 100644 index 0000000..cef27d6 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.member.service; + +public class AuthService { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java new file mode 100644 index 0000000..cdcdea0 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.vote.controller; + +public class VoteController { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java new file mode 100644 index 0000000..6ed809d --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.vote.entity; + +public class PartLeadVote { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java new file mode 100644 index 0000000..79a844a --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.vote.entity; + +public class TeamVote { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java new file mode 100644 index 0000000..a6903e2 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.vote.repository; + +public interface PartLeadRepository { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java new file mode 100644 index 0000000..c8d76f4 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.vote.repository; + +public interface TeamVoteRepository { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java new file mode 100644 index 0000000..0631b8d --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java @@ -0,0 +1,4 @@ +package com.ceos22nd.voting_system.domain.vote.service; + +public class VoteService { +} From 36443963ffa82bfbadcb9e467f34a8a97676351c Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Mon, 24 Nov 2025 18:25:28 +0900 Subject: [PATCH 04/26] =?UTF-8?q?feat:=20Member=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/entity/Member.java | 35 +++++++++++++++++++ .../domain/member/enums/PartType.java | 5 +++ 2 files changed, 40 insertions(+) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java index 02302f4..a1d9985 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java @@ -1,4 +1,39 @@ package com.ceos22nd.voting_system.domain.member.entity; +import com.ceos22nd.voting_system.domain.member.enums.PartType; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor public class Member { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "login_id", unique = true) + private String loginId; + + @Column(name = "password") + private String password; + + @Column(name = "email", unique = true) + private String email; + + @Enumerated(EnumType.STRING) + @Column(name = "part") + private PartType part; + + @Column(name ="real_name") + private String realName; + + @Column(name = "is_part_lead_candidate") + private Boolean isPartLeadCandidate; + + @Column(name = "team_id") + private String teamId; } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java b/src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java new file mode 100644 index 0000000..ece340a --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java @@ -0,0 +1,5 @@ +package com.ceos22nd.voting_system.domain.member.enums; + +public enum PartType { + FRONTEND, BACKEND +} From b9ccb86705aa02dc15eaffcb9b0b3efc7b5c3d60 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 29 Nov 2025 16:00:06 +0900 Subject: [PATCH 05/26] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EB=B0=8F=20JWT=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 7 +- .../domain/auth/config/SecurityConfig.java | 42 +++++++++ .../auth/controller/AuthController.java | 47 ++++++++++ .../domain/auth/dto/LogInRequest.java | 9 ++ .../domain/auth/dto/LogInResponse.java | 6 ++ .../domain/auth/dto/SignUpRequest.java | 30 +++++++ .../domain/auth/dto/SignUpResponse.java | 19 ++++ .../auth/jwt/JwtAuthenticationFilter.java | 57 ++++++++++++ .../domain/auth/jwt/TokenProvider.java | 77 ++++++++++++++++ .../auth/security/CustomUserDetails.java | 54 ++++++++++++ .../domain/auth/service/AuthService.java | 88 +++++++++++++++++++ .../service/CustomUserDetailsService.java | 23 +++++ .../member/controller/AuthController.java | 4 - .../member/controller/MemberController.java | 11 +++ .../domain/member/entity/Member.java | 46 ++++++++-- .../member/repository/MemberRepoisitory.java | 4 - .../member/repository/MemberRepository.java | 15 ++++ .../domain/member/service/AuthService.java | 4 - .../domain/member/service/MemberService.java | 11 +++ src/main/resources/application.yml | 6 +- 20 files changed, 537 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/controller/AuthController.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInRequest.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInResponse.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpResponse.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/JwtAuthenticationFilter.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/TokenProvider.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/security/CustomUserDetails.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/auth/service/CustomUserDetailsService.java delete mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java delete mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java delete mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java diff --git a/build.gradle b/build.gradle index 20eafd1..de250b6 100644 --- a/build.gradle +++ b/build.gradle @@ -25,9 +25,10 @@ repositories { } dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' @@ -39,6 +40,10 @@ dependencies { testImplementation 'org.springframework.security:spring-security-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5' + runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5' } tasks.named('test') { diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java new file mode 100644 index 0000000..daafe47 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java @@ -0,0 +1,42 @@ +package com.ceos22nd.voting_system.domain.auth.config; + +import com.ceos22nd.voting_system.domain.auth.jwt.JwtAuthenticationFilter; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + private final JwtAuthenticationFilter jwtAuthenticationFilter; + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + return http + .csrf(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .httpBasic(AbstractHttpConfigurer::disable) + .sessionManagement(session -> + session.sessionCreationPolicy(SessionCreationPolicy.STATELESS) + ) + .authorizeHttpRequests((auth) -> auth + .requestMatchers("/api/auth/signup", "/api/auth/login").permitAll() + .anyRequest().authenticated()) + .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) + .build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/controller/AuthController.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/controller/AuthController.java new file mode 100644 index 0000000..40f2f4b --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/controller/AuthController.java @@ -0,0 +1,47 @@ +package com.ceos22nd.voting_system.domain.auth.controller; + +import com.ceos22nd.voting_system.domain.auth.dto.LogInRequest; +import com.ceos22nd.voting_system.domain.auth.dto.LogInResponse; +import com.ceos22nd.voting_system.domain.auth.dto.SignUpRequest; +import com.ceos22nd.voting_system.domain.auth.dto.SignUpResponse; +import com.ceos22nd.voting_system.domain.auth.service.AuthService; +import jakarta.validation.Valid; +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.RestController; + +@RestController +@RequiredArgsConstructor +public class AuthController { + + private final AuthService authService; + + /** + * 회원가입 API + * + * @param request SignUpRequest (회원가입 요청) + * @return SignUpResponse (회원가입 응답) + */ + @Valid + @PostMapping("/api/auth/signup") + public ResponseEntity signUp(@RequestBody SignUpRequest request){ + SignUpResponse response = authService.signUp(request); + return ResponseEntity.status(HttpStatus.CREATED).body(response); + } + + /** + * 로그인 API + * + * @param request LogInRequest (로그인 요청) + * @return JwtTokenResponse (JWT 토큰) + */ + @Valid + @PostMapping("/api/auth/login") + public ResponseEntity logIn(@RequestBody LogInRequest request){ + LogInResponse response = authService.logIn(request); + return ResponseEntity.status(HttpStatus.OK).body(response); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInRequest.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInRequest.java new file mode 100644 index 0000000..d084ace --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInRequest.java @@ -0,0 +1,9 @@ + package com.ceos22nd.voting_system.domain.auth.dto; + + import jakarta.validation.constraints.NotBlank; + + public record LogInRequest( + @NotBlank String loginId, + @NotBlank String password + ) { + } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInResponse.java new file mode 100644 index 0000000..02492a0 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/LogInResponse.java @@ -0,0 +1,6 @@ +package com.ceos22nd.voting_system.domain.auth.dto; + +public record LogInResponse( + String accessToken +) { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java new file mode 100644 index 0000000..fb84ec5 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java @@ -0,0 +1,30 @@ +package com.ceos22nd.voting_system.domain.auth.dto; + +import com.ceos22nd.voting_system.domain.member.enums.PartType; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record SignUpRequest( + @NotBlank(message = "아이디를 입력해주세요.") + String loginId, + + @NotBlank(message = "비밀번호를 입력해주세요.") + String password, + + @NotBlank(message = "이메일을 입력해주세요.") + @Email(message = "이메일 형식이 올바르지 않습니다.") + String email, + + @NotBlank(message = "이름을 입력해주세요.") + String realName, + + @NotNull(message = "파트를 입력해주세요.") + PartType part, + + String team, + + @NotNull(message = "파트장 후보 여부를 체크해주세요.") + Boolean isPartLeadCandidate +) { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpResponse.java new file mode 100644 index 0000000..8abd639 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpResponse.java @@ -0,0 +1,19 @@ +package com.ceos22nd.voting_system.domain.auth.dto; + +import com.ceos22nd.voting_system.domain.member.entity.Member; +import lombok.Builder; + +@Builder +public record SignUpResponse( + String email, + String partType, + boolean isPartLeadCandidate +) { + public static SignUpResponse from(Member member){ + return SignUpResponse.builder() + .email(member.getEmail()) + .partType(member.getPart().name().toLowerCase()) + .isPartLeadCandidate(member.isPartLeadCandidate()) + .build(); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/JwtAuthenticationFilter.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/JwtAuthenticationFilter.java new file mode 100644 index 0000000..a7b3096 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/JwtAuthenticationFilter.java @@ -0,0 +1,57 @@ +package com.ceos22nd.voting_system.domain.auth.jwt; + +import com.ceos22nd.voting_system.domain.auth.service.CustomUserDetailsService; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@Slf4j +@Component +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + private final TokenProvider tokenProvider; + private final CustomUserDetailsService customUserDetailsService; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + + String token = resolveToken(request); + + if (StringUtils.hasText(token) && tokenProvider.validateToken(token)) { + Long memberId = tokenProvider.getMemberId(token); + + UserDetails userDetails = customUserDetailsService.loadUserByUsername(memberId.toString()); + + if (userDetails != null) { + UsernamePasswordAuthenticationToken authentication = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } + + filterChain.doFilter(request, response); + } + + private String resolveToken(HttpServletRequest request) { + String bearerToken = request.getHeader("Authorization"); + if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) { + return bearerToken.substring(7); + } + return null; + } +} \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/TokenProvider.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/TokenProvider.java new file mode 100644 index 0000000..77d2485 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/jwt/TokenProvider.java @@ -0,0 +1,77 @@ +package com.ceos22nd.voting_system.domain.auth.jwt; + +import io.jsonwebtoken.*; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import io.jsonwebtoken.security.SecurityException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.util.Date; + +@Slf4j +@Component +public class TokenProvider { + private final SecretKey key; + private final long accessTokenExpiration; + + public TokenProvider( + @Value("${jwt.secret}") String secret, + @Value("${jwt.access_expiration}") long accessTokenExpiration + ) { + byte[] keyBytes = Decoders.BASE64.decode(secret); + this.key = Keys.hmacShaKeyFor(keyBytes); + this.accessTokenExpiration = accessTokenExpiration; + } + + public String createAccessToken(Long memberId) { + Date now = new Date(); + Date validity = new Date(now.getTime() + accessTokenExpiration); + + return Jwts.builder() + .setSubject(memberId.toString()) + .setIssuedAt(now) + .setExpiration(validity) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + + public boolean validateToken(String token) { + try { + Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token); + return true; + } catch (SecurityException | MalformedJwtException e) { + log.info("잘못된 JWT 서명입니다."); + } catch (ExpiredJwtException e) { + log.info("만료된 JWT 토큰입니다."); + } catch (UnsupportedJwtException e) { + log.info("지원되지 않는 JWT 토큰입니다."); + } catch (IllegalArgumentException e){ + log.info("잘못된 JWT 토큰입니다."); + } + return false; + } + + public Long getMemberId(String token) { + return Long.parseLong( + parseClaims(token).getSubject() + ); + } + + public Claims parseClaims(String token){ + try { + return Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token) + .getBody(); + } catch (ExpiredJwtException e) { + return e.getClaims(); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/security/CustomUserDetails.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/security/CustomUserDetails.java new file mode 100644 index 0000000..96f25ec --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/security/CustomUserDetails.java @@ -0,0 +1,54 @@ +package com.ceos22nd.voting_system.domain.auth.security; + +import com.ceos22nd.voting_system.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.Collection; +import java.util.Collections; + +@RequiredArgsConstructor +public class CustomUserDetails implements UserDetails { + private final Member member; + + public Long getId() { + return member.getId(); + } + + @Override + public Collection getAuthorities(){ + return Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER")); + } + + @Override + public String getPassword() { + return member.getPassword(); + } + + @Override + public String getUsername() { + return member.getId().toString(); + } + + @Override + public boolean isEnabled() { + return UserDetails.super.isEnabled(); + } + + @Override + public boolean isCredentialsNonExpired() { + return UserDetails.super.isCredentialsNonExpired(); + } + + @Override + public boolean isAccountNonLocked() { + return UserDetails.super.isAccountNonLocked(); + } + + @Override + public boolean isAccountNonExpired() { + return UserDetails.super.isAccountNonExpired(); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java new file mode 100644 index 0000000..586f152 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java @@ -0,0 +1,88 @@ +package com.ceos22nd.voting_system.domain.auth.service; + +import com.ceos22nd.voting_system.domain.auth.dto.LogInRequest; +import com.ceos22nd.voting_system.domain.auth.dto.LogInResponse; +import com.ceos22nd.voting_system.domain.auth.dto.SignUpRequest; +import com.ceos22nd.voting_system.domain.auth.dto.SignUpResponse; +import com.ceos22nd.voting_system.domain.auth.jwt.TokenProvider; +import com.ceos22nd.voting_system.domain.member.entity.Member; +import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; +import com.ceos22nd.voting_system.global.dto.ErrorCode; +import com.ceos22nd.voting_system.global.exception.BusinessException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@RequiredArgsConstructor +public class AuthService { + + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + private final TokenProvider tokenProvider; + + @Transactional + public SignUpResponse signUp(SignUpRequest request){ + log.info("회원가입 시도: loginId = {}, email = {}, name = {}", + request.loginId(), request.email(), request.realName() + ); + // 아이디 유효성 검사 + validateLoginId(request.loginId()); + + // 이메일 유효성 검사 + validateEmail(request.email()); + + // 비밀번호 해싱 + String encryptedPassword = passwordEncoder.encode(request.password()); + + // Member 객체 생성 + Member newMember = Member.create( + request.loginId(), + encryptedPassword, + request.email(), + request.part(), + request.realName(), + request.isPartLeadCandidate() + ); + + // DB 저장 + Member savedMember = memberRepository.save(newMember); + + log.info("회원가입 성공: memberId = {}", savedMember.getId()); + return SignUpResponse.from(savedMember); + } + + private void validateLoginId(String loginId){ + boolean exist = memberRepository.existsByLoginId(loginId); + if (exist){ + throw new BusinessException(ErrorCode.DUPLICATE_LOGIN_ID); + } + } + + private void validateEmail(String email){ + boolean exist = memberRepository.existsByEmail(email); + if (exist){ + throw new BusinessException(ErrorCode.DUPLICATE_EMAIL); + } + } + + @Transactional(readOnly = true) + public LogInResponse logIn(LogInRequest request){ + log.info("로그인 시도: loginId = {}", request.loginId()); + Member member = memberRepository.findByLoginId(request.loginId()) + .orElseThrow(() -> new BusinessException(ErrorCode.LOGIN_FAILED)); + + if (!passwordEncoder.matches(request.password(), member.getPassword())){ + throw new BusinessException(ErrorCode.LOGIN_FAILED); + } + + String accessToken = tokenProvider.createAccessToken(member.getId()); + + log.info("로그인 성공: memberId = {}, loginId = {}", member.getId(), member.getLoginId()); + return new LogInResponse(accessToken); + } + +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/service/CustomUserDetailsService.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/CustomUserDetailsService.java new file mode 100644 index 0000000..cb7dfb8 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/CustomUserDetailsService.java @@ -0,0 +1,23 @@ +package com.ceos22nd.voting_system.domain.auth.service; + +import com.ceos22nd.voting_system.domain.auth.security.CustomUserDetails; +import com.ceos22nd.voting_system.domain.member.entity.Member; +import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; +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 memberId) throws UsernameNotFoundException { + Member member = memberRepository.findById(Long.parseLong(memberId)) + .orElseThrow(() -> new UsernameNotFoundException("해당 유저가 존재하지 않습니다. id= " + memberId)); + return new CustomUserDetails(member); + } +} \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java deleted file mode 100644 index 1e4af47..0000000 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/AuthController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ceos22nd.voting_system.domain.member.controller; - -public class AuthController { -} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java new file mode 100644 index 0000000..24d912d --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java @@ -0,0 +1,11 @@ +package com.ceos22nd.voting_system.domain.member.controller; + +import com.ceos22nd.voting_system.domain.member.service.MemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +public class MemberController { + private final MemberService memberService; +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java index a1d9985..685a32c 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java @@ -6,34 +6,62 @@ @Entity @Getter -@Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor public class Member { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "login_id", unique = true) + @Column(name = "login_id", unique = true, nullable = false) private String loginId; - @Column(name = "password") + @Column(name = "password", nullable = false) private String password; - @Column(name = "email", unique = true) + @Column(name = "email", unique = true, nullable = false) private String email; @Enumerated(EnumType.STRING) - @Column(name = "part") + @Column(name = "part", nullable = false) private PartType part; - @Column(name ="real_name") + @Column(name ="real_name", nullable = false) private String realName; - @Column(name = "is_part_lead_candidate") - private Boolean isPartLeadCandidate; + @Column(name = "is_part_lead_candidate", nullable = false) + private boolean isPartLeadCandidate; + // TODO: Team Entity 와 Join 하기 @Column(name = "team_id") private String teamId; + + @Builder(access = AccessLevel.PRIVATE) + private Member(String loginId, String password, String email, + PartType part, String realName, boolean isPartLeadCandidate) { + this.loginId = loginId; + this.password = password; // DB 컬럼명과 매핑 + this.email = email; + this.part = part; + this.realName = realName; + this.isPartLeadCandidate = isPartLeadCandidate; + } + + public static Member create( + String loginId, + String encryptedPassword, + String email, + PartType part, + String realName, + boolean isPartLeadCandidate + ){ + return Member.builder() + .loginId(loginId) + .password(encryptedPassword) + .email(email) + .part(part) + .realName(realName) + .isPartLeadCandidate(isPartLeadCandidate) + .build(); + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java deleted file mode 100644 index 92729ed..0000000 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepoisitory.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ceos22nd.voting_system.domain.member.repository; - -public interface MemberRepoisitory { -} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..1a751de --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java @@ -0,0 +1,15 @@ +package com.ceos22nd.voting_system.domain.member.repository; + +import com.ceos22nd.voting_system.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface MemberRepository extends JpaRepository { + Optional findByLoginId(String loginId); + + boolean existsByLoginId(String loginId); + boolean existsByEmail(String email); +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java b/src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java deleted file mode 100644 index cef27d6..0000000 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/service/AuthService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ceos22nd.voting_system.domain.member.service; - -public class AuthService { -} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java b/src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java new file mode 100644 index 0000000..38cdb9c --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java @@ -0,0 +1,11 @@ +package com.ceos22nd.voting_system.domain.member.service; + +import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberService { + private final MemberRepository memberRepository; +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 731351a..f279718 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,4 +12,8 @@ spring: show-sql: true properties: hibernate: - format_sql: true \ No newline at end of file + format_sql: true + +jwt: + secret: ${JWT_SECRET} + access_expiration: ${JWT_ACCESS_EXPIRATION} \ No newline at end of file From 02b9e62ccd7115b6ff98c43a7d3fa83a274c6a0f Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 29 Nov 2025 16:00:43 +0900 Subject: [PATCH 06/26] =?UTF-8?q?feat:=20=EC=A0=84=EC=97=AD=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voting_system/global/dto/ErrorCode.java | 32 ++++++++++++ .../global/dto/ErrorResponse.java | 24 +++++++++ .../global/exception/BusinessException.java | 14 ++++++ .../exception/GlobalExceptionHandler.java | 50 +++++++++++++++++++ 4 files changed, 120 insertions(+) create mode 100644 src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java create mode 100644 src/main/java/com/ceos22nd/voting_system/global/dto/ErrorResponse.java create mode 100644 src/main/java/com/ceos22nd/voting_system/global/exception/BusinessException.java create mode 100644 src/main/java/com/ceos22nd/voting_system/global/exception/GlobalExceptionHandler.java diff --git a/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java b/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java new file mode 100644 index 0000000..62ce715 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java @@ -0,0 +1,32 @@ +package com.ceos22nd.voting_system.global.dto; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ErrorCode { + + /** + * 회원가입 + */ + DUPLICATE_LOGIN_ID(HttpStatus.BAD_REQUEST, "이미 존재하는 아이디입니다."), + DUPLICATE_EMAIL(HttpStatus.BAD_REQUEST, "이미 존재하는 이메일입니다."), + + /** + * 로그인 + */ + LOGIN_FAILED(HttpStatus.UNAUTHORIZED, "아이디 또는 비빌번호가 일치하지 않습니다."), + USER_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 사용자입니다."), + + + /** + * Common + */ + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 오류가 발생헀습니다."), + INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST, "입력값이 올바르지 않습니다."); + + private final HttpStatus httpStatus; + private final String message; +} diff --git a/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorResponse.java b/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorResponse.java new file mode 100644 index 0000000..0f7e106 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorResponse.java @@ -0,0 +1,24 @@ +package com.ceos22nd.voting_system.global.dto; + +import lombok.Builder; +import org.springframework.http.ResponseEntity; + +import java.time.LocalDateTime; + +@Builder +public record ErrorResponse( + String code, + String message, + LocalDateTime timestamp +) { + public static ResponseEntity toResponseEntity(ErrorCode errorCode) { + return ResponseEntity + .status(errorCode.getHttpStatus()) + .body(ErrorResponse.builder() + .code(errorCode.name()) + .message(errorCode.getMessage()) + .timestamp(LocalDateTime.now()) + .build() + ); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/global/exception/BusinessException.java b/src/main/java/com/ceos22nd/voting_system/global/exception/BusinessException.java new file mode 100644 index 0000000..0140fdb --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/global/exception/BusinessException.java @@ -0,0 +1,14 @@ +package com.ceos22nd.voting_system.global.exception; + +import com.ceos22nd.voting_system.global.dto.ErrorCode; +import lombok.Getter; + +@Getter +public class BusinessException extends RuntimeException { + private final ErrorCode errorCode; + + public BusinessException(ErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/global/exception/GlobalExceptionHandler.java b/src/main/java/com/ceos22nd/voting_system/global/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..5c70caa --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/global/exception/GlobalExceptionHandler.java @@ -0,0 +1,50 @@ +package com.ceos22nd.voting_system.global.exception; + +import com.ceos22nd.voting_system.global.dto.ErrorCode; +import com.ceos22nd.voting_system.global.dto.ErrorResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.support.DefaultMessageSourceResolvable; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import java.time.LocalDateTime; +import java.util.Optional; + +@Slf4j +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(BusinessException.class) + public ResponseEntity handleBusinessException(BusinessException e) { + log.warn("Business Exception: {}", e.getMessage()); + return ErrorResponse.toResponseEntity(e.getErrorCode()); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidationException(MethodArgumentNotValidException e) { + + String errorMessage = Optional.ofNullable(e.getBindingResult().getFieldError()) + .map(DefaultMessageSourceResolvable::getDefaultMessage) + .orElse("입력값이 올바르지 않습니다."); + + ErrorResponse response = ErrorResponse.builder() + .code("INVALID_INPUT") + .message(errorMessage) + .timestamp(LocalDateTime.now()) + .build(); + + log.warn("Validation Exception: {}", errorMessage); + + return ResponseEntity + .status(ErrorCode.INVALID_INPUT_VALUE.getHttpStatus()) + .body(response); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception e) { + log.error("Unhandled Exception: ", e); + return ErrorResponse.toResponseEntity(ErrorCode.INTERNAL_SERVER_ERROR); + } +} From 49c7f197c19cbc1d637601f8fba1a09ab40bb0ff Mon Sep 17 00:00:00 2001 From: hxxukii <81512847+gilbert09031@users.noreply.github.com> Date: Thu, 11 Dec 2025 00:41:43 +0900 Subject: [PATCH 07/26] =?UTF-8?q?feat=20:=20=ED=88=AC=ED=91=9C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/entity/Member.java | 20 ++- .../domain/member/entity/Team.java | 24 ++++ .../member/repository/MemberRepository.java | 4 + .../member/repository/TeamRepository.java | 9 ++ .../vote/controller/CandidateController.java | 32 +++++ .../vote/controller/VoteController.java | 46 +++++++ .../domain/vote/dto/VoteRequest.java | 14 ++ .../domain/vote/dto/VoteResultResponse.java | 17 +++ .../domain/vote/dto/VoteStatusResponse.java | 15 +++ .../domain/vote/entity/PartLeadVote.java | 32 +++++ .../domain/vote/entity/TeamVote.java | 35 +++++ .../vote/repository/PartLeadRepository.java | 4 - .../repository/PartLeadVoteRepository.java | 11 ++ .../vote/repository/TeamVoteRepository.java | 9 +- .../domain/vote/service/VoteService.java | 123 +++++++++++++++++- .../voting_system/global/dto/ErrorCode.java | 11 +- src/main/resources/application.yml | 12 +- 17 files changed, 402 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/entity/Team.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteRequest.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteStatusResponse.java delete mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java index 685a32c..07df3b1 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java @@ -1,6 +1,8 @@ package com.ceos22nd.voting_system.domain.member.entity; import com.ceos22nd.voting_system.domain.member.enums.PartType; +import com.ceos22nd.voting_system.global.dto.ErrorCode; +import com.ceos22nd.voting_system.global.exception.BusinessException; import jakarta.persistence.*; import lombok.*; @@ -32,9 +34,9 @@ public class Member { @Column(name = "is_part_lead_candidate", nullable = false) private boolean isPartLeadCandidate; - // TODO: Team Entity 와 Join 하기 - @Column(name = "team_id") - private String teamId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id") + private Team team; @Builder(access = AccessLevel.PRIVATE) private Member(String loginId, String password, String email, @@ -64,4 +66,16 @@ public static Member create( .isPartLeadCandidate(isPartLeadCandidate) .build(); } + + public void validateTeamVote(Long voteTeam) { + if (this.team.getId().equals(voteTeam)) { + throw new BusinessException(ErrorCode.SELF_VOTING_NOT_ALLOWED); + } + } + + public void validateCandidate() { + if(!this.isPartLeadCandidate) { + throw new BusinessException(ErrorCode.CANDIDATE_NOT_FOUND); + } + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Team.java b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Team.java new file mode 100644 index 0000000..89a0042 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Team.java @@ -0,0 +1,24 @@ +package com.ceos22nd.voting_system.domain.member.entity; + +import jakarta.persistence.*; +import lombok.Getter; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table +@Getter +public class Team { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "team_name") + private String teamName; + + @Column(name = "team_member") + @OneToMany(mappedBy = "team") + private List members = new ArrayList<>(); +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java index 1a751de..9acc649 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/MemberRepository.java @@ -4,10 +4,14 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.List; import java.util.Optional; @Repository public interface MemberRepository extends JpaRepository { + + List findByIsPartLeadCandidateIsTrue(); + Optional findByLoginId(String loginId); boolean existsByLoginId(String loginId); diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java new file mode 100644 index 0000000..57b8f35 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java @@ -0,0 +1,9 @@ +package com.ceos22nd.voting_system.domain.member.repository; + +import com.ceos22nd.voting_system.domain.member.entity.Team; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface TeamRepository extends JpaRepository { +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java new file mode 100644 index 0000000..214cffc --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java @@ -0,0 +1,32 @@ +package com.ceos22nd.voting_system.domain.vote.controller; + +import com.ceos22nd.voting_system.domain.member.entity.Member; +import com.ceos22nd.voting_system.domain.member.entity.Team; +import com.ceos22nd.voting_system.domain.vote.service.VoteService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/candidates") +@RequiredArgsConstructor +public class CandidateController { + + private final VoteService voteService; + + @GetMapping("/teams") + public ResponseEntity> getTeamCandidates() { + List teams = voteService.getAllTeams(); + return ResponseEntity.ok(teams); + } + + @GetMapping("/parts") + public ResponseEntity> getPartLeadCandidates() { + List candidates = voteService.getCandidates(); + return ResponseEntity.ok(candidates); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java index cdcdea0..699ecea 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java @@ -1,4 +1,50 @@ package com.ceos22nd.voting_system.domain.vote.controller; +import com.ceos22nd.voting_system.domain.auth.security.CustomUserDetails; +import com.ceos22nd.voting_system.domain.vote.dto.VoteRequest; +import com.ceos22nd.voting_system.domain.vote.dto.VoteStatusResponse; +import com.ceos22nd.voting_system.domain.vote.service.VoteService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/votes") +@RequiredArgsConstructor public class VoteController { + + private final VoteService voteService; + + @PostMapping("/teams") + public ResponseEntity voteForTeam( + @AuthenticationPrincipal CustomUserDetails userDetails, + @RequestBody VoteRequest request) { + + voteService.voteForTeam(userDetails.getId(), request.getTargetId()); + + return ResponseEntity.ok().body("팀 투표가 완료되었습니다."); + } + + @PostMapping("/parts") + public ResponseEntity voteForPartLead( + @AuthenticationPrincipal CustomUserDetails userDetails, + @RequestBody VoteRequest request) { + + voteService.voteForPartLead(userDetails.getId(), request.getTargetId()); + + return ResponseEntity.ok().body("파트장 투표가 완료되었습니다."); + } + + @GetMapping("/status") + public ResponseEntity getVoteStatus( + @AuthenticationPrincipal CustomUserDetails userDetails) { + + Long voterId = userDetails.getId(); + + boolean hasVotedForTeam = voteService.hasVotedForTeam(voterId); + boolean hasVotedForPartLead = voteService.hasVotedForPartLead(voterId); + + return ResponseEntity.ok(VoteStatusResponse.of(hasVotedForTeam, hasVotedForPartLead)); + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteRequest.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteRequest.java new file mode 100644 index 0000000..26226b3 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteRequest.java @@ -0,0 +1,14 @@ +package com.ceos22nd.voting_system.domain.vote.dto; + +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class VoteRequest { + private Long targetId; // teamId 또는 candidateId + + public VoteRequest(Long targetId) { + this.targetId = targetId; + } +} \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java new file mode 100644 index 0000000..b50f3b9 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java @@ -0,0 +1,17 @@ +package com.ceos22nd.voting_system.domain.vote.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class VoteResultResponse { + + private Long targetId; // teamId 또는 candidateId + private String targetName; // team name 또는 member name + private Long voteCount; + + public static VoteResultResponse of(Long tagetId, String targetName, Long voteCount) { + return new VoteResultResponse(tagetId, targetName, voteCount); + } +} \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteStatusResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteStatusResponse.java new file mode 100644 index 0000000..fc30969 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteStatusResponse.java @@ -0,0 +1,15 @@ +package com.ceos22nd.voting_system.domain.vote.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class VoteStatusResponse { + private boolean teamVote; + private boolean partLeadVote; + + public static VoteStatusResponse of(boolean teamVote, boolean partLeadVote) { + return new VoteStatusResponse(teamVote, partLeadVote); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java index 6ed809d..73f2aa6 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/PartLeadVote.java @@ -1,4 +1,36 @@ package com.ceos22nd.voting_system.domain.vote.entity; +import com.ceos22nd.voting_system.domain.member.entity.Member; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(uniqueConstraints = { + @UniqueConstraint(name = "uk_part_lead_vote_voter", columnNames = "voter_id")}) public class PartLeadVote { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @JoinColumn(name = "candidate_id", nullable = false) + @ManyToOne(fetch = FetchType.LAZY) + private Member candidate; + + @JoinColumn(name = "voter_id", nullable = false) + @ManyToOne(fetch = FetchType.LAZY) + private Member voter; + + private PartLeadVote(Member candidate, Member voter) { + this.candidate = candidate; + this.voter = voter; + } + + public static PartLeadVote createVote(Member candidate, Member voter) { + return new PartLeadVote(candidate, voter); + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java index 79a844a..1a63dc0 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/entity/TeamVote.java @@ -1,4 +1,39 @@ package com.ceos22nd.voting_system.domain.vote.entity; +import com.ceos22nd.voting_system.domain.member.entity.Member; +import com.ceos22nd.voting_system.domain.member.entity.Team; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(uniqueConstraints = { + @UniqueConstraint(name = "uk_team_vote_voter", columnNames = "voter_id") +}) public class TeamVote { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id", nullable = false) + private Team team; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "voter_id", nullable = false) + private Member voter; + + private TeamVote(Member voter, Team team) { + this.voter = voter; + this.team = team; + } + + public static TeamVote createVote(Member voter, Team team) { + return new TeamVote(voter, team); + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java deleted file mode 100644 index a6903e2..0000000 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadRepository.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ceos22nd.voting_system.domain.vote.repository; - -public interface PartLeadRepository { -} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java new file mode 100644 index 0000000..26ae396 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java @@ -0,0 +1,11 @@ +package com.ceos22nd.voting_system.domain.vote.repository; + +import com.ceos22nd.voting_system.domain.vote.entity.PartLeadVote; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PartLeadVoteRepository extends JpaRepository { + + Long countByCandidateId(Long teamId); + + boolean existsByVoterId(Long voterId); +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java index c8d76f4..9b1d321 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java @@ -1,4 +1,11 @@ package com.ceos22nd.voting_system.domain.vote.repository; -public interface TeamVoteRepository { +import com.ceos22nd.voting_system.domain.vote.entity.TeamVote; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface TeamVoteRepository extends JpaRepository { + + Long countByTeamId(Long teamId); + + boolean existsByVoterId(Long voterId); } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java index 0631b8d..8321359 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java @@ -1,4 +1,125 @@ package com.ceos22nd.voting_system.domain.vote.service; +import com.ceos22nd.voting_system.domain.member.entity.Member; +import com.ceos22nd.voting_system.domain.member.entity.Team; +import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; +import com.ceos22nd.voting_system.domain.member.repository.TeamRepository; +import com.ceos22nd.voting_system.domain.vote.entity.PartLeadVote; +import com.ceos22nd.voting_system.domain.vote.entity.TeamVote; +import com.ceos22nd.voting_system.domain.vote.repository.PartLeadVoteRepository; +import com.ceos22nd.voting_system.domain.vote.repository.TeamVoteRepository; +import com.ceos22nd.voting_system.global.dto.ErrorCode; +import com.ceos22nd.voting_system.global.exception.BusinessException; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) public class VoteService { -} + + private final TeamVoteRepository teamVoteRepository; + private final PartLeadVoteRepository partLeadRepository; + private final MemberRepository memberRepository; + private final TeamRepository teamRepository; + + /** + * 팀에 투표하기 + */ + @Transactional + public void voteForTeam(Long voterId, Long teamId) { + Member voter = getMemberOrThrow(voterId); + Team team = getTeamOrThrow(teamId); + + validateNotVotedForTeam(voter.getId()); + voter.validateTeamVote(teamId); + + TeamVote teamVote = TeamVote.createVote(voter, team); + teamVoteRepository.save(teamVote); + } + + /** + * 파트장 후보에게 투표하기 + */ + @Transactional + public void voteForPartLead(Long voterId, Long candidateId) { + Member voter = getMemberOrThrow(voterId); + Member candidate = getMemberOrThrow(candidateId); + + validateNotVotedForPartLead(candidate.getId()); + candidate.validateCandidate(); + + PartLeadVote partLeadVote = PartLeadVote.createVote(voter, candidate); + partLeadRepository.save(partLeadVote); + } + + /** + * 팀별 투표 결과 조회 + */ + public long getTeamVoteCount(Long teamId) { + return teamVoteRepository.countByTeamId(teamId); + } + + /** + * 후보자별 투표 결과 조회 + */ + public long getPartLeadVoteCount(Long candidateId) { + return partLeadRepository.countByCandidateId(candidateId); + } + + /** + * 후보자 목록 조회 + */ + public List getCandidates() { + return memberRepository.findByIsPartLeadCandidateIsTrue(); + } + + /** + * 모든 팀 조회 + */ + public List getAllTeams() { + return teamRepository.findAll(); + } + + /** + * 특정 회원의 팀 투표 여부 확인 + */ + public boolean hasVotedForTeam(Long voterId) { + return teamVoteRepository.existsByVoterId(voterId); + } + + /** + * 특정 회원의 파트장 투표 여부 확인 + */ + public boolean hasVotedForPartLead(Long voterId) { + return partLeadRepository.existsByVoterId(voterId); + } + + // ================================================================================================================= + private Member getMemberOrThrow(Long memberId) { + return memberRepository.findById(memberId) + .orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND)); + } + + private Team getTeamOrThrow(Long teamId) { + return teamRepository.findById(teamId) + .orElseThrow(() -> new BusinessException(ErrorCode.TEAM_NOT_FOUND)); + } + + private void validateNotVotedForTeam(Long voterId) { + if(teamVoteRepository.existsByVoterId(voterId)) { + throw new BusinessException(ErrorCode.ALREADY_VOTED); + } + } + + private void validateNotVotedForPartLead(Long voterId) { + if(partLeadRepository.existsByVoterId(voterId)) { + throw new BusinessException(ErrorCode.ALREADY_VOTED); + } + } + + +} \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java b/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java index 62ce715..178786e 100644 --- a/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java +++ b/src/main/java/com/ceos22nd/voting_system/global/dto/ErrorCode.java @@ -25,7 +25,16 @@ public enum ErrorCode { * Common */ INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 오류가 발생헀습니다."), - INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST, "입력값이 올바르지 않습니다."); + INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST, "입력값이 올바르지 않습니다."), + + /** + * Vote + */ + ALREADY_VOTED(HttpStatus.BAD_REQUEST, "이미 투표를 완료했습니다."), + SELF_VOTING_NOT_ALLOWED(HttpStatus.BAD_REQUEST, "본인 팀에 투표할 수 없습니다."), + TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 팀입니다."), + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 회원입니다."), + CANDIDATE_NOT_FOUND(HttpStatus.NOT_FOUND, "후보자가 아닙니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f279718..65c0774 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,13 +1,13 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: ${SPRING_DATASOURCE_URL} - username: ${SPRING_DATASOURCE_USERNAME} - password: ${SPRING_DATASOURCE_PASSWORD} + url: jdbc:mysql://localhost:3306/ceos_vote + username: root + password: 1234 jpa: hibernate: - ddl-auto: ${JPA_HIBERNATE_DDL_AUTO} + ddl-auto: create-drop database-platform: org.hibernate.dialect.MySQLDialect show-sql: true properties: @@ -15,5 +15,5 @@ spring: format_sql: true jwt: - secret: ${JWT_SECRET} - access_expiration: ${JWT_ACCESS_EXPIRATION} \ No newline at end of file + secret: c3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXR1dG9yaWFsLWppd29vbi1tYWtlLXRoaXMta2V5LWxvbmctZW5vdWdo + access_expiration: 300000 \ No newline at end of file From 279bb6e7ecef5fd71aa39d54942e87df27fe65b2 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Thu, 18 Dec 2025 23:18:43 +0900 Subject: [PATCH 08/26] =?UTF-8?q?chore:=20swagger=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 ++ .../voting_system/domain/auth/config/SecurityConfig.java | 1 + 2 files changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index de250b6..55654c5 100644 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.6' + compileOnly 'org.projectlombok:lombok' diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java index daafe47..bd5cbd0 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java @@ -29,6 +29,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { session.sessionCreationPolicy(SessionCreationPolicy.STATELESS) ) .authorizeHttpRequests((auth) -> auth + .requestMatchers("/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", "/api-docs/**", "/v3/api-docs/**").permitAll() .requestMatchers("/api/auth/signup", "/api/auth/login").permitAll() .anyRequest().authenticated()) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) From 8e2e53e508b22563a7d0b9c2757eb5b870361dae Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Thu, 18 Dec 2025 23:22:19 +0900 Subject: [PATCH 09/26] =?UTF-8?q?chore:=20application.yml=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EB=A7=88=EC=8A=A4=ED=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 65c0774..f279718 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,13 +1,13 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/ceos_vote - username: root - password: 1234 + url: ${SPRING_DATASOURCE_URL} + username: ${SPRING_DATASOURCE_USERNAME} + password: ${SPRING_DATASOURCE_PASSWORD} jpa: hibernate: - ddl-auto: create-drop + ddl-auto: ${JPA_HIBERNATE_DDL_AUTO} database-platform: org.hibernate.dialect.MySQLDialect show-sql: true properties: @@ -15,5 +15,5 @@ spring: format_sql: true jwt: - secret: c3ByaW5nLWJvb3Qtc2VjdXJpdHktand0LXR1dG9yaWFsLWppd29vbi1tYWtlLXRoaXMta2V5LWxvbmctZW5vdWdo - access_expiration: 300000 \ No newline at end of file + secret: ${JWT_SECRET} + access_expiration: ${JWT_ACCESS_EXPIRATION} \ No newline at end of file From d8bc9b4b7bbbaa83a87953923b0ff99c80c3c202 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 13:17:03 +0900 Subject: [PATCH 10/26] =?UTF-8?q?chore:=20cors=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/auth/config/SecurityConfig.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java index bd5cbd0..762f171 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java @@ -12,6 +12,11 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; @Configuration @EnableWebSecurity @@ -22,6 +27,7 @@ public class SecurityConfig { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http + .cors(cors -> cors.configurationSource(corsConfigurationSource())) .csrf(AbstractHttpConfigurer::disable) .formLogin(AbstractHttpConfigurer::disable) .httpBasic(AbstractHttpConfigurer::disable) @@ -29,13 +35,34 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { session.sessionCreationPolicy(SessionCreationPolicy.STATELESS) ) .authorizeHttpRequests((auth) -> auth - .requestMatchers("/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", "/api-docs/**", "/v3/api-docs/**").permitAll() - .requestMatchers("/api/auth/signup", "/api/auth/login").permitAll() + .requestMatchers("/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", + "/api-docs/**", "/v3/api-docs/**").permitAll() + .requestMatchers("/api/auth/signup", "/api/auth/login", + "/api/candidates/teams", "api/candidates/parts").permitAll() .anyRequest().authenticated()) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) .build(); } + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + + configuration.setAllowedOrigins(List.of("http://localhost:3000")); + + configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE")); + + configuration.setAllowedHeaders(List.of("*")); + + configuration.setAllowCredentials(true); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + + return source; + } + + @Bean public PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); From 97b24ac748834c0b724fd3ee8b7c34fe7221b97b Mon Sep 17 00:00:00 2001 From: hxxukii <81512847+gilbert09031@users.noreply.github.com> Date: Sat, 20 Dec 2025 13:38:34 +0900 Subject: [PATCH 11/26] =?UTF-8?q?refactor=20:=20=ED=9B=84=EB=B3=B4?= =?UTF-8?q?=EC=9E=90=20=EC=9D=91=EB=8B=B5=20=ED=98=95=EC=8B=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/controller/CandidateController.java | 10 ++++++++-- .../vote/dto/PartLeadCandidateResponse.java | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/dto/PartLeadCandidateResponse.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java index 214cffc..a6b9160 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java @@ -2,6 +2,7 @@ import com.ceos22nd.voting_system.domain.member.entity.Member; import com.ceos22nd.voting_system.domain.member.entity.Team; +import com.ceos22nd.voting_system.domain.vote.dto.PartLeadCandidateResponse; import com.ceos22nd.voting_system.domain.vote.service.VoteService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -25,8 +26,13 @@ public ResponseEntity> getTeamCandidates() { } @GetMapping("/parts") - public ResponseEntity> getPartLeadCandidates() { + public ResponseEntity> getPartLeadCandidates() { List candidates = voteService.getCandidates(); - return ResponseEntity.ok(candidates); + + List response = candidates.stream() + .map(PartLeadCandidateResponse::from) + .toList(); + + return ResponseEntity.ok(response); } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/PartLeadCandidateResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/PartLeadCandidateResponse.java new file mode 100644 index 0000000..f2273c0 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/PartLeadCandidateResponse.java @@ -0,0 +1,19 @@ +package com.ceos22nd.voting_system.domain.vote.dto; + +import com.ceos22nd.voting_system.domain.member.entity.Member; +import lombok.Builder; + +@Builder +public record PartLeadCandidateResponse( + Long id, + String name, + String part +) { + public static PartLeadCandidateResponse from(Member member) { + return PartLeadCandidateResponse.builder() + .id(member.getId()) + .name(member.getRealName()) + .part(member.getPart().name()) + .build(); + } +} From 8fff2e7b1d038d631aecfb9fcef06640bc0edc43 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 13:44:14 +0900 Subject: [PATCH 12/26] =?UTF-8?q?chore:=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voting_system/domain/auth/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java index 762f171..3bb74f9 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java @@ -38,7 +38,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers("/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", "/api-docs/**", "/v3/api-docs/**").permitAll() .requestMatchers("/api/auth/signup", "/api/auth/login", - "/api/candidates/teams", "api/candidates/parts").permitAll() + "/api/candidates/teams", "/api/candidates/parts").permitAll() .anyRequest().authenticated()) .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) .build(); From 0336e819c33b5d34b67ca9fbd29c90be6b649c8c Mon Sep 17 00:00:00 2001 From: hxxukii <81512847+gilbert09031@users.noreply.github.com> Date: Sat, 20 Dec 2025 13:52:12 +0900 Subject: [PATCH 13/26] =?UTF-8?q?feat=20:=20Member=20Status=20=EC=97=94?= =?UTF-8?q?=EB=93=9C=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 31 +++++++++++++++++++ .../member/dto/MemberStatusResponse.java | 20 ++++++++++++ .../domain/member/service/MemberService.java | 8 +++++ 3 files changed, 59 insertions(+) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java index 24d912d..7c63fe3 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java @@ -1,11 +1,42 @@ package com.ceos22nd.voting_system.domain.member.controller; +import com.ceos22nd.voting_system.domain.auth.security.CustomUserDetails; +import com.ceos22nd.voting_system.domain.member.dto.MemberStatusResponse; +import com.ceos22nd.voting_system.domain.member.entity.Member; import com.ceos22nd.voting_system.domain.member.service.MemberService; +import com.ceos22nd.voting_system.domain.vote.service.VoteService; import lombok.RequiredArgsConstructor; +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("api/members") public class MemberController { private final MemberService memberService; + private final VoteService voteService; + + @GetMapping("/me") + public ResponseEntity getMemberStatus( + @AuthenticationPrincipal CustomUserDetails userDetails + ) { + Long memberId = userDetails.getId(); + + Member member = memberService.findByMemberId(memberId); + + boolean hasVotedForTeam = voteService.hasVotedForTeam(memberId); + boolean hasVotedForPart = voteService.hasVotedForPartLead(memberId); + + return ResponseEntity.ok( + MemberStatusResponse.of( + member.getId(), + member.getRealName(), + hasVotedForTeam, + hasVotedForPart + ) + ); + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java new file mode 100644 index 0000000..0f95b46 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java @@ -0,0 +1,20 @@ +package com.ceos22nd.voting_system.domain.member.dto; + +import lombok.Builder; + +@Builder +public record MemberStatusResponse( + Long id, + String name, + boolean hasVotedForTeam, + boolean hasVotedForPartLead +) { + public static MemberStatusResponse of(Long id, String name, boolean teamVote, boolean partVote) { + return MemberStatusResponse.builder() + .id(id) + .name(name) + .hasVotedForTeam(teamVote) + .hasVotedForPartLead(partVote) + .build(); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java b/src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java index 38cdb9c..55317d4 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/service/MemberService.java @@ -1,6 +1,9 @@ package com.ceos22nd.voting_system.domain.member.service; +import com.ceos22nd.voting_system.domain.member.entity.Member; import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; +import com.ceos22nd.voting_system.global.dto.ErrorCode; +import com.ceos22nd.voting_system.global.exception.BusinessException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -8,4 +11,9 @@ @RequiredArgsConstructor public class MemberService { private final MemberRepository memberRepository; + + public Member findByMemberId(Long memberId) { + return memberRepository.findById(memberId) + .orElseThrow(() -> new BusinessException(ErrorCode.MEMBER_NOT_FOUND)); + } } From c20ba48b85db10d9f864d464109140026f11e372 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 15:35:25 +0900 Subject: [PATCH 14/26] =?UTF-8?q?chore:=20front=20Origin=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voting_system/domain/auth/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java index 3bb74f9..911a115 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/config/SecurityConfig.java @@ -48,7 +48,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); - configuration.setAllowedOrigins(List.of("http://localhost:3000")); + configuration.setAllowedOrigins(List.of("http://localhost:3000", "https://next-vote-22nd-inky.vercel.app/")); configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE")); From 0b614408b0e69bd415c059a3d40b539129666c1d Mon Sep 17 00:00:00 2001 From: hxxukii <81512847+gilbert09031@users.noreply.github.com> Date: Sat, 20 Dec 2025 15:36:22 +0900 Subject: [PATCH 15/26] =?UTF-8?q?feat=20:=20Member=20Status=20=EC=97=94?= =?UTF-8?q?=EB=93=9C=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/controller/MemberController.java | 1 + .../voting_system/domain/member/dto/MemberStatusResponse.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java index 7c63fe3..34ae419 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java @@ -34,6 +34,7 @@ public ResponseEntity getMemberStatus( MemberStatusResponse.of( member.getId(), member.getRealName(), + member.getTeam().getTeamName(), hasVotedForTeam, hasVotedForPart ) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java index 0f95b46..859898c 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java @@ -6,13 +6,15 @@ public record MemberStatusResponse( Long id, String name, + String team, boolean hasVotedForTeam, boolean hasVotedForPartLead ) { - public static MemberStatusResponse of(Long id, String name, boolean teamVote, boolean partVote) { + public static MemberStatusResponse of(Long id, String name, String team, boolean teamVote, boolean partVote) { return MemberStatusResponse.builder() .id(id) .name(name) + .team(team) .hasVotedForTeam(teamVote) .hasVotedForPartLead(partVote) .build(); From 96647eb992c760a5b91b19c22e238248ebc7c2f7 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 16:09:15 +0900 Subject: [PATCH 16/26] =?UTF-8?q?feat:=20/me=20=EC=9D=91=EB=8B=B5=EC=97=90?= =?UTF-8?q?=20part=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/controller/MemberController.java | 1 + .../domain/member/dto/MemberStatusResponse.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java index 34ae419..4b5669a 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/controller/MemberController.java @@ -35,6 +35,7 @@ public ResponseEntity getMemberStatus( member.getId(), member.getRealName(), member.getTeam().getTeamName(), + member.getPart(), hasVotedForTeam, hasVotedForPart ) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java index 859898c..672554e 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/dto/MemberStatusResponse.java @@ -1,5 +1,6 @@ package com.ceos22nd.voting_system.domain.member.dto; +import com.ceos22nd.voting_system.domain.member.enums.PartType; import lombok.Builder; @Builder @@ -7,14 +8,17 @@ public record MemberStatusResponse( Long id, String name, String team, + PartType part, boolean hasVotedForTeam, boolean hasVotedForPartLead ) { - public static MemberStatusResponse of(Long id, String name, String team, boolean teamVote, boolean partVote) { + public static MemberStatusResponse of(Long id, String name, String team, PartType part, + boolean teamVote, boolean partVote) { return MemberStatusResponse.builder() .id(id) .name(name) .team(team) + .part(part) .hasVotedForTeam(teamVote) .hasVotedForPartLead(partVote) .build(); From a626e2f6c26d746953b68a7f59481e7ee786b01a Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 16:27:21 +0900 Subject: [PATCH 17/26] =?UTF-8?q?fix:=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EC=8B=9C=20team=20=EB=A7=A4=ED=95=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voting_system/domain/auth/dto/SignUpRequest.java | 2 +- .../voting_system/domain/auth/service/AuthService.java | 7 +++++++ .../voting_system/domain/member/entity/Member.java | 7 +++++-- .../domain/member/repository/TeamRepository.java | 3 +++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java index fb84ec5..ac6706f 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java @@ -21,7 +21,7 @@ public record SignUpRequest( @NotNull(message = "파트를 입력해주세요.") PartType part, - + String team, @NotNull(message = "파트장 후보 여부를 체크해주세요.") diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java index 586f152..0929d1a 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java @@ -6,7 +6,9 @@ import com.ceos22nd.voting_system.domain.auth.dto.SignUpResponse; import com.ceos22nd.voting_system.domain.auth.jwt.TokenProvider; import com.ceos22nd.voting_system.domain.member.entity.Member; +import com.ceos22nd.voting_system.domain.member.entity.Team; import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; +import com.ceos22nd.voting_system.domain.member.repository.TeamRepository; import com.ceos22nd.voting_system.global.dto.ErrorCode; import com.ceos22nd.voting_system.global.exception.BusinessException; import lombok.RequiredArgsConstructor; @@ -23,6 +25,7 @@ public class AuthService { private final MemberRepository memberRepository; private final PasswordEncoder passwordEncoder; private final TokenProvider tokenProvider; + private final TeamRepository teamRepository; @Transactional public SignUpResponse signUp(SignUpRequest request){ @@ -38,12 +41,16 @@ public SignUpResponse signUp(SignUpRequest request){ // 비밀번호 해싱 String encryptedPassword = passwordEncoder.encode(request.password()); + Team team = teamRepository.findByTeamName(request.team()) + .orElseThrow(() -> new BusinessException(ErrorCode.TEAM_NOT_FOUND)); + // Member 객체 생성 Member newMember = Member.create( request.loginId(), encryptedPassword, request.email(), request.part(), + team, request.realName(), request.isPartLeadCandidate() ); diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java index 07df3b1..f73066d 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/entity/Member.java @@ -39,12 +39,13 @@ public class Member { private Team team; @Builder(access = AccessLevel.PRIVATE) - private Member(String loginId, String password, String email, - PartType part, String realName, boolean isPartLeadCandidate) { + private Member(String loginId, String password, String email, PartType part, + Team team, String realName, boolean isPartLeadCandidate) { this.loginId = loginId; this.password = password; // DB 컬럼명과 매핑 this.email = email; this.part = part; + this.team = team; this.realName = realName; this.isPartLeadCandidate = isPartLeadCandidate; } @@ -54,6 +55,7 @@ public static Member create( String encryptedPassword, String email, PartType part, + Team team, String realName, boolean isPartLeadCandidate ){ @@ -62,6 +64,7 @@ public static Member create( .password(encryptedPassword) .email(email) .part(part) + .team(team) .realName(realName) .isPartLeadCandidate(isPartLeadCandidate) .build(); diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java index 57b8f35..feae5c5 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/repository/TeamRepository.java @@ -4,6 +4,9 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository public interface TeamRepository extends JpaRepository { + Optional findByTeamName(String teamName); } From 536e94faaf6d66000a96da3d210c5fcd69c8494e Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 20:05:53 +0900 Subject: [PATCH 18/26] =?UTF-8?q?fix:=20Team=20=EB=A7=A4=ED=95=91=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/auth/dto/SignUpRequest.java | 6 ++-- .../domain/auth/service/AuthService.java | 2 +- .../domain/member/enums/TeamType.java | 34 +++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/member/enums/TeamType.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java index ac6706f..51aca41 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/dto/SignUpRequest.java @@ -1,6 +1,7 @@ package com.ceos22nd.voting_system.domain.auth.dto; import com.ceos22nd.voting_system.domain.member.enums.PartType; +import com.ceos22nd.voting_system.domain.member.enums.TeamType; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -21,8 +22,9 @@ public record SignUpRequest( @NotNull(message = "파트를 입력해주세요.") PartType part, - - String team, + + @NotNull(message = "소속 팀을 선택해주세요.") + TeamType team, @NotNull(message = "파트장 후보 여부를 체크해주세요.") Boolean isPartLeadCandidate diff --git a/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java index 0929d1a..07abe89 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/auth/service/AuthService.java @@ -41,7 +41,7 @@ public SignUpResponse signUp(SignUpRequest request){ // 비밀번호 해싱 String encryptedPassword = passwordEncoder.encode(request.password()); - Team team = teamRepository.findByTeamName(request.team()) + Team team = teamRepository.findByTeamName(request.team().getInputValue()) .orElseThrow(() -> new BusinessException(ErrorCode.TEAM_NOT_FOUND)); // Member 객체 생성 diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/enums/TeamType.java b/src/main/java/com/ceos22nd/voting_system/domain/member/enums/TeamType.java new file mode 100644 index 0000000..8946a5f --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/enums/TeamType.java @@ -0,0 +1,34 @@ +package com.ceos22nd.voting_system.domain.member.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +import java.util.stream.Stream; + +@Getter +@RequiredArgsConstructor +public enum TeamType { + // 괄호 안의 문자열이 프론트에서 보내주는 value와 정확히 일치해야 합니다. + STORIX("STORIX"), + MODELLY("Modelly"), + CATCHUP("CatchUp"), + MENUAL("Menual"), + DIGGINDIE("DiggIndie"); + + private final String inputValue; // 프론트에서 넘어오는 값 + + @JsonCreator + public static TeamType from(String value) { + return Stream.of(TeamType.values()) + .filter(team -> team.getInputValue().equals(value)) + .findFirst() + .orElse(null); + } + + @JsonValue + public String getValue() { + return name(); // CATCHUP + } +} \ No newline at end of file From 828cd89ecf4f9b907c94a0646fa360b844860161 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 20:06:24 +0900 Subject: [PATCH 19/26] =?UTF-8?q?feat:=20=EC=B4=9D=20=EB=93=9D=ED=91=9C?= =?UTF-8?q?=EC=88=98=20=EC=A7=91=EA=B3=84=20api=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/controller/VoteController.java | 17 +++++++++++++++ .../vote/dto/TotalVoteResultResponse.java | 21 +++++++++++++++++++ .../repository/PartLeadVoteRepository.java | 13 ++++++++++++ .../vote/repository/TeamVoteRepository.java | 12 +++++++++++ .../domain/vote/service/VoteService.java | 12 +++++++++++ 5 files changed, 75 insertions(+) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TotalVoteResultResponse.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java index 699ecea..454b09c 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java @@ -1,7 +1,9 @@ package com.ceos22nd.voting_system.domain.vote.controller; import com.ceos22nd.voting_system.domain.auth.security.CustomUserDetails; +import com.ceos22nd.voting_system.domain.vote.dto.TotalVoteResultResponse; import com.ceos22nd.voting_system.domain.vote.dto.VoteRequest; +import com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse; import com.ceos22nd.voting_system.domain.vote.dto.VoteStatusResponse; import com.ceos22nd.voting_system.domain.vote.service.VoteService; import lombok.RequiredArgsConstructor; @@ -9,6 +11,8 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/api/votes") @RequiredArgsConstructor @@ -47,4 +51,17 @@ public ResponseEntity getVoteStatus( return ResponseEntity.ok(VoteStatusResponse.of(hasVotedForTeam, hasVotedForPartLead)); } + + @GetMapping("/results") + public ResponseEntity getVoteResult( + @AuthenticationPrincipal CustomUserDetails userDetails) { + + List teamResults = voteService.getVoteResult("team"); + + List partResults = voteService.getVoteResult("part"); + + TotalVoteResultResponse response = TotalVoteResultResponse.of(teamResults, partResults); + + return ResponseEntity.ok(response); + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TotalVoteResultResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TotalVoteResultResponse.java new file mode 100644 index 0000000..5609e7e --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TotalVoteResultResponse.java @@ -0,0 +1,21 @@ +package com.ceos22nd.voting_system.domain.vote.dto; + +import lombok.Builder; + +import java.util.List; + +@Builder +public record TotalVoteResultResponse( + List teamVoteResults, + List partLeadVoteResults +) { + public static TotalVoteResultResponse of( + List teamVoteResults, + List partLeadResults + ){ + return TotalVoteResultResponse.builder() + .teamVoteResults(teamVoteResults) + .partLeadVoteResults(partLeadResults) + .build(); + } +} diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java index 26ae396..776ed01 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java @@ -1,10 +1,23 @@ package com.ceos22nd.voting_system.domain.vote.repository; +import com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse; import com.ceos22nd.voting_system.domain.vote.entity.PartLeadVote; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; public interface PartLeadVoteRepository extends JpaRepository { + @Query("SELECT new com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse(" + + " m.id, m.realName, COUNT(v)) " + + "FROM PartLeadVote v " + + "RIGHT JOIN v.candidate m " + + "WHERE m.isPartLeadCandidate = true " + + "GROUP BY m.id, m.realName " + + "ORDER BY COUNT(v) DESC") + List findAllPartLeadVoteResults(); + Long countByCandidateId(Long teamId); boolean existsByVoterId(Long voterId); diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java index 9b1d321..05fe0f0 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/TeamVoteRepository.java @@ -1,10 +1,22 @@ package com.ceos22nd.voting_system.domain.vote.repository; +import com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse; import com.ceos22nd.voting_system.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 { + @Query("SELECT new com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse(" + + " t.id, t.teamName, COUNT(v)) " + + "FROM TeamVote v " + + "RIGHT JOIN v.team t " + + "GROUP BY t.id, t.teamName " + + "ORDER BY COUNT(v) DESC") + List findAllTeamVoteResults(); + Long countByTeamId(Long teamId); boolean existsByVoterId(Long voterId); diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java index 8321359..4b7ef69 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java @@ -4,6 +4,7 @@ import com.ceos22nd.voting_system.domain.member.entity.Team; import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; import com.ceos22nd.voting_system.domain.member.repository.TeamRepository; +import com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse; import com.ceos22nd.voting_system.domain.vote.entity.PartLeadVote; import com.ceos22nd.voting_system.domain.vote.entity.TeamVote; import com.ceos22nd.voting_system.domain.vote.repository.PartLeadVoteRepository; @@ -56,6 +57,17 @@ public void voteForPartLead(Long voterId, Long candidateId) { partLeadRepository.save(partLeadVote); } + @Transactional (readOnly = true) + public List getVoteResult(String type){ + if ("team".equalsIgnoreCase(type)){ + return teamVoteRepository.findAllTeamVoteResults(); + } else if ("part".equalsIgnoreCase(type)) { + return partLeadRepository.findAllPartLeadVoteResults(); + } else { + throw new BusinessException(ErrorCode.INVALID_INPUT_VALUE); + } + } + /** * 팀별 투표 결과 조회 */ From bbef05ac0bc60946b3eb9d49ea4ee423b66c9b0c Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sat, 20 Dec 2025 20:08:08 +0900 Subject: [PATCH 20/26] =?UTF-8?q?chore:=20=EC=9E=84=EC=8B=9C=20=ED=8C=80?= =?UTF-8?q?=20=EB=AA=A9=EB=A1=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/import.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/resources/import.sql diff --git a/src/main/resources/import.sql b/src/main/resources/import.sql new file mode 100644 index 0000000..4fd1013 --- /dev/null +++ b/src/main/resources/import.sql @@ -0,0 +1,5 @@ +INSERT INTO team (team_name) VALUES ('STORIX'); +INSERT INTO team (team_name) VALUES ('Modelly'); +INSERT INTO team (team_name) VALUES ('CatchUp'); +INSERT INTO team (team_name) VALUES ('Menual'); +INSERT INTO team (team_name) VALUES ('DiggIndie'); \ No newline at end of file From 979470f55ae73123358b21cab40c48e3537bddc7 Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sun, 21 Dec 2025 00:37:19 +0900 Subject: [PATCH 21/26] =?UTF-8?q?fix:=20=ED=9B=84=EB=B3=B4=20=ED=8C=80=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20api=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/controller/CandidateController.java | 12 +++++++++--- .../domain/vote/dto/TeamCandidateResponse.java | 17 +++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TeamCandidateResponse.java diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java index a6b9160..3429d75 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/CandidateController.java @@ -3,6 +3,7 @@ import com.ceos22nd.voting_system.domain.member.entity.Member; import com.ceos22nd.voting_system.domain.member.entity.Team; import com.ceos22nd.voting_system.domain.vote.dto.PartLeadCandidateResponse; +import com.ceos22nd.voting_system.domain.vote.dto.TeamCandidateResponse; import com.ceos22nd.voting_system.domain.vote.service.VoteService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -20,9 +21,14 @@ public class CandidateController { private final VoteService voteService; @GetMapping("/teams") - public ResponseEntity> getTeamCandidates() { - List teams = voteService.getAllTeams(); - return ResponseEntity.ok(teams); + public ResponseEntity> getTeamCandidates() { + List candidates = voteService.getAllTeams(); + + List response = candidates.stream() + .map(TeamCandidateResponse::from) + .toList(); + + return ResponseEntity.ok(response); } @GetMapping("/parts") diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TeamCandidateResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TeamCandidateResponse.java new file mode 100644 index 0000000..3ccfa17 --- /dev/null +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/TeamCandidateResponse.java @@ -0,0 +1,17 @@ +package com.ceos22nd.voting_system.domain.vote.dto; + +import com.ceos22nd.voting_system.domain.member.entity.Team; +import lombok.Builder; + +@Builder +public record TeamCandidateResponse( + Long id, + String name +) { + public static TeamCandidateResponse from(Team team) { + return TeamCandidateResponse.builder() + .id(team.getId()) + .name(team.getTeamName()) + .build(); + } +} From bc3ac4da81c638fe4683b949edbf0264270daeaa Mon Sep 17 00:00:00 2001 From: ba2slk <0730bss@gmail.com> Date: Sun, 21 Dec 2025 16:26:08 +0900 Subject: [PATCH 22/26] =?UTF-8?q?feat:=20=ED=88=AC=ED=91=9C=20=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EC=A1=B0=ED=9A=8C=20api=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/member/enums/PartType.java | 6 ++++- .../vote/controller/VoteController.java | 19 +++++++++++----- .../domain/vote/dto/VoteResultResponse.java | 4 ++-- .../repository/PartLeadVoteRepository.java | 6 +++-- .../domain/vote/service/VoteService.java | 22 ++++++++++++++----- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java b/src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java index ece340a..0433720 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/member/enums/PartType.java @@ -1,5 +1,9 @@ package com.ceos22nd.voting_system.domain.member.enums; public enum PartType { - FRONTEND, BACKEND + FRONTEND, BACKEND; + + public static PartType from(String value) { + return PartType.valueOf(value.toUpperCase()); + } } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java index 454b09c..d503c09 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/controller/VoteController.java @@ -1,7 +1,7 @@ package com.ceos22nd.voting_system.domain.vote.controller; import com.ceos22nd.voting_system.domain.auth.security.CustomUserDetails; -import com.ceos22nd.voting_system.domain.vote.dto.TotalVoteResultResponse; +import com.ceos22nd.voting_system.domain.member.enums.PartType; import com.ceos22nd.voting_system.domain.vote.dto.VoteRequest; import com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse; import com.ceos22nd.voting_system.domain.vote.dto.VoteStatusResponse; @@ -52,15 +52,22 @@ public ResponseEntity getVoteStatus( return ResponseEntity.ok(VoteStatusResponse.of(hasVotedForTeam, hasVotedForPartLead)); } - @GetMapping("/results") - public ResponseEntity getVoteResult( + @GetMapping("/results/teams") + public ResponseEntity> getTeamVoteResult( @AuthenticationPrincipal CustomUserDetails userDetails) { - List teamResults = voteService.getVoteResult("team"); + List response = voteService.getTeamVoteResult(); - List partResults = voteService.getVoteResult("part"); + return ResponseEntity.ok(response); + } - TotalVoteResultResponse response = TotalVoteResultResponse.of(teamResults, partResults); + @GetMapping("/results/parts/{part}") + public ResponseEntity> getPartVoteResult( + @AuthenticationPrincipal CustomUserDetails userDetails, + @PathVariable("part") String part + ) { + PartType partType = PartType.from(part); + List response = voteService.getPartVoteResult(partType); return ResponseEntity.ok(response); } diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java index b50f3b9..48475a3 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/dto/VoteResultResponse.java @@ -11,7 +11,7 @@ public class VoteResultResponse { private String targetName; // team name 또는 member name private Long voteCount; - public static VoteResultResponse of(Long tagetId, String targetName, Long voteCount) { - return new VoteResultResponse(tagetId, targetName, voteCount); + public static VoteResultResponse of(Long targetId, String targetName, Long voteCount) { + return new VoteResultResponse(targetId, targetName, voteCount); } } \ No newline at end of file diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java index 776ed01..06d6db8 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/repository/PartLeadVoteRepository.java @@ -1,9 +1,11 @@ package com.ceos22nd.voting_system.domain.vote.repository; +import com.ceos22nd.voting_system.domain.member.enums.PartType; import com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse; import com.ceos22nd.voting_system.domain.vote.entity.PartLeadVote; 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; @@ -13,10 +15,10 @@ public interface PartLeadVoteRepository extends JpaRepository findAllPartLeadVoteResults(); + List findAllPartLeadVoteResultsByPart(@Param("part")PartType part); Long countByCandidateId(Long teamId); diff --git a/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java index 4b7ef69..17ee85d 100644 --- a/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java +++ b/src/main/java/com/ceos22nd/voting_system/domain/vote/service/VoteService.java @@ -2,6 +2,7 @@ import com.ceos22nd.voting_system.domain.member.entity.Member; import com.ceos22nd.voting_system.domain.member.entity.Team; +import com.ceos22nd.voting_system.domain.member.enums.PartType; import com.ceos22nd.voting_system.domain.member.repository.MemberRepository; import com.ceos22nd.voting_system.domain.member.repository.TeamRepository; import com.ceos22nd.voting_system.domain.vote.dto.VoteResultResponse; @@ -12,6 +13,7 @@ import com.ceos22nd.voting_system.global.dto.ErrorCode; import com.ceos22nd.voting_system.global.exception.BusinessException; import lombok.RequiredArgsConstructor; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,6 +28,7 @@ public class VoteService { private final PartLeadVoteRepository partLeadRepository; private final MemberRepository memberRepository; private final TeamRepository teamRepository; + private final PartLeadVoteRepository partLeadVoteRepository; /** * 팀에 투표하기 @@ -57,13 +60,20 @@ public void voteForPartLead(Long voterId, Long candidateId) { partLeadRepository.save(partLeadVote); } - @Transactional (readOnly = true) - public List getVoteResult(String type){ - if ("team".equalsIgnoreCase(type)){ + @Transactional(readOnly = true) + public List getTeamVoteResult(){ + try { return teamVoteRepository.findAllTeamVoteResults(); - } else if ("part".equalsIgnoreCase(type)) { - return partLeadRepository.findAllPartLeadVoteResults(); - } else { + } catch (DataAccessException e){ + throw new BusinessException(ErrorCode.INVALID_INPUT_VALUE); + } + } + + @Transactional(readOnly = true) + public List getPartVoteResult(PartType partType){ + try { + return partLeadVoteRepository.findAllPartLeadVoteResultsByPart(partType); + } catch (DataAccessException e){ throw new BusinessException(ErrorCode.INVALID_INPUT_VALUE); } } From c096b4f255d556d5734377337a18fc60fb256acd Mon Sep 17 00:00:00 2001 From: ba2slk <130782318+ba2slk@users.noreply.github.com> Date: Mon, 22 Dec 2025 17:59:31 +0900 Subject: [PATCH 23/26] =?UTF-8?q?docs:=20README=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 7f5d396..b2178f5 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,8 @@ # spring-vote-22nd ceos back-end 22nd voting service project + +## Swagger +https://ceos-22nd-catchup.github.io/swagger-ui/ + +## ERD +image From 80364ea1fc808e77d29102951c3634dfc9baf1af Mon Sep 17 00:00:00 2001 From: ba2slk <130782318+ba2slk@users.noreply.github.com> Date: Mon, 22 Dec 2025 18:15:01 +0900 Subject: [PATCH 24/26] =?UTF-8?q?docs:=20README=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/README.md b/README.md index b2178f5..cb3d0b9 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,30 @@ https://ceos-22nd-catchup.github.io/swagger-ui/ ## ERD image + +## 기능 +### 로그인 +- JWT +- AccessToken 기반 +- 일회성 서비스임을 고려하여 RefreshToken 및 로그아웃 미구현 + +### 회원가입 +- 아이디, 비밀번호, 이메일, 파트, 이름, 팀 +- 아이디와 이메일 중복 여부는 회원가입 요청 시점에서 일괄 검사 +- 파트와 팀은 각각 PartType과 TeamType으로 정의해서 일관성 확보 + +### 투표 +- 레포지토리 단에서 득표 순으로 내림차순 정렬하여 반환. +- 파트장 투표와 팀 투표는 반드시 로그인한 사용자만 가능. +- 한 아이디 당 한 번만 투표 가능 (1인 1표). +- 투표 페이지에 접근할 수는 있지만, 투표에 참여할 수는 없음. +- 파트장 투표 시 본인의 파트에 해당하는 파트장 투표만 가능함. + - 프론트엔드에서 로그인한 사용자의 파트 소속을 확인해서 애초에 백엔드 투표 페이지에 접근할 수 없도록 조치함. + - 다만 백엔드에서도 이를 검증하는 로직을 추가하였음. +- 데모데이 투표 시 본인이 속한 팀에는 투표를 할 수 없음. + +## 서버 배포 전략 +- OCI 인스턴스 +- 수동 배포 + - Spring과 MySQL 서버만 필요한 간단한 구조였음 + - 이미 OCI 환경에 기존에 구축한 환경으로 서버를 구동하기 충분했기 때문에 Github Action을 통한 Docker 컨테이너 기반 배포 자동화를 도입하지는 않았음 From c8f74e46ef64a8d82ece399c893a78405bf00e38 Mon Sep 17 00:00:00 2001 From: ba2slk <130782318+ba2slk@users.noreply.github.com> Date: Mon, 22 Dec 2025 18:44:44 +0900 Subject: [PATCH 25/26] =?UTF-8?q?docs:=20=EB=8D=B0=EB=AA=A8=20url=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cb3d0b9..eca28fa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # spring-vote-22nd ceos back-end 22nd voting service project +[CEOS 22기 파트장 & 팀 투표 하러가기](https://next-vote-22nd-inky.vercel.app/) + ## Swagger https://ceos-22nd-catchup.github.io/swagger-ui/ From 65f09d3b0adce9bae9f732e46170071199ce275e Mon Sep 17 00:00:00 2001 From: ba2slk <130782318+ba2slk@users.noreply.github.com> Date: Mon, 22 Dec 2025 18:45:14 +0900 Subject: [PATCH 26/26] =?UTF-8?q?chore:=20=EC=98=A4=ED=83=80=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eca28fa..5c2c1e6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # spring-vote-22nd ceos back-end 22nd voting service project -[CEOS 22기 파트장 & 팀 투표 하러가기](https://next-vote-22nd-inky.vercel.app/) +[CEOS 22기 파트장 & 팀 투표 하러 가기](https://next-vote-22nd-inky.vercel.app/) ## Swagger https://ceos-22nd-catchup.github.io/swagger-ui/