From 316e18591190bcc14c81401475f882d598150f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=84=B1=28Jason=29?= Date: Mon, 24 Jun 2024 08:01:02 +0900 Subject: [PATCH 01/96] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..75f82d8fa --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# spring-gift-enhancement \ No newline at end of file From 8569d459abe1615bbb96553bcc59bb9ee7879c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=9E=AC=EC=84=B1=28Jason=29?= Date: Mon, 24 Jun 2024 08:01:31 +0900 Subject: [PATCH 02/96] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..8bbd0354f --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# spring-gift-order \ No newline at end of file From d5003d14cfe0951643ff1411a5c978332e05e72e Mon Sep 17 00:00:00 2001 From: wotjd243 Date: Mon, 15 Jul 2024 09:00:02 +0900 Subject: [PATCH 03/96] feat: set up the project --- .gitignore | 40 ++++ build.gradle | 31 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++++++++++++++++++++++ gradlew.bat | 92 ++++++++ settings.gradle | 1 + src/main/java/gift/Application.java | 11 + src/main/resources/application.properties | 1 + src/main/resources/static/.gitkeep | 0 src/main/resources/templates/.gitkeep | 0 src/test/java/gift/.gitkeep | 0 12 files changed, 432 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/gift/Application.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/static/.gitkeep create mode 100644 src/main/resources/templates/.gitkeep create mode 100644 src/test/java/gift/.gitkeep diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..0caf866b0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..df7db9334 --- /dev/null +++ b/build.gradle @@ -0,0 +1,31 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.1' + id 'io.spring.dependency-management' version '1.1.5' +} + +group = 'camp.nextstep.edu' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-web' + runtimeOnly 'com.h2database:h2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..3fa8f862f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..1aa94a426 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..6689b85be --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +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/settings.gradle b/settings.gradle new file mode 100644 index 000000000..1610f01c4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'spring-gift' diff --git a/src/main/java/gift/Application.java b/src/main/java/gift/Application.java new file mode 100644 index 000000000..61603cca0 --- /dev/null +++ b/src/main/java/gift/Application.java @@ -0,0 +1,11 @@ +package gift; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 000000000..3d16b65f4 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=spring-gift diff --git a/src/main/resources/static/.gitkeep b/src/main/resources/static/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/templates/.gitkeep b/src/main/resources/templates/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/java/gift/.gitkeep b/src/test/java/gift/.gitkeep new file mode 100644 index 000000000..e69de29bb From ba7709c7d2c5d8dc3b3930da7f70d110e7c93dd6 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Tue, 16 Jul 2024 22:26:59 +0900 Subject: [PATCH 04/96] feat: migrate prev project codes --- README.md | 2 +- src/main/java/gift/config/WebConfig.java | 22 +++ .../gift/controller/MemberController.java | 68 +++++++++ .../gift/controller/ProductController.java | 71 ++++++++++ .../java/gift/controller/WishController.java | 77 ++++++++++ src/main/java/gift/dto/ProductRequest.java | 43 ++++++ src/main/java/gift/dto/ProductResponse.java | 47 +++++++ src/main/java/gift/entity/Member.java | 41 ++++++ src/main/java/gift/entity/Product.java | 71 ++++++++++ src/main/java/gift/entity/Wish.java | 55 ++++++++ .../exception/GlobalExceptionHandler.java | 49 +++++++ .../gift/filter/JwtAuthenticationFilter.java | 33 +++++ .../gift/repository/MemberRepository.java | 14 ++ .../gift/repository/ProductRepository.java | 12 ++ .../java/gift/repository/WishRepository.java | 13 ++ src/main/java/gift/service/MemberService.java | 26 ++++ .../java/gift/service/ProductService.java | 38 +++++ src/main/java/gift/service/WishService.java | 32 +++++ src/main/java/gift/util/JwtUtil.java | 58 ++++++++ src/main/resources/data.sql | 4 + src/main/resources/schema.sql | 20 +++ src/main/resources/static/css/style.css | 132 ++++++++++++++++++ src/main/resources/templates/addProduct.html | 30 ++++ src/main/resources/templates/editProduct.html | 30 ++++ src/main/resources/templates/error.html | 14 ++ src/main/resources/templates/product.html | 41 ++++++ src/main/resources/templates/products.html | 40 ++++++ .../gift/controller/MemberControllerTest.java | 80 +++++++++++ .../controller/ProductControllerTest.java | 80 +++++++++++ .../gift/controller/WishControllerTest.java | 117 ++++++++++++++++ .../java/gift/service/ProductServiceTest.java | 70 ++++++++++ 31 files changed, 1429 insertions(+), 1 deletion(-) create mode 100644 src/main/java/gift/config/WebConfig.java create mode 100644 src/main/java/gift/controller/MemberController.java create mode 100644 src/main/java/gift/controller/ProductController.java create mode 100644 src/main/java/gift/controller/WishController.java create mode 100644 src/main/java/gift/dto/ProductRequest.java create mode 100644 src/main/java/gift/dto/ProductResponse.java create mode 100644 src/main/java/gift/entity/Member.java create mode 100644 src/main/java/gift/entity/Product.java create mode 100644 src/main/java/gift/entity/Wish.java create mode 100644 src/main/java/gift/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/gift/filter/JwtAuthenticationFilter.java create mode 100644 src/main/java/gift/repository/MemberRepository.java create mode 100644 src/main/java/gift/repository/ProductRepository.java create mode 100644 src/main/java/gift/repository/WishRepository.java create mode 100644 src/main/java/gift/service/MemberService.java create mode 100644 src/main/java/gift/service/ProductService.java create mode 100644 src/main/java/gift/service/WishService.java create mode 100644 src/main/java/gift/util/JwtUtil.java create mode 100644 src/main/resources/data.sql create mode 100644 src/main/resources/schema.sql create mode 100644 src/main/resources/static/css/style.css create mode 100644 src/main/resources/templates/addProduct.html create mode 100644 src/main/resources/templates/editProduct.html create mode 100644 src/main/resources/templates/error.html create mode 100644 src/main/resources/templates/product.html create mode 100644 src/main/resources/templates/products.html create mode 100644 src/test/java/gift/controller/MemberControllerTest.java create mode 100644 src/test/java/gift/controller/ProductControllerTest.java create mode 100644 src/test/java/gift/controller/WishControllerTest.java create mode 100644 src/test/java/gift/service/ProductServiceTest.java diff --git a/README.md b/README.md index 75f82d8fa..61c9663cb 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# spring-gift-enhancement \ No newline at end of file +# spring-gift-enhancement diff --git a/src/main/java/gift/config/WebConfig.java b/src/main/java/gift/config/WebConfig.java new file mode 100644 index 000000000..b1479971a --- /dev/null +++ b/src/main/java/gift/config/WebConfig.java @@ -0,0 +1,22 @@ +package gift.config; + +import gift.filter.JwtAuthenticationFilter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class WebConfig { + + @Autowired + private JwtAuthenticationFilter jwtAuthenticationFilter; + + @Bean + public FilterRegistrationBean jwtAuthenticationFilterRegistration() { + FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); + registrationBean.setFilter(jwtAuthenticationFilter); + registrationBean.addUrlPatterns("/api/*"); // 필요한 URL 패턴 설정 + return registrationBean; + } +} diff --git a/src/main/java/gift/controller/MemberController.java b/src/main/java/gift/controller/MemberController.java new file mode 100644 index 000000000..03939c6e4 --- /dev/null +++ b/src/main/java/gift/controller/MemberController.java @@ -0,0 +1,68 @@ +package gift.controller; + +import gift.entity.Member; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import gift.service.MemberService; +import gift.util.JwtUtil; + +import jakarta.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + + +@RestController +@RequestMapping("/member") +public class MemberController { + @Autowired + private MemberService memberService; + + @Autowired + private JwtUtil jwtUtil; + + @PostMapping("/register") + public ResponseEntity> register(@RequestBody Member member) { + memberService.save(member); + Map response = new HashMap<>(); + response.put("message", "success"); + return ResponseEntity.ok(response); + } + + @PostMapping("/login") + public ResponseEntity> login(@RequestBody Member loginRequest) { + Optional memberOpt = memberService.findByEmail(loginRequest.getEmail()); + if(memberOpt.isPresent() && memberOpt.get().getPassword().equals(loginRequest.getPassword())) { + String token = jwtUtil.generateToken(memberOpt.get().getEmail()); + Map response = new HashMap<>(); + response.put("message", "success"); + response.put("token", token); + return ResponseEntity.ok(response); + } + return ResponseEntity.status(401).body(null); + } + + // endpoint that checking member information + @GetMapping("/me") + public ResponseEntity getCurrentMember(HttpServletRequest request) { + String email = getEmailFromRequest(request); + if(email != null) { + Optional memberOpt = memberService.findByEmail(email); + if(memberOpt.isPresent()) { + return ResponseEntity.ok(memberOpt.get()); + } + } + return ResponseEntity.status(401).body(null); + } + + // Extracting email from token using HttpServletRequest + private String getEmailFromRequest(HttpServletRequest request) { + String authorizationHeader = request.getHeader("Authorization"); + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + String token = authorizationHeader.substring(7); + return jwtUtil.extractEmail(token); + } + return null; + } +} diff --git a/src/main/java/gift/controller/ProductController.java b/src/main/java/gift/controller/ProductController.java new file mode 100644 index 000000000..5dbee3d17 --- /dev/null +++ b/src/main/java/gift/controller/ProductController.java @@ -0,0 +1,71 @@ +package gift.controller; + +import gift.dto.ProductRequest; +import gift.dto.ProductResponse; +import gift.entity.Product; +import gift.service.ProductService; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/api/products") +public class ProductController { + private final ProductService productService; + + @Autowired + public ProductController(ProductService productService) { + this.productService = productService; + } + + @GetMapping + public ResponseEntity getAllProducts(Pageable pageable) { + Page products = productService.findAll(pageable); + Page response = products.map(product -> new ProductResponse( + product.getId(), + product.getName(), + product.getPrice(), + product.getImageUrl() + )); + return ResponseEntity.ok(response); + } + + @PostMapping + public ResponseEntity addProduct(@Valid @RequestBody ProductRequest productRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()) { + String errors = bindingResult.getAllErrors().stream() + .map(error -> error.getDefaultMessage()) + .collect(Collectors.joining(", ")); + return ResponseEntity.badRequest().body(errors); + } + Product product = new Product(); + product.setName(productRequest.getName()); + product.setPrice(productRequest.getPrice()); + product.setImageUrl(productRequest.getImageUrl()); + return ResponseEntity.ok(productService.save(product)); + } + + @PutMapping("/{id}") + public ResponseEntity updateProduct(@PathVariable Long id, @Valid @RequestBody ProductRequest productRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()) { + String errors = bindingResult.getAllErrors().stream() + .map(error -> error.getDefaultMessage()) + .collect(Collectors.joining(", ")); + return ResponseEntity.badRequest().body(errors); + } + Product product = new Product(); + return ResponseEntity.ok(productService.save(product)); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteProduct(@PathVariable Long id) { + productService.deleteById(id); + return ResponseEntity.ok().build(); + } +} diff --git a/src/main/java/gift/controller/WishController.java b/src/main/java/gift/controller/WishController.java new file mode 100644 index 000000000..392224fff --- /dev/null +++ b/src/main/java/gift/controller/WishController.java @@ -0,0 +1,77 @@ +package gift.controller; + +import gift.entity.Member; +import gift.entity.Wish; +import gift.repository.MemberRepository; +import gift.service.WishService; +import gift.util.JwtUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import jakarta.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Optional; + + +@RestController +@RequestMapping("/wishes") +public class WishController { + @Autowired + private WishService wishService; + + @Autowired + private MemberRepository memberRepository; + + @Autowired + private JwtUtil jwtUtil; + + @PostMapping + public ResponseEntity addWish(@RequestBody Wish wish, HttpServletRequest request) { + String email = getEmailFromRequest(request); + if (email != null) { + Optional memberOpt = memberRepository.findByEmail(email); + if(memberOpt.isPresent()) { + wish.setMember(memberOpt.get()); + wishService.save(wish); + return ResponseEntity.ok(wish); + } + } + return ResponseEntity.status(401).body(null); + } + + @GetMapping + public ResponseEntity> getWishes(HttpServletRequest request) { + String email = getEmailFromRequest(request); + if (email != null) { + Optional memberOpt = memberRepository.findByEmail(email); + if(memberOpt.isPresent()) { + return ResponseEntity.ok(wishService.findByMember(memberOpt.get())); + } + } + return ResponseEntity.status(401).body(null); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteWish(@PathVariable Long id, HttpServletRequest request) { + String email = getEmailFromRequest(request); + if (email != null) { + Optional memberOpt = memberRepository.findByEmail(email); + if(memberOpt.isPresent()) { + wishService.deleteById(id); + return ResponseEntity.ok("Wish deleted successfully"); + } + } + return ResponseEntity.status(401).body(null); + } + + // Extracting email from token using HttpServletRequest + private String getEmailFromRequest(HttpServletRequest request) { + String authorizationHeader = request.getHeader("Authorization"); + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + String token = authorizationHeader.substring(7); + return jwtUtil.extractEmail(token); + } + return null; + } +} diff --git a/src/main/java/gift/dto/ProductRequest.java b/src/main/java/gift/dto/ProductRequest.java new file mode 100644 index 000000000..99947c327 --- /dev/null +++ b/src/main/java/gift/dto/ProductRequest.java @@ -0,0 +1,43 @@ +package gift.dto; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; + +public class ProductRequest { + @NotEmpty + @Size(max = 15) + @Pattern(regexp = "^[a-zA-Z0-9()\\[\\]+\\-&/_ ]+$", message = "Invalid characters in name") + private String name; + + @NotNull + private Integer price; + + @NotEmpty + private String imageUrl; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getPrice() { + return price; + } + + public void setPrice(Integer price) { + this.price = price; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } +} diff --git a/src/main/java/gift/dto/ProductResponse.java b/src/main/java/gift/dto/ProductResponse.java new file mode 100644 index 000000000..e337ab34e --- /dev/null +++ b/src/main/java/gift/dto/ProductResponse.java @@ -0,0 +1,47 @@ +package gift.dto; + +public class ProductResponse { + private Long id; + private String name; + private Integer price; + private String imageUrl; + + public ProductResponse(Long id, String name, Integer price, String imageUrl) { + this.id = id; + this.name = name; + this.price = price; + this.imageUrl = imageUrl; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getPrice() { + return price; + } + + public void setPrice(Integer price) { + this.price = price; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } +} diff --git a/src/main/java/gift/entity/Member.java b/src/main/java/gift/entity/Member.java new file mode 100644 index 000000000..e17ae5065 --- /dev/null +++ b/src/main/java/gift/entity/Member.java @@ -0,0 +1,41 @@ +package gift.entity; + +import jakarta.persistence.*; + +@Entity +public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, unique = true, length = 255) + private String email; + + @Column(nullable = false, length = 255) + private String password; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} + diff --git a/src/main/java/gift/entity/Product.java b/src/main/java/gift/entity/Product.java new file mode 100644 index 000000000..e2c966c9c --- /dev/null +++ b/src/main/java/gift/entity/Product.java @@ -0,0 +1,71 @@ +package gift.entity; + +import jakarta.persistence.GenerationType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Positive; +import jakarta.validation.constraints.Size; + +@Entity +public class Product { + @Positive(message = "price must be positive") + @Column(nullable = false) + private int price; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank(message = "name must not be blank") + @Size(max = 15, message = "name must be less than 15 characters") + @Column(nullable = false, length = 15) + private String name; + + @NotBlank(message = "image url must not be blank") + @Column(nullable = false, length = 255) + private String imageUrl; + + public Product(Long id, String name, int price, String imageUrl) { + this.id = id; + this.price = price; + this.name = name; + this.imageUrl = imageUrl; + } + + public int getPrice() { + return price; + } + + public void setPrice(int price) { + this.price = price; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + +} diff --git a/src/main/java/gift/entity/Wish.java b/src/main/java/gift/entity/Wish.java new file mode 100644 index 000000000..ff9a2b2af --- /dev/null +++ b/src/main/java/gift/entity/Wish.java @@ -0,0 +1,55 @@ +package gift.entity; + +import jakarta.persistence.*; + +@Entity +public class Wish { + @Id + @GeneratedValue + private Long id; + + @ManyToOne + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @ManyToOne + @JoinColumn(name = "product_id", nullable = false) + private Product product; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Member getMember() { + return member; + } + + public void setMember(Member member) { + this.member = member; + } + + public Product getProduct() { + return product; + } + + public void setProduct(Product product) { + this.product = product; + } + + // 추가: member의 id를 반환하는 메서드 + public Long getMemberId() { + return member != null ? member.getId() : null; + } + + // 추가: product의 id를 반환하는 메서드 + public Long getProductId() { + return product != null ? product.getId() : null; + } + + // 아래 id를 반환하는 메서드를 쓴 이유: 객체 지향적으로는 참조한 객체 자체를 반환하는게 맞지만, + // 외래 키 값 자체가 필요하게 될 수도 있을 것 같아서. +} diff --git a/src/main/java/gift/exception/GlobalExceptionHandler.java b/src/main/java/gift/exception/GlobalExceptionHandler.java new file mode 100644 index 000000000..8bb560b05 --- /dev/null +++ b/src/main/java/gift/exception/GlobalExceptionHandler.java @@ -0,0 +1,49 @@ +package gift.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; + +import jakarta.persistence.EntityNotFoundException; +import java.nio.file.AccessDeniedException; +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + + // 유효성 검사 예외 처리. 각 필드의 오류 메시지를 모아서 반환. + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleValidationException(MethodArgumentNotValidException ex) { + Map errors = new HashMap<>(); + ex.getBindingResult().getFieldErrors().forEach(error -> { + String fieldsName = ((FieldError) error).getField(); + String errorMessage = ((FieldError) error).getDefaultMessage(); + errors.put(fieldsName, errorMessage); + }); + return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); + } + + // EntityNotFoundException이 발생 시 호출. 엔티티를 찾을 수 없는 경우의 응답. findById 호출 시 엔티티가 없을 때. + @ExceptionHandler(EntityNotFoundException.class) + public ResponseEntity handleEntityNotFoundException(EntityNotFoundException ex) { + return new ResponseEntity<>(ex.getMessage(), HttpStatus.NOT_FOUND); + } + + // 접근 권한이 없는 경우 발생. 403 반환. + @ExceptionHandler(AccessDeniedException.class) + @ResponseStatus(HttpStatus.FORBIDDEN) + public ResponseEntity handleAccessDeniedException(AccessDeniedException ex) { + return new ResponseEntity<>("Access denided", HttpStatus.FORBIDDEN); + } + + // 일반적인 예외 처리. + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception ex) { + return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + } +} diff --git a/src/main/java/gift/filter/JwtAuthenticationFilter.java b/src/main/java/gift/filter/JwtAuthenticationFilter.java new file mode 100644 index 000000000..d58df3ada --- /dev/null +++ b/src/main/java/gift/filter/JwtAuthenticationFilter.java @@ -0,0 +1,33 @@ +package gift.filter; + +import gift.util.JwtUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +@Component +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + @Autowired + private JwtUtil jwtUtil; + + @Override + protected void doFilterInternal(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, jakarta.servlet.FilterChain filterChain) throws jakarta.servlet.ServletException, IOException { + String authorizationHeader = request.getHeader("Authorization"); + + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + String token = authorizationHeader.substring(7); + if (jwtUtil.validateToken(token)) { + String email = jwtUtil.extractEmail(token); + request.setAttribute("email", email); + } else { + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid JWT token"); + return; + } + } + + filterChain.doFilter(request, response); + } +} diff --git a/src/main/java/gift/repository/MemberRepository.java b/src/main/java/gift/repository/MemberRepository.java new file mode 100644 index 000000000..269cd7e63 --- /dev/null +++ b/src/main/java/gift/repository/MemberRepository.java @@ -0,0 +1,14 @@ +package gift.repository; + +import gift.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.Optional; + +@Repository +public interface MemberRepository extends JpaRepository { + Optional findByEmail(String email); +} + + + diff --git a/src/main/java/gift/repository/ProductRepository.java b/src/main/java/gift/repository/ProductRepository.java new file mode 100644 index 000000000..e42abf01d --- /dev/null +++ b/src/main/java/gift/repository/ProductRepository.java @@ -0,0 +1,12 @@ +package gift.repository; + +import gift.entity.Product; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProductRepository extends JpaRepository { + Page findAll(Pageable pageable); +} diff --git a/src/main/java/gift/repository/WishRepository.java b/src/main/java/gift/repository/WishRepository.java new file mode 100644 index 000000000..bb5c0c2d5 --- /dev/null +++ b/src/main/java/gift/repository/WishRepository.java @@ -0,0 +1,13 @@ +package gift.repository; + +import gift.entity.Member; +import gift.entity.Wish; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface WishRepository extends JpaRepository { + List findByMember(Member member); +} diff --git a/src/main/java/gift/service/MemberService.java b/src/main/java/gift/service/MemberService.java new file mode 100644 index 000000000..ee2f972b0 --- /dev/null +++ b/src/main/java/gift/service/MemberService.java @@ -0,0 +1,26 @@ +package gift.service; + +import gift.entity.Member; +import gift.repository.MemberRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class MemberService { + @Autowired + private MemberRepository memberRepository; + + public Optional findByEmail(String email) { + return memberRepository.findByEmail(email); + } + + public Member save(Member member) { + return memberRepository.save(member); + } + + public void delete(Member member) { + memberRepository.delete(member); + } +} diff --git a/src/main/java/gift/service/ProductService.java b/src/main/java/gift/service/ProductService.java new file mode 100644 index 000000000..47c4a882e --- /dev/null +++ b/src/main/java/gift/service/ProductService.java @@ -0,0 +1,38 @@ +package gift.service; + +import gift.entity.Product; +import gift.repository.ProductRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class ProductService { + private final ProductRepository productRepository; + + @Autowired + public ProductService(ProductRepository productRepository) { + this.productRepository = productRepository; + } + + public Page findAll(Pageable pageable) { + return productRepository.findAll(pageable); + } + + public Optional findById(Long id) { + return productRepository.findById(id); + } + + public Product save(Product product) { + return productRepository.save(product); + } + + public void deleteById(Long id) { + productRepository.deleteById(id); + } +} + + diff --git a/src/main/java/gift/service/WishService.java b/src/main/java/gift/service/WishService.java new file mode 100644 index 000000000..e3c4cb64f --- /dev/null +++ b/src/main/java/gift/service/WishService.java @@ -0,0 +1,32 @@ +package gift.service; + +import gift.entity.Member; +import gift.entity.Wish; +import gift.repository.WishRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class WishService { + @Autowired + private WishRepository wishRepository; + + public Wish save(Wish wish) { + return wishRepository.save(wish); + } + + public List findByMember(Member member) { + return wishRepository.findByMember(member); + } + + public Optional findById(Long id) { + return wishRepository.findById(id); + } + + public void deleteById(Long id) { + wishRepository.deleteById(id); + } +} diff --git a/src/main/java/gift/util/JwtUtil.java b/src/main/java/gift/util/JwtUtil.java new file mode 100644 index 000000000..2e390c4f6 --- /dev/null +++ b/src/main/java/gift/util/JwtUtil.java @@ -0,0 +1,58 @@ +package gift.util; + +import org.springframework.stereotype.Component; + +import java.util.Base64; +import java.util.Date; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import java.security.Key; +import java.util.HashMap; +import java.util.Map; + +@Component +public class JwtUtil { + private static final String SECRET_KEY = "your_secret_key"; + private static final long EXPIRATION_TIME = 86400000; // 1 day + + public String generateToken(String email) { + long now = System.currentTimeMillis(); + long exp = now + EXPIRATION_TIME; + + String header = Base64.getUrlEncoder().encodeToString("{\"alg\":\"HS256\",\"typ\":\"JWT\"}".getBytes()); + String payload = Base64.getUrlEncoder().encodeToString(("{\"sub\":\"" + email + "\",\"exp\":" + exp + "}").getBytes()); + + String signature = hmacSha256(header + "." + payload, SECRET_KEY); + + return header + "." + payload + "." + signature; + } + + public String extractEmail(String token) { + String[] parts = token.split("\\."); + if (parts.length == 3 && validateToken(token)) { + String payload = new String(Base64.getUrlDecoder().decode(parts[1])); + return payload.split(",")[0].split(":")[1].replace("\"", ""); + } + return null; + } + + public boolean validateToken(String token) { + String[] parts = token.split("\\."); + if (parts.length == 3) { + String signature = hmacSha256(parts[0] + "." + parts[1], SECRET_KEY); + return signature.equals(parts[2]); + } + return false; + } + + private String hmacSha256(String data, String secret) { + try { + Mac mac = Mac.getInstance("HmacSHA256"); + SecretKeySpec secretKeySpec = new SecretKeySpec(secret.getBytes(), "HmacSHA256"); + mac.init(secretKeySpec); + return Base64.getUrlEncoder().withoutPadding().encodeToString(mac.doFinal(data.getBytes())); + } catch (Exception e) { + throw new RuntimeException("Failed to calculate HMAC-SHA256", e); + } + } +} diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql new file mode 100644 index 000000000..7b8e0a1a8 --- /dev/null +++ b/src/main/resources/data.sql @@ -0,0 +1,4 @@ +INSERT INTO member (email, password) VALUES ('user1@example.com', '$2a$10$DowQ5TeDZa/WZMkEzZcV/OiTFeYYOCfMZ1zxPC5iH70Z/84kO0GhO'); -- password: password +INSERT INTO product (name, price, image_url) VALUES ('Product1', 1000, 'http://example.com/image1.jpg'); +INSERT INTO product (name, price, image_url) VALUES ('Product2', 2000, 'http://example.com/image2.jpg'); +INSERT INTO wishlist (member_id, product_id) VALUES (1, 1); diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql new file mode 100644 index 000000000..61e189c1d --- /dev/null +++ b/src/main/resources/schema.sql @@ -0,0 +1,20 @@ +CREATE TABLE IF NOT EXISTS member ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + email VARCHAR(255) NOT NULL UNIQUE, + password VARCHAR(255) NOT NULL +); + +CREATE TABLE IF NOT EXISTS product ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255) NOT NULL, + price INT NOT NULL, + image_url VARCHAR(255) NOT NULL +); + +CREATE TABLE IF NOT EXISTS wishlist ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + member_id BIGINT NOT NULL, + product_id BIGINT NOT NULL, + FOREIGN KEY (member_id) REFERENCES member(id), + FOREIGN KEY (product_id) REFERENCES product(id) +); diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css new file mode 100644 index 000000000..0045e3c9e --- /dev/null +++ b/src/main/resources/static/css/style.css @@ -0,0 +1,132 @@ + body { + font-family: Arial, sans-serif; + background-color: #f8f9fa; + margin: 0; + padding: 0; + } + + .container { + max-width: 960px; + margin: 0 auto; + padding: 20px; + } + + h1 { + font-size: 2rem; + color: #333; + text-align: center; + margin-bottom: 20px; + } + + .table { + width: 100%; + margin-bottom: 1rem; + color: #212529; + border-collapse: collapse; + } + + .table th, + .table td { + padding: 0.75rem; + vertical-align: top; + border-top: 1px solid #dee2e6; + text-align: left; + } + + .table thead th { + vertical-align: bottom; + border-bottom: 2px solid #dee2e6; + } + + .table tbody + tbody { + border-top: 2px solid #dee2e6; + } + + .table .table { + background-color: #fff; + } + + .btn { + display: inline-block; + font-weight: 400; + color: #212529; + text-align: center; + vertical-align: middle; + cursor: pointer; + background-color: transparent; + border: 1px solid transparent; + padding: 0.375rem 0.75rem; + font-size: 1rem; + line-height: 1.5; + border-radius: 0.25rem; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + } + + .btn-success { + color: #fff; + background-color: #28a745; + border-color: #28a745; + } + + .btn-warning { + color: #212529; + background-color: #ffc107; + border-color: #ffc107; + } + + .btn-danger { + color: #fff; + background-color: #dc3545; + border-color: #dc3545; + } + + .d-flex { + display: flex; + align-items: center; + } + + .justify-content-end { + justify-content: flex-end; + } + + .mb-2 { + margin-bottom: 0.5rem; + } + + .mt-4 { + margin-top: 1.5rem; + } + + .form-group { + margin-bottom: 1rem; + } + + .form-control { + display: block; + width: 100%; + padding: 0.375rem 0.75rem; + font-size: 1rem; + line-height: 1.5; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: 0.25rem; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + } + + .form-control:focus { + color: #495057; + background-color: #fff; + border-color: #80bdff; + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +<<<<<<< HEAD +<<<<<<< HEAD + } +======= + } +>>>>>>> 699b3988c963094da78a61983a5a8ba21bd0f705 +======= + } +>>>>>>> upstream/jinhwa-park diff --git a/src/main/resources/templates/addProduct.html b/src/main/resources/templates/addProduct.html new file mode 100644 index 000000000..ad7d61e15 --- /dev/null +++ b/src/main/resources/templates/addProduct.html @@ -0,0 +1,30 @@ + + + + Add Product + + + +
+

Add Product

+
+
+

+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ + diff --git a/src/main/resources/templates/editProduct.html b/src/main/resources/templates/editProduct.html new file mode 100644 index 000000000..2fab7918b --- /dev/null +++ b/src/main/resources/templates/editProduct.html @@ -0,0 +1,30 @@ + + + + Edit Product + + + +
+

Edit Product

+
+
+

+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ + diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html new file mode 100644 index 000000000..96b9c2fb9 --- /dev/null +++ b/src/main/resources/templates/error.html @@ -0,0 +1,14 @@ + + + + Error + + + +
+

An error occurred

+

There was an error processing your request. Please try again later.

+ Back to Products +
+ + diff --git a/src/main/resources/templates/product.html b/src/main/resources/templates/product.html new file mode 100644 index 000000000..8a34b635d --- /dev/null +++ b/src/main/resources/templates/product.html @@ -0,0 +1,41 @@ + + + + Manage Products + + + +
+

Manage Products

+
+ Add New Product +
+ + + + + + + + + + + + + + + + + +
NamePriceImage URLActions
Product NameProduct PriceProduct Image URL + Edit + Delete +
+
+ + +<<<<<<< HEAD + +======= + +>>>>>>> upstream/jinhwa-park diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html new file mode 100644 index 000000000..cbe3b99f8 --- /dev/null +++ b/src/main/resources/templates/products.html @@ -0,0 +1,40 @@ + + + + Manage Products + + + +
+

Manage Products

+
+

+
+
+ Add New Product +
+ + + + + + + + + + + + + + + + + +
NamePriceImage URLActions
Product NameProduct PriceProduct Image URL + Edit + Delete +
+
+ + + diff --git a/src/test/java/gift/controller/MemberControllerTest.java b/src/test/java/gift/controller/MemberControllerTest.java new file mode 100644 index 000000000..289e025f8 --- /dev/null +++ b/src/test/java/gift/controller/MemberControllerTest.java @@ -0,0 +1,80 @@ +package gift.controller; + +import gift.entity.Member; +import gift.service.MemberService; +import gift.util.JwtUtil; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.Optional; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(MemberController.class) +public class MemberControllerTest { + @Autowired + private MockMvc mockMvc; + + @MockBean + private MemberService memberService; + + @MockBean + private JwtUtil jwtUtil; + + @Test + @DisplayName("회원가입") + public void registerMember() throws Exception { + Member member = new Member(); + member.setEmail("testemail@example.com"); + member.setPassword("testPassword"); + + given(memberService.save(any(Member.class))).willReturn(member); + + mockMvc.perform(post("/members/register") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"email\":\"testemail@example.com\",\"password\":\"testPassword\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.message").value("success")); + } + + @Test + @DisplayName("로그인") + public void loginMember() throws Exception { + Member member = new Member(); + member.setEmail("testemail@example.com"); + member.setPassword("testPassword"); + + given(memberService.findByEmail(anyString())).willReturn(Optional.of(member)); + given(jwtUtil.generateToken(anyString())).willReturn("fakeToken"); + + mockMvc.perform(post("/members/login") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"email\":\"testemail@example.com\",\"password\":\"testPassword\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.token").value("fakeToken")); + } + + @Test + @DisplayName("현재 로그인한 회원") + public void getCurrentMember() throws Exception { + Member member = new Member(); + member.setEmail("testemail@example.com"); + + given(jwtUtil.extractEmail(anyString())).willReturn("testemail@example.com"); + given(memberService.findByEmail(anyString())).willReturn(Optional.of(member)); + mockMvc.perform(post("/member/current") + .header("Authorization", "Bearer fakeToken")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.email").value("testemail@example.com")); + } +} diff --git a/src/test/java/gift/controller/ProductControllerTest.java b/src/test/java/gift/controller/ProductControllerTest.java new file mode 100644 index 000000000..b9cfa8912 --- /dev/null +++ b/src/test/java/gift/controller/ProductControllerTest.java @@ -0,0 +1,80 @@ +package gift.controller; + +import gift.entity.Product; +import gift.service.ProductService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.Arrays; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(ProductController.class) +public class ProductControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean + private ProductService productService; + + @Test + @DisplayName("전체 상품 조회") + public void getAllProducts() throws Exception { + Page products = new PageImpl<>(Arrays.asList( + new Product(1L, "Product1", 100, "url1"), + new Product(2L, "Product2", 200, "url2") + ), PageRequest.of(0, 10), 2); + given(productService.findAll(any(PageRequest.class))).willReturn(products); + + mockMvc.perform(get("/api/products?page=0&size=10")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.content[0].name").value("Product1")) + .andExpect(jsonPath("$.content[1].name").value("Product2")); + } + + @Test + @DisplayName("상품 추가") + public void addProduct() throws Exception { + Product product = new Product(1L, "Product1", 100, "url1"); + given(productService.save(any(Product.class))).willReturn(product); + + mockMvc.perform(post("/api/products") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.name").value("Product1")); + } + + @Test + @DisplayName("상품 수정") + public void updateProduct() throws Exception { + Product product = new Product(1L, "Product1", 100, "url1"); + given(productService.save(any(Product.class))).willReturn(product); + + mockMvc.perform(put("/api/products/1") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.name").value("Product1")); + } + + @Test + @DisplayName("상품 삭제") + public void deleteProduct() throws Exception { + mockMvc.perform(delete("/api/products/1")) + .andExpect(status().isNoContent()); + } +} diff --git a/src/test/java/gift/controller/WishControllerTest.java b/src/test/java/gift/controller/WishControllerTest.java new file mode 100644 index 000000000..18436e3d0 --- /dev/null +++ b/src/test/java/gift/controller/WishControllerTest.java @@ -0,0 +1,117 @@ +package gift.controller; + +import gift.entity.Member; +import gift.entity.Product; +import gift.entity.Wish; +import gift.repository.MemberRepository; +import gift.service.WishService; +import gift.util.JwtUtil; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.Arrays; +import java.util.Optional; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@WebMvcTest(WishController.class) +public class WishControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean + private WishService wishService; + + @MockBean + private MemberRepository memberRepository; + + @MockBean + private JwtUtil jwtUtil; + + @Test + @DisplayName("위시리스트 전체 조회") + public void getWishes() throws Exception { + Member member = new Member(); + member.setId(1L); + member.setEmail("test@example.com"); + member.setPassword("password"); + + Product product = new Product(); + product.setId(1L); + product.setName("Product1"); + product.setPrice(100); + product.setImageUrl("http://example.com/image.jpg"); + + Wish wish = new Wish(); + wish.setId(1L); + wish.setMember(member); + wish.setProduct(product); + + given(jwtUtil.extractEmail(anyString())).willReturn("test@example.com"); + given(memberRepository.findByEmail(anyString())).willReturn(Optional.of(member)); + given(wishService.findByMember(any(Member.class))).willReturn(Arrays.asList(wish)); + + mockMvc.perform(get("/wishes") + .header("Authorization", "Bearer fake-jwt-token")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].id").value(1L)); + } + + @Test + @DisplayName("위시리스트 추가") + public void addWish() throws Exception { + Member member = new Member(); + member.setId(1L); + member.setEmail("test@example.com"); + member.setPassword("password"); + + Product product = new Product(); + product.setId(1L); + product.setName("Product1"); + product.setPrice(100); + product.setImageUrl("http://example.com/image.jpg"); + + Wish wish = new Wish(); + wish.setId(1L); + wish.setMember(member); + wish.setProduct(product); + + given(jwtUtil.extractEmail(anyString())).willReturn("test@example.com"); + given(memberRepository.findByEmail(anyString())).willReturn(Optional.of(member)); + given(wishService.save(any(Wish.class))).willReturn(wish); + + mockMvc.perform(post("/wishes") + .header("Authorization", "Bearer fake-jwt-token") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"productId\":1}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id").value(1L)); + } + + @Test + @DisplayName("위시리스트 삭제") + public void deleteWish() throws Exception { + Member member = new Member(); + member.setId(1L); + member.setEmail("test@example.com"); + member.setPassword("password"); + + given(jwtUtil.extractEmail(anyString())).willReturn("test@example.com"); + given(memberRepository.findByEmail(anyString())).willReturn(Optional.of(member)); + + mockMvc.perform(delete("/wishes/1") + .header("Authorization", "Bearer fake-jwt-token")) + .andExpect(status().isOk()) + .andExpect(content().string("Wish deleted successfully")); + } +} diff --git a/src/test/java/gift/service/ProductServiceTest.java b/src/test/java/gift/service/ProductServiceTest.java new file mode 100644 index 000000000..bddaf76be --- /dev/null +++ b/src/test/java/gift/service/ProductServiceTest.java @@ -0,0 +1,70 @@ +//package gift.service; +// +//import gift.entity.Product; +//import gift.service.ProductService; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest; +//import org.springframework.context.annotation.ComponentScan; +// +//import java.util.List; +// +//import static org.junit.jupiter.api.Assertions.*; +// +//@JdbcTest +//@ComponentScan(basePackages = "gift.service") +//class ProductServiceTest { +// +// @Autowired +// private ProductService productService; +// +// @BeforeEach +// void setUp() { +// // 데이터 초기화 코드가 필요할 경우 추가 +// } +// +// @Test +// void getAllProducts() { +// List products = productService.getAllProducts(); +// assertEquals(2, products.size()); +// } +// +// @Test +// void addProduct() { +// Product newProduct = new Product.Builder() +// .name("New Product") +// .price(3000) +// .imageUrl("https://example.com/newproduct.jpg") +// .build(); +// productService.addProduct(newProduct); +// +// List products = productService.getAllProducts(); +// assertEquals(3, products.size()); +// assertTrue(products.stream().anyMatch(product -> "New Product".equals(product.getName()))); +// } +// +// @Test +// void updateProduct() { +// Product updatedProduct = new Product.Builder() +// .id(1L) +// .name("Updated Product") +// .price(1500) +// .imageUrl("https://example.com/updatedproduct.jpg") +// .build(); +// productService.updateProduct(1L, updatedProduct); +// +// Product product = productService.getProductById(1L); +// assertEquals("Updated Product", product.getName()); +// assertEquals(1500, product.getPrice()); +// } +// +// @Test +// void deleteProduct() { +// productService.deleteProduct(1L); +// +// List products = productService.getAllProducts(); +// assertEquals(1, products.size()); +// assertFalse(products.stream().anyMatch(product -> product.getId().equals(1L))); +// } +//} From 6c1df36a633007bcd4b9ed3e71f342e1ccdb69bd Mon Sep 17 00:00:00 2001 From: evol <61404196+Jinhwa-Park@users.noreply.github.com> Date: Tue, 16 Jul 2024 22:33:48 +0900 Subject: [PATCH 05/96] feat: migrate prev project codes (#131) --- README.md | 2 +- src/main/java/gift/config/WebConfig.java | 22 +++ .../gift/controller/MemberController.java | 68 +++++++++ .../gift/controller/ProductController.java | 71 ++++++++++ .../java/gift/controller/WishController.java | 77 ++++++++++ src/main/java/gift/dto/ProductRequest.java | 43 ++++++ src/main/java/gift/dto/ProductResponse.java | 47 +++++++ src/main/java/gift/entity/Member.java | 41 ++++++ src/main/java/gift/entity/Product.java | 71 ++++++++++ src/main/java/gift/entity/Wish.java | 55 ++++++++ .../exception/GlobalExceptionHandler.java | 49 +++++++ .../gift/filter/JwtAuthenticationFilter.java | 33 +++++ .../gift/repository/MemberRepository.java | 14 ++ .../gift/repository/ProductRepository.java | 12 ++ .../java/gift/repository/WishRepository.java | 13 ++ src/main/java/gift/service/MemberService.java | 26 ++++ .../java/gift/service/ProductService.java | 38 +++++ src/main/java/gift/service/WishService.java | 32 +++++ src/main/java/gift/util/JwtUtil.java | 58 ++++++++ src/main/resources/data.sql | 4 + src/main/resources/schema.sql | 20 +++ src/main/resources/static/css/style.css | 132 ++++++++++++++++++ src/main/resources/templates/addProduct.html | 30 ++++ src/main/resources/templates/editProduct.html | 30 ++++ src/main/resources/templates/error.html | 14 ++ src/main/resources/templates/product.html | 41 ++++++ src/main/resources/templates/products.html | 40 ++++++ .../gift/controller/MemberControllerTest.java | 80 +++++++++++ .../controller/ProductControllerTest.java | 80 +++++++++++ .../gift/controller/WishControllerTest.java | 117 ++++++++++++++++ .../java/gift/service/ProductServiceTest.java | 70 ++++++++++ 31 files changed, 1429 insertions(+), 1 deletion(-) create mode 100644 src/main/java/gift/config/WebConfig.java create mode 100644 src/main/java/gift/controller/MemberController.java create mode 100644 src/main/java/gift/controller/ProductController.java create mode 100644 src/main/java/gift/controller/WishController.java create mode 100644 src/main/java/gift/dto/ProductRequest.java create mode 100644 src/main/java/gift/dto/ProductResponse.java create mode 100644 src/main/java/gift/entity/Member.java create mode 100644 src/main/java/gift/entity/Product.java create mode 100644 src/main/java/gift/entity/Wish.java create mode 100644 src/main/java/gift/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/gift/filter/JwtAuthenticationFilter.java create mode 100644 src/main/java/gift/repository/MemberRepository.java create mode 100644 src/main/java/gift/repository/ProductRepository.java create mode 100644 src/main/java/gift/repository/WishRepository.java create mode 100644 src/main/java/gift/service/MemberService.java create mode 100644 src/main/java/gift/service/ProductService.java create mode 100644 src/main/java/gift/service/WishService.java create mode 100644 src/main/java/gift/util/JwtUtil.java create mode 100644 src/main/resources/data.sql create mode 100644 src/main/resources/schema.sql create mode 100644 src/main/resources/static/css/style.css create mode 100644 src/main/resources/templates/addProduct.html create mode 100644 src/main/resources/templates/editProduct.html create mode 100644 src/main/resources/templates/error.html create mode 100644 src/main/resources/templates/product.html create mode 100644 src/main/resources/templates/products.html create mode 100644 src/test/java/gift/controller/MemberControllerTest.java create mode 100644 src/test/java/gift/controller/ProductControllerTest.java create mode 100644 src/test/java/gift/controller/WishControllerTest.java create mode 100644 src/test/java/gift/service/ProductServiceTest.java diff --git a/README.md b/README.md index 75f82d8fa..61c9663cb 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# spring-gift-enhancement \ No newline at end of file +# spring-gift-enhancement diff --git a/src/main/java/gift/config/WebConfig.java b/src/main/java/gift/config/WebConfig.java new file mode 100644 index 000000000..b1479971a --- /dev/null +++ b/src/main/java/gift/config/WebConfig.java @@ -0,0 +1,22 @@ +package gift.config; + +import gift.filter.JwtAuthenticationFilter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class WebConfig { + + @Autowired + private JwtAuthenticationFilter jwtAuthenticationFilter; + + @Bean + public FilterRegistrationBean jwtAuthenticationFilterRegistration() { + FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); + registrationBean.setFilter(jwtAuthenticationFilter); + registrationBean.addUrlPatterns("/api/*"); // 필요한 URL 패턴 설정 + return registrationBean; + } +} diff --git a/src/main/java/gift/controller/MemberController.java b/src/main/java/gift/controller/MemberController.java new file mode 100644 index 000000000..03939c6e4 --- /dev/null +++ b/src/main/java/gift/controller/MemberController.java @@ -0,0 +1,68 @@ +package gift.controller; + +import gift.entity.Member; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import gift.service.MemberService; +import gift.util.JwtUtil; + +import jakarta.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + + +@RestController +@RequestMapping("/member") +public class MemberController { + @Autowired + private MemberService memberService; + + @Autowired + private JwtUtil jwtUtil; + + @PostMapping("/register") + public ResponseEntity> register(@RequestBody Member member) { + memberService.save(member); + Map response = new HashMap<>(); + response.put("message", "success"); + return ResponseEntity.ok(response); + } + + @PostMapping("/login") + public ResponseEntity> login(@RequestBody Member loginRequest) { + Optional memberOpt = memberService.findByEmail(loginRequest.getEmail()); + if(memberOpt.isPresent() && memberOpt.get().getPassword().equals(loginRequest.getPassword())) { + String token = jwtUtil.generateToken(memberOpt.get().getEmail()); + Map response = new HashMap<>(); + response.put("message", "success"); + response.put("token", token); + return ResponseEntity.ok(response); + } + return ResponseEntity.status(401).body(null); + } + + // endpoint that checking member information + @GetMapping("/me") + public ResponseEntity getCurrentMember(HttpServletRequest request) { + String email = getEmailFromRequest(request); + if(email != null) { + Optional memberOpt = memberService.findByEmail(email); + if(memberOpt.isPresent()) { + return ResponseEntity.ok(memberOpt.get()); + } + } + return ResponseEntity.status(401).body(null); + } + + // Extracting email from token using HttpServletRequest + private String getEmailFromRequest(HttpServletRequest request) { + String authorizationHeader = request.getHeader("Authorization"); + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + String token = authorizationHeader.substring(7); + return jwtUtil.extractEmail(token); + } + return null; + } +} diff --git a/src/main/java/gift/controller/ProductController.java b/src/main/java/gift/controller/ProductController.java new file mode 100644 index 000000000..5dbee3d17 --- /dev/null +++ b/src/main/java/gift/controller/ProductController.java @@ -0,0 +1,71 @@ +package gift.controller; + +import gift.dto.ProductRequest; +import gift.dto.ProductResponse; +import gift.entity.Product; +import gift.service.ProductService; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import java.util.stream.Collectors; + +@RestController +@RequestMapping("/api/products") +public class ProductController { + private final ProductService productService; + + @Autowired + public ProductController(ProductService productService) { + this.productService = productService; + } + + @GetMapping + public ResponseEntity getAllProducts(Pageable pageable) { + Page products = productService.findAll(pageable); + Page response = products.map(product -> new ProductResponse( + product.getId(), + product.getName(), + product.getPrice(), + product.getImageUrl() + )); + return ResponseEntity.ok(response); + } + + @PostMapping + public ResponseEntity addProduct(@Valid @RequestBody ProductRequest productRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()) { + String errors = bindingResult.getAllErrors().stream() + .map(error -> error.getDefaultMessage()) + .collect(Collectors.joining(", ")); + return ResponseEntity.badRequest().body(errors); + } + Product product = new Product(); + product.setName(productRequest.getName()); + product.setPrice(productRequest.getPrice()); + product.setImageUrl(productRequest.getImageUrl()); + return ResponseEntity.ok(productService.save(product)); + } + + @PutMapping("/{id}") + public ResponseEntity updateProduct(@PathVariable Long id, @Valid @RequestBody ProductRequest productRequest, BindingResult bindingResult) { + if(bindingResult.hasErrors()) { + String errors = bindingResult.getAllErrors().stream() + .map(error -> error.getDefaultMessage()) + .collect(Collectors.joining(", ")); + return ResponseEntity.badRequest().body(errors); + } + Product product = new Product(); + return ResponseEntity.ok(productService.save(product)); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteProduct(@PathVariable Long id) { + productService.deleteById(id); + return ResponseEntity.ok().build(); + } +} diff --git a/src/main/java/gift/controller/WishController.java b/src/main/java/gift/controller/WishController.java new file mode 100644 index 000000000..392224fff --- /dev/null +++ b/src/main/java/gift/controller/WishController.java @@ -0,0 +1,77 @@ +package gift.controller; + +import gift.entity.Member; +import gift.entity.Wish; +import gift.repository.MemberRepository; +import gift.service.WishService; +import gift.util.JwtUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import jakarta.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Optional; + + +@RestController +@RequestMapping("/wishes") +public class WishController { + @Autowired + private WishService wishService; + + @Autowired + private MemberRepository memberRepository; + + @Autowired + private JwtUtil jwtUtil; + + @PostMapping + public ResponseEntity addWish(@RequestBody Wish wish, HttpServletRequest request) { + String email = getEmailFromRequest(request); + if (email != null) { + Optional memberOpt = memberRepository.findByEmail(email); + if(memberOpt.isPresent()) { + wish.setMember(memberOpt.get()); + wishService.save(wish); + return ResponseEntity.ok(wish); + } + } + return ResponseEntity.status(401).body(null); + } + + @GetMapping + public ResponseEntity> getWishes(HttpServletRequest request) { + String email = getEmailFromRequest(request); + if (email != null) { + Optional memberOpt = memberRepository.findByEmail(email); + if(memberOpt.isPresent()) { + return ResponseEntity.ok(wishService.findByMember(memberOpt.get())); + } + } + return ResponseEntity.status(401).body(null); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteWish(@PathVariable Long id, HttpServletRequest request) { + String email = getEmailFromRequest(request); + if (email != null) { + Optional memberOpt = memberRepository.findByEmail(email); + if(memberOpt.isPresent()) { + wishService.deleteById(id); + return ResponseEntity.ok("Wish deleted successfully"); + } + } + return ResponseEntity.status(401).body(null); + } + + // Extracting email from token using HttpServletRequest + private String getEmailFromRequest(HttpServletRequest request) { + String authorizationHeader = request.getHeader("Authorization"); + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + String token = authorizationHeader.substring(7); + return jwtUtil.extractEmail(token); + } + return null; + } +} diff --git a/src/main/java/gift/dto/ProductRequest.java b/src/main/java/gift/dto/ProductRequest.java new file mode 100644 index 000000000..99947c327 --- /dev/null +++ b/src/main/java/gift/dto/ProductRequest.java @@ -0,0 +1,43 @@ +package gift.dto; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; + +public class ProductRequest { + @NotEmpty + @Size(max = 15) + @Pattern(regexp = "^[a-zA-Z0-9()\\[\\]+\\-&/_ ]+$", message = "Invalid characters in name") + private String name; + + @NotNull + private Integer price; + + @NotEmpty + private String imageUrl; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getPrice() { + return price; + } + + public void setPrice(Integer price) { + this.price = price; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } +} diff --git a/src/main/java/gift/dto/ProductResponse.java b/src/main/java/gift/dto/ProductResponse.java new file mode 100644 index 000000000..e337ab34e --- /dev/null +++ b/src/main/java/gift/dto/ProductResponse.java @@ -0,0 +1,47 @@ +package gift.dto; + +public class ProductResponse { + private Long id; + private String name; + private Integer price; + private String imageUrl; + + public ProductResponse(Long id, String name, Integer price, String imageUrl) { + this.id = id; + this.name = name; + this.price = price; + this.imageUrl = imageUrl; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getPrice() { + return price; + } + + public void setPrice(Integer price) { + this.price = price; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } +} diff --git a/src/main/java/gift/entity/Member.java b/src/main/java/gift/entity/Member.java new file mode 100644 index 000000000..e17ae5065 --- /dev/null +++ b/src/main/java/gift/entity/Member.java @@ -0,0 +1,41 @@ +package gift.entity; + +import jakarta.persistence.*; + +@Entity +public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, unique = true, length = 255) + private String email; + + @Column(nullable = false, length = 255) + private String password; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} + diff --git a/src/main/java/gift/entity/Product.java b/src/main/java/gift/entity/Product.java new file mode 100644 index 000000000..e2c966c9c --- /dev/null +++ b/src/main/java/gift/entity/Product.java @@ -0,0 +1,71 @@ +package gift.entity; + +import jakarta.persistence.GenerationType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Positive; +import jakarta.validation.constraints.Size; + +@Entity +public class Product { + @Positive(message = "price must be positive") + @Column(nullable = false) + private int price; + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank(message = "name must not be blank") + @Size(max = 15, message = "name must be less than 15 characters") + @Column(nullable = false, length = 15) + private String name; + + @NotBlank(message = "image url must not be blank") + @Column(nullable = false, length = 255) + private String imageUrl; + + public Product(Long id, String name, int price, String imageUrl) { + this.id = id; + this.price = price; + this.name = name; + this.imageUrl = imageUrl; + } + + public int getPrice() { + return price; + } + + public void setPrice(int price) { + this.price = price; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + +} diff --git a/src/main/java/gift/entity/Wish.java b/src/main/java/gift/entity/Wish.java new file mode 100644 index 000000000..ff9a2b2af --- /dev/null +++ b/src/main/java/gift/entity/Wish.java @@ -0,0 +1,55 @@ +package gift.entity; + +import jakarta.persistence.*; + +@Entity +public class Wish { + @Id + @GeneratedValue + private Long id; + + @ManyToOne + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @ManyToOne + @JoinColumn(name = "product_id", nullable = false) + private Product product; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Member getMember() { + return member; + } + + public void setMember(Member member) { + this.member = member; + } + + public Product getProduct() { + return product; + } + + public void setProduct(Product product) { + this.product = product; + } + + // 추가: member의 id를 반환하는 메서드 + public Long getMemberId() { + return member != null ? member.getId() : null; + } + + // 추가: product의 id를 반환하는 메서드 + public Long getProductId() { + return product != null ? product.getId() : null; + } + + // 아래 id를 반환하는 메서드를 쓴 이유: 객체 지향적으로는 참조한 객체 자체를 반환하는게 맞지만, + // 외래 키 값 자체가 필요하게 될 수도 있을 것 같아서. +} diff --git a/src/main/java/gift/exception/GlobalExceptionHandler.java b/src/main/java/gift/exception/GlobalExceptionHandler.java new file mode 100644 index 000000000..8bb560b05 --- /dev/null +++ b/src/main/java/gift/exception/GlobalExceptionHandler.java @@ -0,0 +1,49 @@ +package gift.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; + +import jakarta.persistence.EntityNotFoundException; +import java.nio.file.AccessDeniedException; +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + + // 유효성 검사 예외 처리. 각 필드의 오류 메시지를 모아서 반환. + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleValidationException(MethodArgumentNotValidException ex) { + Map errors = new HashMap<>(); + ex.getBindingResult().getFieldErrors().forEach(error -> { + String fieldsName = ((FieldError) error).getField(); + String errorMessage = ((FieldError) error).getDefaultMessage(); + errors.put(fieldsName, errorMessage); + }); + return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); + } + + // EntityNotFoundException이 발생 시 호출. 엔티티를 찾을 수 없는 경우의 응답. findById 호출 시 엔티티가 없을 때. + @ExceptionHandler(EntityNotFoundException.class) + public ResponseEntity handleEntityNotFoundException(EntityNotFoundException ex) { + return new ResponseEntity<>(ex.getMessage(), HttpStatus.NOT_FOUND); + } + + // 접근 권한이 없는 경우 발생. 403 반환. + @ExceptionHandler(AccessDeniedException.class) + @ResponseStatus(HttpStatus.FORBIDDEN) + public ResponseEntity handleAccessDeniedException(AccessDeniedException ex) { + return new ResponseEntity<>("Access denided", HttpStatus.FORBIDDEN); + } + + // 일반적인 예외 처리. + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception ex) { + return new ResponseEntity<>(ex.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + } +} diff --git a/src/main/java/gift/filter/JwtAuthenticationFilter.java b/src/main/java/gift/filter/JwtAuthenticationFilter.java new file mode 100644 index 000000000..d58df3ada --- /dev/null +++ b/src/main/java/gift/filter/JwtAuthenticationFilter.java @@ -0,0 +1,33 @@ +package gift.filter; + +import gift.util.JwtUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +@Component +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + @Autowired + private JwtUtil jwtUtil; + + @Override + protected void doFilterInternal(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, jakarta.servlet.FilterChain filterChain) throws jakarta.servlet.ServletException, IOException { + String authorizationHeader = request.getHeader("Authorization"); + + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + String token = authorizationHeader.substring(7); + if (jwtUtil.validateToken(token)) { + String email = jwtUtil.extractEmail(token); + request.setAttribute("email", email); + } else { + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid JWT token"); + return; + } + } + + filterChain.doFilter(request, response); + } +} diff --git a/src/main/java/gift/repository/MemberRepository.java b/src/main/java/gift/repository/MemberRepository.java new file mode 100644 index 000000000..269cd7e63 --- /dev/null +++ b/src/main/java/gift/repository/MemberRepository.java @@ -0,0 +1,14 @@ +package gift.repository; + +import gift.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.Optional; + +@Repository +public interface MemberRepository extends JpaRepository { + Optional findByEmail(String email); +} + + + diff --git a/src/main/java/gift/repository/ProductRepository.java b/src/main/java/gift/repository/ProductRepository.java new file mode 100644 index 000000000..e42abf01d --- /dev/null +++ b/src/main/java/gift/repository/ProductRepository.java @@ -0,0 +1,12 @@ +package gift.repository; + +import gift.entity.Product; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProductRepository extends JpaRepository { + Page findAll(Pageable pageable); +} diff --git a/src/main/java/gift/repository/WishRepository.java b/src/main/java/gift/repository/WishRepository.java new file mode 100644 index 000000000..bb5c0c2d5 --- /dev/null +++ b/src/main/java/gift/repository/WishRepository.java @@ -0,0 +1,13 @@ +package gift.repository; + +import gift.entity.Member; +import gift.entity.Wish; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface WishRepository extends JpaRepository { + List findByMember(Member member); +} diff --git a/src/main/java/gift/service/MemberService.java b/src/main/java/gift/service/MemberService.java new file mode 100644 index 000000000..ee2f972b0 --- /dev/null +++ b/src/main/java/gift/service/MemberService.java @@ -0,0 +1,26 @@ +package gift.service; + +import gift.entity.Member; +import gift.repository.MemberRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class MemberService { + @Autowired + private MemberRepository memberRepository; + + public Optional findByEmail(String email) { + return memberRepository.findByEmail(email); + } + + public Member save(Member member) { + return memberRepository.save(member); + } + + public void delete(Member member) { + memberRepository.delete(member); + } +} diff --git a/src/main/java/gift/service/ProductService.java b/src/main/java/gift/service/ProductService.java new file mode 100644 index 000000000..47c4a882e --- /dev/null +++ b/src/main/java/gift/service/ProductService.java @@ -0,0 +1,38 @@ +package gift.service; + +import gift.entity.Product; +import gift.repository.ProductRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +public class ProductService { + private final ProductRepository productRepository; + + @Autowired + public ProductService(ProductRepository productRepository) { + this.productRepository = productRepository; + } + + public Page findAll(Pageable pageable) { + return productRepository.findAll(pageable); + } + + public Optional findById(Long id) { + return productRepository.findById(id); + } + + public Product save(Product product) { + return productRepository.save(product); + } + + public void deleteById(Long id) { + productRepository.deleteById(id); + } +} + + diff --git a/src/main/java/gift/service/WishService.java b/src/main/java/gift/service/WishService.java new file mode 100644 index 000000000..e3c4cb64f --- /dev/null +++ b/src/main/java/gift/service/WishService.java @@ -0,0 +1,32 @@ +package gift.service; + +import gift.entity.Member; +import gift.entity.Wish; +import gift.repository.WishRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +@Service +public class WishService { + @Autowired + private WishRepository wishRepository; + + public Wish save(Wish wish) { + return wishRepository.save(wish); + } + + public List findByMember(Member member) { + return wishRepository.findByMember(member); + } + + public Optional findById(Long id) { + return wishRepository.findById(id); + } + + public void deleteById(Long id) { + wishRepository.deleteById(id); + } +} diff --git a/src/main/java/gift/util/JwtUtil.java b/src/main/java/gift/util/JwtUtil.java new file mode 100644 index 000000000..2e390c4f6 --- /dev/null +++ b/src/main/java/gift/util/JwtUtil.java @@ -0,0 +1,58 @@ +package gift.util; + +import org.springframework.stereotype.Component; + +import java.util.Base64; +import java.util.Date; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import java.security.Key; +import java.util.HashMap; +import java.util.Map; + +@Component +public class JwtUtil { + private static final String SECRET_KEY = "your_secret_key"; + private static final long EXPIRATION_TIME = 86400000; // 1 day + + public String generateToken(String email) { + long now = System.currentTimeMillis(); + long exp = now + EXPIRATION_TIME; + + String header = Base64.getUrlEncoder().encodeToString("{\"alg\":\"HS256\",\"typ\":\"JWT\"}".getBytes()); + String payload = Base64.getUrlEncoder().encodeToString(("{\"sub\":\"" + email + "\",\"exp\":" + exp + "}").getBytes()); + + String signature = hmacSha256(header + "." + payload, SECRET_KEY); + + return header + "." + payload + "." + signature; + } + + public String extractEmail(String token) { + String[] parts = token.split("\\."); + if (parts.length == 3 && validateToken(token)) { + String payload = new String(Base64.getUrlDecoder().decode(parts[1])); + return payload.split(",")[0].split(":")[1].replace("\"", ""); + } + return null; + } + + public boolean validateToken(String token) { + String[] parts = token.split("\\."); + if (parts.length == 3) { + String signature = hmacSha256(parts[0] + "." + parts[1], SECRET_KEY); + return signature.equals(parts[2]); + } + return false; + } + + private String hmacSha256(String data, String secret) { + try { + Mac mac = Mac.getInstance("HmacSHA256"); + SecretKeySpec secretKeySpec = new SecretKeySpec(secret.getBytes(), "HmacSHA256"); + mac.init(secretKeySpec); + return Base64.getUrlEncoder().withoutPadding().encodeToString(mac.doFinal(data.getBytes())); + } catch (Exception e) { + throw new RuntimeException("Failed to calculate HMAC-SHA256", e); + } + } +} diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql new file mode 100644 index 000000000..7b8e0a1a8 --- /dev/null +++ b/src/main/resources/data.sql @@ -0,0 +1,4 @@ +INSERT INTO member (email, password) VALUES ('user1@example.com', '$2a$10$DowQ5TeDZa/WZMkEzZcV/OiTFeYYOCfMZ1zxPC5iH70Z/84kO0GhO'); -- password: password +INSERT INTO product (name, price, image_url) VALUES ('Product1', 1000, 'http://example.com/image1.jpg'); +INSERT INTO product (name, price, image_url) VALUES ('Product2', 2000, 'http://example.com/image2.jpg'); +INSERT INTO wishlist (member_id, product_id) VALUES (1, 1); diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql new file mode 100644 index 000000000..61e189c1d --- /dev/null +++ b/src/main/resources/schema.sql @@ -0,0 +1,20 @@ +CREATE TABLE IF NOT EXISTS member ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + email VARCHAR(255) NOT NULL UNIQUE, + password VARCHAR(255) NOT NULL +); + +CREATE TABLE IF NOT EXISTS product ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255) NOT NULL, + price INT NOT NULL, + image_url VARCHAR(255) NOT NULL +); + +CREATE TABLE IF NOT EXISTS wishlist ( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + member_id BIGINT NOT NULL, + product_id BIGINT NOT NULL, + FOREIGN KEY (member_id) REFERENCES member(id), + FOREIGN KEY (product_id) REFERENCES product(id) +); diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css new file mode 100644 index 000000000..0045e3c9e --- /dev/null +++ b/src/main/resources/static/css/style.css @@ -0,0 +1,132 @@ + body { + font-family: Arial, sans-serif; + background-color: #f8f9fa; + margin: 0; + padding: 0; + } + + .container { + max-width: 960px; + margin: 0 auto; + padding: 20px; + } + + h1 { + font-size: 2rem; + color: #333; + text-align: center; + margin-bottom: 20px; + } + + .table { + width: 100%; + margin-bottom: 1rem; + color: #212529; + border-collapse: collapse; + } + + .table th, + .table td { + padding: 0.75rem; + vertical-align: top; + border-top: 1px solid #dee2e6; + text-align: left; + } + + .table thead th { + vertical-align: bottom; + border-bottom: 2px solid #dee2e6; + } + + .table tbody + tbody { + border-top: 2px solid #dee2e6; + } + + .table .table { + background-color: #fff; + } + + .btn { + display: inline-block; + font-weight: 400; + color: #212529; + text-align: center; + vertical-align: middle; + cursor: pointer; + background-color: transparent; + border: 1px solid transparent; + padding: 0.375rem 0.75rem; + font-size: 1rem; + line-height: 1.5; + border-radius: 0.25rem; + transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + } + + .btn-success { + color: #fff; + background-color: #28a745; + border-color: #28a745; + } + + .btn-warning { + color: #212529; + background-color: #ffc107; + border-color: #ffc107; + } + + .btn-danger { + color: #fff; + background-color: #dc3545; + border-color: #dc3545; + } + + .d-flex { + display: flex; + align-items: center; + } + + .justify-content-end { + justify-content: flex-end; + } + + .mb-2 { + margin-bottom: 0.5rem; + } + + .mt-4 { + margin-top: 1.5rem; + } + + .form-group { + margin-bottom: 1rem; + } + + .form-control { + display: block; + width: 100%; + padding: 0.375rem 0.75rem; + font-size: 1rem; + line-height: 1.5; + color: #495057; + background-color: #fff; + background-clip: padding-box; + border: 1px solid #ced4da; + border-radius: 0.25rem; + transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; + } + + .form-control:focus { + color: #495057; + background-color: #fff; + border-color: #80bdff; + outline: 0; + box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); +<<<<<<< HEAD +<<<<<<< HEAD + } +======= + } +>>>>>>> 699b3988c963094da78a61983a5a8ba21bd0f705 +======= + } +>>>>>>> upstream/jinhwa-park diff --git a/src/main/resources/templates/addProduct.html b/src/main/resources/templates/addProduct.html new file mode 100644 index 000000000..ad7d61e15 --- /dev/null +++ b/src/main/resources/templates/addProduct.html @@ -0,0 +1,30 @@ + + + + Add Product + + + +
+

Add Product

+
+
+

+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ + diff --git a/src/main/resources/templates/editProduct.html b/src/main/resources/templates/editProduct.html new file mode 100644 index 000000000..2fab7918b --- /dev/null +++ b/src/main/resources/templates/editProduct.html @@ -0,0 +1,30 @@ + + + + Edit Product + + + +
+

Edit Product

+
+
+

+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ + diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html new file mode 100644 index 000000000..96b9c2fb9 --- /dev/null +++ b/src/main/resources/templates/error.html @@ -0,0 +1,14 @@ + + + + Error + + + +
+

An error occurred

+

There was an error processing your request. Please try again later.

+ Back to Products +
+ + diff --git a/src/main/resources/templates/product.html b/src/main/resources/templates/product.html new file mode 100644 index 000000000..8a34b635d --- /dev/null +++ b/src/main/resources/templates/product.html @@ -0,0 +1,41 @@ + + + + Manage Products + + + +
+

Manage Products

+
+ Add New Product +
+ + + + + + + + + + + + + + + + + +
NamePriceImage URLActions
Product NameProduct PriceProduct Image URL + Edit + Delete +
+
+ + +<<<<<<< HEAD + +======= + +>>>>>>> upstream/jinhwa-park diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html new file mode 100644 index 000000000..cbe3b99f8 --- /dev/null +++ b/src/main/resources/templates/products.html @@ -0,0 +1,40 @@ + + + + Manage Products + + + +
+

Manage Products

+
+

+
+
+ Add New Product +
+ + + + + + + + + + + + + + + + + +
NamePriceImage URLActions
Product NameProduct PriceProduct Image URL + Edit + Delete +
+
+ + + diff --git a/src/test/java/gift/controller/MemberControllerTest.java b/src/test/java/gift/controller/MemberControllerTest.java new file mode 100644 index 000000000..289e025f8 --- /dev/null +++ b/src/test/java/gift/controller/MemberControllerTest.java @@ -0,0 +1,80 @@ +package gift.controller; + +import gift.entity.Member; +import gift.service.MemberService; +import gift.util.JwtUtil; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.Optional; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(MemberController.class) +public class MemberControllerTest { + @Autowired + private MockMvc mockMvc; + + @MockBean + private MemberService memberService; + + @MockBean + private JwtUtil jwtUtil; + + @Test + @DisplayName("회원가입") + public void registerMember() throws Exception { + Member member = new Member(); + member.setEmail("testemail@example.com"); + member.setPassword("testPassword"); + + given(memberService.save(any(Member.class))).willReturn(member); + + mockMvc.perform(post("/members/register") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"email\":\"testemail@example.com\",\"password\":\"testPassword\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.message").value("success")); + } + + @Test + @DisplayName("로그인") + public void loginMember() throws Exception { + Member member = new Member(); + member.setEmail("testemail@example.com"); + member.setPassword("testPassword"); + + given(memberService.findByEmail(anyString())).willReturn(Optional.of(member)); + given(jwtUtil.generateToken(anyString())).willReturn("fakeToken"); + + mockMvc.perform(post("/members/login") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"email\":\"testemail@example.com\",\"password\":\"testPassword\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.token").value("fakeToken")); + } + + @Test + @DisplayName("현재 로그인한 회원") + public void getCurrentMember() throws Exception { + Member member = new Member(); + member.setEmail("testemail@example.com"); + + given(jwtUtil.extractEmail(anyString())).willReturn("testemail@example.com"); + given(memberService.findByEmail(anyString())).willReturn(Optional.of(member)); + mockMvc.perform(post("/member/current") + .header("Authorization", "Bearer fakeToken")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.email").value("testemail@example.com")); + } +} diff --git a/src/test/java/gift/controller/ProductControllerTest.java b/src/test/java/gift/controller/ProductControllerTest.java new file mode 100644 index 000000000..b9cfa8912 --- /dev/null +++ b/src/test/java/gift/controller/ProductControllerTest.java @@ -0,0 +1,80 @@ +package gift.controller; + +import gift.entity.Product; +import gift.service.ProductService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.Arrays; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@WebMvcTest(ProductController.class) +public class ProductControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean + private ProductService productService; + + @Test + @DisplayName("전체 상품 조회") + public void getAllProducts() throws Exception { + Page products = new PageImpl<>(Arrays.asList( + new Product(1L, "Product1", 100, "url1"), + new Product(2L, "Product2", 200, "url2") + ), PageRequest.of(0, 10), 2); + given(productService.findAll(any(PageRequest.class))).willReturn(products); + + mockMvc.perform(get("/api/products?page=0&size=10")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.content[0].name").value("Product1")) + .andExpect(jsonPath("$.content[1].name").value("Product2")); + } + + @Test + @DisplayName("상품 추가") + public void addProduct() throws Exception { + Product product = new Product(1L, "Product1", 100, "url1"); + given(productService.save(any(Product.class))).willReturn(product); + + mockMvc.perform(post("/api/products") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.name").value("Product1")); + } + + @Test + @DisplayName("상품 수정") + public void updateProduct() throws Exception { + Product product = new Product(1L, "Product1", 100, "url1"); + given(productService.save(any(Product.class))).willReturn(product); + + mockMvc.perform(put("/api/products/1") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\"}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.name").value("Product1")); + } + + @Test + @DisplayName("상품 삭제") + public void deleteProduct() throws Exception { + mockMvc.perform(delete("/api/products/1")) + .andExpect(status().isNoContent()); + } +} diff --git a/src/test/java/gift/controller/WishControllerTest.java b/src/test/java/gift/controller/WishControllerTest.java new file mode 100644 index 000000000..18436e3d0 --- /dev/null +++ b/src/test/java/gift/controller/WishControllerTest.java @@ -0,0 +1,117 @@ +package gift.controller; + +import gift.entity.Member; +import gift.entity.Product; +import gift.entity.Wish; +import gift.repository.MemberRepository; +import gift.service.WishService; +import gift.util.JwtUtil; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.Arrays; +import java.util.Optional; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.BDDMockito.given; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +@WebMvcTest(WishController.class) +public class WishControllerTest { + + @Autowired + private MockMvc mockMvc; + + @MockBean + private WishService wishService; + + @MockBean + private MemberRepository memberRepository; + + @MockBean + private JwtUtil jwtUtil; + + @Test + @DisplayName("위시리스트 전체 조회") + public void getWishes() throws Exception { + Member member = new Member(); + member.setId(1L); + member.setEmail("test@example.com"); + member.setPassword("password"); + + Product product = new Product(); + product.setId(1L); + product.setName("Product1"); + product.setPrice(100); + product.setImageUrl("http://example.com/image.jpg"); + + Wish wish = new Wish(); + wish.setId(1L); + wish.setMember(member); + wish.setProduct(product); + + given(jwtUtil.extractEmail(anyString())).willReturn("test@example.com"); + given(memberRepository.findByEmail(anyString())).willReturn(Optional.of(member)); + given(wishService.findByMember(any(Member.class))).willReturn(Arrays.asList(wish)); + + mockMvc.perform(get("/wishes") + .header("Authorization", "Bearer fake-jwt-token")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$[0].id").value(1L)); + } + + @Test + @DisplayName("위시리스트 추가") + public void addWish() throws Exception { + Member member = new Member(); + member.setId(1L); + member.setEmail("test@example.com"); + member.setPassword("password"); + + Product product = new Product(); + product.setId(1L); + product.setName("Product1"); + product.setPrice(100); + product.setImageUrl("http://example.com/image.jpg"); + + Wish wish = new Wish(); + wish.setId(1L); + wish.setMember(member); + wish.setProduct(product); + + given(jwtUtil.extractEmail(anyString())).willReturn("test@example.com"); + given(memberRepository.findByEmail(anyString())).willReturn(Optional.of(member)); + given(wishService.save(any(Wish.class))).willReturn(wish); + + mockMvc.perform(post("/wishes") + .header("Authorization", "Bearer fake-jwt-token") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"productId\":1}")) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.id").value(1L)); + } + + @Test + @DisplayName("위시리스트 삭제") + public void deleteWish() throws Exception { + Member member = new Member(); + member.setId(1L); + member.setEmail("test@example.com"); + member.setPassword("password"); + + given(jwtUtil.extractEmail(anyString())).willReturn("test@example.com"); + given(memberRepository.findByEmail(anyString())).willReturn(Optional.of(member)); + + mockMvc.perform(delete("/wishes/1") + .header("Authorization", "Bearer fake-jwt-token")) + .andExpect(status().isOk()) + .andExpect(content().string("Wish deleted successfully")); + } +} diff --git a/src/test/java/gift/service/ProductServiceTest.java b/src/test/java/gift/service/ProductServiceTest.java new file mode 100644 index 000000000..bddaf76be --- /dev/null +++ b/src/test/java/gift/service/ProductServiceTest.java @@ -0,0 +1,70 @@ +//package gift.service; +// +//import gift.entity.Product; +//import gift.service.ProductService; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest; +//import org.springframework.context.annotation.ComponentScan; +// +//import java.util.List; +// +//import static org.junit.jupiter.api.Assertions.*; +// +//@JdbcTest +//@ComponentScan(basePackages = "gift.service") +//class ProductServiceTest { +// +// @Autowired +// private ProductService productService; +// +// @BeforeEach +// void setUp() { +// // 데이터 초기화 코드가 필요할 경우 추가 +// } +// +// @Test +// void getAllProducts() { +// List products = productService.getAllProducts(); +// assertEquals(2, products.size()); +// } +// +// @Test +// void addProduct() { +// Product newProduct = new Product.Builder() +// .name("New Product") +// .price(3000) +// .imageUrl("https://example.com/newproduct.jpg") +// .build(); +// productService.addProduct(newProduct); +// +// List products = productService.getAllProducts(); +// assertEquals(3, products.size()); +// assertTrue(products.stream().anyMatch(product -> "New Product".equals(product.getName()))); +// } +// +// @Test +// void updateProduct() { +// Product updatedProduct = new Product.Builder() +// .id(1L) +// .name("Updated Product") +// .price(1500) +// .imageUrl("https://example.com/updatedproduct.jpg") +// .build(); +// productService.updateProduct(1L, updatedProduct); +// +// Product product = productService.getProductById(1L); +// assertEquals("Updated Product", product.getName()); +// assertEquals(1500, product.getPrice()); +// } +// +// @Test +// void deleteProduct() { +// productService.deleteProduct(1L); +// +// List products = productService.getAllProducts(); +// assertEquals(1, products.size()); +// assertFalse(products.stream().anyMatch(product -> product.getId().equals(1L))); +// } +//} From c9708c4b6ecff5787f98a4874bc1c3c774822a55 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Tue, 16 Jul 2024 23:03:20 +0900 Subject: [PATCH 06/96] docs: delete unnecessary lines --- build.gradle | 11 ++++++++++- src/main/resources/static/css/style.css | 10 +--------- src/main/resources/templates/product.html | 3 --- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index df7db9334..eafb705a9 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.3.1' id 'io.spring.dependency-management' version '1.1.5' + id 'war' } group = 'camp.nextstep.edu' @@ -9,7 +10,7 @@ version = '0.0.1-SNAPSHOT' java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(17) } } @@ -21,9 +22,17 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-jdbc' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' runtimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + providedCompile 'jakarta.platform:jakarta.jakartaee-api:8.0.0' + developmentOnly('org.springframework.boot:spring-boot-devtools') +} + +tasks.withType(JavaCompile) { + options.compilerArgs << '-parameters' } tasks.named('test') { diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 0045e3c9e..35d0ff11f 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -121,12 +121,4 @@ border-color: #80bdff; outline: 0; box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25); -<<<<<<< HEAD -<<<<<<< HEAD - } -======= - } ->>>>>>> 699b3988c963094da78a61983a5a8ba21bd0f705 -======= - } ->>>>>>> upstream/jinhwa-park +} diff --git a/src/main/resources/templates/product.html b/src/main/resources/templates/product.html index 8a34b635d..4bb9d8c41 100644 --- a/src/main/resources/templates/product.html +++ b/src/main/resources/templates/product.html @@ -36,6 +36,3 @@

Manage Products

<<<<<<< HEAD -======= - ->>>>>>> upstream/jinhwa-park From 3efb2375471cd7a84327429aa2c32e3733a536f6 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Wed, 17 Jul 2024 13:53:48 +0900 Subject: [PATCH 07/96] docs: add README --- README.md | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/README.md b/README.md index 61c9663cb..170fdaf0e 100644 --- a/README.md +++ b/README.md @@ -1 +1,59 @@ # spring-gift-enhancement + +## 기능 요구 사항 +1. 상품 정보에 카테고리를 추가한다. + 1. 상품 카테고리는 수정할 수 있다. + 2. 관리자 화면에서 상품을 추가할 때 카테고리를 지정할 수 있다. +2. 카테고리는 1차 카테고리만 있으며 2차 카테고리는 고려하지 않는다. +3. 카테고리의 예시는 아래와 같아. + 1. 교환권, 상품권, 뷰티, 패션, 식품, 리빙/도서, 레저/스포츠, 아티스트/캐릭터, 유아동/반려, 디지털/가전, 카카오프렌즈, 트렌드 선물, 백화점 ... +아래 예시와 같이 HTTP 메시지를 주고 받도록 구현한다. +**Request** +```angular2html +GET /api/categories HTTP/1.1 +``` +**Response** +```angular2html +HTTP/1.1 200 +Content-Type: application/json + +[ + { + "id": 91, + "name": "교환권", + "color": "#6c95d1", + "imageUrl": "https://gift-s.kakaocdn.net/dn/gift/images/m640/dimm_theme.png", + "description": "" + } +] +``` + +### 힌트 +아래의 DDL을 보고 유추한다. +```angular2html +create table category +( + id bigint not null auto_increment, + name varchar(255) not null, + primary key (id) +) engine=InnoDB + +create table product +( + price integer not null, + category_id bigint not null, + id bigint not null auto_increment, + name varchar(15) not null, + image_url varchar(255) not null, + primary key (id) +) engine=InnoDB + +alter table category + add constraint uk_category unique (name) + +alter table product + add constraint fk_product_category_id_ref_category_id + foreign key (category_id) + references category (id) + +``` \ No newline at end of file From 0d0c2a95a9260005b77b54db690c07247d356b78 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Wed, 17 Jul 2024 14:22:46 +0900 Subject: [PATCH 08/96] docs: modify typo --- README.md | 3 ++- src/main/java/gift/controller/CategoryController.java | 2 ++ src/main/java/gift/entity/Category.java | 2 ++ src/main/java/gift/repository/CategoryRepository.java | 2 ++ src/main/java/gift/service/CategoryService.java | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/main/java/gift/controller/CategoryController.java create mode 100644 src/main/java/gift/entity/Category.java create mode 100644 src/main/java/gift/repository/CategoryRepository.java create mode 100644 src/main/java/gift/service/CategoryService.java diff --git a/README.md b/README.md index 170fdaf0e..a7a0502f7 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,10 @@ 1. 상품 카테고리는 수정할 수 있다. 2. 관리자 화면에서 상품을 추가할 때 카테고리를 지정할 수 있다. 2. 카테고리는 1차 카테고리만 있으며 2차 카테고리는 고려하지 않는다. -3. 카테고리의 예시는 아래와 같아. +3. 카테고리의 예시는 아래와 같다. 1. 교환권, 상품권, 뷰티, 패션, 식품, 리빙/도서, 레저/스포츠, 아티스트/캐릭터, 유아동/반려, 디지털/가전, 카카오프렌즈, 트렌드 선물, 백화점 ... 아래 예시와 같이 HTTP 메시지를 주고 받도록 구현한다. + **Request** ```angular2html GET /api/categories HTTP/1.1 diff --git a/src/main/java/gift/controller/CategoryController.java b/src/main/java/gift/controller/CategoryController.java new file mode 100644 index 000000000..3b77af898 --- /dev/null +++ b/src/main/java/gift/controller/CategoryController.java @@ -0,0 +1,2 @@ +package gift.controller;public class CategoryController { +} diff --git a/src/main/java/gift/entity/Category.java b/src/main/java/gift/entity/Category.java new file mode 100644 index 000000000..5a5f1ee86 --- /dev/null +++ b/src/main/java/gift/entity/Category.java @@ -0,0 +1,2 @@ +package gift.entity;public class Category { +} diff --git a/src/main/java/gift/repository/CategoryRepository.java b/src/main/java/gift/repository/CategoryRepository.java new file mode 100644 index 000000000..ab2d5991e --- /dev/null +++ b/src/main/java/gift/repository/CategoryRepository.java @@ -0,0 +1,2 @@ +package gift.repository;public class CategoryRepository { +} diff --git a/src/main/java/gift/service/CategoryService.java b/src/main/java/gift/service/CategoryService.java new file mode 100644 index 000000000..3ae25041a --- /dev/null +++ b/src/main/java/gift/service/CategoryService.java @@ -0,0 +1,2 @@ +package gift.service;public class CategoryService { +} From f596fbfec8a2c31e214b295771b6062302dcc1cc Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Wed, 17 Jul 2024 16:05:30 +0900 Subject: [PATCH 09/96] rename: move prev codes to oldTestCodes directory --- .../MemberControllerTest.java | 8 +++--- .../ProductControllerTest.java | 28 +++++++++++-------- .../WishControllerTest.java | 8 +++--- .../service/ProductServiceTest.java | 0 4 files changed, 25 insertions(+), 19 deletions(-) rename src/test/{java/gift/controller => oldTestCodes}/MemberControllerTest.java (97%) rename src/test/{java/gift/controller => oldTestCodes}/ProductControllerTest.java (80%) rename src/test/{java/gift/controller => oldTestCodes}/WishControllerTest.java (98%) rename src/test/{java/gift => oldTestCodes}/service/ProductServiceTest.java (100%) diff --git a/src/test/java/gift/controller/MemberControllerTest.java b/src/test/oldTestCodes/MemberControllerTest.java similarity index 97% rename from src/test/java/gift/controller/MemberControllerTest.java rename to src/test/oldTestCodes/MemberControllerTest.java index 289e025f8..b0e06bb06 100644 --- a/src/test/java/gift/controller/MemberControllerTest.java +++ b/src/test/oldTestCodes/MemberControllerTest.java @@ -20,7 +20,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(MemberController.class) +//@WebMvcTest(MemberController.class) public class MemberControllerTest { @Autowired private MockMvc mockMvc; @@ -31,7 +31,7 @@ public class MemberControllerTest { @MockBean private JwtUtil jwtUtil; - @Test + // @Test @DisplayName("회원가입") public void registerMember() throws Exception { Member member = new Member(); @@ -47,7 +47,7 @@ public void registerMember() throws Exception { .andExpect(jsonPath("$.message").value("success")); } - @Test + //@Test @DisplayName("로그인") public void loginMember() throws Exception { Member member = new Member(); @@ -64,7 +64,7 @@ public void loginMember() throws Exception { .andExpect(jsonPath("$.token").value("fakeToken")); } - @Test + //@Test @DisplayName("현재 로그인한 회원") public void getCurrentMember() throws Exception { Member member = new Member(); diff --git a/src/test/java/gift/controller/ProductControllerTest.java b/src/test/oldTestCodes/ProductControllerTest.java similarity index 80% rename from src/test/java/gift/controller/ProductControllerTest.java rename to src/test/oldTestCodes/ProductControllerTest.java index b9cfa8912..89e83f869 100644 --- a/src/test/java/gift/controller/ProductControllerTest.java +++ b/src/test/oldTestCodes/ProductControllerTest.java @@ -1,5 +1,6 @@ package gift.controller; +import gift.entity.Category; import gift.entity.Product; import gift.service.ProductService; import org.junit.jupiter.api.DisplayName; @@ -21,7 +22,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -@WebMvcTest(ProductController.class) +//@WebMvcTest(ProductController.class) public class ProductControllerTest { @Autowired @@ -30,12 +31,15 @@ public class ProductControllerTest { @MockBean private ProductService productService; - @Test + //@Test @DisplayName("전체 상품 조회") public void getAllProducts() throws Exception { + Category category1 = new Category(); + Category category2 = new Category(); + Page products = new PageImpl<>(Arrays.asList( - new Product(1L, "Product1", 100, "url1"), - new Product(2L, "Product2", 200, "url2") + new Product(1L, "Product1", 100, "url1", category1), + new Product(2L, "Product2", 200, "url2", category2) ), PageRequest.of(0, 10), 2); given(productService.findAll(any(PageRequest.class))).willReturn(products); @@ -45,33 +49,35 @@ public void getAllProducts() throws Exception { .andExpect(jsonPath("$.content[1].name").value("Product2")); } - @Test + //@Test @DisplayName("상품 추가") public void addProduct() throws Exception { - Product product = new Product(1L, "Product1", 100, "url1"); + Category category = new Category(); + Product product = new Product(1L, "Product1", 100, "url1", category); given(productService.save(any(Product.class))).willReturn(product); mockMvc.perform(post("/api/products") .contentType(MediaType.APPLICATION_JSON) - .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\"}")) + .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\",\"category\":{\"name\":\"Category1\", \"description\":\"Description1\", \"imageUrl\":\"url1\"}}")) .andExpect(status().isOk()) .andExpect(jsonPath("$.name").value("Product1")); } - @Test + //@Test @DisplayName("상품 수정") public void updateProduct() throws Exception { - Product product = new Product(1L, "Product1", 100, "url1"); + Category category = new Category(); + Product product = new Product(1L, "Product1", 100, "url1", category); given(productService.save(any(Product.class))).willReturn(product); mockMvc.perform(put("/api/products/1") .contentType(MediaType.APPLICATION_JSON) - .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\"}")) + .content("{\"price\":100,\"name\":\"Product1\",\"imageUrl\":\"url1\",\"category\":{\"name\":\"Category1\", \"description\":\"Description1\", \"imageUrl\":\"url1\"}}")) .andExpect(status().isOk()) .andExpect(jsonPath("$.name").value("Product1")); } - @Test + //@Test @DisplayName("상품 삭제") public void deleteProduct() throws Exception { mockMvc.perform(delete("/api/products/1")) diff --git a/src/test/java/gift/controller/WishControllerTest.java b/src/test/oldTestCodes/WishControllerTest.java similarity index 98% rename from src/test/java/gift/controller/WishControllerTest.java rename to src/test/oldTestCodes/WishControllerTest.java index 18436e3d0..432aec3ad 100644 --- a/src/test/java/gift/controller/WishControllerTest.java +++ b/src/test/oldTestCodes/WishControllerTest.java @@ -23,7 +23,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; -@WebMvcTest(WishController.class) +//@WebMvcTest(WishController.class) public class WishControllerTest { @Autowired @@ -38,7 +38,7 @@ public class WishControllerTest { @MockBean private JwtUtil jwtUtil; - @Test + //@Test @DisplayName("위시리스트 전체 조회") public void getWishes() throws Exception { Member member = new Member(); @@ -67,7 +67,7 @@ public void getWishes() throws Exception { .andExpect(jsonPath("$[0].id").value(1L)); } - @Test + // @Test @DisplayName("위시리스트 추가") public void addWish() throws Exception { Member member = new Member(); @@ -98,7 +98,7 @@ public void addWish() throws Exception { .andExpect(jsonPath("$.id").value(1L)); } - @Test + //@Test @DisplayName("위시리스트 삭제") public void deleteWish() throws Exception { Member member = new Member(); diff --git a/src/test/java/gift/service/ProductServiceTest.java b/src/test/oldTestCodes/service/ProductServiceTest.java similarity index 100% rename from src/test/java/gift/service/ProductServiceTest.java rename to src/test/oldTestCodes/service/ProductServiceTest.java From 319d6a274ace00950cb3a03af861bba8c920905d Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Wed, 17 Jul 2024 16:07:16 +0900 Subject: [PATCH 10/96] feat: add codes about Category --- .../gift/controller/CategoryController.java | 16 +++++++- src/main/java/gift/entity/Category.java | 40 ++++++++++++++++++- .../gift/repository/CategoryRepository.java | 10 ++++- .../java/gift/service/CategoryService.java | 13 +++++- 4 files changed, 75 insertions(+), 4 deletions(-) diff --git a/src/main/java/gift/controller/CategoryController.java b/src/main/java/gift/controller/CategoryController.java index 3b77af898..39ea4f6ed 100644 --- a/src/main/java/gift/controller/CategoryController.java +++ b/src/main/java/gift/controller/CategoryController.java @@ -1,2 +1,16 @@ -package gift.controller;public class CategoryController { +package gift.controller; + +import gift.service.CategoryService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@RequestMapping("/api/categories") +public class CategoryController { + private final CategoryService categoryService; + + public CategoryController(CategoryService categoryService) { + this.categoryService = categoryService; + } } diff --git a/src/main/java/gift/entity/Category.java b/src/main/java/gift/entity/Category.java index 5a5f1ee86..34201f5b6 100644 --- a/src/main/java/gift/entity/Category.java +++ b/src/main/java/gift/entity/Category.java @@ -1,2 +1,40 @@ -package gift.entity;public class Category { +package gift.entity; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; + +import java.util.List; + +@Entity +public class Category { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank(message = "name must not be blank") + @Column(nullable = false, length = 255) + private String name; + + @Column(nullable = false) + private String description; + + @Column(nullable = false, length = 255) + private String imageUrl; + + public Category() {} + + public Long getId() {return id;} + + public String getName() {return name;} + + public String getDescription() {return description;} + + public String getImageUrl() {return imageUrl;} + + public void update(String id, String name, String description, String imageUrl) { + this.name = name; + this.description = description; + this.imageUrl = imageUrl; + } + } diff --git a/src/main/java/gift/repository/CategoryRepository.java b/src/main/java/gift/repository/CategoryRepository.java index ab2d5991e..c66ce9988 100644 --- a/src/main/java/gift/repository/CategoryRepository.java +++ b/src/main/java/gift/repository/CategoryRepository.java @@ -1,2 +1,10 @@ -package gift.repository;public class CategoryRepository { +package gift.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import gift.entity.Category; + +@Repository +public interface CategoryRepository extends JpaRepository { + } diff --git a/src/main/java/gift/service/CategoryService.java b/src/main/java/gift/service/CategoryService.java index 3ae25041a..d0d741349 100644 --- a/src/main/java/gift/service/CategoryService.java +++ b/src/main/java/gift/service/CategoryService.java @@ -1,2 +1,13 @@ -package gift.service;public class CategoryService { +package gift.service; + +import gift.repository.CategoryRepository; +import org.springframework.stereotype.Service; + +@Service +public class CategoryService { + private CategoryRepository categoryRepository; + + public CategoryService(CategoryRepository categoryRepository) { + this.categoryRepository = categoryRepository; + } } From d50a1b7d905e08fb0e9b1a2ac7e6cf26895eeb20 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Wed, 17 Jul 2024 16:08:03 +0900 Subject: [PATCH 11/96] feat: changed feature about set to update --- src/main/java/gift/entity/Member.java | 11 ++------- src/main/java/gift/entity/Product.java | 34 +++++++++++--------------- 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/main/java/gift/entity/Member.java b/src/main/java/gift/entity/Member.java index e17ae5065..6fd8be7e7 100644 --- a/src/main/java/gift/entity/Member.java +++ b/src/main/java/gift/entity/Member.java @@ -18,23 +18,16 @@ public Long getId() { return id; } - public void setId(Long id) { - this.id = id; - } - public String getEmail() { return email; } - public void setEmail(String email) { - this.email = email; - } - public String getPassword() { return password; } - public void setPassword(String password) { + public void update(String email, String password) { + this.email = email; this.password = password; } } diff --git a/src/main/java/gift/entity/Product.java b/src/main/java/gift/entity/Product.java index e2c966c9c..3e37f4007 100644 --- a/src/main/java/gift/entity/Product.java +++ b/src/main/java/gift/entity/Product.java @@ -1,10 +1,6 @@ package gift.entity; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; +import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Positive; import jakarta.validation.constraints.Size; @@ -28,44 +24,42 @@ public class Product { @Column(nullable = false, length = 255) private String imageUrl; - public Product(Long id, String name, int price, String imageUrl) { + @ManyToOne + private Category category; + + public Product(Long id, String name, int price, String imageUrl, Category category) { this.id = id; this.price = price; this.name = name; this.imageUrl = imageUrl; + this.category = category; } - public int getPrice() { - return price; + public Product() { + } - public void setPrice(int price) { - this.price = price; + public int getPrice() { + return price; } public Long getId() { return id; } - public void setId(Long id) { - this.id = id; - } - public String getName() { return name; } - public void setName(String name) { - this.name = name; - } - public String getImageUrl() { return imageUrl; } - public void setImageUrl(String imageUrl) { + public void update(int price, String name, String imageUrl, Category category) { + this.price = price; + this.name = name; this.imageUrl = imageUrl; + this.category = category; } - } From 41a56e15c2911289681cdd2d6e96efa841b65f27 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 00:03:47 +0900 Subject: [PATCH 12/96] refactor: modify ProductController as modified Product entity --- .../gift/controller/ProductController.java | 52 ++++++++++++++----- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/src/main/java/gift/controller/ProductController.java b/src/main/java/gift/controller/ProductController.java index 5dbee3d17..951921db3 100644 --- a/src/main/java/gift/controller/ProductController.java +++ b/src/main/java/gift/controller/ProductController.java @@ -12,6 +12,7 @@ import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import java.util.Optional; import java.util.stream.Collectors; @RestController @@ -39,32 +40,55 @@ public ResponseEntity getAllProducts(Pageable pageable) { @PostMapping public ResponseEntity addProduct(@Valid @RequestBody ProductRequest productRequest, BindingResult bindingResult) { if(bindingResult.hasErrors()) { - String errors = bindingResult.getAllErrors().stream() - .map(error -> error.getDefaultMessage()) - .collect(Collectors.joining(", ")); + String errors = bindingResult.getAllErrors().stream().map(error -> error.getDefaultMessage()).collect(Collectors.joining(",")); return ResponseEntity.badRequest().body(errors); } - Product product = new Product(); - product.setName(productRequest.getName()); - product.setPrice(productRequest.getPrice()); - product.setImageUrl(productRequest.getImageUrl()); - return ResponseEntity.ok(productService.save(product)); + Product product = new Product( + null, + productRequest.getName(), + productRequest.getPrice(), + productRequest.getImageUrl(), + null // Category 설정 + ); + return ResponseEntity.ok(new ProductResponse( + productService.save(product).getId(), + product.getName(), + product.getPrice(), + product.getImageUrl() + )); } @PutMapping("/{id}") - public ResponseEntity updateProduct(@PathVariable Long id, @Valid @RequestBody ProductRequest productRequest, BindingResult bindingResult) { + public ResponseEntity updateProduct(@PathVariable Long id, @RequestBody ProductRequest productRequest, BindingResult bindingResult) { if(bindingResult.hasErrors()) { - String errors = bindingResult.getAllErrors().stream() - .map(error -> error.getDefaultMessage()) - .collect(Collectors.joining(", ")); + String errors = bindingResult.getAllErrors().stream().map(error -> error.getDefaultMessage()).collect(Collectors.joining(",")); return ResponseEntity.badRequest().body(errors); } - Product product = new Product(); - return ResponseEntity.ok(productService.save(product)); + Optional existingOpt = productService.findById(id); + if(existingOpt.isEmpty()) { + return ResponseEntity.notFound().build(); + } + Product existingProduct = existingOpt.get(); + existingProduct.update( + productRequest.getPrice(), + productRequest.getName(), + productRequest.getImageUrl(), + null // Category + ); + return ResponseEntity.ok(new ProductResponse( + productService.save(existingProduct).getId(), + existingProduct.getName(), + existingProduct.getPrice(), + existingProduct.getImageUrl() + )); } + @DeleteMapping("/{id}") public ResponseEntity deleteProduct(@PathVariable Long id) { + if(productService.findById(id).isEmpty()) { + return ResponseEntity.notFound().build(); + } productService.deleteById(id); return ResponseEntity.ok().build(); } From 8efe5622b369ca310da5d70af7f23e2f9f0fcf5d Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 01:14:20 +0900 Subject: [PATCH 13/96] feat: add getEmailFromRequest method to JwtUtil --- src/main/java/gift/util/JwtUtil.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/gift/util/JwtUtil.java b/src/main/java/gift/util/JwtUtil.java index 2e390c4f6..1de9607a1 100644 --- a/src/main/java/gift/util/JwtUtil.java +++ b/src/main/java/gift/util/JwtUtil.java @@ -1,5 +1,6 @@ package gift.util; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; import java.util.Base64; @@ -55,4 +56,18 @@ private String hmacSha256(String data, String secret) { throw new RuntimeException("Failed to calculate HMAC-SHA256", e); } } + + // Extract getEmailFromRequest logic as JwtUtil to reduce redundancy + public String getEmailFromRequest(HttpServletRequest request) { + String authorizationHeader = request.getHeader("Authorization"); + if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { + String token = authorizationHeader.substring(7); + try { + return extractEmail(token); + } catch (Exception e) { + return null; + } + } + return null; + } } From 2378e85c75938d1f4846dd12db05207a7653d807 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 01:15:20 +0900 Subject: [PATCH 14/96] refactor: update controllers with clear return types and improve readability --- .../gift/controller/CategoryController.java | 38 +++++++++++++- .../gift/controller/MemberController.java | 35 +++++-------- .../java/gift/controller/WishController.java | 50 ++++++++----------- 3 files changed, 70 insertions(+), 53 deletions(-) diff --git a/src/main/java/gift/controller/CategoryController.java b/src/main/java/gift/controller/CategoryController.java index 39ea4f6ed..5a4598f2f 100644 --- a/src/main/java/gift/controller/CategoryController.java +++ b/src/main/java/gift/controller/CategoryController.java @@ -1,8 +1,12 @@ package gift.controller; +import gift.entity.Category; import gift.service.CategoryService; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Optional; @RestController @@ -13,4 +17,34 @@ public class CategoryController { public CategoryController(CategoryService categoryService) { this.categoryService = categoryService; } + + @GetMapping + public ResponseEntity> getAllCategories() { + List categories = categoryService.getAllCategories(); + return ResponseEntity.ok(categories); + } + + @GetMapping("/{id}") + public ResponseEntity getCategoryById(@PathVariable Long id) { + Optional category = categoryService.getCategoryById(id); + return category.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); + } + + @PostMapping + public ResponseEntity createCategory(@RequestBody Category category) { + Category createdCategory = categoryService.createCategory(category); + return ResponseEntity.ok(createdCategory); + } + + @PutMapping("/{id}") + public ResponseEntity updateCategory(@PathVariable Long id, @RequestBody Category categoryDetails) { + Category updatedCategory = categoryService.updateCategory(id, categoryDetails); + return ResponseEntity.ok(updatedCategory); + } + + @DeleteMapping + public ResponseEntity deleteCategory(@PathVariable Long id) { + categoryService.deleteCategory(id); + return ResponseEntity.noContent().build(); + } } diff --git a/src/main/java/gift/controller/MemberController.java b/src/main/java/gift/controller/MemberController.java index 03939c6e4..ba409fe63 100644 --- a/src/main/java/gift/controller/MemberController.java +++ b/src/main/java/gift/controller/MemberController.java @@ -16,11 +16,15 @@ @RestController @RequestMapping("/member") public class MemberController { - @Autowired - private MemberService memberService; + + private final MemberService memberService; + private final JwtUtil jwtUtil; @Autowired - private JwtUtil jwtUtil; + public MemberController(MemberService memberService, JwtUtil jwtUtil) { + this.memberService = memberService; + this.jwtUtil = jwtUtil; + } @PostMapping("/register") public ResponseEntity> register(@RequestBody Member member) { @@ -30,7 +34,7 @@ public ResponseEntity> register(@RequestBody Member member) return ResponseEntity.ok(response); } - @PostMapping("/login") + @PostMapping public ResponseEntity> login(@RequestBody Member loginRequest) { Optional memberOpt = memberService.findByEmail(loginRequest.getEmail()); if(memberOpt.isPresent() && memberOpt.get().getPassword().equals(loginRequest.getPassword())) { @@ -40,29 +44,16 @@ public ResponseEntity> login(@RequestBody Member loginReques response.put("token", token); return ResponseEntity.ok(response); } - return ResponseEntity.status(401).body(null); + return ResponseEntity.status(401).body(Map.of("message", "Invalid credentials")); } - // endpoint that checking member information @GetMapping("/me") - public ResponseEntity getCurrentMember(HttpServletRequest request) { - String email = getEmailFromRequest(request); + public ResponseEntity getCurrentMember(HttpServletRequest request) { + String email = jwtUtil.getEmailFromRequest(request); if(email != null) { - Optional memberOpt = memberService.findByEmail(email); - if(memberOpt.isPresent()) { - return ResponseEntity.ok(memberOpt.get()); - } + return memberService.findByEmail(email).map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.status(401).build()); } - return ResponseEntity.status(401).body(null); + return ResponseEntity.status(401).body("Invalid token"); } - // Extracting email from token using HttpServletRequest - private String getEmailFromRequest(HttpServletRequest request) { - String authorizationHeader = request.getHeader("Authorization"); - if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { - String token = authorizationHeader.substring(7); - return jwtUtil.extractEmail(token); - } - return null; - } } diff --git a/src/main/java/gift/controller/WishController.java b/src/main/java/gift/controller/WishController.java index 392224fff..05a0ed468 100644 --- a/src/main/java/gift/controller/WishController.java +++ b/src/main/java/gift/controller/WishController.java @@ -13,28 +13,29 @@ import java.util.List; import java.util.Optional; - @RestController @RequestMapping("/wishes") public class WishController { - @Autowired - private WishService wishService; + private final WishService wishService; + private final MemberRepository memberRepository; + private final JwtUtil jwtUtil; @Autowired - private MemberRepository memberRepository; - - @Autowired - private JwtUtil jwtUtil; + public WishController(WishService wishService, MemberRepository memberRepository, JwtUtil jwtUtil) { + this.wishService = wishService; + this.memberRepository = memberRepository; + this.jwtUtil = jwtUtil; + } @PostMapping public ResponseEntity addWish(@RequestBody Wish wish, HttpServletRequest request) { - String email = getEmailFromRequest(request); + String email = jwtUtil.getEmailFromRequest(request); if (email != null) { Optional memberOpt = memberRepository.findByEmail(email); - if(memberOpt.isPresent()) { + if (memberOpt.isPresent()) { wish.setMember(memberOpt.get()); - wishService.save(wish); - return ResponseEntity.ok(wish); + Wish savedWish = wishService.save(wish); + return ResponseEntity.ok(savedWish); } } return ResponseEntity.status(401).body(null); @@ -42,36 +43,27 @@ public ResponseEntity addWish(@RequestBody Wish wish, HttpServletRequest r @GetMapping public ResponseEntity> getWishes(HttpServletRequest request) { - String email = getEmailFromRequest(request); + String email = jwtUtil.getEmailFromRequest(request); if (email != null) { Optional memberOpt = memberRepository.findByEmail(email); - if(memberOpt.isPresent()) { - return ResponseEntity.ok(wishService.findByMember(memberOpt.get())); + if (memberOpt.isPresent()) { + List wishes = wishService.findByMember(memberOpt.get()); + return ResponseEntity.ok(wishes); } } return ResponseEntity.status(401).body(null); } @DeleteMapping("/{id}") - public ResponseEntity deleteWish(@PathVariable Long id, HttpServletRequest request) { - String email = getEmailFromRequest(request); + public ResponseEntity deleteWish(@PathVariable Long id, HttpServletRequest request) { + String email = jwtUtil.getEmailFromRequest(request); if (email != null) { Optional memberOpt = memberRepository.findByEmail(email); - if(memberOpt.isPresent()) { + if (memberOpt.isPresent()) { wishService.deleteById(id); - return ResponseEntity.ok("Wish deleted successfully"); + return ResponseEntity.noContent().build(); // 204 No Content } } - return ResponseEntity.status(401).body(null); - } - - // Extracting email from token using HttpServletRequest - private String getEmailFromRequest(HttpServletRequest request) { - String authorizationHeader = request.getHeader("Authorization"); - if (authorizationHeader != null && authorizationHeader.startsWith("Bearer ")) { - String token = authorizationHeader.substring(7); - return jwtUtil.extractEmail(token); - } - return null; + return ResponseEntity.status(401).build(); } } From 3c5036ea2cd85561b2dd79e76089ab9d5303be46 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 01:16:20 +0900 Subject: [PATCH 15/96] feat: add new fields(color, imageUrl, description) and update Category entity --- src/main/java/gift/entity/Category.java | 12 +++++-- .../java/gift/service/CategoryService.java | 33 ++++++++++++++++++- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/main/java/gift/entity/Category.java b/src/main/java/gift/entity/Category.java index 34201f5b6..81c188dd4 100644 --- a/src/main/java/gift/entity/Category.java +++ b/src/main/java/gift/entity/Category.java @@ -16,25 +16,31 @@ public class Category { private String name; @Column(nullable = false) - private String description; + private String color; @Column(nullable = false, length = 255) private String imageUrl; + @Column(nullable = false) + private String description; + public Category() {} public Long getId() {return id;} public String getName() {return name;} - public String getDescription() {return description;} + public String getColor() {return color;} public String getImageUrl() {return imageUrl;} - public void update(String id, String name, String description, String imageUrl) { + public String getDescription() {return description;} + + public void update(String name, String color, String imageUrl, String description) { this.name = name; this.description = description; this.imageUrl = imageUrl; + this.color = color; } } diff --git a/src/main/java/gift/service/CategoryService.java b/src/main/java/gift/service/CategoryService.java index d0d741349..ea2ec2b82 100644 --- a/src/main/java/gift/service/CategoryService.java +++ b/src/main/java/gift/service/CategoryService.java @@ -1,13 +1,44 @@ package gift.service; import gift.repository.CategoryRepository; +import gift.entity.Category; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Optional; + @Service public class CategoryService { - private CategoryRepository categoryRepository; + private final CategoryRepository categoryRepository; public CategoryService(CategoryRepository categoryRepository) { this.categoryRepository = categoryRepository; } + + public List getAllCategories() { + return categoryRepository.findAll(); + } + + public Optional getCategoryById(Long id) { + return categoryRepository.findById(id); + } + + public Category createCategory(Category category) { + return categoryRepository.save(category); + } + + public Category updateCategory(Long id, Category categoryDetails) { + Category category = categoryRepository.findById(id).orElseThrow(() -> new RuntimeException("Category not found")); + category.update( + categoryDetails.getName(), + categoryDetails.getColor(), + categoryDetails.getImageUrl(), + categoryDetails.getDescription() + ); + return categoryRepository.save(category); + } + + public void deleteCategory(Long id) { + categoryRepository.deleteById(id); + } } From 30200d0bf418db13fb57c52b67397009f93fa07e Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 16:26:52 +0900 Subject: [PATCH 16/96] feat: add path variable support for category deletion --- src/main/java/gift/controller/CategoryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gift/controller/CategoryController.java b/src/main/java/gift/controller/CategoryController.java index 5a4598f2f..61dd8ccdd 100644 --- a/src/main/java/gift/controller/CategoryController.java +++ b/src/main/java/gift/controller/CategoryController.java @@ -42,7 +42,7 @@ public ResponseEntity updateCategory(@PathVariable Long id, @RequestBo return ResponseEntity.ok(updatedCategory); } - @DeleteMapping + @DeleteMapping("/{id}") public ResponseEntity deleteCategory(@PathVariable Long id) { categoryService.deleteCategory(id); return ResponseEntity.noContent().build(); From 3d12d7b5be16b874b7a533cdd552fdb82eb3e4fb Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 16:29:40 +0900 Subject: [PATCH 17/96] feat: integrate category handling in ProductController --- .../gift/controller/ProductController.java | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/main/java/gift/controller/ProductController.java b/src/main/java/gift/controller/ProductController.java index 951921db3..3c9d04774 100644 --- a/src/main/java/gift/controller/ProductController.java +++ b/src/main/java/gift/controller/ProductController.java @@ -2,6 +2,7 @@ import gift.dto.ProductRequest; import gift.dto.ProductResponse; +import gift.entity.Category; import gift.entity.Product; import gift.service.ProductService; import jakarta.validation.Valid; @@ -32,7 +33,8 @@ public ResponseEntity getAllProducts(Pageable pageable) { product.getId(), product.getName(), product.getPrice(), - product.getImageUrl() + product.getImageUrl(), + product.getCategory().getName() )); return ResponseEntity.ok(response); } @@ -43,18 +45,20 @@ public ResponseEntity addProduct(@Valid @RequestBody ProductRequest productRe String errors = bindingResult.getAllErrors().stream().map(error -> error.getDefaultMessage()).collect(Collectors.joining(",")); return ResponseEntity.badRequest().body(errors); } + Category category = productService.getCategoryById(productRequest.getCategoryId()).orElseThrow(() -> new RuntimeException("Category not found")); Product product = new Product( - null, productRequest.getName(), productRequest.getPrice(), productRequest.getImageUrl(), - null // Category 설정 + category ); + Product savedProduct = productService.save(product); return ResponseEntity.ok(new ProductResponse( - productService.save(product).getId(), - product.getName(), - product.getPrice(), - product.getImageUrl() + savedProduct.getId(), + savedProduct.getName(), + savedProduct.getPrice(), + savedProduct.getImageUrl(), + savedProduct.getCategory().getName() )); } @@ -68,18 +72,21 @@ public ResponseEntity updateProduct(@PathVariable Long id, @RequestBody Produ if(existingOpt.isEmpty()) { return ResponseEntity.notFound().build(); } + Category category = productService.getCategoryById(productRequest.getCategoryId()).orElseThrow(() -> new RuntimeException("Category not found")); Product existingProduct = existingOpt.get(); existingProduct.update( - productRequest.getPrice(), - productRequest.getName(), - productRequest.getImageUrl(), - null // Category + productRequest.getPrice(), + productRequest.getName(), + productRequest.getImageUrl(), + category ); - return ResponseEntity.ok(new ProductResponse( - productService.save(existingProduct).getId(), - existingProduct.getName(), - existingProduct.getPrice(), - existingProduct.getImageUrl() + Product updatedProduct = productService.save(existingProduct); + return ResponseEntity.ok(new ProductResponse( //Long id, String name, Integer price, String imageUrl, String categoryName + updatedProduct.getId(), + updatedProduct.getName(), + updatedProduct.getPrice(), + updatedProduct.getImageUrl(), + updatedProduct.getCategory().getName() )); } From e0e7fbe1b95540f62337c8bcdd83a533cb0a631a Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 16:31:26 +0900 Subject: [PATCH 18/96] feat: update Product entity to include category handling --- src/main/java/gift/entity/Product.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/gift/entity/Product.java b/src/main/java/gift/entity/Product.java index 3e37f4007..a67339270 100644 --- a/src/main/java/gift/entity/Product.java +++ b/src/main/java/gift/entity/Product.java @@ -27,6 +27,10 @@ public class Product { @ManyToOne private Category category; + public Product() { + + } + public Product(Long id, String name, int price, String imageUrl, Category category) { this.id = id; this.price = price; @@ -35,8 +39,13 @@ public Product(Long id, String name, int price, String imageUrl, Category catego this.category = category; } - public Product() { - + // for ProductController.addProduct + // it's ok since the value of the id fields can be automatically generated by the DB using @GenerationValue(strategy=GenerationType.IDENTITY) + public Product(String name, int price, String imageUrl, Category category) { + this.name = name; + this.price = price; + this.imageUrl = imageUrl; + this.category = category; } public int getPrice() { @@ -55,6 +64,8 @@ public String getImageUrl() { return imageUrl; } + public Category getCategory() {return category;} + public void update(int price, String name, String imageUrl, Category category) { this.price = price; this.name = name; From b6eca3ec1d453385ce0a86594731cfe7fa7106fa Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 16:32:16 +0900 Subject: [PATCH 19/96] feat: update ProductRequest, ProductResponse, ProductService to include category handling --- src/main/java/gift/dto/ProductRequest.java | 7 +++++++ src/main/java/gift/dto/ProductResponse.java | 8 +++++++- src/main/java/gift/service/ProductService.java | 8 +++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/main/java/gift/dto/ProductRequest.java b/src/main/java/gift/dto/ProductRequest.java index 99947c327..6fcd5fb77 100644 --- a/src/main/java/gift/dto/ProductRequest.java +++ b/src/main/java/gift/dto/ProductRequest.java @@ -17,6 +17,9 @@ public class ProductRequest { @NotEmpty private String imageUrl; + @NotNull + private Long categoryId; + public String getName() { return name; } @@ -40,4 +43,8 @@ public String getImageUrl() { public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } + + public Long getCategoryId() {return categoryId;} + + public void setCategoryId(Long categoryId) {this.categoryId = categoryId;} } diff --git a/src/main/java/gift/dto/ProductResponse.java b/src/main/java/gift/dto/ProductResponse.java index e337ab34e..002d15a9c 100644 --- a/src/main/java/gift/dto/ProductResponse.java +++ b/src/main/java/gift/dto/ProductResponse.java @@ -5,12 +5,14 @@ public class ProductResponse { private String name; private Integer price; private String imageUrl; + private String categoryName; - public ProductResponse(Long id, String name, Integer price, String imageUrl) { + public ProductResponse(Long id, String name, Integer price, String imageUrl, String categoryName) { this.id = id; this.name = name; this.price = price; this.imageUrl = imageUrl; + this.categoryName = categoryName; } public Long getId() { @@ -44,4 +46,8 @@ public String getImageUrl() { public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } + + public String getCategoryName() {return categoryName;} + + public void setCategoryName(String categoryName) {this.categoryName = categoryName;} } diff --git a/src/main/java/gift/service/ProductService.java b/src/main/java/gift/service/ProductService.java index 47c4a882e..4578a4194 100644 --- a/src/main/java/gift/service/ProductService.java +++ b/src/main/java/gift/service/ProductService.java @@ -1,6 +1,8 @@ package gift.service; +import gift.entity.Category; import gift.entity.Product; +import gift.repository.CategoryRepository; import gift.repository.ProductRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -12,10 +14,12 @@ @Service public class ProductService { private final ProductRepository productRepository; + private final CategoryRepository categoryRepository; @Autowired - public ProductService(ProductRepository productRepository) { + public ProductService(ProductRepository productRepository, CategoryRepository categoryRepository) { this.productRepository = productRepository; + this.categoryRepository = categoryRepository; } public Page findAll(Pageable pageable) { @@ -33,6 +37,8 @@ public Product save(Product product) { public void deleteById(Long id) { productRepository.deleteById(id); } + + public Optional getCategoryById(Long id) {return categoryRepository.findById(id);} } From 3f683855ae3d5884dfb7dd6780ea1d225dd6b86c Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 16:47:03 +0900 Subject: [PATCH 20/96] feat: Add code to WishController to verify ProductId --- .../java/gift/controller/WishController.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/main/java/gift/controller/WishController.java b/src/main/java/gift/controller/WishController.java index 05a0ed468..d16dd0277 100644 --- a/src/main/java/gift/controller/WishController.java +++ b/src/main/java/gift/controller/WishController.java @@ -1,8 +1,10 @@ package gift.controller; import gift.entity.Member; +import gift.entity.Product; import gift.entity.Wish; import gift.repository.MemberRepository; +import gift.repository.ProductRepository; import gift.service.WishService; import gift.util.JwtUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -18,27 +20,35 @@ public class WishController { private final WishService wishService; private final MemberRepository memberRepository; + private final ProductRepository productRepository; private final JwtUtil jwtUtil; @Autowired - public WishController(WishService wishService, MemberRepository memberRepository, JwtUtil jwtUtil) { + public WishController(WishService wishService, MemberRepository memberRepository, ProductRepository productRepository, JwtUtil jwtUtil) { this.wishService = wishService; this.memberRepository = memberRepository; + this.productRepository = productRepository; this.jwtUtil = jwtUtil; } @PostMapping public ResponseEntity addWish(@RequestBody Wish wish, HttpServletRequest request) { String email = jwtUtil.getEmailFromRequest(request); - if (email != null) { - Optional memberOpt = memberRepository.findByEmail(email); - if (memberOpt.isPresent()) { - wish.setMember(memberOpt.get()); - Wish savedWish = wishService.save(wish); - return ResponseEntity.ok(savedWish); - } + if(email == null) { + return ResponseEntity.status(401).body(null); } - return ResponseEntity.status(401).body(null); + Optional memberOpt = memberRepository.findByEmail(email); + if(memberOpt.isEmpty()) { + return ResponseEntity.status(401).body(null); + } + Optional productOpt = productRepository.findById(wish.getProductId()); + if(productOpt.isEmpty()) { + return ResponseEntity.status(401).body(null); + } + wish.setMember(memberOpt.get()); + wish.setProduct(productOpt.get()); + Wish savedWish = wishService.save(wish); + return ResponseEntity.status(201).body(savedWish); } @GetMapping From b5c7cbdc641dde5ce7f36f5e171c2366dfa95f3b Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 16:58:04 +0900 Subject: [PATCH 21/96] "remove: delete unnecessary product.html" --- src/main/resources/templates/product.html | 38 ----------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/main/resources/templates/product.html diff --git a/src/main/resources/templates/product.html b/src/main/resources/templates/product.html deleted file mode 100644 index 4bb9d8c41..000000000 --- a/src/main/resources/templates/product.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - Manage Products - - - -
-

Manage Products

-
- Add New Product -
- - - - - - - - - - - - - - - - - -
NamePriceImage URLActions
Product NameProduct PriceProduct Image URL - Edit - Delete -
-
- - -<<<<<<< HEAD - From b9d1b08dd9113ed97f4759fbfd9e258094a3ebf7 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 20:06:16 +0900 Subject: [PATCH 22/96] docs: update README --- README.md | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a7a0502f7..703d260c7 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,50 @@ # spring-gift-enhancement +## 기능 요구사항 +1. 상품 정보에 옵션을 추가한다. 상품과 옵션 모델 간의 관계를 고려하여 설계하고 구현한다. + 1. 상품에는 항상 하나 이상의 옵션이 있어야 한다. + 1. 옵션 이름은 공백을 포함하여 최대 50자까지 입력할 수 있다. + 2. 특수 문자 + 1. 가능: ( ), [ ], +, -, &, /, _ + 2. 그 외 특수 문자 사용 불가 + 3. 옵션 수량은 최소 1개 이상 1억개 미만이다. + 2. 중복된 옵션은 구매 시 고객에게 불편을 줄 수 있다. 동일한 상품 내의 옵션 이름은 중복될 수 없다. + 3. (선택) 관리자 화면에서 옵션을 추가할 수 있다. +2. 아래 예시와 같이 HTTP 메시지를 주고받도록 구현한다. + +**Request** + ``` + GET /api/products/1/options HTTP/1.1 + ``` + +**Response** + ``` + HTTP/1.1 200 +Content-Type: application/json + + [ + { + "id": 464946561, + "name": "01. [Best] 시어버터 핸드 & 시어 스틱 립 밤", + "quantity": 969 + } + ] + + ``` + + +
+ Step1 정리 ## 기능 요구 사항 + 1. 상품 정보에 카테고리를 추가한다. 1. 상품 카테고리는 수정할 수 있다. 2. 관리자 화면에서 상품을 추가할 때 카테고리를 지정할 수 있다. 2. 카테고리는 1차 카테고리만 있으며 2차 카테고리는 고려하지 않는다. 3. 카테고리의 예시는 아래와 같다. 1. 교환권, 상품권, 뷰티, 패션, 식품, 리빙/도서, 레저/스포츠, 아티스트/캐릭터, 유아동/반려, 디지털/가전, 카카오프렌즈, 트렌드 선물, 백화점 ... -아래 예시와 같이 HTTP 메시지를 주고 받도록 구현한다. - + 아래 예시와 같이 HTTP 메시지를 주고 받도록 구현한다. + **Request** ```angular2html GET /api/categories HTTP/1.1 @@ -57,4 +93,5 @@ alter table product foreign key (category_id) references category (id) -``` \ No newline at end of file +``` +
\ No newline at end of file From e6f9d4c99ee71ab7b26d56a7625b729c10e93848 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 22:06:38 +0900 Subject: [PATCH 23/96] feat: make addOption page for admin --- src/main/resources/templates/addOption.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/main/resources/templates/addOption.html diff --git a/src/main/resources/templates/addOption.html b/src/main/resources/templates/addOption.html new file mode 100644 index 000000000..c8f1c6464 --- /dev/null +++ b/src/main/resources/templates/addOption.html @@ -0,0 +1,18 @@ + + + + + Add Option + + +
+ +
+ + +
+ + +
+ + From 4a990a1cab464f0952f65567bcf06f1c15fa9319 Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 22:09:32 +0900 Subject: [PATCH 24/96] refactor: change dependency injection from field to constructor --- src/main/java/gift/service/MemberService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/gift/service/MemberService.java b/src/main/java/gift/service/MemberService.java index ee2f972b0..1042de2d4 100644 --- a/src/main/java/gift/service/MemberService.java +++ b/src/main/java/gift/service/MemberService.java @@ -9,8 +9,12 @@ @Service public class MemberService { + private final MemberRepository memberRepository; + @Autowired - private MemberRepository memberRepository; + public MemberService(MemberRepository memberRepository) { + this.memberRepository = memberRepository; + } public Optional findByEmail(String email) { return memberRepository.findByEmail(email); From f735135b7ad36aebf8ccb1046bf40a6590e24adb Mon Sep 17 00:00:00 2001 From: Jinhwa-Park Date: Thu, 18 Jul 2024 22:10:22 +0900 Subject: [PATCH 25/96] feat: implement option features --- .../gift/controller/OptionController.java | 32 +++++++++++++++ src/main/java/gift/dto/OptionDTO.java | 26 +++++++++++++ src/main/java/gift/entity/Option.java | 30 ++++++++++++++ .../gift/repository/OptionRepository.java | 10 +++++ src/main/java/gift/service/OptionService.java | 39 +++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 src/main/java/gift/controller/OptionController.java create mode 100644 src/main/java/gift/dto/OptionDTO.java create mode 100644 src/main/java/gift/entity/Option.java create mode 100644 src/main/java/gift/repository/OptionRepository.java create mode 100644 src/main/java/gift/service/OptionService.java diff --git a/src/main/java/gift/controller/OptionController.java b/src/main/java/gift/controller/OptionController.java new file mode 100644 index 000000000..0337554f6 --- /dev/null +++ b/src/main/java/gift/controller/OptionController.java @@ -0,0 +1,32 @@ +package gift.controller; + +import gift.dto.OptionDTO; +import gift.entity.Option; +import gift.service.OptionService; +import jakarta.validation.Valid; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/products/{productId}/options") +public class OptionController { + private final OptionService optionService; + + public OptionController(OptionService optionService) { + this.optionService = optionService; + } + + @GetMapping + public ResponseEntity> getOptions(@PathVariable Long productId) { + List