diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000..b5436b0 Binary files /dev/null and b/dump.rdb differ diff --git a/week6_refresh_assignment/.gitignore b/week6_refresh_assignment/.gitignore new file mode 100644 index 0000000..19b1fc0 --- /dev/null +++ b/week6_refresh_assignment/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +application.yml + diff --git a/week6_refresh_assignment/build.gradle b/week6_refresh_assignment/build.gradle new file mode 100644 index 0000000..0440419 --- /dev/null +++ b/week6_refresh_assignment/build.gradle @@ -0,0 +1,49 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'org.spot' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + testImplementation 'io.rest-assured:rest-assured' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3' + implementation 'org.springframework.boot:spring-boot-starter-validation' + //JWT + implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5' + implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5' + implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5' + + implementation("software.amazon.awssdk:bom:2.21.0") + implementation("software.amazon.awssdk:s3:2.21.0") + //Security + implementation 'org.springframework.boot:spring-boot-starter-security' + + //Redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/week6_refresh_assignment/gradle/wrapper/gradle-wrapper.jar b/week6_refresh_assignment/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/week6_refresh_assignment/gradle/wrapper/gradle-wrapper.jar differ diff --git a/week6_refresh_assignment/gradle/wrapper/gradle-wrapper.properties b/week6_refresh_assignment/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b82aa23 --- /dev/null +++ b/week6_refresh_assignment/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/week6_refresh_assignment/gradlew b/week6_refresh_assignment/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/week6_refresh_assignment/gradlew @@ -0,0 +1,249 @@ +#!/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. +# + +############################################################################## +# +# 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/subprojects/plugins/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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/week6_refresh_assignment/gradlew.bat b/week6_refresh_assignment/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/week6_refresh_assignment/gradlew.bat @@ -0,0 +1,92 @@ +@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 + +@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/week6_refresh_assignment/settings.gradle b/week6_refresh_assignment/settings.gradle new file mode 100644 index 0000000..c9fe82e --- /dev/null +++ b/week6_refresh_assignment/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'pratice' diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/PraticeApplication.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/PraticeApplication.java new file mode 100644 index 0000000..5d4eddf --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/PraticeApplication.java @@ -0,0 +1,13 @@ +package org.spot.pratice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PraticeApplication { + + public static void main(String[] args) { + SpringApplication.run(PraticeApplication.class, args); + } + +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/PrincipalHandler.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/PrincipalHandler.java new file mode 100644 index 0000000..4ea1d62 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/PrincipalHandler.java @@ -0,0 +1,27 @@ +package org.spot.pratice.auth; + +import org.spot.pratice.common.exception.UnauthorizedException; +import org.spot.pratice.common.exception.message.ErrorMessage; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; + +@Component +public class PrincipalHandler { + + private static final String ANONYMOUS_USER = "anonymousUser"; + + public Long getUserIdFromPrincipal() { + // 현재 인증된 사용자의 Principal 객체를 가져오기. + Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); + isPrincipalNull(principal); // Principal 객체가 null이거나 익명의 사용자일 경우 예외를 던지기. + return Long.valueOf(principal.toString()); + } + + public void isPrincipalNull( + final Object principal + ) { + if (principal.toString().equals(ANONYMOUS_USER)) { + throw new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION); + } + } +} \ No newline at end of file diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/SecurityConfig.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/SecurityConfig.java new file mode 100644 index 0000000..f13fa14 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/SecurityConfig.java @@ -0,0 +1,48 @@ +package org.spot.pratice.auth; + +import lombok.RequiredArgsConstructor; +import org.spot.pratice.auth.filter.CustomAccessDeniedHandler; +import org.spot.pratice.auth.filter.CustomJwtAuthenticationEntryPoint; +import org.spot.pratice.auth.filter.JwtAuthenticationFilter; +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.annotation.web.configurers.RequestCacheConfigurer; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@Configuration +@RequiredArgsConstructor +@EnableWebSecurity //web Security를 사용할 수 있게 +public class SecurityConfig { + private final JwtAuthenticationFilter jwtAuthenticationFilter; + private final CustomJwtAuthenticationEntryPoint customJwtAuthenticationEntryPoint; + private final CustomAccessDeniedHandler customAccessDeniedHandler; + + + private static final String[] AUTH_WHITE_LIST = {"/api/v1/member"}; + + @Bean + SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.csrf(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .requestCache(RequestCacheConfigurer::disable) + .httpBasic(AbstractHttpConfigurer::disable) + .exceptionHandling(exception -> + { + exception.authenticationEntryPoint(customJwtAuthenticationEntryPoint); + exception.accessDeniedHandler(customAccessDeniedHandler); + }); + + + http.authorizeHttpRequests(auth -> { + auth.requestMatchers(AUTH_WHITE_LIST).permitAll(); + auth.anyRequest().authenticated(); + }) + .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); + + return http.build(); + } +} \ No newline at end of file diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/UserAuthentication.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/UserAuthentication.java new file mode 100644 index 0000000..e0187d8 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/UserAuthentication.java @@ -0,0 +1,18 @@ +package org.spot.pratice.auth; + + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; + +import java.util.Collection; + +public class UserAuthentication extends UsernamePasswordAuthenticationToken { + + public UserAuthentication(Object principal, Object credentials, Collection authorities) { + super(principal, credentials, authorities); + } + + public static UserAuthentication createUserAuthentication(Long userId) { + return new UserAuthentication(userId, null, null); + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/CustomAccessDeniedHandler.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/CustomAccessDeniedHandler.java new file mode 100644 index 0000000..5047544 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/CustomAccessDeniedHandler.java @@ -0,0 +1,21 @@ +package org.spot.pratice.auth.filter; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.access.AccessDeniedException; // 올바른 import 경로 +import org.springframework.security.web.access.AccessDeniedHandler; +import org.springframework.stereotype.Component; +import java.io.IOException; + +@Component +public class CustomAccessDeniedHandler implements AccessDeniedHandler { + @Override + public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException, ServletException { + setResponse(response); + } + + private void setResponse(HttpServletResponse response) { + response.setStatus(HttpServletResponse.SC_FORBIDDEN); + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/CustomJwtAuthenticationEntryPoint.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/CustomJwtAuthenticationEntryPoint.java new file mode 100644 index 0000000..3fd458e --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/CustomJwtAuthenticationEntryPoint.java @@ -0,0 +1,37 @@ +package org.spot.pratice.auth.filter; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.spot.pratice.common.dto.ErrorResponse; +import org.spot.pratice.common.exception.message.ErrorMessage; +import org.springframework.http.MediaType; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class CustomJwtAuthenticationEntryPoint implements AuthenticationEntryPoint { + + private final ObjectMapper objectMapper; + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { + setResponse(response); + } + + private void setResponse(HttpServletResponse response) throws IOException { + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setCharacterEncoding("UTF-8"); + response.getWriter() + .write(objectMapper.writeValueAsString( + ErrorResponse.of(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION.getStatus(), + ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION.getMessage()))); + } +} + diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/JwtAuthenticationFilter.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/JwtAuthenticationFilter.java new file mode 100644 index 0000000..c4baf2e --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/filter/JwtAuthenticationFilter.java @@ -0,0 +1,52 @@ +package org.spot.pratice.auth.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import org.spot.pratice.auth.UserAuthentication; +import org.spot.pratice.common.exception.UnauthorizedException; +import org.spot.pratice.common.exception.message.ErrorMessage; +import org.spot.pratice.common.jwt.JwtTokenProvider; +import org.spot.pratice.common.jwt.JwtValidationType; +import org.springframework.security.core.context.SecurityContextHolder; +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; + +@Component +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final JwtTokenProvider jwtTokenProvider; + + @Override + protected void doFilterInternal(@NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain) throws ServletException, IOException { + try { + final String token = getJwtFromRequest(request); + if (jwtTokenProvider.validateToken(token) == JwtValidationType.VALID_JWT) { + Long memberId = jwtTokenProvider.getUserFromJwt(token); + UserAuthentication authentication = UserAuthentication.createUserAuthentication(memberId); + authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authentication); + } + } catch (Exception exception) { + throw new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION); + } + filterChain.doFilter(request, response); + } + + private String getJwtFromRequest(HttpServletRequest request) { + String bearerToken = request.getHeader("Authorization"); + if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) { + return bearerToken.substring("Bearer ".length()); + } + return null; + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/RedisConfig.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/RedisConfig.java new file mode 100644 index 0000000..29d57ce --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/RedisConfig.java @@ -0,0 +1,32 @@ +package org.spot.pratice.auth.redis; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +public class RedisConfig { + + @Value("${spring.data.redis.host}") + private String host; + + @Value("${spring.data.redis.port}") + private int port; + + @Bean + public RedisConnectionFactory redisConnectionFactory() { + return new LettuceConnectionFactory(host, port); + } + @Bean + public RedisTemplate redisTemplate() { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory()); + redisTemplate.setKeySerializer(new StringRedisSerializer()); + redisTemplate.setValueSerializer(new StringRedisSerializer()); + return redisTemplate; + } +} \ No newline at end of file diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/domain/Token.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/domain/Token.java new file mode 100644 index 0000000..7821a8f --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/domain/Token.java @@ -0,0 +1,31 @@ +package org.spot.pratice.auth.redis.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.index.Indexed; + +@RedisHash(value = "", timeToLive = 60 * 60 * 24 * 1000L * 14) +@AllArgsConstructor +@Getter +@Builder +public class Token { + + @Id + private Long id; + + @Indexed + private String refreshToken; + + public static Token of( + final Long id, + final String refreshToken + ) { + return Token.builder() + .id(id) + .refreshToken(refreshToken) + .build(); + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/repository/RedisTokenRepository.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/repository/RedisTokenRepository.java new file mode 100644 index 0000000..7cc2e05 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/auth/redis/repository/RedisTokenRepository.java @@ -0,0 +1,12 @@ +package org.spot.pratice.auth.redis.repository; + + +import org.spot.pratice.auth.redis.domain.Token; +import org.springframework.data.repository.CrudRepository; + +import java.util.Optional; + +public interface RedisTokenRepository extends CrudRepository { + Optional findByRefreshToken(final String refreshToken); + Optional findById(final Long id); +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/GlobalExceptionHandler.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/GlobalExceptionHandler.java new file mode 100644 index 0000000..092beef --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/GlobalExceptionHandler.java @@ -0,0 +1,40 @@ +package org.spot.pratice.common; + +import jakarta.persistence.EntityNotFoundException; +import org.spot.pratice.common.dto.ErrorResponse; +import org.spot.pratice.common.exception.NotFoundException; +import org.spot.pratice.common.exception.UnauthorizedException; +import org.spot.pratice.common.exception.message.ErrorMessage; +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; + +import java.util.Objects; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + + + @ExceptionHandler(MethodArgumentNotValidException.class) + protected ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ErrorResponse.of(HttpStatus.BAD_REQUEST.value(), Objects.requireNonNull(e.getBindingResult().getFieldError()).getDefaultMessage())); + } + + + @ExceptionHandler(NotFoundException.class) + protected ResponseEntity handleEntityNotFoundException(NotFoundException e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(ErrorResponse.of(ErrorMessage.MEMBER_NOT_FOUND)); + } + + + @ExceptionHandler(UnauthorizedException.class) + protected ResponseEntity handlerUnauthorizedException(UnauthorizedException e) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .body(ErrorResponse.of(e.getErrorMessage().getStatus(), e.getErrorMessage().getMessage())); + } +} + diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/ErrorResponse.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/ErrorResponse.java new file mode 100644 index 0000000..87d9f3c --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/ErrorResponse.java @@ -0,0 +1,15 @@ +package org.spot.pratice.common.dto; + +import org.spot.pratice.common.exception.message.ErrorMessage; + +public record ErrorResponse( + int status, + String message +) { + public static ErrorResponse of(int status, String message) { + return new ErrorResponse(status, message); + } + public static ErrorResponse of(ErrorMessage errorMessage) { + return new ErrorResponse(errorMessage.getStatus(), errorMessage.getMessage()); + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/SuccessMessage.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/SuccessMessage.java new file mode 100644 index 0000000..4ab6daa --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/SuccessMessage.java @@ -0,0 +1,15 @@ +package org.spot.pratice.common.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum SuccessMessage { + + BLOG_CREATE_SUCCESS(HttpStatus.CREATED.value(),"블로그 생성이 완료되었습니다."), + ; + private final int status; + private final String message; +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/SuccessStatusResponse.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/SuccessStatusResponse.java new file mode 100644 index 0000000..8cbe3a6 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/dto/SuccessStatusResponse.java @@ -0,0 +1,13 @@ +package org.spot.pratice.common.dto; + +public record SuccessStatusResponse( + int status, + String message +) { + + public static SuccessStatusResponse of(SuccessMessage successMessage) { + return new SuccessStatusResponse(successMessage.getStatus(), successMessage.getMessage()); + } + +} + diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/BusinessException.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/BusinessException.java new file mode 100644 index 0000000..5fe39e3 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/BusinessException.java @@ -0,0 +1,16 @@ +package org.spot.pratice.common.exception; + +import lombok.Getter; +import org.postgresql.util.ServerErrorMessage; +import org.spot.pratice.common.exception.message.ErrorMessage; + +@Getter +public class BusinessException extends RuntimeException { + + private final ErrorMessage errorMessage; + + public BusinessException(ErrorMessage errorMessage) { + super(errorMessage.getMessage()); + this.errorMessage = errorMessage; + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/NotFoundException.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/NotFoundException.java new file mode 100644 index 0000000..fbed0c6 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/NotFoundException.java @@ -0,0 +1,9 @@ +package org.spot.pratice.common.exception; + +import org.spot.pratice.common.exception.message.ErrorMessage; + +public class NotFoundException extends BusinessException { + public NotFoundException(ErrorMessage errorMessage) { + super(errorMessage); + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/UnauthorizedException.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/UnauthorizedException.java new file mode 100644 index 0000000..701a60d --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/UnauthorizedException.java @@ -0,0 +1,9 @@ +package org.spot.pratice.common.exception; + +import org.spot.pratice.common.exception.message.ErrorMessage; + +public class UnauthorizedException extends BusinessException { + public UnauthorizedException(ErrorMessage errorMessage) { + super(errorMessage); + } +} \ No newline at end of file diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/message/ErrorMessage.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/message/ErrorMessage.java new file mode 100644 index 0000000..e24dd9e --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/exception/message/ErrorMessage.java @@ -0,0 +1,16 @@ +package org.spot.pratice.common.exception.message; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@AllArgsConstructor +@Getter +public enum ErrorMessage { + MEMBER_NOT_FOUND(HttpStatus.NO_CONTENT.value(), "ID에 해당하는 사용자가 존재하지 않습니다."), + JWT_UNAUTHORIZED_EXCEPTION(HttpStatus.UNAUTHORIZED.value(), "사용자의 로그인 검증을 실패했습니다."), + BLOG_NOT_FOUND(HttpStatus.NO_CONTENT.value(), "ID에 해당하는 블로그가 존재하지 않습니다."); + + private final int status; + private final String message; +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/jwt/JwtTokenProvider.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/jwt/JwtTokenProvider.java new file mode 100644 index 0000000..6ec5e78 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/jwt/JwtTokenProvider.java @@ -0,0 +1,84 @@ +package org.spot.pratice.common.jwt; + +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.Keys; +import lombok.RequiredArgsConstructor; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.util.Base64; +import java.util.Date; + +@Component +@RequiredArgsConstructor +public class JwtTokenProvider { + + private static final String USER_ID = "userId"; + + private static final Long ACCESS_TOKEN_EXPIRATION_TIME = 24 * 60 * 1000L; + private static final Long REFRESH_TOKEN_EXPIRATION_TIME = 24 * 60 * 60 * 1000L * 14; + + @Value("${jwt.secret}") + private String JWT_SECRET; + + + public String issueAccessToken(final Authentication authentication) { + return generateToken(authentication, ACCESS_TOKEN_EXPIRATION_TIME); + } + + public String issueRefreshToken(final Authentication authentication) { + return generateToken(authentication, REFRESH_TOKEN_EXPIRATION_TIME); + } + + + public String generateToken(Authentication authentication, Long tokenExpirationTime) { + final Date now = new Date(); + final Claims claims = Jwts.claims() + .setIssuedAt(now) + .setExpiration(new Date(now.getTime() + tokenExpirationTime)); // 만료 시간 + + claims.put(USER_ID, authentication.getPrincipal()); + + return Jwts.builder() + .setHeaderParam(Header.TYPE, Header.JWT_TYPE) // Header + .setClaims(claims) // Claim + .signWith(getSigningKey()) // Signature + .compact(); + } + + private SecretKey getSigningKey() { + String encodedKey = Base64.getEncoder().encodeToString(JWT_SECRET.getBytes()); //SecretKey 통해 서명 생성 + return Keys.hmacShaKeyFor(encodedKey.getBytes()); //일반적으로 HMAC (Hash-based Message Authentication Code) 알고리즘 사용 + } + + public JwtValidationType validateToken(String token) { + try { + final Claims claims = getBody(token); + return JwtValidationType.VALID_JWT; + } catch (MalformedJwtException ex) { + return JwtValidationType.INVALID_JWT_TOKEN; + } catch (ExpiredJwtException ex) { + return JwtValidationType.EXPIRED_JWT_TOKEN; + } catch (UnsupportedJwtException ex) { + return JwtValidationType.UNSUPPORTED_JWT_TOKEN; + } catch (IllegalArgumentException ex) { + return JwtValidationType.EMPTY_JWT; + } + } + + private Claims getBody(final String token) { + return Jwts.parserBuilder() + .setSigningKey(getSigningKey()) + .build() + .parseClaimsJws(token) + .getBody(); + } + + public Long getUserFromJwt(String token) { + Claims claims = getBody(token); + return Long.valueOf(claims.get(USER_ID).toString()); + } +} \ No newline at end of file diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/common/jwt/JwtValidationType.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/jwt/JwtValidationType.java new file mode 100644 index 0000000..a1349b6 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/common/jwt/JwtValidationType.java @@ -0,0 +1,10 @@ +package org.spot.pratice.common.jwt; + +public enum JwtValidationType { + VALID_JWT, // 유효한 JWT + INVALID_JWT_SIGNATURE, // 유효하지 않은 서명 + INVALID_JWT_TOKEN, // 유효하지 않은 토큰 + EXPIRED_JWT_TOKEN, // 만료된 토큰 + UNSUPPORTED_JWT_TOKEN, // 지원하지 않는 형식의 토큰 + EMPTY_JWT // 빈 JWT +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/config/JpaAuditingConfig.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/config/JpaAuditingConfig.java new file mode 100644 index 0000000..336e866 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/config/JpaAuditingConfig.java @@ -0,0 +1,9 @@ +package org.spot.pratice.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@Configuration +@EnableJpaAuditing +public class JpaAuditingConfig { +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/BlogController.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/BlogController.java new file mode 100644 index 0000000..fcfc965 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/BlogController.java @@ -0,0 +1,47 @@ +package org.spot.pratice.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.spot.pratice.auth.PrincipalHandler; +import org.spot.pratice.common.dto.SuccessMessage; +import org.spot.pratice.common.dto.SuccessStatusResponse; +import org.spot.pratice.service.BlogService; +import org.spot.pratice.service.dto.BlogCreateRequest; +import org.spot.pratice.service.dto.BlogTitleUpdateRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.net.URI; + +@RestController +@RequestMapping("/api/v1") +@RequiredArgsConstructor +public class BlogController { + + private final BlogService blogService; + private final PrincipalHandler principalHandler; + + + @PostMapping("/blog") + public ResponseEntity createBlog( + @ModelAttribute BlogCreateRequest blogCreateRequest + ) { + return ResponseEntity.created(URI.create(blogService.create( + principalHandler.getUserIdFromPrincipal(), blogCreateRequest))).build(); + } + + + @PatchMapping("/blog/{blogId}/title") + public ResponseEntity updateBlogTitle( + @PathVariable Long blogId, + @Valid @RequestBody BlogTitleUpdateRequest blogTitleUdpateRequest + ) { + blogService.updateTitle(blogId, blogTitleUdpateRequest); + return ResponseEntity.noContent().build(); + } +} + + + diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/MemberController.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/MemberController.java new file mode 100644 index 0000000..2e7f5d7 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/MemberController.java @@ -0,0 +1,77 @@ +package org.spot.pratice.controller; + + +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.spot.pratice.auth.PrincipalHandler; +import org.spot.pratice.common.exception.UnauthorizedException; +import org.spot.pratice.common.exception.message.ErrorMessage; +import org.spot.pratice.domain.Member; +import org.spot.pratice.service.dto.MemberFindDto; +import org.spot.pratice.service.MemberService; +import org.spot.pratice.service.dto.MemberCreateDto; +import org.spot.pratice.service.dto.UserJoinResponse; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.net.URI; +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/member") +public class MemberController { + + private final MemberService memberService; + private final PrincipalHandler principalHandler; + + @PostMapping + public ResponseEntity postMember( + @RequestBody MemberCreateDto memberCreate + ) { + UserJoinResponse userJoinResponse = memberService.createMember(memberCreate); + return ResponseEntity.status(HttpStatus.CREATED) + .header("Location", userJoinResponse.userId()) + .body( + userJoinResponse + ); + } + + @GetMapping("/refresh") + public ResponseEntity refreshToken(@RequestHeader("Authorization") String refreshToken){ + + refreshToken = refreshToken.substring(7); // "Bearer " 부분을 제거 + + + UserJoinResponse userJoinResponse = memberService.refreshToken(refreshToken); + return ResponseEntity.status(HttpStatus.CREATED) + .body(userJoinResponse); + } + + + + @GetMapping("/{memberId}") + public ResponseEntity getMemberById( + @PathVariable Long memberId + ) { + return ResponseEntity.ok(memberService.getMemberById(memberId)); + } + + @DeleteMapping("/{memberId}") + public ResponseEntity deleteMember( + @PathVariable Long memberId + ) { + Member member = memberService.deleteMember(memberId); + return ResponseEntity.ok(member); + } + + + @GetMapping + public ResponseEntity> getAllMembers() { + List memberList = memberService.getAllMembers(); + return ResponseEntity.ok(memberList); + } + +} \ No newline at end of file diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/TestController.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/TestController.java new file mode 100644 index 0000000..a071431 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/TestController.java @@ -0,0 +1,20 @@ +package org.spot.pratice.controller; + +import org.spot.pratice.controller.dto.ApiResponse; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestController { + + @GetMapping("/test") + public String test() { + return "1차 세미나 테스트 API 입니다!"; + } + + @GetMapping("/test/json") + public ApiResponse testJson() { + return ApiResponse.create("1차 세미나 테스트 API - JSON application ignore test commit"); + } + +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/dto/ApiResponse.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/dto/ApiResponse.java new file mode 100644 index 0000000..50044e6 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/controller/dto/ApiResponse.java @@ -0,0 +1,17 @@ +package org.spot.pratice.controller.dto; + + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public class ApiResponse { + + String content; + + public static ApiResponse create(String content) { + return new ApiResponse(content); + } + +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/BaseTimeEntity.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/BaseTimeEntity.java new file mode 100644 index 0000000..3247097 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/BaseTimeEntity.java @@ -0,0 +1,22 @@ +package org.spot.pratice.domain; + +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseTimeEntity { + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Blog.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Blog.java new file mode 100644 index 0000000..47bd234 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Blog.java @@ -0,0 +1,50 @@ +package org.spot.pratice.domain; + +import jakarta.persistence.*; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.spot.pratice.service.dto.BlogCreateRequest; + +@Entity +@Getter +@NoArgsConstructor +public class Blog extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @OneToOne(fetch = FetchType.LAZY) + private Member member; + + @Column(length = 200) + private String title; + + private String description; + + private String imageUrl; + + @Builder + public Blog(Member member, String title, String description, String imageUrl) { + this.member = member; + this.title = title; + this.description = description; + this.imageUrl = imageUrl; + } + + public static Blog create( + Member member, + String title, + String description, + String imageUrl + ) { + return new Blog(member, title, description, imageUrl); + } + + public void updateTitle( + String title + ) { + this.title = title; + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Member.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Member.java new file mode 100644 index 0000000..d6b5111 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Member.java @@ -0,0 +1,42 @@ +package org.spot.pratice.domain; + + +import jakarta.persistence.*; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor +public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + @Enumerated(EnumType.STRING) + private Part part; + + private int age; + + + public static Member create(String name, Part part, int age) { + return Member.builder() + .name(name) + .part(part) + .age(age) + .build(); + } + + @Builder + public Member(String name, Part part, int age) { + this.name = name; + this.part = part; + this.age = age; + } + + + +} \ No newline at end of file diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Part.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Part.java new file mode 100644 index 0000000..e7275a9 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Part.java @@ -0,0 +1,8 @@ +package org.spot.pratice.domain; + +public enum Part { + IOS, + SERVER, + WEB, + DESIGN; +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Post.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Post.java new file mode 100644 index 0000000..23cd61e --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/domain/Post.java @@ -0,0 +1,22 @@ +package org.spot.pratice.domain; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor +public class Post extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String title; + + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + private Blog blog; +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/external/AwsConfig.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/external/AwsConfig.java new file mode 100644 index 0000000..d2e2699 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/external/AwsConfig.java @@ -0,0 +1,49 @@ +package org.spot.pratice.external; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import software.amazon.awssdk.auth.credentials.SystemPropertyCredentialsProvider; +import software.amazon.awssdk.regions.Region; +import software.amazon.awssdk.services.s3.S3Client; + + +@Configuration +public class AwsConfig { + + private static final String AWS_ACCESS_KEY_ID = "aws.accessKeyId"; + private static final String AWS_SECRET_ACCESS_KEY = "aws.secretAccessKey"; + + private final String accessKey; + private final String secretKey; + private final String regionString; + + public AwsConfig(@Value("${aws-property.access-key}") final String accessKey, + @Value("${aws-property.secret-key}") final String secretKey, + @Value("${aws-property.aws-region}") final String regionString) { + this.accessKey = accessKey; + this.secretKey = secretKey; + this.regionString = regionString; + } + + + @Bean + public SystemPropertyCredentialsProvider systemPropertyCredentialsProvider() { + System.setProperty(AWS_ACCESS_KEY_ID, accessKey); + System.setProperty(AWS_SECRET_ACCESS_KEY, secretKey); + return SystemPropertyCredentialsProvider.create(); + } + + @Bean + public Region getRegion() { + return Region.of(regionString); + } + + @Bean + public S3Client getS3Client() { + return S3Client.builder() + .region(getRegion()) + .credentialsProvider(systemPropertyCredentialsProvider()) + .build(); + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/external/S3Service.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/external/S3Service.java new file mode 100644 index 0000000..844face --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/external/S3Service.java @@ -0,0 +1,81 @@ +package org.spot.pratice.external; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import org.springframework.web.multipart.MultipartFile; +import software.amazon.awssdk.core.sync.RequestBody; +import software.amazon.awssdk.services.s3.S3Client; +import software.amazon.awssdk.services.s3.model.PutObjectRequest; +import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; + +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +@Component +public class S3Service { + + private final String bucketName; + private final AwsConfig awsConfig; + private static final List IMAGE_EXTENSIONS = Arrays.asList("image/jpeg", "image/png", "image/jpg", "image/webp"); + + + public S3Service(@Value("${aws-property.s3-bucket-name}") final String bucketName, AwsConfig awsConfig) { + this.bucketName = bucketName; + this.awsConfig = awsConfig; + } + + + public String uploadImage(String directoryPath, MultipartFile image) throws IOException { + final String key = directoryPath + generateImageFileName(); + final S3Client s3Client = awsConfig.getS3Client(); + + validateExtension(image); + validateFileSize(image); + + PutObjectRequest request = PutObjectRequest.builder() + .bucket(bucketName) + .key(key) + .contentType(image.getContentType()) + .contentDisposition("inline") + .build(); + + RequestBody requestBody = RequestBody.fromBytes(image.getBytes()); + s3Client.putObject(request, requestBody); + return key; + } + + public void deleteImage(String key) throws IOException { + final S3Client s3Client = awsConfig.getS3Client(); + + s3Client.deleteObject((DeleteObjectRequest.Builder builder) -> + builder.bucket(bucketName) + .key(key) + .build() + ); + } + + + private String generateImageFileName() { + return UUID.randomUUID() + ".jpg"; + } + + + private void validateExtension(MultipartFile image) { + String contentType = image.getContentType(); + if (!IMAGE_EXTENSIONS.contains(contentType)) { + throw new RuntimeException("이미지 확장자는 jpg, png, webp만 가능합니다."); + } + } + + private static final Long MAX_FILE_SIZE = 5 * 1024 * 1024L; + + private void validateFileSize(MultipartFile image) { + if (image.getSize() > MAX_FILE_SIZE) { + throw new RuntimeException("이미지 사이즈는 5MB를 넘을 수 없습니다."); + } + } + +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/repository/BlogRepository.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/repository/BlogRepository.java new file mode 100644 index 0000000..c8c3082 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/repository/BlogRepository.java @@ -0,0 +1,7 @@ +package org.spot.pratice.repository; + +import org.spot.pratice.domain.Blog; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BlogRepository extends JpaRepository { +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/repository/MemberRepository.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/repository/MemberRepository.java new file mode 100644 index 0000000..3803c0a --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/repository/MemberRepository.java @@ -0,0 +1,11 @@ +package org.spot.pratice.repository; + +import org.spot.pratice.domain.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + +public interface MemberRepository extends JpaRepository { + + +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/service/BlogService.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/BlogService.java new file mode 100644 index 0000000..96d64c5 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/BlogService.java @@ -0,0 +1,58 @@ +package org.spot.pratice.service; + +import jakarta.persistence.EntityNotFoundException; +import lombok.RequiredArgsConstructor; +import org.spot.pratice.common.exception.NotFoundException; +import org.spot.pratice.common.exception.message.ErrorMessage; +import org.spot.pratice.domain.Blog; +import org.spot.pratice.domain.Member; +import org.spot.pratice.external.S3Service; +import org.spot.pratice.repository.BlogRepository; +import org.spot.pratice.service.dto.BlogCreateRequest; +import org.spot.pratice.service.dto.BlogTitleUpdateRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.io.IOException; + +@Service +@RequiredArgsConstructor +public class BlogService { + + private final BlogRepository blogRepository; + private final MemberService memberService; + private final S3Service s3Service; + private static final String BLOG_S3_UPLOAD_FOLER = "blog/"; + + + + @Transactional + public String create(Long memberId, BlogCreateRequest createRequest) { + //member찾기 + Member member = memberService.findById(memberId); + try { + Blog blog = blogRepository.save(Blog.create(member, createRequest.title(), createRequest.description(), + s3Service.uploadImage(BLOG_S3_UPLOAD_FOLER, createRequest.image()))); + return blog.getId().toString(); + } catch (RuntimeException | IOException e) { + throw new RuntimeException(e.getMessage()); + } + } + + + @Transactional + public void updateTitle(Long blogId, BlogTitleUpdateRequest blogTitleUpdateRequest) { + Blog blog = findBlogById(blogId); + + blog.updateTitle(blogTitleUpdateRequest.title()); + } + + + public Blog findBlogById(Long blogId) { + return blogRepository.findById(blogId).orElseThrow( + ()-> new NotFoundException(ErrorMessage.BLOG_NOT_FOUND) + ); + } + + +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/service/MemberService.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/MemberService.java new file mode 100644 index 0000000..f72c106 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/MemberService.java @@ -0,0 +1,115 @@ +package org.spot.pratice.service; + +import jakarta.persistence.EntityNotFoundException; +import lombok.RequiredArgsConstructor; +import org.spot.pratice.auth.UserAuthentication; +import org.spot.pratice.auth.redis.domain.Token; +import org.spot.pratice.auth.redis.repository.RedisTokenRepository; +import org.spot.pratice.common.exception.NotFoundException; +import org.spot.pratice.common.exception.UnauthorizedException; +import org.spot.pratice.common.exception.message.ErrorMessage; +import org.spot.pratice.common.jwt.JwtTokenProvider; +import org.spot.pratice.common.jwt.JwtValidationType; +import org.spot.pratice.service.dto.MemberFindDto; +import org.spot.pratice.domain.Member; +import org.spot.pratice.repository.MemberRepository; +import org.spot.pratice.service.dto.MemberCreateDto; +import org.spot.pratice.service.dto.UserJoinResponse; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; + private final JwtTokenProvider jwtTokenProvider; + private final RedisTokenRepository redisTokenRepository; + + @Transactional + public UserJoinResponse createMember( + MemberCreateDto memberCreate + ) { + Member member = memberRepository.save( + Member.create(memberCreate.name(), memberCreate.part(), memberCreate.age()) + ); + Long memberId = member.getId(); + String accessToken = jwtTokenProvider.issueAccessToken( + UserAuthentication.createUserAuthentication(memberId) + ); + String refreshToken = jwtTokenProvider.issueRefreshToken( + UserAuthentication.createUserAuthentication(memberId) + ); + redisTokenRepository.save(Token.of(memberId, refreshToken)); + + return UserJoinResponse.of(accessToken, refreshToken, memberId.toString()); + } + + + @Transactional + public UserJoinResponse refreshToken(String refreshToken) { + // Refresh Token 유효성 검증 + if (jwtTokenProvider.validateToken(refreshToken) != JwtValidationType.VALID_JWT) { + throw new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION); + } + + // Refresh Token으로 사용자 ID 찾기 + Long memberId = redisTokenRepository.findByRefreshToken(refreshToken) + .map(Token::getId) + .orElseThrow(() -> new UnauthorizedException(ErrorMessage.JWT_UNAUTHORIZED_EXCEPTION)); + + // 새로운 Access Token 및 Refresh Token 발급 + String newAccessToken = jwtTokenProvider.issueAccessToken(UserAuthentication.createUserAuthentication(memberId)); + String newRefreshToken = jwtTokenProvider.issueRefreshToken(UserAuthentication.createUserAuthentication(memberId)); + + // 새로운 Refresh Token 저장 + redisTokenRepository.save(Token.of(memberId, newRefreshToken)); + + return UserJoinResponse.of(newAccessToken, newRefreshToken, memberId.toString()); + } + + + + public Member findById(Long memberId) { + return memberRepository.findById(memberId).orElseThrow( + () -> new NotFoundException(ErrorMessage.MEMBER_NOT_FOUND) + ); + } + + private Member findMemberById( + Long memberId + ) { + return memberRepository.findById(memberId).orElseThrow( + () -> new EntityNotFoundException("ID에 해당하는 사용자가 존재하지 않습니다.") + ); + } + + public MemberFindDto getMemberById( + Long memberId + ) { + return MemberFindDto.of(findMemberById(memberId)); + } + + @Transactional + public Member deleteMember( + Long memberId + ) { + Member member = findMemberById(memberId); + memberRepository.delete(member); + return member; + } + + + public List getAllMembers() { + List memberList = memberRepository.findAll(); + return memberList.stream() + .map(MemberFindDto::of) + .collect(java.util.stream.Collectors.toList()); + } + + + + +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/BlogCreateRequest.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/BlogCreateRequest.java new file mode 100644 index 0000000..418b81c --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/BlogCreateRequest.java @@ -0,0 +1,12 @@ +package org.spot.pratice.service.dto; + +import org.springframework.web.multipart.MultipartFile; + +public record BlogCreateRequest( + String title, + String description, + MultipartFile image +) { +} + + diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/BlogTitleUpdateRequest.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/BlogTitleUpdateRequest.java new file mode 100644 index 0000000..05f04a8 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/BlogTitleUpdateRequest.java @@ -0,0 +1,10 @@ +package org.spot.pratice.service.dto; + +import jakarta.validation.constraints.Size; + +public record BlogTitleUpdateRequest( + + @Size(max=100,message="최대글자 100개임 조절해주세요") + String title +) { +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/MemberCreateDto.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/MemberCreateDto.java new file mode 100644 index 0000000..368a739 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/MemberCreateDto.java @@ -0,0 +1,10 @@ +package org.spot.pratice.service.dto; + +import org.spot.pratice.domain.Part; + +public record MemberCreateDto( + String name, + Part part, + int age +) { +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/MemberFindDto.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/MemberFindDto.java new file mode 100644 index 0000000..b240013 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/MemberFindDto.java @@ -0,0 +1,17 @@ +package org.spot.pratice.service.dto; + +import org.spot.pratice.domain.Member; +import org.spot.pratice.domain.Part; + +public record MemberFindDto( + String name, + Part part, + int age +) { + + public static MemberFindDto of( + Member member + ) { + return new MemberFindDto(member.getName(), member.getPart(), member.getAge()); + } +} diff --git a/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/UserJoinResponse.java b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/UserJoinResponse.java new file mode 100644 index 0000000..d9599f6 --- /dev/null +++ b/week6_refresh_assignment/src/main/java/org/spot/pratice/service/dto/UserJoinResponse.java @@ -0,0 +1,19 @@ +package org.spot.pratice.service.dto; + +public record UserJoinResponse( + String accessToken, + String refreshToken, + String userId +) { + + public static UserJoinResponse of( + String accessToken, + String refreshToken, + String userId + ) { + return new UserJoinResponse(accessToken,refreshToken, userId); + } +} + + + diff --git a/week6_refresh_assignment/src/main/resources/application.properties b/week6_refresh_assignment/src/main/resources/application.properties new file mode 100644 index 0000000..b7690ed --- /dev/null +++ b/week6_refresh_assignment/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=pratice diff --git a/week6_refresh_assignment/src/test/java/org/spot/pratice/PraticeApplicationTests.java b/week6_refresh_assignment/src/test/java/org/spot/pratice/PraticeApplicationTests.java new file mode 100644 index 0000000..a38a962 --- /dev/null +++ b/week6_refresh_assignment/src/test/java/org/spot/pratice/PraticeApplicationTests.java @@ -0,0 +1,13 @@ +package org.spot.pratice; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class PraticeApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/week6_refresh_assignment/src/test/java/org/spot/pratice/controller/BlogControllerTest.java b/week6_refresh_assignment/src/test/java/org/spot/pratice/controller/BlogControllerTest.java new file mode 100644 index 0000000..14c32ea --- /dev/null +++ b/week6_refresh_assignment/src/test/java/org/spot/pratice/controller/BlogControllerTest.java @@ -0,0 +1,68 @@ +package org.spot.pratice.controller; + + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.spot.pratice.repository.BlogRepository; +import org.spot.pratice.repository.MemberRepository; +import org.spot.pratice.service.BlogService; +import org.spot.pratice.service.MemberService; +import org.spot.pratice.service.dto.BlogCreateRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.test.mock.mockito.SpyBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(BlogController.class) //SpringBootTest로 서버를 구동시키는 대신 Controller 계층만 테스트 +@AutoConfigureMockMvc //Spring Boot 테스트에서 MockMvc를 사용하기 위한 설정을 자동으로 제공하는 어노테이션 +public class BlogControllerTest { + @Autowired + private MockMvc mockMvc; + + /* + BlogRepository -> BlogService -> MemberService -> MemberRepository + -> BlogRepository + */ + @SpyBean + private BlogService blogService; + + @SpyBean + private MemberService memberService; + + @MockBean + private MemberRepository memberRepository; + + @MockBean + private BlogRepository blogRepository; + + @Autowired + private ObjectMapper objectMapper; //생성하는 객체를 String JSON 배열로 바꾸기 위해 사용 + + @Nested + class createBlog { + @Test + @DisplayName("Blog 생성 실패 테스트") + public void createBlogSuccess() throws Exception { + //given + String request = objectMapper.writeValueAsString(new BlogCreateRequest("영철이네 블로그", "블로그입니다.")); + //when + mockMvc.perform( + post("/api/v1/blog") + .content(request).header("memberId", 2) + .contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isNotFound()) //생성 실패 시나리오로 NotFound가 돌아오는 상황을 테스트 + .andDo(print()); // 끝난 후 모든 결과를 출력 + + } + } +} diff --git a/week6_refresh_assignment/src/test/java/org/spot/pratice/controller/MemberControllerTest.java b/week6_refresh_assignment/src/test/java/org/spot/pratice/controller/MemberControllerTest.java new file mode 100644 index 0000000..d148252 --- /dev/null +++ b/week6_refresh_assignment/src/test/java/org/spot/pratice/controller/MemberControllerTest.java @@ -0,0 +1,52 @@ +package org.spot.pratice.controller; + +import io.restassured.RestAssured; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.spot.pratice.repository.MemberRepository; +import org.spot.pratice.service.MemberService; +import org.spot.pratice.service.dto.MemberCreateDto; +import org.spot.pratice.settings.ApiTest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import static org.spot.pratice.domain.Part.SERVER; + +public class MemberControllerTest extends ApiTest { + + @Autowired + private MemberService memberService; + + @Autowired + private MemberRepository memberRepository; + + @Nested // 중첩 테스트를 진행할 수 있게하는 테스트 + @DisplayName("멤버 생성 테스트") + public class CreateMember { + + @Test + @DisplayName("요청 성공 케이스") + public void createMemberSuccess() throws Exception { + //given + final var request = new MemberCreateDto( + "최영철", + SERVER, + 24); + //when + final var response = RestAssured + .given() + .log().all() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .post("/api/v1/member") + .then().log().all().extract(); + //then + Assertions.assertThat(response.statusCode()).isEqualTo(HttpStatus.CREATED.value()); + } + + } + +} diff --git a/week6_refresh_assignment/src/test/java/org/spot/pratice/settings/ApiTest.java b/week6_refresh_assignment/src/test/java/org/spot/pratice/settings/ApiTest.java new file mode 100644 index 0000000..6ec211c --- /dev/null +++ b/week6_refresh_assignment/src/test/java/org/spot/pratice/settings/ApiTest.java @@ -0,0 +1,19 @@ +package org.spot.pratice.settings; + +import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public class ApiTest { + + @LocalServerPort + private int port; + + @BeforeEach + //각 테스트 진행 전 실행 + void setUp() { + RestAssured.port = port; + } +}