diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week6/week6_java/DD" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week6/week6_java/DD" new file mode 100644 index 0000000..e69de29 diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week6/week6_java/EvenOdd.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week6/week6_java/DecisionTree.java" similarity index 100% rename from "\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week6/week6_java/EvenOdd.java" rename to "\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week6/week6_java/DecisionTree.java" diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/.DS_Store" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/.DS_Store" new file mode 100644 index 0000000..fb49b5d Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/.DS_Store" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/.gitignore" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/.gitignore" new file mode 100644 index 0000000..c2065bc --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/.gitignore" @@ -0,0 +1,37 @@ +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/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/build.gradle" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/build.gradle" new file mode 100644 index 0000000..1d7229e --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/build.gradle" @@ -0,0 +1,32 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.12' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + compileOnly 'org.projectlombok:lombok' + implementation 'org.springframework.boot:spring-boot-starter-web' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradle/wrapper/gradle-wrapper.jar" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradle/wrapper/gradle-wrapper.jar" new file mode 100644 index 0000000..249e583 Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradle/wrapper/gradle-wrapper.jar" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradle/wrapper/gradle-wrapper.properties" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradle/wrapper/gradle-wrapper.properties" new file mode 100644 index 0000000..774fae8 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradle/wrapper/gradle-wrapper.properties" @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradlew" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradlew" new file mode 100755 index 0000000..a69d9cb --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradlew" @@ -0,0 +1,240 @@ +#!/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/master/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 + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradlew.bat" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradlew.bat" new file mode 100644 index 0000000..53a6b23 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/gradlew.bat" @@ -0,0 +1,91 @@ +@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=. +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. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +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/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/settings.gradle" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/settings.gradle" new file mode 100644 index 0000000..b1ccdc1 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/settings.gradle" @@ -0,0 +1 @@ +rootProject.name = 'week9' diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/.DS_Store" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/.DS_Store" new file mode 100644 index 0000000..0af7110 Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/.DS_Store" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/.DS_Store" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/.DS_Store" new file mode 100644 index 0000000..646adcb Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/.DS_Store" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/.DS_Store" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/.DS_Store" new file mode 100644 index 0000000..fd418e8 Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/.DS_Store" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/.DS_Store" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/.DS_Store" new file mode 100644 index 0000000..58d0bd8 Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/.DS_Store" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/.DS_Store" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/.DS_Store" new file mode 100644 index 0000000..31438a3 Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/.DS_Store" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/.DS_Store" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/.DS_Store" new file mode 100644 index 0000000..3dec55d Binary files /dev/null and "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/.DS_Store" differ diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/Week9Application.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/Week9Application.java" new file mode 100644 index 0000000..032d0f7 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/Week9Application.java" @@ -0,0 +1,13 @@ +package com.example.week9; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Week9Application { + + public static void main(String[] args) { + SpringApplication.run(Week9Application.class, args); + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/AwsSqsConfig.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/AwsSqsConfig.java" new file mode 100644 index 0000000..3f5a905 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/AwsSqsConfig.java" @@ -0,0 +1,36 @@ +package com.example.icebutler_server.global.config; + + +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.services.sqs.AmazonSQSAsync; +import com.amazonaws.services.sqs.AmazonSQSAsyncClientBuilder; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +@Configuration +public class AwsSqsConfig { + + @Value("${aws.sqs.accesskey}") + private String accessKey; + + @Value("${aws.sqs.secretkey}") + private String secretKey; + + @Value("${aws.sqs.region.static}") + private String region; + /** + * sqs 접근을 위한 위한 사용자 bean + */ + @Primary + @Bean + public AmazonSQSAsync amazonSQSAws() { + BasicAWSCredentials awsCreds = new BasicAWSCredentials(accessKey, secretKey); + return AmazonSQSAsyncClientBuilder.standard() + .withRegion(region) + .withCredentials(new AWSStaticCredentialsProvider(awsCreds)) + .build(); + } +} \ No newline at end of file diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/QueryDslConfig.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/QueryDslConfig.java" new file mode 100644 index 0000000..545a56f --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/QueryDslConfig.java" @@ -0,0 +1,19 @@ +package com.example.icebutler_server.global.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +@Configuration +public class QueryDslConfig { + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory queryFactory() { + return new JPAQueryFactory(entityManager); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/RedisConfig.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/RedisConfig.java" new file mode 100644 index 0000000..5f06de9 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/RedisConfig.java" @@ -0,0 +1,47 @@ +package com.example.icebutler_server.global.config; + +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.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.serializer.StringRedisSerializer; +@Configuration + +public class RedisConfig { + @Value("${spring.redis.host}") + private String host; + + @Value("${spring.redis.port}") + private int port; + + @Value("${spring.redis.password}") + private String password; + @Bean + public RedisConnectionFactory redisConnectionFactory() { + RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration(); + redisStandaloneConfiguration.setHostName(host); + redisStandaloneConfiguration.setPort(port); + redisStandaloneConfiguration.setPassword(password); + return new LettuceConnectionFactory(redisStandaloneConfiguration); + } + + @Bean + public RedisTemplate redisTemplate() { + RedisTemplate redisTemplate = new RedisTemplate<>(); + redisTemplate.setConnectionFactory(redisConnectionFactory()); + return redisTemplate; + } +// +// @Bean +// public StringRedisTemplate stringRedisTemplate() { +// StringRedisTemplate stringRedisTemplate = new StringRedisTemplate(); +// stringRedisTemplate.setKeySerializer(new StringRedisSerializer()); +// stringRedisTemplate.setValueSerializer(new StringRedisSerializer()); +// stringRedisTemplate.setConnectionFactory(redisConnectionFactory()); +// return stringRedisTemplate; +// } +} \ No newline at end of file diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/WebConfig.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/WebConfig.java" new file mode 100644 index 0000000..ec9c8a4 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/config/WebConfig.java" @@ -0,0 +1,25 @@ +package com.example.icebutler_server.global.config; + +import com.example.icebutler_server.global.resolver.AdminResolver; +import com.example.icebutler_server.global.resolver.LoginResolver; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +@RequiredArgsConstructor +@Configuration +public class WebConfig implements WebMvcConfigurer { + private final LoginResolver isLoginResolver; + private final AdminResolver adminResolver; + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(isLoginResolver); + resolvers.add(adminResolver); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/controller/ExceptionController.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/controller/ExceptionController.java" new file mode 100644 index 0000000..39ca7c4 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/controller/ExceptionController.java" @@ -0,0 +1,12 @@ +package com.example.icebutler_server.global.controller; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@RestControllerAdvice +public class ExceptionController { + /** + * Global Exceptions + */ +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/dto/response/ResponseCustom.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/dto/response/ResponseCustom.java" new file mode 100644 index 0000000..1e4ae5a --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/dto/response/ResponseCustom.java" @@ -0,0 +1,143 @@ +package com.example.icebutler_server.global.dto.response; + +import lombok.*; +import org.springframework.http.HttpStatus; +import org.springframework.lang.Nullable; + +import java.time.LocalDateTime; + +@Getter +@Setter +@ToString +@NoArgsConstructor +public class ResponseCustom{ + + private T data; + private LocalDateTime transaction_time; + private HttpStatus status; + private String description; + private int statusCode; + + @Builder + public ResponseCustom(T data, LocalDateTime transaction_time, HttpStatus status, String description, int statusCode) { + this.data = data; + this.transaction_time = transaction_time; + this.status = status; + this.description = description; + this.statusCode = statusCode; + } + + // OK + public static ResponseCustom CREATED(@Nullable T data) { + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.OK) + .statusCode(HttpStatus.OK.value()) + .data(data) + .build(); + } + + public static ResponseCustom OK(@Nullable T data) { + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.OK) + .statusCode(HttpStatus.OK.value()) + .data(data) + .build(); + } + + public static ResponseCustom OK() { + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.OK) + .statusCode(HttpStatus.OK.value()) + .build(); + } + + public static ResponseCustom BAD_REQUEST(@Nullable String description){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.BAD_REQUEST) + .statusCode(HttpStatus.BAD_REQUEST.value()) + .description(description) + .build(); + } + + public static ResponseCustom BAD_REQUEST(@Nullable T data){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.BAD_REQUEST) + .statusCode(HttpStatus.BAD_REQUEST.value()) + .data(data) + .build(); + } + + public static ResponseCustom NOT_FOUND(@Nullable T data){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.NOT_FOUND) + .statusCode(HttpStatus.NOT_FOUND.value()) + .data(data) + .build(); + } + + public static ResponseCustom NOT_FOUND(@Nullable String description){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.NOT_FOUND) + .statusCode(HttpStatus.NOT_FOUND.value()) + .description(description) + .build(); + } + + public static ResponseCustom FORBIDDEN(){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.FORBIDDEN) + .statusCode(HttpStatus.FORBIDDEN.value()) + .build(); + } + + public static ResponseCustom FORBIDDEN(String description){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.FORBIDDEN) + .statusCode(HttpStatus.FORBIDDEN.value()) + .description(description) + .build(); + } + + + + public static ResponseCustom UNAUTHORIZED(){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.UNAUTHORIZED) + .statusCode(HttpStatus.UNAUTHORIZED.value()) + .build(); + } + + public static ResponseCustom INTERNAL_SERVER_ERROR(){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .build(); + } + + public static ResponseCustom INTERNAL_SERVER_ERROR(String description){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .status(HttpStatus.INTERNAL_SERVER_ERROR) + .statusCode(HttpStatus.INTERNAL_SERVER_ERROR.value()) + .description(description) + .build(); + } + + public static ResponseCustom JWT_EXPIRED(){ + return (ResponseCustom) ResponseCustom.builder() + .transaction_time(LocalDateTime.now()) + .description("JWT_EXPIRED") + .statusCode(441) + .build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entity/BaseEntity.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entity/BaseEntity.java" new file mode 100644 index 0000000..4c27bad --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entity/BaseEntity.java" @@ -0,0 +1,41 @@ +package com.example.icebutler_server.global.entity; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.*; +import java.io.Serializable; +import java.time.LocalDateTime; + +@EntityListeners(AuditingEntityListener.class) +@Getter +@MappedSuperclass +public class BaseEntity implements Serializable { + + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updateAt; + + @Setter + @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT true") + private Boolean isEnable = true; + + @PrePersist + public void prePersist(){ + LocalDateTime now = LocalDateTime.now(); + createdAt = now; + updateAt = now; + } + + @PreUpdate + public void preUpdate(){ + updateAt = LocalDateTime.now(); + } + +} \ No newline at end of file diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entity/FridgeRole.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entity/FridgeRole.java" new file mode 100644 index 0000000..0d5723e --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entity/FridgeRole.java" @@ -0,0 +1,5 @@ +package com.example.icebutler_server.global.entity; + +public enum FridgeRole { + OWNER, MEMBER +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/CartEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/CartEntityListener.java" new file mode 100644 index 0000000..b816533 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/CartEntityListener.java" @@ -0,0 +1,16 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.cart.entity.cart.Cart; +import com.example.icebutler_server.cart.repository.cart.CartFoodRepository; +import com.example.icebutler_server.global.util.BeanUtils; + +import javax.persistence.PreRemove; + +public class CartEntityListener { + + @PreRemove + public void onUpdate(Cart cart){ + CartFoodRepository cartFoodRepository = BeanUtils.getBean(CartFoodRepository.class); + cartFoodRepository.deleteByCart(cart); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FoodEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FoodEntityListener.java" new file mode 100644 index 0000000..e39f825 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FoodEntityListener.java" @@ -0,0 +1,25 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.cart.repository.cart.CartFoodRepository; +import com.example.icebutler_server.cart.repository.multiCart.MultiCartFoodRepository; +import com.example.icebutler_server.food.entity.Food; +import com.example.icebutler_server.fridge.repository.fridge.FridgeFood.FridgeFoodRepository; +import com.example.icebutler_server.fridge.repository.multiFridge.MultiFridgeFood.MultiFridgeFoodRepository; +import com.example.icebutler_server.global.util.BeanUtils; + +import javax.persistence.PreRemove; + +public class FoodEntityListener { + + @PreRemove + public void onUpdate(Food food){ + CartFoodRepository cartFoodRepository = BeanUtils.getBean(CartFoodRepository.class); + cartFoodRepository.deleteByFood(food); + MultiCartFoodRepository multiCartFoodRepository = BeanUtils.getBean(MultiCartFoodRepository.class); + multiCartFoodRepository.deleteByFood(food); + FridgeFoodRepository fridgeFoodRepository = BeanUtils.getBean(FridgeFoodRepository.class); + fridgeFoodRepository.deleteByFood(food); + MultiFridgeFoodRepository multiFridgeFoodRepository = BeanUtils.getBean(MultiFridgeFoodRepository.class); + multiFridgeFoodRepository.deleteByFood(food); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FridgeEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FridgeEntityListener.java" new file mode 100644 index 0000000..baa3ab6 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FridgeEntityListener.java" @@ -0,0 +1,22 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.cart.repository.cart.CartRepository; +import com.example.icebutler_server.fridge.entity.fridge.Fridge; +import com.example.icebutler_server.fridge.repository.fridge.FridgeFood.FridgeFoodRepository; +import com.example.icebutler_server.fridge.repository.fridge.FridgeUserRepository; +import com.example.icebutler_server.global.util.BeanUtils; + +import javax.persistence.PreRemove; + +public class FridgeEntityListener { + + @PreRemove + public void onUpdate(Fridge fridge){ + CartRepository cartRepository = BeanUtils.getBean(CartRepository.class); + cartRepository.deleteByFridge(fridge); + FridgeFoodRepository fridgeFoodRepository = BeanUtils.getBean(FridgeFoodRepository.class); + fridgeFoodRepository.deleteByFridge(fridge); + FridgeUserRepository fridgeUserRepository = BeanUtils.getBean(FridgeUserRepository.class); + fridgeUserRepository.deleteByFridge(fridge); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FridgeUserEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FridgeUserEntityListener.java" new file mode 100644 index 0000000..4d07bb2 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/FridgeUserEntityListener.java" @@ -0,0 +1,16 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.fridge.entity.fridge.FridgeUser; +import com.example.icebutler_server.fridge.repository.fridge.FridgeFood.FridgeFoodRepository; +import com.example.icebutler_server.global.util.BeanUtils; + +import javax.persistence.PreRemove; + +public class FridgeUserEntityListener { + + @PreRemove + public void onUpdate(FridgeUser fridgeUser){ + FridgeFoodRepository fridgeFoodRepository = BeanUtils.getBean(FridgeFoodRepository.class); + fridgeFoodRepository.deleteOwnerByFridgeUser(fridgeUser); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiCartEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiCartEntityListener.java" new file mode 100644 index 0000000..4d1cf9e --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiCartEntityListener.java" @@ -0,0 +1,16 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.cart.entity.multiCart.MultiCart; +import com.example.icebutler_server.cart.repository.multiCart.MultiCartFoodRepository; +import com.example.icebutler_server.global.util.BeanUtils; + +import javax.persistence.PreRemove; + +public class MultiCartEntityListener { + + @PreRemove + public void onUpdate(MultiCart multiCart){ + MultiCartFoodRepository multiCartFoodRepository = BeanUtils.getBean(MultiCartFoodRepository.class); + multiCartFoodRepository.deleteByMultiCart(multiCart); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiFridgeEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiFridgeEntityListener.java" new file mode 100644 index 0000000..b2067b0 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiFridgeEntityListener.java" @@ -0,0 +1,22 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.cart.repository.multiCart.MultiCartRepository; +import com.example.icebutler_server.fridge.entity.multiFridge.MultiFridge; +import com.example.icebutler_server.fridge.repository.multiFridge.MultiFridgeFood.MultiFridgeFoodRepository; +import com.example.icebutler_server.fridge.repository.multiFridge.MultiFridgeUserRepository; +import com.example.icebutler_server.global.util.BeanUtils; + +import javax.persistence.PreRemove; + +public class MultiFridgeEntityListener { + + @PreRemove + public void onUpdate(MultiFridge multiFridge){ + MultiCartRepository multiCartRepository = BeanUtils.getBean(MultiCartRepository.class); + multiCartRepository.deleteByMultiFridgeUserMultiFridge(multiFridge); + MultiFridgeFoodRepository multiFridgeFoodRepository = BeanUtils.getBean(MultiFridgeFoodRepository.class); + multiFridgeFoodRepository.deleteByMultiFridge(multiFridge); + MultiFridgeUserRepository multiFridgeUserRepository = BeanUtils.getBean(MultiFridgeUserRepository.class); + multiFridgeUserRepository.deleteByMultiFridge(multiFridge); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiFridgeUserEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiFridgeUserEntityListener.java" new file mode 100644 index 0000000..234a6d3 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/MultiFridgeUserEntityListener.java" @@ -0,0 +1,19 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.cart.repository.multiCart.MultiCartRepository; +import com.example.icebutler_server.fridge.entity.multiFridge.MultiFridgeUser; +import com.example.icebutler_server.fridge.repository.multiFridge.MultiFridgeFood.MultiFridgeFoodRepository; +import com.example.icebutler_server.global.util.BeanUtils; + +import javax.persistence.PreRemove; + +public class MultiFridgeUserEntityListener { + + @PreRemove + public void onUpdate(MultiFridgeUser multiFridgeUser){ + MultiFridgeFoodRepository multiFridgeFoodRepository = BeanUtils.getBean(MultiFridgeFoodRepository.class); + multiFridgeFoodRepository.deleteOwnerByMultiFridgeUser(multiFridgeUser); + MultiCartRepository multiCartRepository = BeanUtils.getBean(MultiCartRepository.class); + multiCartRepository.deleteByMultiFridgeUser(multiFridgeUser); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/UserEntityListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/UserEntityListener.java" new file mode 100644 index 0000000..9c397d5 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/entityListener/UserEntityListener.java" @@ -0,0 +1,19 @@ +package com.example.icebutler_server.global.entityListener; + +import com.example.icebutler_server.fridge.repository.fridge.FridgeUserRepository; +import com.example.icebutler_server.fridge.repository.multiFridge.MultiFridgeUserRepository; +import com.example.icebutler_server.global.util.BeanUtils; +import com.example.icebutler_server.user.entity.User; + +import javax.persistence.PreRemove; + +public class UserEntityListener { + + @PreRemove + public void onUpdate(User user){ + FridgeUserRepository fridgeUserRepository = BeanUtils.getBean(FridgeUserRepository.class); + fridgeUserRepository.deleteByUser(user); + MultiFridgeUserRepository multiFridgeUserRepository = BeanUtils.getBean(MultiFridgeUserRepository.class); + multiFridgeUserRepository.deleteByUser(user); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/dto/AdminReq.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/dto/AdminReq.java" new file mode 100644 index 0000000..6adb9a8 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/dto/AdminReq.java" @@ -0,0 +1,26 @@ +package com.example.icebutler_server.global.feign.dto; + +import com.example.icebutler_server.admin.entity.Admin; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +public class AdminReq { + private Long adminIdx; + private String email; + + @Builder + public AdminReq(Long adminIdx, String email) { + this.adminIdx = adminIdx; + this.email = email; + } + + public static AdminReq toDto(Admin admin){ + AdminReq adminReq = new AdminReq(); + adminReq.adminIdx = admin.getAdminIdx(); + adminReq.email = admin.getEmail(); + return adminReq; + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/dto/UserReq.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/dto/UserReq.java" new file mode 100644 index 0000000..7ea9bdb --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/dto/UserReq.java" @@ -0,0 +1,18 @@ +package com.example.icebutler_server.global.feign.dto; + +import lombok.Builder; +import lombok.Data; + +@Data +public class UserReq { + private Long userIdx; + private String nickname; + private String profileImgKey; + + @Builder + public UserReq(Long userIdx, String nickname, String profileImgKey) { + this.userIdx = userIdx; + this.nickname = nickname; + this.profileImgKey = profileImgKey; + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/event/UserEvent.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/event/UserEvent.java" new file mode 100644 index 0000000..58ce135 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/event/UserEvent.java" @@ -0,0 +1,27 @@ +package com.example.icebutler_server.global.feign.event; + +import com.example.icebutler_server.global.feign.dto.UserReq; +import com.example.icebutler_server.user.entity.User; +import lombok.Getter; + +@Getter +public class UserEvent { + private Long userIdx; + private String nickname; + private String profileImgKey; + + public static UserEvent toEvent(User user){ + UserEvent userJoinEvent = new UserEvent(); + userJoinEvent.userIdx = user.getUserIdx(); + userJoinEvent.nickname = user.getNickname(); + userJoinEvent.profileImgKey = user.getProfileImgKey(); + return userJoinEvent; + } + + public UserReq toDto() { + return UserReq.builder() + .userIdx(this.userIdx) + .nickname(this.nickname) + .profileImgKey(this.profileImgKey).build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/feignClient/RecipeServerClient.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/feignClient/RecipeServerClient.java" new file mode 100644 index 0000000..322f106 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/feignClient/RecipeServerClient.java" @@ -0,0 +1,24 @@ +package com.example.icebutler_server.global.feign.feignClient; + +import com.example.icebutler_server.global.dto.response.ResponseCustom; +import com.example.icebutler_server.global.feign.dto.AdminReq; +import com.example.icebutler_server.global.feign.dto.UserReq; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.*; + +@Component +@FeignClient(name="recipe-server", url = "${server.recipe.url}") +public interface RecipeServerClient { + @PostMapping("/users") + void addUser(@RequestBody UserReq userReq); + + @PatchMapping("/users") + void changeUser(@RequestBody UserReq userReq); + + @DeleteMapping("/users") + void deleteUser(@RequestBody UserReq userReq); + + @PostMapping("/admin") + ResponseCustom addAdmin(@RequestBody AdminReq adminReq); +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/handler/RecipeServerEventHandler.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/handler/RecipeServerEventHandler.java" new file mode 100644 index 0000000..e96fb88 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/handler/RecipeServerEventHandler.java" @@ -0,0 +1,11 @@ +package com.example.icebutler_server.global.feign.handler; + +import com.example.icebutler_server.global.feign.event.UserEvent; + +public interface RecipeServerEventHandler { + void addUser(UserEvent userEvent); + + void changeUserProfile(UserEvent userEvent); + + void deleteUser(UserEvent userEvent); +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/handler/RecipeServerEventHandlerImpl.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/handler/RecipeServerEventHandlerImpl.java" new file mode 100644 index 0000000..cf88266 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/handler/RecipeServerEventHandlerImpl.java" @@ -0,0 +1,46 @@ +package com.example.icebutler_server.global.feign.handler; + +import com.example.icebutler_server.global.feign.event.UserEvent; +import com.example.icebutler_server.global.feign.feignClient.RecipeServerClient; +import feign.FeignException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +@Slf4j +@RequiredArgsConstructor +@Component +public class RecipeServerEventHandlerImpl implements RecipeServerEventHandler{ + private final RecipeServerClient recipeServerClient; + + @Async + @EventListener + @Override + public void addUser(UserEvent userEvent) { + try { + recipeServerClient.addUser(userEvent.toDto()); + } catch (FeignException e) { + log.error(e.getMessage()); + } + } + + @Async + @EventListener + @Override + public void changeUserProfile(UserEvent userEvent) { + try { + recipeServerClient.changeUser(userEvent.toDto()); + } catch (FeignException e) { + log.error(e.getMessage()); + } + } + + @Async + @EventListener + @Override + public void deleteUser(UserEvent userEvent) { + recipeServerClient.deleteUser(userEvent.toDto()); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/publisher/RecipeServerEventPublisher.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/publisher/RecipeServerEventPublisher.java" new file mode 100644 index 0000000..bea5faa --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/publisher/RecipeServerEventPublisher.java" @@ -0,0 +1,11 @@ +package com.example.icebutler_server.global.feign.publisher; + +import com.example.icebutler_server.user.entity.User; + +public interface RecipeServerEventPublisher { + void addUser(User user); + + void changeUserProfile(User user); + + void deleteUser(User user); +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/publisher/RecipeServerEventPublisherImpl.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/publisher/RecipeServerEventPublisherImpl.java" new file mode 100644 index 0000000..136e94d --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/feign/publisher/RecipeServerEventPublisherImpl.java" @@ -0,0 +1,29 @@ +package com.example.icebutler_server.global.feign.publisher; + +import com.example.icebutler_server.global.feign.event.UserEvent; +import com.example.icebutler_server.user.entity.User; +import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Service; + +@RequiredArgsConstructor +@Service +public class RecipeServerEventPublisherImpl implements RecipeServerEventPublisher{ + + private final ApplicationEventPublisher publisher; + + @Override + public void addUser(User user) { + publisher.publishEvent(UserEvent.toEvent(user)); + } + + @Override + public void changeUserProfile(User user) { + publisher.publishEvent(UserEvent.toEvent(user)); + } + + @Override + public void deleteUser(User user) { + publisher.publishEvent(UserEvent.toEvent(user)); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/Admin.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/Admin.java" new file mode 100644 index 0000000..5cb5b0c --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/Admin.java" @@ -0,0 +1,12 @@ +package com.example.icebutler_server.global.resolver; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Admin { + boolean optional() default false; +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/AdminLoginStatus.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/AdminLoginStatus.java" new file mode 100644 index 0000000..0ede797 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/AdminLoginStatus.java" @@ -0,0 +1,18 @@ +package com.example.icebutler_server.global.resolver; + +import lombok.Builder; +import lombok.Data; + +@Data +public class AdminLoginStatus { + private Boolean isLogin; + private Long adminIdx; + @Builder + public AdminLoginStatus(Boolean isLogin, Long adminIdx) { + this.isLogin = isLogin; + this.adminIdx = adminIdx; + } + public static AdminLoginStatus getNotAdminLoginStatus() { + return new AdminLoginStatus(false, null); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/AdminResolver.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/AdminResolver.java" new file mode 100644 index 0000000..f6ebf95 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/AdminResolver.java" @@ -0,0 +1,58 @@ +package com.example.icebutler_server.global.resolver; + +import com.example.icebutler_server.global.util.TokenUtils; +import com.example.icebutler_server.user.exception.AuthAnnotationIsNowhereException; +import com.sun.istack.NotNull; +import lombok.RequiredArgsConstructor; +import org.springframework.core.MethodParameter; +import org.springframework.core.env.Environment; +import org.springframework.lang.Nullable; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +import java.util.Objects; + + +@RequiredArgsConstructor +@Component +public class AdminResolver implements HandlerMethodArgumentResolver{ + + private final TokenUtils tokenUtils; + private final Environment env; + + @Override + public boolean supportsParameter(MethodParameter parameter) + { + return parameter.hasParameterAnnotation(IsAdminLogin.class) + && + AdminLoginStatus.class.equals(parameter.getParameterType()); + } + + @Nullable + @Override + public Object resolveArgument(@NotNull MethodParameter parameter, + ModelAndViewContainer mavContainer, + @NotNull NativeWebRequest webRequest, + WebDataBinderFactory binderFactory) throws Exception + { + Admin admin = parameter.getMethodAnnotation(Admin.class); + + if (admin == null) + throw new AuthAnnotationIsNowhereException(); + + String accessToken = webRequest.getHeader(Objects.requireNonNull(env.getProperty("jwt.auth-header"))); + if(accessToken == null || !tokenUtils.isValidToken(tokenUtils.parseJustTokenFromFullToken(accessToken))) + return AdminLoginStatus.getNotAdminLoginStatus(); + + Long adminIdx = Long.valueOf(tokenUtils.getUserIdFromFullToken(accessToken)); + + if (!admin.optional() && adminIdx == null) { + return AdminLoginStatus.getNotAdminLoginStatus(); + } + + return AdminLoginStatus.builder().isLogin(true).adminIdx(adminIdx).build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/Auth.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/Auth.java" new file mode 100644 index 0000000..7708e35 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/Auth.java" @@ -0,0 +1,12 @@ +package com.example.icebutler_server.global.resolver; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface Auth { + boolean optional() default false; +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/IsAdminLogin.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/IsAdminLogin.java" new file mode 100644 index 0000000..7027cad --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/IsAdminLogin.java" @@ -0,0 +1,11 @@ +package com.example.icebutler_server.global.resolver; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface IsAdminLogin { +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/IsLogin.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/IsLogin.java" new file mode 100644 index 0000000..0cf0d1c --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/IsLogin.java" @@ -0,0 +1,11 @@ +package com.example.icebutler_server.global.resolver; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface IsLogin { +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/LoginResolver.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/LoginResolver.java" new file mode 100644 index 0000000..b0658f8 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/LoginResolver.java" @@ -0,0 +1,58 @@ +package com.example.icebutler_server.global.resolver; + +import com.example.icebutler_server.global.util.TokenUtils; +import com.example.icebutler_server.user.exception.AuthAnnotationIsNowhereException; +import com.sun.istack.NotNull; +import lombok.RequiredArgsConstructor; +import org.springframework.core.MethodParameter; +import org.springframework.core.env.Environment; +import org.springframework.lang.Nullable; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +import java.util.Objects; + + +@RequiredArgsConstructor +@Component +public class LoginResolver implements HandlerMethodArgumentResolver{ + + private final TokenUtils tokenUtils; + private final Environment env; + + @Override + public boolean supportsParameter(MethodParameter parameter) + { + return parameter.hasParameterAnnotation(IsLogin.class) + && + LoginStatus.class.equals(parameter.getParameterType()); + } + + @Nullable + @Override + public Object resolveArgument(@NotNull MethodParameter parameter, + ModelAndViewContainer mavContainer, + @NotNull NativeWebRequest webRequest, + WebDataBinderFactory binderFactory) throws Exception + { + Auth auth = parameter.getMethodAnnotation(Auth.class); + + if (auth == null) + throw new AuthAnnotationIsNowhereException(); + + String accessToken = webRequest.getHeader(Objects.requireNonNull(env.getProperty("jwt.auth-header"))); + if(accessToken == null || !tokenUtils.isValidToken(tokenUtils.parseJustTokenFromFullToken(accessToken))) + return LoginStatus.getNotLoginStatus(); + + Long userIdx = Long.valueOf(tokenUtils.getUserIdFromFullToken(accessToken)); + + if (!auth.optional() && userIdx == null) { + return LoginStatus.getNotLoginStatus(); + } + + return LoginStatus.builder().isLogin(true).userIdx(userIdx).build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/LoginStatus.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/LoginStatus.java" new file mode 100644 index 0000000..fab78ec --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/resolver/LoginStatus.java" @@ -0,0 +1,18 @@ +package com.example.icebutler_server.global.resolver; + +import lombok.Builder; +import lombok.Data; + +@Data +public class LoginStatus { + private Boolean isLogin; + private Long userIdx; + @Builder + public LoginStatus(Boolean isLogin, Long userIdx) { + this.isLogin = isLogin; + this.userIdx = userIdx; + } + public static LoginStatus getNotLoginStatus() { + return new LoginStatus(false, null); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AmazonSQSSender.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AmazonSQSSender.java" new file mode 100644 index 0000000..b44f71b --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AmazonSQSSender.java" @@ -0,0 +1,7 @@ +package com.example.icebutler_server.global.sqs; + +import com.amazonaws.services.sqs.model.SendMessageResult; + +public interface AmazonSQSSender { + SendMessageResult sendMessage(FoodData message); +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AmazonSQSSenderImpl.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AmazonSQSSenderImpl.java" new file mode 100644 index 0000000..92be1b3 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AmazonSQSSenderImpl.java" @@ -0,0 +1,36 @@ +package com.example.icebutler_server.global.sqs; + + +import com.amazonaws.services.sqs.AmazonSQS; +import com.amazonaws.services.sqs.model.SendMessageRequest; +import com.amazonaws.services.sqs.model.SendMessageResult; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.util.UUID; + +@RequiredArgsConstructor +@Component +public class AmazonSQSSenderImpl implements AmazonSQSSender{ + @Value("${aws.sqs.queue.url}") + private String url; + + private final ObjectMapper objectMapper; + private final AmazonSQS amazonSQS; + + @Override + public SendMessageResult sendMessage(FoodData msg){ + SendMessageRequest sendMessageRequest = null; + try { + sendMessageRequest = new SendMessageRequest(url, objectMapper.writeValueAsString(msg)) + .withMessageGroupId("sqs-test") + .withMessageDeduplicationId(UUID.randomUUID().toString()); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + return amazonSQS.sendMessage(sendMessageRequest); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AwsSqsListener.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AwsSqsListener.java" new file mode 100644 index 0000000..feb2543 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/AwsSqsListener.java" @@ -0,0 +1,37 @@ +package com.example.icebutler_server.global.sqs; + +import io.awspring.cloud.messaging.listener.Acknowledgment; +import io.awspring.cloud.messaging.listener.SqsMessageDeletionPolicy; +import io.awspring.cloud.messaging.listener.annotation.SqsListener; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.messaging.handler.annotation.Headers; +import org.springframework.messaging.handler.annotation.Payload; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Slf4j +@Component +@RequiredArgsConstructor +public class AwsSqsListener { + @Value("${aws.sqs.queue.url}") + private String queueUrl; + +// @Value("${aws.sqs.queue.name}") +// private String queueName; + + @SqsListener(value = "${aws.sqs.queue.name}", deletionPolicy = SqsMessageDeletionPolicy.NEVER) + public void listen(@Payload String info, @Headers Map headers, Acknowledgment ack) { + log.info("-------------------------------------start SqsListener"); + log.info("-------------------------------------info {}", info); +// log.info("-------------------------------------headers {}", headers); + String id = headers.get("id"); + System.out.println("id = " + id); + long approximateReceiveCount = Long.parseLong(headers.get("ApproximateReceiveCount")); + System.out.println("approximateReceiveCount = " + approximateReceiveCount); + + ack.acknowledge(); + } +} \ No newline at end of file diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/FoodData.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/FoodData.java" new file mode 100644 index 0000000..7da627c --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/sqs/FoodData.java" @@ -0,0 +1,36 @@ +package com.example.icebutler_server.global.sqs; + +import com.example.icebutler_server.food.entity.Food; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import java.util.UUID; + +@NoArgsConstructor +@Getter +public class FoodData { + private String foodName; + private String foodImgKey; + private String foodCategory; + private UUID uuid; + + @Builder + public FoodData(String foodName, String foodImgKey, String foodCategory, UUID uuid) { + this.foodName = foodName; + this.foodImgKey = foodImgKey; + this.foodCategory = foodCategory; + this.uuid = uuid; + } + + public static FoodData toDto(Food food) { + FoodData foodData = new FoodData(); + foodData.foodName = food.getFoodName(); + foodData.foodImgKey = food.getFoodImgKey(); + foodData.foodCategory = food.getFoodCategory().toString(); + foodData.uuid = food.getUuid(); + return foodData; + } +} \ No newline at end of file diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/AppleUtils.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/AppleUtils.java" new file mode 100644 index 0000000..3e6b259 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/AppleUtils.java" @@ -0,0 +1,58 @@ +package com.example.icebutler_server.global.util; + +import com.example.icebutler_server.purchase.dto.request.UserReceiptReq; +import com.example.icebutler_server.purchase.dto.response.AppleInAppPurchaseRes; +import com.example.icebutler_server.purchase.exception.IllegalStateAppleReceiptException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestTemplate; + +import java.util.HashMap; +import java.util.Map; + +@Slf4j +@RequiredArgsConstructor +@Component +public class AppleUtils { + + public static String appleProductionUrl; + public static String appleSandboxUrl; + + @Value("${apple.production.url}") + public static void setAppleProductionUrl(String value) { + appleProductionUrl = value; + } + @Value("${apple.sandbox.url}") + public static void setAppleSandboxUrl(String value) { + appleSandboxUrl = value; + } + + public AppleInAppPurchaseRes verifyReceipt(UserReceiptReq userReceiptReq) throws IllegalStateException { + Map requestMap = new HashMap<>(); + requestMap.put("receipt-data", userReceiptReq.getReceiptData()); + + RestTemplate restTemplate = new RestTemplateBuilder().build(); + ResponseEntity responseEntity = restTemplate.postForEntity(Constant.APPLE_PRODUCTION_URL, requestMap, AppleInAppPurchaseRes.class); + AppleInAppPurchaseRes appleInAppPurchaseRes = responseEntity.getBody(); + + if (appleInAppPurchaseRes != null) { + Long status = appleInAppPurchaseRes.getReceipt().getStatus(); + + // status -> 0 이면 정상 처리 + if (status == 21007) { + // Test 환경이라면 다시 체크 + responseEntity = restTemplate.postForEntity(appleSandboxUrl, requestMap, AppleInAppPurchaseRes.class); + appleInAppPurchaseRes = responseEntity.getBody(); + } else if (status != 0) { + throw new IllegalStateAppleReceiptException(status); + } + return appleInAppPurchaseRes; + } + return null; + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/AwsS3ImageUrlUtil.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/AwsS3ImageUrlUtil.java" new file mode 100644 index 0000000..3dbedcb --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/AwsS3ImageUrlUtil.java" @@ -0,0 +1,27 @@ +package com.example.icebutler_server.global.util; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +@RequiredArgsConstructor +@Component +public class AwsS3ImageUrlUtil { + + public static String bucket; + public static String region; + public static String profile; + + @Value("${aws.s3.region}") + public void setRegion(String value) { + region = value; + } + @Value("${aws.s3.bucket}") + public void setBucket(String value) { + bucket = value; + } + + public static String toUrl(String imageKey) { + return "https://"+bucket+".s3."+region+".amazonaws.com/"+imageKey; + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/BeanUtils.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/BeanUtils.java" new file mode 100644 index 0000000..cda5414 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/BeanUtils.java" @@ -0,0 +1,19 @@ +package com.example.icebutler_server.global.util; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.stereotype.Component; + +@Component +public class BeanUtils implements ApplicationContextAware { + private static ApplicationContext applicationContext; + + @Override + public void setApplicationContext(ApplicationContext act) throws BeansException { + applicationContext = act; + } + public static T getBean(Class tClass){ + return applicationContext.getBean(tClass); + } +} \ No newline at end of file diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/Constant.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/Constant.java" new file mode 100644 index 0000000..db1b7cb --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/Constant.java" @@ -0,0 +1,26 @@ +package com.example.icebutler_server.global.util; + +public final class Constant { + public static final String ENCODE_TYPE = "multipart/form-data"; + public static final String FRIDGE = "fridge"; + public static final String MULTI_FRIDGE = "multi"; + public static final String COMMA = ","; + public static final String API_URL="https://naveropenapi.apigw.ntruss.com/map-geocode/v2/geocode"; + public static final String ACCESS_KEYID="726nwzjyd7"; + public static final String SECRET_KEY="UlPo60Xf0LuYOmzZTcT7N2w6YV7Hx9WS9cHGVDU5"; + public static final String APPLE_SANDBOX_URL = "https://sandbox.itunes.apple.com/verifyReceipt"; + public static final String APPLE_PRODUCTION_URL = "https://buy.itunes.apple.com/verifyReceipt"; + + public static class Food { + public static final String IMG_FOLDER = "food/"; + public static final String ICON_EXTENSION = ".png"; + } + public static class FridgeFood { + public static final String IMG_FOLDER = "fridge-food/"; + } + + public static class PushNotification{ + public static final String FRIDGE = "냉장고"; + public static final String IMMINENT_EXPIRATION = "유통기한"; + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateService.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateService.java" new file mode 100644 index 0000000..4ed26ec --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateService.java" @@ -0,0 +1,10 @@ +package com.example.icebutler_server.global.util; + +import com.sun.istack.NotNull; + +public interface RedisTemplateService { + public void deleteUserRefreshToken(@NotNull Long userIdx); + public String getUserRefreshToken(@NotNull Long userIdx); + public void setUserRefreshToken(@NotNull Long userIdx, String refreshToken) ; + + } diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateServiceImpl.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateServiceImpl.java" new file mode 100644 index 0000000..3b9ee34 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateServiceImpl.java" @@ -0,0 +1,32 @@ +package com.example.icebutler_server.global.util; + +import com.sun.istack.NotNull; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@RequiredArgsConstructor +@Service +public class RedisTemplateServiceImpl implements RedisTemplateService { + + private final RedisTemplate redisTemplate; + + public void deleteUserRefreshToken(Long userIdx){ + String key=String.valueOf(userIdx); + if(redisTemplate.opsForValue().get(key)!=null) redisTemplate.delete(userIdx); + } + +// @Nullable + @Transactional(readOnly = true) + public String getUserRefreshToken(@NotNull Long userIdx) { + ValueOperations valueOperations = redisTemplate.opsForValue(); + return valueOperations.get(userIdx); + } + + public void setUserRefreshToken(@NotNull Long userIdx, String refreshToken) { + ValueOperations valueOperations = redisTemplate.opsForValue(); + valueOperations.set(userIdx, refreshToken); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateServiceMock.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateServiceMock.java" new file mode 100644 index 0000000..fd3347f --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisTemplateServiceMock.java" @@ -0,0 +1,35 @@ +//package com.example.icebutler_server.global.util; +// +// +// +//import com.sun.istack.NotNull; +//import lombok.RequiredArgsConstructor; +//import org.springframework.stereotype.Service; +//import org.springframework.transaction.annotation.Transactional; +// +//import java.util.HashMap; +// +//@RequiredArgsConstructor +//@Service +//public class RedisTemplateServiceMock implements RedisTemplateService { +// +// private final HashMap redisTemplate; +// +// public void deleteUserRefreshToken(@NotNull Long userIdx){ +//// ValueOperations valueOperations = redisTemplate.opsForValue(); +//// valueOperations.getAndDelete(userIdx); +// redisTemplate.remove(userIdx); +// } +// +// // @Nullable +// @Transactional(readOnly = true) +// public String getUserRefreshToken(@NotNull Long userIdx) { +//// ValueOperations valueOperations = redisTemplate.opsForValue(); +//// return valueOperations.get(userIdx); +// return redisTemplate.get(userIdx); +// } +// +// public void setUserRefreshToken(@NotNull Long userIdx, String refreshToken) { +// redisTemplate.put(userIdx, refreshToken); +// } +//} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisUtils.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisUtils.java" new file mode 100644 index 0000000..c5737c2 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/RedisUtils.java" @@ -0,0 +1,49 @@ +package com.example.icebutler_server.global.util; + +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.stereotype.Component; + +import java.util.concurrent.TimeUnit; + +@Component +@RequiredArgsConstructor +public class RedisUtils { + private final RedisTemplate redisTemplate; + private final RedisTemplate redisBlackListTemplate; + + public void set(String key, Object o, int minutes) { + redisTemplate.setValueSerializer(new Jackson2JsonRedisSerializer(o.getClass())); + redisTemplate.opsForValue().set(key, o, minutes, TimeUnit.MINUTES); + } + + public Object get(String key) { + return redisTemplate.opsForValue().get(key); + } + + public boolean delete(String key) { + return redisTemplate.delete(key); + } + + public boolean hasKey(String key) { + return redisTemplate.hasKey(key); + } + + public void setBlackList(String key, Object o, Long milliSeconds) { + redisBlackListTemplate.setValueSerializer(new Jackson2JsonRedisSerializer(o.getClass())); + redisBlackListTemplate.opsForValue().set(key, o, milliSeconds, TimeUnit.MILLISECONDS); + } + + public Object getBlackList(String key) { + return redisBlackListTemplate.opsForValue().get(key); + } + + public boolean deleteBlackList(String key) { + return redisBlackListTemplate.delete(key); + } + + public boolean hasKeyBlackList(String key) { + return redisBlackListTemplate.hasKey(key); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/TokenUtils.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/TokenUtils.java" new file mode 100644 index 0000000..bd0a97e --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/global/util/TokenUtils.java" @@ -0,0 +1,251 @@ +package com.example.icebutler_server.global.util; + +import com.example.icebutler_server.user.dto.request.UserAuthTokenReq; +import com.example.icebutler_server.user.dto.response.PostUserRes; +import com.example.icebutler_server.user.entity.User; +import com.example.icebutler_server.user.exception.TokenExpirationException; +import io.jsonwebtoken.*; +import io.netty.handler.codec.compression.CompressionException; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import java.util.Date; +import java.util.Objects; + +@Slf4j +@RequiredArgsConstructor +@Component +public class TokenUtils { + public static final String USER_IDX = "userIdx"; + public static final String NICKNAME = "nickname"; + + public static final String EMAIL = "email"; + public static final String ONE_BLOCK = " "; + public static final String COMMA = ","; + + public enum TYPE { + REFRESH, + ACCESS + } + + private final RedisTemplateService redisTemplateService; +// private final RedisTemplateServiceMock redisTemplateService; + + public static String accessKeyId; + public static String secretKey; + public static String tokenType; + public static String accessName; + public static String refreshName; + public static String accessExTime; + public static String refreshExTime; + + + @Value("${jwt.secret}") + public void accessKeyId(String value) { + accessKeyId = value; + } + + @Value("${jwt.secret}") + public void setSecretKey(String value) { + secretKey = value; + } + + @Value("${jwt.token-type}") + public void setTokenType(String value) { + tokenType = value; + } + + @Value("${jwt.access-name}") + public void setAccessName(String value) { + accessName = value; + } + + @Value("${jwt.refresh-name}") + public void setRefreshName(String value) { + refreshName = value; + } + + @Value("${jwt.access-expired-time}") + public void setAccessExpiredTime(String value) { + accessExTime = value; + } + + @Value("${jwt.refresh-expired-time}") + public void setRefreshExpireTime(String value) { + refreshExTime = value; + } + + public String createToken(User user) { + String access_token = this.createAccessToken(user.getUserIdx(), user.getNickname()); + String refresh_token = this.createRefreshToken(user.getUserIdx(), user.getNickname()); + return access_token + COMMA + refresh_token; + } + + public String createToken(Long idx, String email) { + String access_token = this.createAccessTokenEmail(idx, email); + String refresh_token = this.createRefreshTokenEmail(idx, email); + return access_token + COMMA + refresh_token; + } + + public String createAccessToken(Long userIdx, String nickname) { + Claims claims = Jwts.claims() + .setSubject(accessName) + .setIssuedAt(new Date()); + claims.put(USER_IDX, userIdx); + claims.put(NICKNAME, nickname); + Date ext = new Date(); + ext.setTime(ext.getTime() + Long.parseLong(Objects.requireNonNull(accessExTime))); + String accessToken = Jwts.builder() + .setHeaderParam("typ", "JWT") + .setClaims(claims) + .setExpiration(ext) + .signWith(SignatureAlgorithm.HS256, secretKey) + .compact(); + return tokenType + ONE_BLOCK + accessToken; + } + + public String createRefreshToken(Long userIdx, String nickname) { + Claims claims = Jwts.claims() + .setSubject(refreshName) + .setIssuedAt(new Date()); + claims.put(USER_IDX, userIdx); + claims.put(NICKNAME, nickname); + Date ext = new Date(); + ext.setTime(ext.getTime() + Long.parseLong(Objects.requireNonNull(refreshExTime))); + String refreshToken = Jwts.builder() + .setHeaderParam("typ", "JWT") + .setClaims(claims) + .setExpiration(ext) + .signWith(SignatureAlgorithm.HS256, secretKey) + .compact(); + redisTemplateService.setUserRefreshToken(userIdx, tokenType + ONE_BLOCK + refreshToken); + return tokenType + ONE_BLOCK + refreshToken; + } + + public String createAccessTokenEmail(Long userIdx, String email) { + Claims claims = Jwts.claims() + .setSubject(accessName) + .setIssuedAt(new Date()); + claims.put(USER_IDX, userIdx); + claims.put(EMAIL, email); + Date ext = new Date(); + ext.setTime(ext.getTime() + Long.parseLong(Objects.requireNonNull(accessExTime))); + String accessToken = Jwts.builder() + .setHeaderParam("typ", "JWT") + .setClaims(claims) + .setExpiration(ext) + .signWith(SignatureAlgorithm.HS256, secretKey) + .compact(); + return tokenType + ONE_BLOCK + accessToken; + } + + public String createRefreshTokenEmail(Long userIdx, String email) { + Claims claims = Jwts.claims() + .setSubject(refreshName) + .setIssuedAt(new Date()); + claims.put(USER_IDX, userIdx); + claims.put(EMAIL, email); + Date ext = new Date(); + ext.setTime(ext.getTime() + Long.parseLong(Objects.requireNonNull(refreshExTime))); + String refreshToken = Jwts.builder() + .setHeaderParam("typ", "JWT") + .setClaims(claims) + .setExpiration(ext) + .signWith(SignatureAlgorithm.HS256, secretKey) + .compact(); + redisTemplateService.setUserRefreshToken(userIdx, tokenType + ONE_BLOCK + refreshToken); + return tokenType + ONE_BLOCK + refreshToken; + } + + public boolean isValidToken(String justToken) { + if (justToken != null && justToken.split(ONE_BLOCK).length == 2) + justToken = justToken.split(ONE_BLOCK)[1]; + try { + Claims claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(justToken).getBody(); + return true; + } catch (ExpiredJwtException exception) { + log.error("Token Tampered"); + return true; + } catch (MalformedJwtException exception) { + log.error("Token MalformedJwtException"); + return false; + } catch (ClaimJwtException exception) { + log.error("Token ClaimJwtException"); + return false; + } catch (UnsupportedJwtException exception) { + log.error("Token UnsupportedJwtException"); + return false; + } catch (CompressionException exception) { + log.error("Token CompressionException"); + return false; + } catch (RequiredTypeException exception) { + log.error("Token RequiredTypeException"); + return false; + } catch (NullPointerException exception) { + log.error("Token is null"); + return false; + } catch (Exception exception) { + log.error("Undefined ERROR"); + return false; + } + } + + private Claims getJwtBodyFromJustToken(String justToken) { + try { + return Jwts.parser() + .setSigningKey(secretKey) + .parseClaimsJws(justToken) + .getBody(); + } catch (ExpiredJwtException e) { + throw new TokenExpirationException(); + } + } + + public boolean isTokenExpired(String justToken) { + if (justToken != null && justToken.split(ONE_BLOCK).length == 2) + justToken = justToken.split(ONE_BLOCK)[1]; + try { + Jwts.parser().setSigningKey(secretKey).parseClaimsJws(justToken).getBody(); + } catch (ExpiredJwtException e) { + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + return false; + } + + public String getUserIdFromFullToken(String fullToken) { + return String.valueOf(getJwtBodyFromJustToken(parseJustTokenFromFullToken(fullToken)).get(USER_IDX)); + } + + public String getNicknameFromFullToken(String fullToken) { + return String.valueOf(getJwtBodyFromJustToken(parseJustTokenFromFullToken(fullToken)).get(NICKNAME)); + } + + // "Bearer eyi35..." 로 부터 "Bearer " 이하만 떼어내는 메서드 + public String parseJustTokenFromFullToken(String fullToken) { + if (StringUtils.hasText(fullToken) + && + fullToken.startsWith(Objects.requireNonNull(tokenType)) + ) + return fullToken.split(ONE_BLOCK)[1]; // e부터 시작하는 jwt 토큰 + return null; + } + + @Transactional + public String accessExpiration(UserAuthTokenReq userAuthTokenReq) { + String userRefreshToken = redisTemplateService.getUserRefreshToken(userAuthTokenReq.getUserIdx()); + String refreshNickname = getNicknameFromFullToken(userRefreshToken); + if (userRefreshToken == null) throw new TokenExpirationException(); + if (refreshNickname.isEmpty()) throw new TokenExpirationException(); + + //토큰이 만료되었을 경우. + return createAccessToken(userAuthTokenReq.getUserIdx(), refreshNickname); + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserAuthController.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserAuthController.java" new file mode 100644 index 0000000..16bd186 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserAuthController.java" @@ -0,0 +1,28 @@ +package com.example.week9.user.controller; + +import com.example.icebutler_server.global.dto.response.ResponseCustom; +import com.example.icebutler_server.global.util.TokenUtils; +import com.example.icebutler_server.user.dto.request.UserAuthTokenReq; +import lombok.RequiredArgsConstructor; +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; + + +@RequiredArgsConstructor +@RequestMapping("/auth") +@RestController +public class UserAuthController { + + private final TokenUtils tokenUtils; + + @PostMapping("/renew") + public ResponseCustom accessToken(@RequestBody +// @Valid + UserAuthTokenReq userAuthTokenReq) { + return ResponseCustom.OK(tokenUtils.accessExpiration(userAuthTokenReq)); + } + + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserController.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserController.java" new file mode 100644 index 0000000..f229872 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserController.java" @@ -0,0 +1,99 @@ +package com.example.week9.user.controller; + +import com.example.icebutler_server.global.dto.response.ResponseCustom; +import com.example.icebutler_server.global.resolver.IsLogin; +import com.example.icebutler_server.global.resolver.LoginStatus; +import com.example.icebutler_server.user.dto.LoginUserReq; +import com.example.icebutler_server.user.dto.request.PatchProfileReq; +import com.example.icebutler_server.user.dto.request.PostNicknameReq; +import com.example.icebutler_server.user.dto.request.PostUserReq; +import com.example.icebutler_server.user.dto.response.MyNotificationRes; +import com.example.icebutler_server.user.dto.response.MyProfileRes; +import com.example.icebutler_server.user.service.UserService; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.*; +import com.example.icebutler_server.global.resolver.Auth; +import org.springframework.data.domain.Pageable; + +@RestController +@RequestMapping(value = "/users") +@RequiredArgsConstructor +public class UserController { + + private final UserService userService; + + @ResponseBody + @PostMapping("/join") + public ResponseCustom join(@RequestBody PostUserReq postUserReq) { + return ResponseCustom.OK(userService.join(postUserReq)); + } + + @ResponseBody + @PostMapping("/login") + public ResponseCustom login(@RequestBody LoginUserReq loginUserReq) { + return ResponseCustom.OK(userService.login(loginUserReq)); + } + + @Auth + @ResponseBody + @PatchMapping("/profile") + public ResponseCustom modifyProfile(@RequestBody PatchProfileReq patchProfileReq, + @IsLogin LoginStatus loginStatus) { + userService.modifyProfile(loginStatus.getUserIdx(), patchProfileReq); + return ResponseCustom.OK(); + } + + @ResponseBody + @PostMapping("/nickname") + public ResponseCustom checkNickname(@RequestBody PostNicknameReq postNicknameReq) { + return ResponseCustom.OK(userService.checkNickname(postNicknameReq)); + } + + //유저 탈퇴 + @Auth + @DeleteMapping("/delete") + public ResponseCustom deleteUser( + @IsLogin LoginStatus loginStatus + ) { + userService.deleteUser(loginStatus.getUserIdx()); + return ResponseCustom.OK(); + } + + //유저 로그아웃 + @Auth + @PostMapping("/logout") + public ResponseCustom logout( + @IsLogin LoginStatus loginStatus + ) { + userService.logout(loginStatus.getUserIdx()); + return ResponseCustom.OK(); + } + + // 마이페이지 조회 + @Auth + @GetMapping("") + public ResponseCustom profile( + @IsLogin LoginStatus loginStatus + ) { + return ResponseCustom.OK(userService.checkProfile(loginStatus.getUserIdx())); + } + + //유저 닉네임 검색 조회 + @GetMapping("/search") + public ResponseCustom searchNickname( + @RequestParam String nickname + ) { + return ResponseCustom.OK(userService.searchNickname(nickname)); + } + + @Auth + @GetMapping("/notification") + public ResponseCustom getUserNotification( + @IsLogin LoginStatus loginStatus, + Pageable pageable + ) { + return ResponseCustom.OK(userService.getUserNotification(loginStatus.getUserIdx(), pageable)); + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserExceptionController.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserExceptionController.java" new file mode 100644 index 0000000..3ce2698 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/controller/UserExceptionController.java" @@ -0,0 +1,75 @@ +package com.example.icebutler_server.user.controller; + +import com.example.icebutler_server.global.dto.response.ResponseCustom; +import com.example.icebutler_server.user.exception.*; +import io.jsonwebtoken.ExpiredJwtException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@Slf4j +@RestControllerAdvice +public class UserExceptionController { + /** + * User Exceptions + */ + @ExceptionHandler(UserNotFoundException.class) + public ResponseCustom catchUserNotFoundException(UserNotFoundException e) { + log.error(e.getMessage()); + return ResponseCustom.NOT_FOUND(e.getMessage()); + } + + @ExceptionHandler(UserNicknameNotFoundException.class) + public ResponseCustom catchUserNicknameNotFoundException(UserNicknameNotFoundException e) { + log.error(e.getMessage()); + return ResponseCustom.NOT_FOUND(e.getMessage()); + } + + @ExceptionHandler(AccessDeniedUserException.class) + public ResponseCustom catchAccessDeniedUserException(AccessDeniedUserException e) { + log.error(e.getMessage()); + return ResponseCustom.FORBIDDEN(e.getMessage()); + } + + @ExceptionHandler(CannotDeleteFridgeException.class) + public ResponseCustom CannotDeleteFridgeException(CannotDeleteFridgeException e) { + log.error(e.getMessage()); + return ResponseCustom.NOT_FOUND(e.getMessage()); + } + + @ExceptionHandler(ProviderMissingValueException.class) + public ResponseCustom catchProviderMissingValueException(ProviderMissingValueException e) { + log.error(e.getMessage()); + return ResponseCustom.NOT_FOUND(e.getMessage()); + } + + @ExceptionHandler(AlreadyWithdrawUserException.class) + public ResponseCustom catchAlreadyWithdrawUserException(AlreadyWithdrawUserException e) { + log.error(e.getMessage()); + return ResponseCustom.FORBIDDEN(e.getMessage()); + } + + @ExceptionHandler(InvalidUserNickNameException.class) + public ResponseCustom catchInvalidUserNickNameException(InvalidUserNickNameException e) { + log.error(e.getMessage()); + return ResponseCustom.BAD_REQUEST(e.getMessage()); + } + + @ExceptionHandler(InvalidUserProfileImgKeyException.class) + public ResponseCustom catchInvalidUserProfileException(InvalidUserProfileImgKeyException e) { + log.error(e.getMessage()); + return ResponseCustom.BAD_REQUEST(e.getMessage()); + } + + @ExceptionHandler(TokenExpirationException.class) + public ResponseCustom catchTokenExpirationException(TokenExpirationException e) { + log.error(e.getMessage()); + return ResponseCustom.BAD_REQUEST(e.getMessage()); + } + + @ExceptionHandler(AuthAnnotationIsNowhereException.class) + public ResponseCustom catchAuthAnnotationIsNowhereException(AuthAnnotationIsNowhereException e) { + log.error(e.getMessage()); + return ResponseCustom.BAD_REQUEST(e.getMessage()); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/LoginUserReq.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/LoginUserReq.java" new file mode 100644 index 0000000..0afcc46 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/LoginUserReq.java" @@ -0,0 +1,10 @@ +package com.example.icebutler_server.user.dto; + +import lombok.Getter; + +@Getter +public class LoginUserReq { + private String email; + private String provider; + private String fcmToken; +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/assembler/UserAssembler.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/assembler/UserAssembler.java" new file mode 100644 index 0000000..2073ad3 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/assembler/UserAssembler.java" @@ -0,0 +1,44 @@ +package com.example.icebutler_server.user.dto.assembler; + +import com.example.icebutler_server.alarm.entity.PushNotification; +import com.example.icebutler_server.user.dto.request.PostUserReq; +import com.example.icebutler_server.user.dto.response.MyNotificationRes; +import com.example.icebutler_server.user.entity.User; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Component; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +@Component +@RequiredArgsConstructor +public class UserAssembler { + + public User signUpOrLogin(User user, PostUserReq postUserReq) { + user.login(postUserReq.getFcmToken()); + return user; + } + +// 2자 이상 8자 이하, 영어 또는 숫자 또는 한글로 구성 +// 특이사항 : 한글 초성 및 모음은 허가하지 않는다. + public Boolean isValidNickname(String nickname) { + boolean err = false; + String regex = "^(?=.*[a-z0-9가-힣])[a-z0-9가-힣]{2,8}$"; + Pattern p = Pattern.compile(regex); + Matcher m = p.matcher(nickname); + if(m.matches()) { + err = true; + } + return err; + } + + // 알림 list return + public Page toUserNotificationList(Page notifications){ + return notifications.map(n -> MyNotificationRes.builder() + .pushNotificationType(n.getPushNotificationType()) + .notificationInfo(n.getNotificationInfo()) + .createdAt(n.getCreatedAt()) + .build()); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PatchProfileReq.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PatchProfileReq.java" new file mode 100644 index 0000000..3d6c532 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PatchProfileReq.java" @@ -0,0 +1,9 @@ +package com.example.icebutler_server.user.dto.request; + +import lombok.Getter; + +@Getter +public class PatchProfileReq { + private String nickname; + private String profileImgKey; +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PostNicknameReq.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PostNicknameReq.java" new file mode 100644 index 0000000..ef309af --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PostNicknameReq.java" @@ -0,0 +1,8 @@ +package com.example.icebutler_server.user.dto.request; + +import lombok.Getter; + +@Getter +public class PostNicknameReq { + private String nickname; +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PostUserReq.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PostUserReq.java" new file mode 100644 index 0000000..8f2a2ee --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/PostUserReq.java" @@ -0,0 +1,12 @@ +package com.example.icebutler_server.user.dto.request; + +import lombok.Getter; + +@Getter +public class PostUserReq { + private String provider; + private String email; + private String nickname; + private String profileImgKey; + private String fcmToken; +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/UserAuthTokenReq.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/UserAuthTokenReq.java" new file mode 100644 index 0000000..d3dc526 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/request/UserAuthTokenReq.java" @@ -0,0 +1,26 @@ +package com.example.icebutler_server.user.dto.request; + +import lombok.Builder; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + + +@RequiredArgsConstructor +@Getter +public class UserAuthTokenReq { + +// @NotNull(message = "유저 ID를 입력해주세요") +// @NotBlank(message = "유저 ID를 입력해주세요") + private Long userIdx; + +// @NotNull(message = "유저 닉네임을 입력해주세요") +// @NotBlank(message = "유저 닉네임을 입력해주세요") + private String nickname; + + @Builder + public UserAuthTokenReq(Long userIdx, String nickname) { + this.userIdx = userIdx; + this.nickname = nickname; + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/IsEnableRes.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/IsEnableRes.java" new file mode 100644 index 0000000..61e5f62 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/IsEnableRes.java" @@ -0,0 +1,17 @@ +package com.example.icebutler_server.user.dto.response; + +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Getter +public class IsEnableRes { + private Boolean isEnable; + + @Builder + public IsEnableRes(Boolean isEnable){ + this.isEnable=isEnable; + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/MyNotificationRes.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/MyNotificationRes.java" new file mode 100644 index 0000000..108ef4e --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/MyNotificationRes.java" @@ -0,0 +1,23 @@ +package com.example.icebutler_server.user.dto.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Builder; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class MyNotificationRes { + + private String pushNotificationType; + private String notificationInfo; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private LocalDateTime createdAt; + + @Builder + public MyNotificationRes(String pushNotificationType, String notificationInfo, LocalDateTime createdAt) { + this.pushNotificationType = pushNotificationType; + this.notificationInfo = notificationInfo; + this.createdAt = createdAt; + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/MyProfileRes.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/MyProfileRes.java" new file mode 100644 index 0000000..dc9c955 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/MyProfileRes.java" @@ -0,0 +1,32 @@ +package com.example.icebutler_server.user.dto.response; + +import com.example.icebutler_server.global.util.AwsS3ImageUrlUtil; +import com.example.icebutler_server.user.entity.User; +import lombok.*; + +@Data +@RequiredArgsConstructor +public class MyProfileRes { + + private Long userIdx; + private String nickname; + private String profileImgUrl; + private String email; + + @Builder + public MyProfileRes(Long userIdx, String nickname, String profileImgUrl, String email) { + this.userIdx = userIdx; + this.nickname = nickname; + this.profileImgUrl = profileImgUrl; + this.email = email; + } + + public static MyProfileRes toDto(User user) { + return MyProfileRes.builder() + .userIdx(user.getUserIdx()) + .nickname(user.getNickname()) + .profileImgUrl(AwsS3ImageUrlUtil.toUrl(user.getProfileImgKey())) + .email(user.getEmail()) + .build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/NickNameRes.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/NickNameRes.java" new file mode 100644 index 0000000..df29790 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/NickNameRes.java" @@ -0,0 +1,24 @@ +package com.example.icebutler_server.user.dto.response; + +import com.example.icebutler_server.global.util.AwsS3ImageUrlUtil; +import com.example.icebutler_server.user.entity.User; +import lombok.*; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class NickNameRes { + private String nickname; + private Long userIdx; + private String profileImgUrl; + + + public static NickNameRes toDto(User user){ + return NickNameRes.builder() + .nickname(user.getNickname()) + .userIdx(user.getUserIdx()) + .profileImgUrl(AwsS3ImageUrlUtil.toUrl(user.getProfileImgKey())) + .build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/PostNickNameRes.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/PostNickNameRes.java" new file mode 100644 index 0000000..4844a2d --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/PostNickNameRes.java" @@ -0,0 +1,23 @@ +package com.example.icebutler_server.user.dto.response; + +import lombok.Builder; +import lombok.Getter; + +@Getter +public class PostNickNameRes { + private String nickname; + private boolean existence; + + @Builder + public PostNickNameRes(String nickname, boolean existence) { + this.nickname = nickname; + this.existence = existence; + } + + public static PostNickNameRes toDto(String nickname, Boolean existence) { + return PostNickNameRes.builder() + .nickname(nickname) + .existence(existence) + .build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/PostUserRes.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/PostUserRes.java" new file mode 100644 index 0000000..fc8722b --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/dto/response/PostUserRes.java" @@ -0,0 +1,28 @@ +package com.example.icebutler_server.user.dto.response; + +import lombok.Builder; +import lombok.Data; + +import static com.example.icebutler_server.global.util.Constant.COMMA; + +@Data +public class PostUserRes { + private String accessToken; + private String refreshToken; + + @Builder + public PostUserRes(String accessToken, String refreshToken) { + this.accessToken = accessToken; + this.refreshToken = refreshToken; + } + + public static PostUserRes toDto(String token) { + String accessToken = token.split(COMMA)[0]; + String refreshToken = token.split(COMMA)[1]; + + return PostUserRes.builder() + .accessToken(accessToken) + .refreshToken(refreshToken) + .build(); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/entity/Provider.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/entity/Provider.java" new file mode 100644 index 0000000..63449b3 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/entity/Provider.java" @@ -0,0 +1,25 @@ +package com.example.icebutler_server.user.entity; + +import lombok.Getter; + +import java.util.Arrays; + +@Getter +public enum Provider { + KAKAO(1, "카카오"), + APPLE(2, "애플"); + + private int number; + private String name; + + Provider(int number, String name) { + this.number = number; + this.name = name; + } + + public static Provider getProviderByName(String name) { + return Arrays.stream(Provider.values()) + .filter(r -> r.getName().equals(name)) + .findAny().orElse(null); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/entity/User.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/entity/User.java" new file mode 100644 index 0000000..67c3a7a --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/entity/User.java" @@ -0,0 +1,69 @@ +package com.example.icebutler_server.user.entity; + +import com.example.icebutler_server.global.entity.BaseEntity; +import com.example.icebutler_server.global.entityListener.UserEntityListener; +import lombok.*; +import org.hibernate.annotations.SQLDelete; + +import javax.persistence.*; + +@NoArgsConstructor(access= AccessLevel.PROTECTED) +@Getter +@Entity +@SQLDelete(sql = "UPDATE user SET is_enable = false, update_at = current_timestamp WHERE user_idx = ?") +@EntityListeners(UserEntityListener.class) +public class User extends BaseEntity { + + @Id @GeneratedValue(strategy = GenerationType.AUTO) + @Column(nullable = false) + private Long userIdx; + + @Column(nullable = false) + private String email; + + @Column(nullable = false) + private String nickname; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Provider provider; + + private String profileImgKey; + + private Boolean loginStatus; + + @Column(length = 300) + private String fcmToken; + + @Setter + @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT false") + private Boolean isDenied = false; + + @Builder + public User(Provider provider, String email, String nickname, String profileImgKey, String fcmToken) { + this.provider = provider; + this.email = email; + this.nickname = nickname; + this.profileImgKey = profileImgKey; + this.fcmToken = fcmToken; + } + + public void login(String fcmToken) { + this.loginStatus = true; + this.fcmToken = fcmToken; + } + + public void logout() { + this.loginStatus = false; + this.fcmToken = null; + } + + public void modifyProfile(String nickname, String profileImgKey) { + this.nickname = nickname; + this.profileImgKey = profileImgKey; + } + + public void deleteUser() { + this.setIsEnable(false); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AccessDeniedUserException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AccessDeniedUserException.java" new file mode 100644 index 0000000..575df7e --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AccessDeniedUserException.java" @@ -0,0 +1,5 @@ +package com.example.icebutler_server.user.exception; + +public class AccessDeniedUserException extends RuntimeException{ + public AccessDeniedUserException() {super("관리자에 의해 서비스 이용이 제한되었습니다.");} +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AlreadyExistNickNameException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AlreadyExistNickNameException.java" new file mode 100644 index 0000000..1c1c7e8 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AlreadyExistNickNameException.java" @@ -0,0 +1,5 @@ +package com.example.icebutler_server.user.exception; + +public class AlreadyExistNickNameException extends RuntimeException { + public AlreadyExistNickNameException() {super("이미 존재하는 닉네임입니다.");} +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AlreadyWithdrawUserException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AlreadyWithdrawUserException.java" new file mode 100644 index 0000000..bc69420 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AlreadyWithdrawUserException.java" @@ -0,0 +1,7 @@ +package com.example.icebutler_server.user.exception; + +public class AlreadyWithdrawUserException extends RuntimeException { + public AlreadyWithdrawUserException() { + super("이미 탈퇴한 회원입니다."); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AuthAnnotationIsNowhereException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AuthAnnotationIsNowhereException.java" new file mode 100644 index 0000000..c13adbe --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/AuthAnnotationIsNowhereException.java" @@ -0,0 +1,6 @@ +package com.example.icebutler_server.user.exception; + +public class AuthAnnotationIsNowhereException extends RuntimeException { + public AuthAnnotationIsNowhereException() { super("토큰을 통해 userId를 추출하는 메서드에는 @Auth 어노테이션을 붙여주세요."); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/CannotDeleteFridgeException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/CannotDeleteFridgeException.java" new file mode 100644 index 0000000..0d0257a --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/CannotDeleteFridgeException.java" @@ -0,0 +1,6 @@ +package com.example.icebutler_server.user.exception; + +public class CannotDeleteFridgeException extends RuntimeException { + public CannotDeleteFridgeException() { super("해당 냉장고에 멤버가 있어서 삭제할 수 없습니다."); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/InvalidUserNickNameException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/InvalidUserNickNameException.java" new file mode 100644 index 0000000..0bd928f --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/InvalidUserNickNameException.java" @@ -0,0 +1,7 @@ +package com.example.icebutler_server.user.exception; + +public class InvalidUserNickNameException extends RuntimeException { + public InvalidUserNickNameException() { + super("올바르지 않은 닉네임 형식입니다."); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/InvalidUserProfileImgKeyException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/InvalidUserProfileImgKeyException.java" new file mode 100644 index 0000000..3971a40 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/InvalidUserProfileImgKeyException.java" @@ -0,0 +1,5 @@ +package com.example.icebutler_server.user.exception; + +public class InvalidUserProfileImgKeyException extends RuntimeException { + public InvalidUserProfileImgKeyException() {super("올바르지 않은 데이터 형식입니다.");} +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/ProviderMissingValueException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/ProviderMissingValueException.java" new file mode 100644 index 0000000..429414f --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/ProviderMissingValueException.java" @@ -0,0 +1,5 @@ +package com.example.icebutler_server.user.exception; + +public class ProviderMissingValueException extends RuntimeException { + public ProviderMissingValueException() {super("부적절한 소셜로그인 provider 입력입니다.");} +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/TokenExpirationException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/TokenExpirationException.java" new file mode 100644 index 0000000..cae65fc --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/TokenExpirationException.java" @@ -0,0 +1,8 @@ +package com.example.icebutler_server.user.exception; + +public class TokenExpirationException extends RuntimeException { + public TokenExpirationException() { + super("만료된 토큰입니다. 다시 발급해주세요."); + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserEmailMissingValueException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserEmailMissingValueException.java" new file mode 100644 index 0000000..fd7c5bd --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserEmailMissingValueException.java" @@ -0,0 +1,5 @@ +package com.example.icebutler_server.user.exception; + +public class UserEmailMissingValueException extends RuntimeException { + public UserEmailMissingValueException() {super("사용자 이메일 값을 찾아올 수 없습니다.");} +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserNicknameNotFoundException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserNicknameNotFoundException.java" new file mode 100644 index 0000000..d713726 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserNicknameNotFoundException.java" @@ -0,0 +1,8 @@ +package com.example.icebutler_server.user.exception; + +public class UserNicknameNotFoundException extends RuntimeException{ + public UserNicknameNotFoundException(){ + super("요청한 닉네임을 가진 유저를 찾을 수 없습니다."); + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserNotFoundException.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserNotFoundException.java" new file mode 100644 index 0000000..07a98ba --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/exception/UserNotFoundException.java" @@ -0,0 +1,7 @@ +package com.example.icebutler_server.user.exception; + +public class UserNotFoundException extends RuntimeException { + public UserNotFoundException(){ + super("요청한 idx를 가진 유저를 찾을 수 없습니다."); + } +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/repository/UserRepository.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/repository/UserRepository.java" new file mode 100644 index 0000000..6332dea --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/repository/UserRepository.java" @@ -0,0 +1,17 @@ +package com.example.icebutler_server.user.repository; + +import com.example.icebutler_server.user.entity.Provider; +import com.example.icebutler_server.user.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface UserRepository extends JpaRepository { + Optional findByUserIdxAndIsEnable(Long userIdx, Boolean isEnable); + User findByEmailAndProvider(String email, Provider provider); + Boolean existsByNickname(String nickName); + List findByNicknameContains(String nickname); +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/service/UserService.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/service/UserService.java" new file mode 100644 index 0000000..989c70a --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/service/UserService.java" @@ -0,0 +1,33 @@ +package com.example.icebutler_server.user.service; + +import com.example.icebutler_server.global.resolver.IsLogin; +import com.example.icebutler_server.user.dto.LoginUserReq; +import com.example.icebutler_server.user.dto.request.PatchProfileReq; +import com.example.icebutler_server.user.dto.response.*; +import com.example.icebutler_server.user.dto.request.PostNicknameReq; +import com.example.icebutler_server.user.dto.request.PostUserReq; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import java.util.List; + +public interface UserService { + PostUserRes join(PostUserReq postUserReq); + + PostUserRes login(LoginUserReq loginUserReq); + + void modifyProfile(@IsLogin Long userIdx, PatchProfileReq patchProfileReq); + + PostNickNameRes checkNickname(PostNicknameReq postNicknameReq); + + void deleteUser(Long userIdx); + + void logout(Long userIdx); + //마이페이지 조회 + + MyProfileRes checkProfile(Long userIdx); + + List searchNickname(String nickname); + + Page getUserNotification(Long userIdx, Pageable pageable); +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/service/UserServiceImpl.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/service/UserServiceImpl.java" new file mode 100644 index 0000000..2f66d6f --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/java/com/example/week9/user/service/UserServiceImpl.java" @@ -0,0 +1,177 @@ +package com.example.icebutler_server.user.service; + +import com.example.icebutler_server.alarm.repository.PushNotificationRepository; +import com.example.icebutler_server.fridge.entity.fridge.Fridge; +import com.example.icebutler_server.fridge.entity.fridge.FridgeUser; +import com.example.icebutler_server.fridge.repository.fridge.FridgeRepository; +import com.example.icebutler_server.fridge.repository.fridge.FridgeUserRepository; +import com.example.icebutler_server.global.entity.FridgeRole; +import com.example.icebutler_server.global.feign.publisher.RecipeServerEventPublisherImpl; +import com.example.icebutler_server.global.resolver.IsLogin; +import com.example.icebutler_server.global.util.RedisTemplateService; +import com.example.icebutler_server.global.util.RedisUtils; +import com.example.icebutler_server.global.util.TokenUtils; +import com.example.icebutler_server.user.dto.LoginUserReq; +import com.example.icebutler_server.user.dto.assembler.UserAssembler; +import com.example.icebutler_server.user.dto.request.PatchProfileReq; +import com.example.icebutler_server.user.dto.request.PostNicknameReq; +import com.example.icebutler_server.user.dto.request.PostUserReq; +import com.example.icebutler_server.user.dto.response.*; +import com.example.icebutler_server.user.entity.Provider; +import com.example.icebutler_server.user.entity.User; +import com.example.icebutler_server.user.exception.*; +import com.example.icebutler_server.user.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class UserServiceImpl implements UserService { + + private final UserRepository userRepository; + private final FridgeUserRepository fridgeUserRepository; + private final FridgeRepository fridgeRepository; + private final UserAssembler userAssembler; + private final TokenUtils tokenUtils; + private final RedisUtils redisUtils; + + private final RecipeServerEventPublisherImpl recipeServerEventPublisher; + private final RedisTemplateService redisTemplateService; + private final PushNotificationRepository pushNotificationRepository; + + + // 소셜로그인 + @Transactional + public PostUserRes join(PostUserReq postUserReq) { + User user = checkUserInfo(postUserReq.getEmail(), postUserReq.getProvider()); + if (user == null) user = saveUser(postUserReq); + + // 정지된 회원은 재가입 불가 + if (user.getIsDenied().equals(true)) throw new AccessDeniedUserException(); + // 자진 탈퇴 회원은 재가입 처리 + if (user.getIsEnable().equals(false)) user.setIsEnable(true); + + user.login(postUserReq.getFcmToken()); + this.recipeServerEventPublisher.addUser(user); + return PostUserRes.toDto(tokenUtils.createToken(user)); + } + + // @Transactional +// public PostUserRes login(LoginUserReq loginUserReq) { +// User user = checkUserInfo(loginUserReq.getEmail(), loginUserReq.getProvider()); +// if (user.getIsEnable().equals(false)) throw new AlreadyWithdrawUserException(); +// +// user.login(loginUserReq.getFcmToken()); +// return PostUserRes.toDto(tokenUtils.createToken(user)); +// } + @Transactional + public PostUserRes login(LoginUserReq loginUserReq) { + User user = checkUserInfo(loginUserReq.getEmail(), loginUserReq.getProvider()); + + if (user != null) { + if (user.getIsEnable().equals(false)) throw new AlreadyWithdrawUserException(); + user.login(loginUserReq.getFcmToken()); + return PostUserRes.toDto(tokenUtils.createToken(user)); + } + return null; + } + + + public User checkUserInfo(String email, String provider) { + if (Provider.getProviderByName(provider) == null) throw new ProviderMissingValueException(); + if (!StringUtils.hasText(email)) throw new UserEmailMissingValueException(); + + return userRepository.findByEmailAndProvider(email, Provider.getProviderByName(provider)); + } + + @Transactional + public User saveUser(PostUserReq postUserReq) { + return userRepository.save(User.builder() + .provider(Provider.getProviderByName(postUserReq.getProvider())) + .email(postUserReq.getEmail()) + .nickname(postUserReq.getNickname()) + .profileImgKey(postUserReq.getProfileImgKey()) + .fcmToken(postUserReq.getFcmToken()) + .build()); + } + + // 프로필 설정 + @Transactional + public void modifyProfile(@IsLogin Long userIdx, PatchProfileReq patchProfileReq) { + User user = userRepository.findByUserIdxAndIsEnable(userIdx, true).orElseThrow(UserNotFoundException::new); + + if (!StringUtils.hasText(patchProfileReq.getNickname())) throw new InvalidUserNickNameException(); + if (!StringUtils.hasText(patchProfileReq.getProfileImgKey())) throw new InvalidUserProfileImgKeyException(); + + user.modifyProfile(patchProfileReq.getNickname(), patchProfileReq.getProfileImgKey()); + recipeServerEventPublisher.changeUserProfile(user); + } + + // 닉네임 중복 확인 + public PostNickNameRes checkNickname(PostNicknameReq postNicknameReq) { + if (!userAssembler.isValidNickname(postNicknameReq.getNickname())) throw new InvalidUserNickNameException(); + Boolean existence = userRepository.existsByNickname(postNicknameReq.getNickname()); + + return PostNickNameRes.toDto(postNicknameReq.getNickname(), existence); + } + + //유저 탈퇴 + @Override + @Transactional + public void deleteUser(Long userIdx) { + User user = userRepository.findByUserIdxAndIsEnable(userIdx, true).orElseThrow(UserNotFoundException::new); + List fridgeOwners = fridgeUserRepository.findByUserAndRoleAndIsEnable(user, FridgeRole.OWNER, true); + for (FridgeUser fridgeOwner : fridgeOwners) { + Fridge fridge = fridgeOwner.getFridge(); + List fridgeMembers = fridgeUserRepository.findByFridgeAndRoleAndIsEnable(fridge, FridgeRole.MEMBER, true); + if (fridgeMembers.size() > 0) { + throw new CannotDeleteFridgeException(); + } + fridgeRepository.delete(fridge); + } + user.deleteUser(); + redisTemplateService.deleteUserRefreshToken(userIdx); +// user.setIsEnable(false); + recipeServerEventPublisher.deleteUser(user); + } + + //유저 로그아웃 + @Override + @Transactional + public void logout(Long userIdx) { + User user = userRepository.findByUserIdxAndIsEnable(userIdx, true).orElseThrow(UserNotFoundException::new); + redisTemplateService.deleteUserRefreshToken(userIdx); + user.logout(); + } + + //마이페이지 조회 + @Override + public MyProfileRes checkProfile(Long userIdx) { + User user = userRepository.findByUserIdxAndIsEnable(userIdx, true).orElseThrow(UserNotFoundException::new); + + return MyProfileRes.toDto(user); + + } + + @Override + public List searchNickname(String nickname) { + return userRepository.findByNicknameContains(nickname) + .stream().map(NickNameRes::toDto).collect(Collectors.toList()); +// return NickNameRes.toDto(user.getNickname()); + } + + @Override + public Page getUserNotification(Long userIdx, Pageable pageable) { + User user = userRepository.findByUserIdxAndIsEnable(userIdx, true).orElseThrow(UserNotFoundException::new); + return this.userAssembler.toUserNotificationList(this.pushNotificationRepository.findByUserOrderByCreatedAtDesc(user, pageable)); + } + +} diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/resources/application.properties" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/resources/application.properties" new file mode 100644 index 0000000..8b13789 --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/main/resources/application.properties" @@ -0,0 +1 @@ + diff --git "a/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/test/java/com/example/week9/Week9ApplicationTests.java" "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/test/java/com/example/week9/Week9ApplicationTests.java" new file mode 100644 index 0000000..c36246b --- /dev/null +++ "b/\355\225\231\354\235\264_\354\235\264\354\212\271\355\225\231/week9/src/test/java/com/example/week9/Week9ApplicationTests.java" @@ -0,0 +1,13 @@ +package com.example.week9; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Week9ApplicationTests { + + @Test + void contextLoads() { + } + +}