From a1140b191246ec0a5625008358f46fad8e11abc6 Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Sat, 28 Dec 2024 00:49:39 +0900 Subject: [PATCH 01/27] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=EC=B4=88=EA=B8=B0?= =?UTF-8?q?=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 + .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 15 ++ .idea/gradle.xml | 17 ++ .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 10 + .idea/modules.xml | 9 + .idea/modules/vote.main.iml | 8 + .idea/spring-vote-20th.iml | 9 + .idea/vcs.xml | 6 + vote/.gitattributes | 3 + vote/.gitignore | 44 +++ vote/build.gradle | 39 +++ vote/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes vote/gradle/wrapper/gradle-wrapper.properties | 7 + vote/gradlew | 252 ++++++++++++++++++ vote/gradlew.bat | 94 +++++++ vote/settings.gradle | 1 + .../ceos/vote/VoteApplication.java | 15 ++ .../vote/global/entity/BaseTimeEntity.java | 25 ++ .../global/exception/ApiExceptionHandler.java | 37 +++ .../global/exception/CustomException.java | 19 ++ .../ceos/vote/global/exception/ErrorCode.java | 22 ++ .../vote/global/exception/ErrorResponse.java | 39 +++ .../ceos/vote/VoteApplicationTests.java | 13 + 25 files changed, 717 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/modules/vote.main.iml create mode 100644 .idea/spring-vote-20th.iml create mode 100644 .idea/vcs.xml create mode 100644 vote/.gitattributes create mode 100644 vote/.gitignore create mode 100644 vote/build.gradle create mode 100644 vote/gradle/wrapper/gradle-wrapper.jar create mode 100644 vote/gradle/wrapper/gradle-wrapper.properties create mode 100755 vote/gradlew create mode 100644 vote/gradlew.bat create mode 100644 vote/settings.gradle create mode 100644 vote/src/main/java/photoground/ceos/vote/VoteApplication.java create mode 100644 vote/src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java create mode 100644 vote/src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java create mode 100644 vote/src/main/java/photoground/ceos/vote/global/exception/CustomException.java create mode 100644 vote/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java create mode 100644 vote/src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java create mode 100644 vote/src/test/java/photoground/ceos/vote/VoteApplicationTests.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..fd5e7d1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..1d3def4 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..01d672b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..fdc392f --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..a7de245 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..637f93f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/vote.main.iml b/.idea/modules/vote.main.iml new file mode 100644 index 0000000..cf84e60 --- /dev/null +++ b/.idea/modules/vote.main.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/spring-vote-20th.iml b/.idea/spring-vote-20th.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/spring-vote-20th.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/vote/.gitattributes b/vote/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/vote/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/vote/.gitignore b/vote/.gitignore new file mode 100644 index 0000000..ffd6cd6 --- /dev/null +++ b/vote/.gitignore @@ -0,0 +1,44 @@ +/resources +application.yml +application-local.yml +application-dev.yml + + + +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/ diff --git a/vote/build.gradle b/vote/build.gradle new file mode 100644 index 0000000..112fb27 --- /dev/null +++ b/vote/build.gradle @@ -0,0 +1,39 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'photoground.ceos' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/vote/gradle/wrapper/gradle-wrapper.jar b/vote/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/vote/gradle/wrapper/gradle-wrapper.properties b/vote/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e2847c8 --- /dev/null +++ b/vote/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/vote/gradlew b/vote/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/vote/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/vote/gradlew.bat b/vote/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/vote/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/vote/settings.gradle b/vote/settings.gradle new file mode 100644 index 0000000..bfce6e0 --- /dev/null +++ b/vote/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'vote' diff --git a/vote/src/main/java/photoground/ceos/vote/VoteApplication.java b/vote/src/main/java/photoground/ceos/vote/VoteApplication.java new file mode 100644 index 0000000..2537e7e --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/VoteApplication.java @@ -0,0 +1,15 @@ +package photoground.ceos.vote; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class VoteApplication { + + public static void main(String[] args) { + SpringApplication.run(VoteApplication.class, args); + } + +} diff --git a/vote/src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java b/vote/src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java new file mode 100644 index 0000000..c07e02d --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java @@ -0,0 +1,25 @@ +package photoground.ceos.vote.global.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public class BaseTimeEntity { + + @CreatedDate + @Column(name = "created_at", updatable = false, columnDefinition = "timestamp") + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at", columnDefinition = "timestamp") + private LocalDateTime updatedAt; + +} diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java b/vote/src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java new file mode 100644 index 0000000..c389e42 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java @@ -0,0 +1,37 @@ +package photoground.ceos.vote.global.exception; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +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; + +@Slf4j +@RestControllerAdvice +public class ApiExceptionHandler { + + @ExceptionHandler(value = CustomException.class) + public ResponseEntity handleCustomException(CustomException e) { + log.error("[handleCustomException] {} : {}", e.getErrorCode().name(), e.getErrorCode().getMessage()); + return ErrorResponse.fromException(e); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidationException(MethodArgumentNotValidException ex) { + String errorMessage = ex.getBindingResult() + .getAllErrors() + .get(0) + .getDefaultMessage(); // 첫 번째 에러 메시지 가져오기 + + log.error("[Validation Error] {}", errorMessage); + return ResponseEntity + .status(HttpStatus.BAD_REQUEST) + .body(ErrorResponse.builder() + .status(HttpStatus.BAD_REQUEST) + .code("VALIDATION_ERROR") + .message(errorMessage) + .build()); + } + +} \ No newline at end of file diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/CustomException.java b/vote/src/main/java/photoground/ceos/vote/global/exception/CustomException.java new file mode 100644 index 0000000..499b934 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/global/exception/CustomException.java @@ -0,0 +1,19 @@ +package photoground.ceos.vote.global.exception; + +import lombok.Getter; + +@Getter +public class CustomException extends RuntimeException { + private ErrorCode errorCode; + + private String info; + + public CustomException(ErrorCode errorCode){ + this.errorCode = errorCode; + } + + public CustomException(ErrorCode errorCode, String info){ + this.errorCode = errorCode; + this.info = info; + } +} diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java b/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java new file mode 100644 index 0000000..78544d6 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java @@ -0,0 +1,22 @@ +package photoground.ceos.vote.global.exception; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ErrorCode { + // Auth + BAD_CREDENTIALS(HttpStatus.UNAUTHORIZED, "아이디 또는 비밀번호가 잘못되었습니다."), + FAIL_AUTHENTICATION(HttpStatus.UNAUTHORIZED, "로그인에 실패했습니다. 다시 시도해주세요."), + INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다."), + TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), + FAIL_AUTHORIZATION(HttpStatus.FORBIDDEN, "권한이 없는 요청입니다."), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "INTERNAL SERVER ERROR"); + + + private final HttpStatus status; + private final String message; + +} diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java b/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java new file mode 100644 index 0000000..c14aba2 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java @@ -0,0 +1,39 @@ +package photoground.ceos.vote.global.exception; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; + +@Getter +@Builder +public class ErrorResponse { + + private final HttpStatus status; // HTTP 상태 코드 + private final String code; // 에러 코드 + private final String message; // 에러 메시지 + + // ErrorResponse 생성 메서드 + public static ErrorResponse of(HttpStatus status, String code, String message) { + return ErrorResponse.builder() + .status(status) + .message(message) + .code(code) + .build(); + } + + public static ResponseEntity fromException(CustomException e) { + String message = e.getErrorCode().getMessage(); + if (e.getInfo() != null) { + message += " " + e.getInfo(); // 추가 정보가 있는 경우 결합 + } + return ResponseEntity + .status(e.getErrorCode().getStatus()) + .body(ErrorResponse.builder() + .status(e.getErrorCode().getStatus()) + .code(e.getErrorCode().name()) + .message(message) + .build()); + } +} \ No newline at end of file diff --git a/vote/src/test/java/photoground/ceos/vote/VoteApplicationTests.java b/vote/src/test/java/photoground/ceos/vote/VoteApplicationTests.java new file mode 100644 index 0000000..c299f77 --- /dev/null +++ b/vote/src/test/java/photoground/ceos/vote/VoteApplicationTests.java @@ -0,0 +1,13 @@ +package photoground.ceos.vote; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VoteApplicationTests { + + @Test + void contextLoads() { + } + +} From 3e41670ce4a73d68f59686af5ec60bcfb7603964 Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Sat, 28 Dec 2024 14:28:43 +0900 Subject: [PATCH 02/27] =?UTF-8?q?=E2=9C=A8=20feat=20:=20entity=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ .../vote/domain/member/entity/Member.java | 40 ++++++ .../ceos/vote/domain/member/entity/Part.java | 11 ++ .../ceos/vote/domain/member/entity/Team.java | 14 ++ .../vote/domain/vote/entity/LeaderVote.java | 23 ++++ .../vote/domain/vote/entity/TeamVote.java | 17 +++ .../ceos/vote/domain/vote/entity/Vote.java | 35 +++++ .../ceos/vote/test/TestController.java | 14 ++ 8 files changed, 278 insertions(+) create mode 100644 .idea/uiDesigner.xml create mode 100644 vote/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java create mode 100644 vote/src/main/java/photoground/ceos/vote/domain/member/entity/Part.java create mode 100644 vote/src/main/java/photoground/ceos/vote/domain/member/entity/Team.java create mode 100644 vote/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java create mode 100644 vote/src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java create mode 100644 vote/src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java create mode 100644 vote/src/main/java/photoground/ceos/vote/test/TestController.java diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java b/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java new file mode 100644 index 0000000..9073c60 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java @@ -0,0 +1,40 @@ +package photoground.ceos.vote.domain.member.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import photoground.ceos.vote.global.entity.BaseTimeEntity; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Builder +@AllArgsConstructor +public class Member extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "member_id") + private Long id; + + private Long username; + private String password; + private String email; + private String name; + + @Enumerated(EnumType.STRING) + private Part part; + + @Enumerated(EnumType.STRING) + private Team team; + +} diff --git a/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Part.java b/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Part.java new file mode 100644 index 0000000..5b5a063 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Part.java @@ -0,0 +1,11 @@ +package photoground.ceos.vote.domain.member.entity; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum Part { + FRONTEND("프론트엔드"), + BACKEND("백엔드"); + + private final String name; +} diff --git a/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Team.java b/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Team.java new file mode 100644 index 0000000..767e0e1 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Team.java @@ -0,0 +1,14 @@ +package photoground.ceos.vote.domain.member.entity; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum Team { + PHOTO_GROUND("포토그라운드"), + ANGEL_BRIDGE("엔젤브릿지"), + PEDAL_GENIE("페달지니"), + CAKE_WAY("케이크WAY"), + CUPFEE_DEAL("커피딜"); + + private final String name; +} diff --git a/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java b/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java new file mode 100644 index 0000000..4233d79 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java @@ -0,0 +1,23 @@ +package photoground.ceos.vote.domain.vote.entity; + +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import photoground.ceos.vote.domain.member.entity.Member; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@DiscriminatorValue("L") +public class LeaderVote extends Vote { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "candidate_id") + private Member candidate; + +} diff --git a/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java b/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java new file mode 100644 index 0000000..5c5ede4 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java @@ -0,0 +1,17 @@ +package photoground.ceos.vote.domain.vote.entity; + +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import photoground.ceos.vote.domain.member.entity.Team; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@DiscriminatorValue("T") +public class TeamVote extends Vote { + + private Team team; +} diff --git a/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java b/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java new file mode 100644 index 0000000..e20c216 --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java @@ -0,0 +1,35 @@ +package photoground.ceos.vote.domain.vote.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import photoground.ceos.vote.domain.member.entity.Member; +import photoground.ceos.vote.global.entity.BaseTimeEntity; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(name = "vote_type") +public class Vote extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "vote_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "voter_id") + private Member voter; +} diff --git a/vote/src/main/java/photoground/ceos/vote/test/TestController.java b/vote/src/main/java/photoground/ceos/vote/test/TestController.java new file mode 100644 index 0000000..e8fb7db --- /dev/null +++ b/vote/src/main/java/photoground/ceos/vote/test/TestController.java @@ -0,0 +1,14 @@ +package photoground.ceos.vote.test; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestController { + + @GetMapping("/test") + public ResponseEntity test(){ + return ResponseEntity.ok("Hello World"); + } +} From 0a133eec891f52a090fd861444876d5037492a92 Mon Sep 17 00:00:00 2001 From: sh0311 <111671498+sh0311@users.noreply.github.com> Date: Sun, 29 Dec 2024 12:43:53 +0900 Subject: [PATCH 03/27] Create cicd.yml --- .github/workflows/cicd.yml | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/cicd.yml diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml new file mode 100644 index 0000000..2f88ee9 --- /dev/null +++ b/.github/workflows/cicd.yml @@ -0,0 +1,57 @@ +name: CICD + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 #github actions의 탬플릿(자동으로 pull받음) + - name: Install JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: Build with Gradle + run: | + mkdir -p ./src/main/resources + echo ${{ secrets.APPLICATION }} | base64 --decode > ./src/main/resources/application.yml + echo ${{ secrets.APPLICATION_PROD }} | base64 --decode > ./src/main/resources/application-prod.yml + echo ${{ secrets.APPLICATION_LOCAL }} | base64 --decode > ./src/main/resources/application-local.yml + chmod 777 ./gradlew + ./gradlew clean build -x test #jar파일 생성 + + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build Docker (create Docker image) + run: docker build --platform linux/amd64 -t ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote . + - name: Push Docker + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote:latest + + deploy: + needs: build + runs-on: ubuntu-latest + steps: + - name: Docker compose #ec2로 이동해서 ec2에 접속 + uses: appleboy/ssh-action@master + with: + username: ubuntu + host: ${{ secrets.VOTE_SERVER_IP }} + key: ${{ secrets.EC2_SSH_KEY }} + script: | + sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote:latest + sudo docker ps -q --filter "name=ceos_vote" | grep -q . && sudo docker stop ceos_vote && sudo docker rm ceos_vote || true + sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos_vote:latest + From e7ed737a33a5ffe42a884454004dc9ed5a1f0138 Mon Sep 17 00:00:00 2001 From: sh0311 <111671498+sh0311@users.noreply.github.com> Date: Sun, 29 Dec 2024 14:07:00 +0900 Subject: [PATCH 04/27] Update cicd.yml --- .github/workflows/cicd.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 2f88ee9..7412b35 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -20,6 +20,13 @@ jobs: java-version: '17' distribution: 'temurin' + - name: Verify files and directories + run: | + echo "Current directory:" + pwd + echo "Files in current directory:" + ls -al + - name: Build with Gradle run: | mkdir -p ./src/main/resources From b45f9aab12a731a1df09b6d8f9ae9124f4655161 Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Sun, 29 Dec 2024 14:10:07 +0900 Subject: [PATCH 05/27] =?UTF-8?q?feat=20:=20Dockerfile=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 13 +++++++++++++ vote/.gitignore | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c82b85d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +# 1. Java 이미지를 기반으로 설정 +FROM openjdk:17-jdk + +ARG JAR_FILE=/build/libs/*.jar + +# 3. JAR 파일 복사 +COPY ${JAR_FILE} app.jar + +# 4. 환경 변수로 Spring Profile 설정 (기본값: local) +ENV SPRING_PROFILES_ACTIVE=dev + +# 5. 애플리케이션 실행 +ENTRYPOINT ["java", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "app.jar"] \ No newline at end of file diff --git a/vote/.gitignore b/vote/.gitignore index ffd6cd6..2c9b6a7 100644 --- a/vote/.gitignore +++ b/vote/.gitignore @@ -1,7 +1,7 @@ /resources application.yml application-local.yml -application-dev.yml +application-prod.yml From a17f0ee8174b69250f3a1596367fbc66842790cb Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Sun, 29 Dec 2024 14:16:36 +0900 Subject: [PATCH 06/27] =?UTF-8?q?=F0=9F=9A=9A=20move=20:=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes vote/.gitattributes => .gitattributes | 0 vote/.gitignore => .gitignore | 4 +-- .idea/modules/vote.main.iml | 4 +-- HELP.md | 25 ++++++++++++++++++ vote/build.gradle => build.gradle | 0 .../wrapper/gradle-wrapper.jar | Bin .../wrapper/gradle-wrapper.properties | 0 vote/gradlew => gradlew | 0 vote/gradlew.bat => gradlew.bat | 0 vote/settings.gradle => settings.gradle | 0 .../ceos/vote/VoteApplication.java | 0 .../vote/domain/member/entity/Member.java | 0 .../ceos/vote/domain/member/entity/Part.java | 0 .../ceos/vote/domain/member/entity/Team.java | 0 .../vote/domain/vote/entity/LeaderVote.java | 0 .../vote/domain/vote/entity/TeamVote.java | 0 .../ceos/vote/domain/vote/entity/Vote.java | 0 .../vote/global/entity/BaseTimeEntity.java | 0 .../global/exception/ApiExceptionHandler.java | 0 .../global/exception/CustomException.java | 0 .../ceos/vote/global/exception/ErrorCode.java | 0 .../vote/global/exception/ErrorResponse.java | 0 .../ceos/vote/test/TestController.java | 0 .../ceos/vote/VoteApplicationTests.java | 0 25 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 .DS_Store rename vote/.gitattributes => .gitattributes (100%) rename vote/.gitignore => .gitignore (90%) create mode 100644 HELP.md rename vote/build.gradle => build.gradle (100%) rename {vote/gradle => gradle}/wrapper/gradle-wrapper.jar (100%) rename {vote/gradle => gradle}/wrapper/gradle-wrapper.properties (100%) rename vote/gradlew => gradlew (100%) rename vote/gradlew.bat => gradlew.bat (100%) rename vote/settings.gradle => settings.gradle (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/VoteApplication.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/domain/member/entity/Member.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/domain/member/entity/Part.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/domain/member/entity/Team.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/global/exception/CustomException.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/global/exception/ErrorCode.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java (100%) rename {vote/src => src}/main/java/photoground/ceos/vote/test/TestController.java (100%) rename {vote/src => src}/test/java/photoground/ceos/vote/VoteApplicationTests.java (100%) diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..48fc58a87a9cd448df31d1f37ab5522644433667 GIT binary patch literal 6148 zcmeHK%SyvQ6g|^c`x5NZjgT)W_y=ieK|w+E2Q+Oh#cH7s+-C1T_zQlYD?RtlP?I!u zDI)ilJ7+REXC`x|WHJC;e=|M!Ag@wNyvT4ov4JC7SU-RDp(H14CoZs*yYNy2%o^Qy|UpsM2>LtNsT{HIc<-ZD-#aYJ^G z^S&aMDa50!;utHsv*vGxXFlQTCx_Loth!465~KVa)Tbq>@sILwddITWW*sQ_2d;p3j3K$1WJ@O92c`4CLT{vPmFK2rc zcyYkgqnE>l!-oqayKq8rIy(E0lnxhrw9*_f2l5V7{bfh?|Ka}ge_mu)=72fyuN-i- z!R?^WDTTdtXL7RFM$9{=gz!?2TL~+=6_YDl@d;Cd?U7W7alq6gTNw5spf*@x4*aSE EUm!q|$p8QV literal 0 HcmV?d00001 diff --git a/vote/.gitattributes b/.gitattributes similarity index 100% rename from vote/.gitattributes rename to .gitattributes diff --git a/vote/.gitignore b/.gitignore similarity index 90% rename from vote/.gitignore rename to .gitignore index 2c9b6a7..e6328b0 100644 --- a/vote/.gitignore +++ b/.gitignore @@ -5,10 +5,10 @@ application-prod.yml -HELP.md +vote/HELP.md .gradle build/ -!gradle/wrapper/gradle-wrapper.jar +!../gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ diff --git a/.idea/modules/vote.main.iml b/.idea/modules/vote.main.iml index cf84e60..afc1871 100644 --- a/.idea/modules/vote.main.iml +++ b/.idea/modules/vote.main.iml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..1052f41 --- /dev/null +++ b/HELP.md @@ -0,0 +1,25 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.1/gradle-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.1/gradle-plugin/packaging-oci-image.html) +* [Spring Web](https://docs.spring.io/spring-boot/3.4.1/reference/web/servlet.html) +* [Spring Data JPA](https://docs.spring.io/spring-boot/3.4.1/reference/data/sql.html#data.sql.jpa-and-spring-data) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) +* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) + +### Additional Links +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + diff --git a/vote/build.gradle b/build.gradle similarity index 100% rename from vote/build.gradle rename to build.gradle diff --git a/vote/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from vote/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/vote/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from vote/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/vote/gradlew b/gradlew similarity index 100% rename from vote/gradlew rename to gradlew diff --git a/vote/gradlew.bat b/gradlew.bat similarity index 100% rename from vote/gradlew.bat rename to gradlew.bat diff --git a/vote/settings.gradle b/settings.gradle similarity index 100% rename from vote/settings.gradle rename to settings.gradle diff --git a/vote/src/main/java/photoground/ceos/vote/VoteApplication.java b/src/main/java/photoground/ceos/vote/VoteApplication.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/VoteApplication.java rename to src/main/java/photoground/ceos/vote/VoteApplication.java diff --git a/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java b/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java rename to src/main/java/photoground/ceos/vote/domain/member/entity/Member.java diff --git a/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Part.java b/src/main/java/photoground/ceos/vote/domain/member/entity/Part.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/domain/member/entity/Part.java rename to src/main/java/photoground/ceos/vote/domain/member/entity/Part.java diff --git a/vote/src/main/java/photoground/ceos/vote/domain/member/entity/Team.java b/src/main/java/photoground/ceos/vote/domain/member/entity/Team.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/domain/member/entity/Team.java rename to src/main/java/photoground/ceos/vote/domain/member/entity/Team.java diff --git a/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java b/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java rename to src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java diff --git a/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java b/src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java rename to src/main/java/photoground/ceos/vote/domain/vote/entity/TeamVote.java diff --git a/vote/src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java b/src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java rename to src/main/java/photoground/ceos/vote/domain/vote/entity/Vote.java diff --git a/vote/src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java b/src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java rename to src/main/java/photoground/ceos/vote/global/entity/BaseTimeEntity.java diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java b/src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java rename to src/main/java/photoground/ceos/vote/global/exception/ApiExceptionHandler.java diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/CustomException.java b/src/main/java/photoground/ceos/vote/global/exception/CustomException.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/global/exception/CustomException.java rename to src/main/java/photoground/ceos/vote/global/exception/CustomException.java diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java b/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java rename to src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java diff --git a/vote/src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java b/src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java rename to src/main/java/photoground/ceos/vote/global/exception/ErrorResponse.java diff --git a/vote/src/main/java/photoground/ceos/vote/test/TestController.java b/src/main/java/photoground/ceos/vote/test/TestController.java similarity index 100% rename from vote/src/main/java/photoground/ceos/vote/test/TestController.java rename to src/main/java/photoground/ceos/vote/test/TestController.java diff --git a/vote/src/test/java/photoground/ceos/vote/VoteApplicationTests.java b/src/test/java/photoground/ceos/vote/VoteApplicationTests.java similarity index 100% rename from vote/src/test/java/photoground/ceos/vote/VoteApplicationTests.java rename to src/test/java/photoground/ceos/vote/VoteApplicationTests.java From c9f512b50df8f3de3c221cdd9b8de27277bfc49c Mon Sep 17 00:00:00 2001 From: sh0311 <111671498+sh0311@users.noreply.github.com> Date: Sun, 29 Dec 2024 14:30:47 +0900 Subject: [PATCH 07/27] Update cicd.yml --- .github/workflows/cicd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 7412b35..254ef02 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -58,7 +58,7 @@ jobs: host: ${{ secrets.VOTE_SERVER_IP }} key: ${{ secrets.EC2_SSH_KEY }} script: | - sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote:latest + sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote sudo docker ps -q --filter "name=ceos_vote" | grep -q . && sudo docker stop ceos_vote && sudo docker rm ceos_vote || true - sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos_vote:latest + sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos_vote From 3c5e4199964b228aa9e5d552ed1dc30e2226ec56 Mon Sep 17 00:00:00 2001 From: sh0311 <111671498+sh0311@users.noreply.github.com> Date: Sun, 29 Dec 2024 14:42:01 +0900 Subject: [PATCH 08/27] Update cicd.yml --- .github/workflows/cicd.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 254ef02..364065c 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -43,7 +43,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build Docker (create Docker image) - run: docker build --platform linux/amd64 -t ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote . + run: docker build --platform linux/amd64 -t ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote:latest . - name: Push Docker run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote:latest @@ -58,7 +58,11 @@ jobs: host: ${{ secrets.VOTE_SERVER_IP }} key: ${{ secrets.EC2_SSH_KEY }} script: | - sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote - sudo docker ps -q --filter "name=ceos_vote" | grep -q . && sudo docker stop ceos_vote && sudo docker rm ceos_vote || true - sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos_vote + sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote:latest + if [ $(sudo docker ps -q --filter "name=ceos_vote") ]; then + echo "Stopping and removing existing container..." + sudo docker stop ceos_vote + sudo docker rm ceos_vote + fi + sudo docker run -d -p 8080:8080 ${{ secrets.DOCKERHUB_USERNAME }}/ceos_vote:latest From 154e7f0fcebee7508ba1361b433268da82cbe888 Mon Sep 17 00:00:00 2001 From: sh0311 <111671498+sh0311@users.noreply.github.com> Date: Sun, 29 Dec 2024 15:41:31 +0900 Subject: [PATCH 09/27] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c82b85d..40be9f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG JAR_FILE=/build/libs/*.jar COPY ${JAR_FILE} app.jar # 4. 환경 변수로 Spring Profile 설정 (기본값: local) -ENV SPRING_PROFILES_ACTIVE=dev +ENV SPRING_PROFILES_ACTIVE=prod # 5. 애플리케이션 실행 -ENTRYPOINT ["java", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-Dspring.profiles.active=${SPRING_PROFILES_ACTIVE}", "-jar", "app.jar"] From 7af69c6eec1cf11cdddf0ed320c8f8baa503636e Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Mon, 30 Dec 2024 15:23:45 +0900 Subject: [PATCH 10/27] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=ED=9B=84=EB=B3=B4?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 2 +- .idea/gradle.xml | 9 ++++ .idea/modules.xml | 2 +- .../vote/domain/member/entity/Member.java | 2 +- .../ceos/vote/domain/member/entity/Team.java | 2 + .../member/repository/MemberRepository.java | 10 +++++ .../domain/member/service/MemberService.java | 21 ++++++++++ .../vote/controller/VoteController.java | 36 ++++++++++++++++ .../ceos/vote/domain/vote/dto/LeaderDTO.java | 22 ++++++++++ .../vote/domain/vote/dto/LeaderListDTO.java | 18 ++++++++ .../vote/domain/vote/dto/TeamListDTO.java | 19 +++++++++ .../vote/repository/VoteRepository.java | 7 ++++ .../vote/domain/vote/service/VoteService.java | 42 +++++++++++++++++++ 13 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java create mode 100644 src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java create mode 100644 src/main/java/photoground/ceos/vote/domain/vote/controller/VoteController.java create mode 100644 src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderDTO.java create mode 100644 src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderListDTO.java create mode 100644 src/main/java/photoground/ceos/vote/domain/vote/dto/TeamListDTO.java create mode 100644 src/main/java/photoground/ceos/vote/domain/vote/repository/VoteRepository.java create mode 100644 src/main/java/photoground/ceos/vote/domain/vote/service/VoteService.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 1d3def4..8c129a5 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -8,7 +8,7 @@ - + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 01d672b..4fcec57 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,15 @@ - + \ No newline at end of file diff --git a/src/main/java/photoground/ceos/vote/domain/vote/controller/VoteController.java b/src/main/java/photoground/ceos/vote/domain/vote/controller/VoteController.java index 1d91750..ae64498 100644 --- a/src/main/java/photoground/ceos/vote/domain/vote/controller/VoteController.java +++ b/src/main/java/photoground/ceos/vote/domain/vote/controller/VoteController.java @@ -45,7 +45,7 @@ public ResponseEntity showCandidates() { } //파트장 투표 - @PostMapping("/leader") //로그인 구현 후 수정 + @PostMapping("/leader") public ResponseEntity> LeaderVote(@RequestBody VoteLeaderDTO voteDTO, @AuthenticationPrincipal CustomUserDetails customUserDetails) { diff --git a/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java b/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java index 95f09a7..84068df 100644 --- a/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java +++ b/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java @@ -5,6 +5,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -80,6 +81,8 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) { //경로별 인가 작업 http.authorizeHttpRequests((auth) -> auth .requestMatchers("/login", "/", "/api/member/join").permitAll() // 해당 경로는 모든 사용자가 접근 가능 + .requestMatchers(HttpMethod.GET, "/api/votes/team").permitAll() + .requestMatchers(HttpMethod.GET, "/api/votes/leader").permitAll() .requestMatchers("/admin").hasRole("ADMIN") // admin 경로는 해당 권한을 가진 사용자만 접근 가능. .requestMatchers("/api/reissue").permitAll() // 리프레시 토큰은 모든 사용자가 접근 가능 .anyRequest().authenticated()); // 이외의 남은 경로는 로그인한 사용자만 접근 가능 From d8484095744842feb3ebb9f07ff8265d5bea5bca Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Fri, 3 Jan 2025 14:31:39 +0900 Subject: [PATCH 21/27] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=ED=9B=84=EB=B3=B4?= =?UTF-8?q?=EC=9E=90=EB=8A=94=20candidate=20=EC=97=94=ED=8B=B0=ED=8B=B0?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/candidate/entity/Candidate.java | 47 +++++++++++++++++++ .../repository/CandidateRepository.java | 12 +++++ .../candidate/service/CandidateService.java | 34 ++++++++++++++ .../vote/domain/member/entity/Member.java | 8 +--- .../member/repository/MemberRepository.java | 3 -- .../domain/member/service/MemberService.java | 10 ---- .../ceos/vote/domain/vote/dto/LeaderDTO.java | 10 ++-- .../vote/domain/vote/dto/LeaderResultDTO.java | 12 ++--- .../vote/domain/vote/entity/LeaderVote.java | 5 +- .../vote/domain/vote/service/VoteService.java | 19 ++++---- .../ceos/vote/global/exception/ErrorCode.java | 5 +- 11 files changed, 123 insertions(+), 42 deletions(-) create mode 100644 src/main/java/photoground/ceos/vote/domain/candidate/entity/Candidate.java create mode 100644 src/main/java/photoground/ceos/vote/domain/candidate/repository/CandidateRepository.java create mode 100644 src/main/java/photoground/ceos/vote/domain/candidate/service/CandidateService.java diff --git a/src/main/java/photoground/ceos/vote/domain/candidate/entity/Candidate.java b/src/main/java/photoground/ceos/vote/domain/candidate/entity/Candidate.java new file mode 100644 index 0000000..de94e2f --- /dev/null +++ b/src/main/java/photoground/ceos/vote/domain/candidate/entity/Candidate.java @@ -0,0 +1,47 @@ +package photoground.ceos.vote.domain.candidate.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import photoground.ceos.vote.domain.member.entity.Part; +import photoground.ceos.vote.domain.member.entity.Team; +import photoground.ceos.vote.global.entity.BaseTimeEntity; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +@Builder +@AllArgsConstructor +public class Candidate extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "candidate_id") + private Long id; + + private String name; + + @Builder.Default + private Integer voteNum = 0; + + @Enumerated(EnumType.STRING) + private Part part; + + @Enumerated(EnumType.STRING) + private Team team; + + + public void increaseVoteNum() { + voteNum++; + } + +} diff --git a/src/main/java/photoground/ceos/vote/domain/candidate/repository/CandidateRepository.java b/src/main/java/photoground/ceos/vote/domain/candidate/repository/CandidateRepository.java new file mode 100644 index 0000000..ebd85cd --- /dev/null +++ b/src/main/java/photoground/ceos/vote/domain/candidate/repository/CandidateRepository.java @@ -0,0 +1,12 @@ +package photoground.ceos.vote.domain.candidate.repository; + +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import photoground.ceos.vote.domain.candidate.entity.Candidate; +import photoground.ceos.vote.domain.member.entity.Part; + +public interface CandidateRepository extends JpaRepository { + + List findByPart(Part part); + +} diff --git a/src/main/java/photoground/ceos/vote/domain/candidate/service/CandidateService.java b/src/main/java/photoground/ceos/vote/domain/candidate/service/CandidateService.java new file mode 100644 index 0000000..2ae9269 --- /dev/null +++ b/src/main/java/photoground/ceos/vote/domain/candidate/service/CandidateService.java @@ -0,0 +1,34 @@ +package photoground.ceos.vote.domain.candidate.service; + +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import photoground.ceos.vote.domain.candidate.entity.Candidate; +import photoground.ceos.vote.domain.candidate.repository.CandidateRepository; +import photoground.ceos.vote.domain.member.entity.Part; +import photoground.ceos.vote.global.exception.CustomException; +import photoground.ceos.vote.global.exception.ErrorCode; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class CandidateService { + + private final CandidateRepository candidateRepository; + + + public List findByPart(Part part) { + return candidateRepository.findByPart(part); + } + + public boolean existsById(Long candidateId) { + return candidateRepository.existsById(candidateId); + } + + public Candidate findById(Long candidateId) { + return candidateRepository.findById(candidateId) + .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_CANDIDATE)); + } + +} diff --git a/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java b/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java index 6a00e92..9eed842 100644 --- a/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java +++ b/src/main/java/photoground/ceos/vote/domain/member/entity/Member.java @@ -39,11 +39,5 @@ public class Member extends BaseTimeEntity { @Enumerated(EnumType.STRING) private Team team; - - @Builder.Default - private Integer voteNum = 0; - - public void increaseVoteNum() { - voteNum++; - } + } diff --git a/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java b/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java index c4a5436..a0e50b5 100644 --- a/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java +++ b/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java @@ -1,12 +1,9 @@ package photoground.ceos.vote.domain.member.repository; -import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import photoground.ceos.vote.domain.member.entity.Member; -import photoground.ceos.vote.domain.member.entity.Part; public interface MemberRepository extends JpaRepository { - List findByPart(Part part); boolean existsByUsername(String username); diff --git a/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java b/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java index ab78238..cbc4737 100644 --- a/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java +++ b/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java @@ -1,13 +1,11 @@ package photoground.ceos.vote.domain.member.service; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import photoground.ceos.vote.domain.member.dto.JoinRequestDto; import photoground.ceos.vote.domain.member.entity.Member; -import photoground.ceos.vote.domain.member.entity.Part; import photoground.ceos.vote.domain.member.entity.UserRole; import photoground.ceos.vote.domain.member.repository.MemberRepository; import photoground.ceos.vote.global.exception.CustomException; @@ -41,19 +39,11 @@ public void joinProcess(JoinRequestDto joinDTO) { memberRepository.save(member); } - public List findByPart(Part part) { - - return memberRepository.findByPart(part); - } public Member findById(Long candidateId) { return memberRepository.findById(candidateId) .orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_MEMBER)); } - public boolean existsById(Long candidateId) { - return memberRepository.existsById(candidateId); - } - } diff --git a/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderDTO.java b/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderDTO.java index a1a4094..89e3eb4 100644 --- a/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderDTO.java +++ b/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderDTO.java @@ -2,7 +2,7 @@ import lombok.Builder; import lombok.Getter; -import photoground.ceos.vote.domain.member.entity.Member; +import photoground.ceos.vote.domain.candidate.entity.Candidate; @Getter @Builder @@ -12,11 +12,11 @@ public class LeaderDTO { private String leaderName; private String teamName; - public static LeaderDTO from(Member member){ + public static LeaderDTO from(Candidate candidate) { return LeaderDTO.builder() - .leaderId(member.getId()) - .leaderName(member.getName()) - .teamName(member.getTeam().name()) + .leaderId(candidate.getId()) + .leaderName(candidate.getName()) + .teamName(candidate.getTeam().getName()) .build(); } } diff --git a/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderResultDTO.java b/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderResultDTO.java index 3d6e774..a14cf9d 100644 --- a/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderResultDTO.java +++ b/src/main/java/photoground/ceos/vote/domain/vote/dto/LeaderResultDTO.java @@ -2,7 +2,7 @@ import lombok.Builder; import lombok.Getter; -import photoground.ceos.vote.domain.member.entity.Member; +import photoground.ceos.vote.domain.candidate.entity.Candidate; @Getter @Builder @@ -13,12 +13,12 @@ public class LeaderResultDTO { private String teamName; private int voteNum; - public static LeaderResultDTO from(Member member) { + public static LeaderResultDTO from(Candidate candidate) { return LeaderResultDTO.builder() - .leaderName(member.getName()) - .leaderId(member.getId()) - .teamName(member.getTeam().getName()) - .voteNum(member.getVoteNum()) + .leaderName(candidate.getName()) + .leaderId(candidate.getId()) + .teamName(candidate.getTeam().getName()) + .voteNum(candidate.getVoteNum()) .build(); } diff --git a/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java b/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java index a15bb53..6ad32fc 100644 --- a/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java +++ b/src/main/java/photoground/ceos/vote/domain/vote/entity/LeaderVote.java @@ -8,6 +8,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import photoground.ceos.vote.domain.candidate.entity.Candidate; import photoground.ceos.vote.domain.member.entity.Member; @Entity @@ -18,9 +19,9 @@ public class LeaderVote extends Vote { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "leader_id") - private Member leader; + private Candidate leader; - public LeaderVote(Member leader, Member voter) { + public LeaderVote(Candidate leader, Member voter) { this.leader = leader; this.voter = voter; } diff --git a/src/main/java/photoground/ceos/vote/domain/vote/service/VoteService.java b/src/main/java/photoground/ceos/vote/domain/vote/service/VoteService.java index 8b2d0f3..9869490 100644 --- a/src/main/java/photoground/ceos/vote/domain/vote/service/VoteService.java +++ b/src/main/java/photoground/ceos/vote/domain/vote/service/VoteService.java @@ -7,6 +7,8 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import photoground.ceos.vote.domain.candidate.entity.Candidate; +import photoground.ceos.vote.domain.candidate.service.CandidateService; import photoground.ceos.vote.domain.member.entity.Member; import photoground.ceos.vote.domain.member.entity.Part; import photoground.ceos.vote.domain.member.entity.Team; @@ -33,12 +35,13 @@ public class VoteService { private final VoteRepository voteRepository; private final MemberService memberService; + private final CandidateService candidateService; // 파트장 후보 조회 public LeaderListDTO showLeaders(Part part) { - List members = memberService.findByPart(part); - List dtos = members.stream().map(LeaderDTO::from + List candidates = candidateService.findByPart(part); + List dtos = candidates.stream().map(LeaderDTO::from ).toList(); return LeaderListDTO.from(dtos); } @@ -65,11 +68,11 @@ public void voteLeader(VoteLeaderDTO voteDTO, Long voterId) { Long leaderId = voteDTO.getLeaderId(); //후보자 id 유효성 체크 - if (!memberExist(leaderId)) { + if (!candidateExist(leaderId)) { throw new CustomException(ErrorCode.LEADER_NOT_EXIST); } - Member leader = memberService.findById(leaderId); + Candidate leader = candidateService.findById(leaderId); Member voter = memberService.findById(voterId); //파트 체크 @@ -112,7 +115,7 @@ public void voteTeam(VoteTeamDTO voteDTO, Long voterId) { public LeaderResultListDTO getLeaderResult(Part part) { //파트가 part인 멤버들 찾아서 리스트에 담기 - List candidates = memberService.findByPart(part); + List candidates = candidateService.findByPart(part); //voteNum 기준 내림차순 정렬 List resultList = candidates.stream() @@ -150,12 +153,12 @@ private boolean duplicateLeaderVote(Long voterId) { } //후보자 id 유효성 체크 - private boolean memberExist(Long candidateId) { - return memberService.existsById(candidateId); + private boolean candidateExist(Long candidateId) { + return candidateService.existsById(candidateId); } //파트 체크 - private boolean validPart(Member candidate, Member voter) { + private boolean validPart(Candidate candidate, Member voter) { Part candidatePart = candidate.getPart(); Part myPart = voter.getPart(); diff --git a/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java b/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java index aa60d8c..8b413b0 100644 --- a/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java +++ b/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java @@ -23,7 +23,10 @@ public enum ErrorCode { TEAM_VOTE_ALREADY_EXIST(HttpStatus.BAD_REQUEST, "이미 투표하셨습니다."), INVALID_TEAM_VOTE(HttpStatus.BAD_REQUEST, "본인 팀에는 투표할 수 없습니다."), - // Member + // CANDIDATE + NOT_FOUND_CANDIDATE(HttpStatus.NOT_FOUND, "해당 id의 후보자는 존재하지 않습니다."), + + // MEMBER NOT_FOUND_MEMBER(HttpStatus.NOT_FOUND, "해당 id의 사용자는 존재하지 않습니다."); private final HttpStatus status; From e14284a753b3e5d77029ba3e3fdf2b4f4472a144 Mon Sep 17 00:00:00 2001 From: seona-moon Date: Fri, 3 Jan 2025 20:18:07 +0900 Subject: [PATCH 22/27] =?UTF-8?q?=E2=9C=A8=20feat=20:=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EB=94=94,=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/MemberController.java | 9 ++++++--- .../member/repository/MemberRepository.java | 2 ++ .../domain/member/service/MemberService.java | 18 +++++++++++++----- .../ceos/vote/global/exception/ErrorCode.java | 3 +++ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/java/photoground/ceos/vote/domain/member/controller/MemberController.java b/src/main/java/photoground/ceos/vote/domain/member/controller/MemberController.java index dc09fdf..d7e3714 100644 --- a/src/main/java/photoground/ceos/vote/domain/member/controller/MemberController.java +++ b/src/main/java/photoground/ceos/vote/domain/member/controller/MemberController.java @@ -1,12 +1,16 @@ package photoground.ceos.vote.domain.member.controller; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import photoground.ceos.vote.domain.member.dto.JoinRequestDto; import photoground.ceos.vote.domain.member.service.MemberService; +import photoground.ceos.vote.global.exception.CustomException; +import photoground.ceos.vote.global.exception.ErrorResponse; @RestController @RequiredArgsConstructor @@ -16,9 +20,8 @@ public class MemberController { private final MemberService memberService; @PostMapping("/join") - public String joinProcess(@RequestBody JoinRequestDto joinDTO) { + public ResponseEntity joinProcess(@RequestBody JoinRequestDto joinDTO) { memberService.joinProcess(joinDTO); - return "회원가입이 완료되었습니다."; + return ResponseEntity.ok("회원가입이 완료되었습니다."); } - } diff --git a/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java b/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java index a0e50b5..fc51a3b 100644 --- a/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java +++ b/src/main/java/photoground/ceos/vote/domain/member/repository/MemberRepository.java @@ -7,5 +7,7 @@ public interface MemberRepository extends JpaRepository { boolean existsByUsername(String username); + boolean existsByEmail(String email); + Member findByUsername(String username); } diff --git a/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java b/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java index cbc4737..1148604 100644 --- a/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java +++ b/src/main/java/photoground/ceos/vote/domain/member/service/MemberService.java @@ -23,15 +23,23 @@ public void joinProcess(JoinRequestDto joinDTO) { String username = joinDTO.getUsername(); String password = joinDTO.getPassword(); + String email = joinDTO.getEmail(); - boolean isExist = memberRepository.existsByUsername(username); + // Username 중복 확인 + boolean isUsernameExist = memberRepository.existsByUsername(username); + if (isUsernameExist) { + throw new CustomException(ErrorCode.DUPLICATE_USERNAME); + } - if (password == null) { - throw new IllegalArgumentException("Password cannot be null"); + // Email 중복 확인 + boolean isEmailExist = memberRepository.existsByEmail(email); + if (isEmailExist) { + throw new CustomException(ErrorCode.DUPLICATE_EMAIL); } - if (isExist) { - throw new IllegalStateException("Username already exists"); + // 비밀번호 null 확인 + if (password == null) { + throw new CustomException(ErrorCode.INVALID_PASSWORD); } // 기본 유저 권한은 USER로 설정 diff --git a/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java b/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java index 8b413b0..4860c2b 100644 --- a/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java +++ b/src/main/java/photoground/ceos/vote/global/exception/ErrorCode.java @@ -14,6 +14,9 @@ public enum ErrorCode { TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), FAIL_AUTHORIZATION(HttpStatus.FORBIDDEN, "권한이 없는 요청입니다."), INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "INTERNAL SERVER ERROR"), + DUPLICATE_USERNAME(HttpStatus.BAD_REQUEST, "이미 존재하는 아이디입니다."), + DUPLICATE_EMAIL(HttpStatus.BAD_REQUEST, "이미 존재하는 이메일입니다."), + INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "비밀번호는 반드시 필요합니다."), // Vote LEADER_VOTE_ALREADY_EXIST(HttpStatus.BAD_REQUEST, "이미 투표하셨습니다."), From aafc3386ea10f9e5d2a799e7d329f2dd9b7ace3b Mon Sep 17 00:00:00 2001 From: seona-moon Date: Sat, 4 Jan 2025 00:22:35 +0900 Subject: [PATCH 23/27] =?UTF-8?q?=F0=9F=94=A7=20chore=20:=20=EC=97=91?= =?UTF-8?q?=EC=84=B8=EC=8A=A4=20=ED=86=A0=ED=81=B0=20=EB=A7=8C=EB=A3=8C?= =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/photoground/ceos/vote/global/jwt/LoginFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/photoground/ceos/vote/global/jwt/LoginFilter.java b/src/main/java/photoground/ceos/vote/global/jwt/LoginFilter.java index 7e9a035..d543776 100644 --- a/src/main/java/photoground/ceos/vote/global/jwt/LoginFilter.java +++ b/src/main/java/photoground/ceos/vote/global/jwt/LoginFilter.java @@ -56,7 +56,7 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR String role = auth.getAuthority(); //토큰 생성 - String access = jwtUtil.createJwt("access", username, role, 600000L); + String access = jwtUtil.createJwt("access", username, role, 3600000L); String refresh = jwtUtil.createJwt("refresh", username, role, 86400000L); //Refresh 토큰 저장 From 9d4747e80812619fc2ec2c9129bbe15e03b90733 Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Sat, 4 Jan 2025 11:17:57 +0900 Subject: [PATCH 24/27] =?UTF-8?q?=F0=9F=94=A7=20chore=20:=20ExposedHeaders?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photoground/ceos/vote/global/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java b/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java index 84068df..f353eb9 100644 --- a/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java +++ b/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java @@ -1,6 +1,7 @@ package photoground.ceos.vote.global.config; import jakarta.servlet.http.HttpServletRequest; +import java.util.Arrays; import java.util.Collections; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; @@ -64,7 +65,7 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) { configuration.setAllowedHeaders(Collections.singletonList("*")); configuration.setMaxAge(3600L); - configuration.setExposedHeaders(Collections.singletonList("Authorization")); + configuration.setExposedHeaders(Arrays.asList("access", "Set-Cookie")); return configuration; } From eb1820a9ed07a201c890b3900d22bceee81775b5 Mon Sep 17 00:00:00 2001 From: sh0311 <0311alice@naver.com> Date: Sat, 4 Jan 2025 12:52:32 +0900 Subject: [PATCH 25/27] =?UTF-8?q?=F0=9F=94=A7=20chore=20:=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=A3=BC=EC=86=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../photoground/ceos/vote/global/config/CorsMvcConfig.java | 2 +- .../photoground/ceos/vote/global/config/SecurityConfig.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/photoground/ceos/vote/global/config/CorsMvcConfig.java b/src/main/java/photoground/ceos/vote/global/config/CorsMvcConfig.java index 0ebf984..c9f773c 100644 --- a/src/main/java/photoground/ceos/vote/global/config/CorsMvcConfig.java +++ b/src/main/java/photoground/ceos/vote/global/config/CorsMvcConfig.java @@ -11,6 +11,6 @@ public class CorsMvcConfig implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry corsRegistry) { // 컨트롤러 경로에 대해 요청을 허용 corsRegistry.addMapping("/**") - .allowedOrigins("http://localhost:3000"); + .allowedOrigins("http://localhost:3000", "https://react-vote-20th-l62s.vercel.app/"); } } \ No newline at end of file diff --git a/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java b/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java index f353eb9..9f4b558 100644 --- a/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java +++ b/src/main/java/photoground/ceos/vote/global/config/SecurityConfig.java @@ -59,7 +59,8 @@ public CorsConfiguration getCorsConfiguration(HttpServletRequest request) { CorsConfiguration configuration = new CorsConfiguration(); - configuration.setAllowedOrigins(Collections.singletonList("http://localhost:3000")); + configuration.setAllowedOrigins( + Arrays.asList("http://localhost:3000", "https://react-vote-20th-l62s.vercel.app/")); configuration.setAllowedMethods(Collections.singletonList("*")); configuration.setAllowCredentials(true); configuration.setAllowedHeaders(Collections.singletonList("*")); From ff8df257c8a44d533e06bc09a575997c1097d7fd Mon Sep 17 00:00:00 2001 From: sh0311 <111671498+sh0311@users.noreply.github.com> Date: Mon, 6 Jan 2025 01:01:13 +0900 Subject: [PATCH 26/27] Update README.md --- README.md | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 76efd88..29849cb 100644 --- a/README.md +++ b/README.md @@ -1 +1,34 @@ -# spring_vote_20th \ No newline at end of file +# spring_vote_20th + +### ERD +image + +### API 명세서 +image + +### 테스트 + +<팀 조회> +image + + +<팀 투표> +image + + +<본인 팀 투표> +image + + +<후보자 조회> +image + + +<중복 투표> +image + + +<투표 결과 조회> +image + + From 71bddbb4b55afb81c7717bf068d5589b9f5bec19 Mon Sep 17 00:00:00 2001 From: sh0311 <111671498+sh0311@users.noreply.github.com> Date: Mon, 6 Jan 2025 01:02:51 +0900 Subject: [PATCH 27/27] Update README.md --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 29849cb..984967f 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,43 @@ # spring_vote_20th ### ERD + image ### API 명세서 -image + +image + ### 테스트 <팀 조회> + image <팀 투표> + image <본인 팀 투표> + image <후보자 조회> + image <중복 투표> + image <투표 결과 조회> + image