From f2c9c749d8d25d1c398b5f7d92cb4eaf8795b1f6 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 00:00:55 +0900 Subject: [PATCH 01/28] =?UTF-8?q?feat:=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B0=8F=20io=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 35 ++ .mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 310 ++++++++++++++++++ mvnw.cmd | 182 ++++++++++ pom.xml | 41 +++ .../java/org/prgrms/kdt/KdtApplication.java | 34 ++ src/main/java/org/prgrms/kdt/OrderTester.java | 54 +++ .../app/configuration/AppConfiguration.java | 17 + .../configuration/YamlPropertiesFactory.java | 22 ++ .../configuration/io/ConsoleInputHandler.java | 18 + .../io/ConsoleOutputHandler.java | 21 ++ .../app/configuration/io/InputHandler.java | 8 + .../app/configuration/io/OutputHandler.java | 8 + .../kdt/user/controller/UserController.java | 8 + .../java/org/prgrms/kdt/user/domain/User.java | 5 + .../kdt/user/repository/UserRepository.java | 5 + .../prgrms/kdt/user/service/UserService.java | 5 + .../voucher/controller/VoucherController.java | 24 ++ .../voucher/domain/FixedAmountVoucher.java | 24 ++ .../domain/PercentDiscountVoucher.java | 24 ++ .../repository/JdbcVoucherRepository.java | 29 ++ .../repository/MemoryVoucherRepository.java | 32 ++ .../voucher/repository/VoucherRepository.java | 10 + .../kdt/voucher/service/VoucherService.java | 30 ++ src/main/resources/application-local.yaml | 7 + src/main/resources/application.properties | 7 + src/main/resources/application.yaml | 12 + src/main/resources/banner.txt | 9 + src/main/resources/logback-backup.xml | 44 +++ src/main/resources/logback.xml | 11 + src/main/resources/version.properties | 1 + .../org/prgrms/kdt/KdtApplicationTests.java | 13 + test/sample.txt | 2 + 35 files changed, 1171 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/org/prgrms/kdt/KdtApplication.java create mode 100644 src/main/java/org/prgrms/kdt/OrderTester.java create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/YamlPropertiesFactory.java create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java create mode 100644 src/main/java/org/prgrms/kdt/user/controller/UserController.java create mode 100644 src/main/java/org/prgrms/kdt/user/domain/User.java create mode 100644 src/main/java/org/prgrms/kdt/user/repository/UserRepository.java create mode 100644 src/main/java/org/prgrms/kdt/user/service/UserService.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java create mode 100644 src/main/resources/application-local.yaml create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yaml create mode 100644 src/main/resources/banner.txt create mode 100644 src/main/resources/logback-backup.xml create mode 100644 src/main/resources/logback.xml create mode 100644 src/main/resources/version.properties create mode 100644 src/test/java/org/prgrms/kdt/KdtApplicationTests.java create mode 100644 test/sample.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..e5df59fd40 --- /dev/null +++ b/.gitignore @@ -0,0 +1,35 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +logs/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000000..e76d1f3241 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or 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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..ffdc10e59f --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/mvnw b/mvnw new file mode 100755 index 0000000000..a16b5431b4 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + 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 + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000000..c8d43372c9 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. 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, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..c4dee81cd2 --- /dev/null +++ b/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.1 + + + org.prgrms + kdt + 0.0.1-SNAPSHOT + kdt + Demo project for Spring Boot + + 16 + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java new file mode 100644 index 0000000000..0deaf14639 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -0,0 +1,34 @@ +package org.prgrms.kdt; + +import org.prgrms.kdt.app.configuration.YamlPropertiesFactory; +import org.prgrms.kdt.order.OrderProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.PropertySource; + +@SpringBootApplication +@ComponentScan( + basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.user", "org.prgrms.kdt.voucher"} +) +@PropertySource(value = "application.yaml", factory = YamlPropertiesFactory.class) +@EnableConfigurationProperties +public class KdtApplication { + + private static final Logger logger = LoggerFactory.getLogger(KdtApplication.class); + + public static void main(String[] args) { + var applicationContext = SpringApplication.run(KdtApplication.class, args); + var orderProperties = applicationContext.getBean(OrderProperties.class); + logger.error("logger name => {}", logger.getName()); + logger.warn("version -> {}", orderProperties.getVersion()); + logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); + logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); + logger.warn("description -> {}", orderProperties.getDescription()); + + } + +} diff --git a/src/main/java/org/prgrms/kdt/OrderTester.java b/src/main/java/org/prgrms/kdt/OrderTester.java new file mode 100644 index 0000000000..37a6890b5d --- /dev/null +++ b/src/main/java/org/prgrms/kdt/OrderTester.java @@ -0,0 +1,54 @@ +package org.prgrms.kdt; + +import org.prgrms.kdt.app.configuration.AppConfiguration; +import org.prgrms.kdt.order.OrderItem; +import org.prgrms.kdt.order.OrderProperties; +import org.prgrms.kdt.order.OrderService; +import org.prgrms.kdt.voucher.FixedAmountVoucher; +import org.prgrms.kdt.voucher.VoucherRepository; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils; +import org.springframework.boot.ansi.AnsiOutput; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.util.Assert; + +import java.io.IOException; +import java.text.MessageFormat; +import java.util.UUID; + +public class OrderTester { + + private static final Logger logger = LoggerFactory.getLogger(OrderTester.class); + + public static void main(String[] args) throws IOException { + AnsiOutput.setEnabled(AnsiOutput.Enabled.ALWAYS); + var applicationContext = new AnnotationConfigApplicationContext(AppConfiguration.class); + +// var environment = applicationContext.getEnvironment(); +// var version = environment.getProperty("kdt.version"); +// var minimumOrderAmount = environment.getProperty("kdt.minimum-order-amount", Integer.class); +// var supportVendors = environment.getProperty("kdt.support-vendors", List.class); +// var description = environment.getProperty("kdt.description", List.class); +// System.out.println(MessageFormat.format("version -> {0}", version)); +// System.out.println(MessageFormat.format("minimumOrderAmount -> {0}", minimumOrderAmount)); +// System.out.println(MessageFormat.format("supportVendors -> {0}", supportVendors)); +// System.out.println(MessageFormat.format("description -> {0}", description)); + var orderProperties = applicationContext.getBean(OrderProperties.class); + logger.error("logger name => {}", logger.getName()); + logger.warn("version -> {}", orderProperties.getVersion()); + logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); + logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); + logger.warn("description -> {}", orderProperties.getDescription()); + + var customerId = UUID.randomUUID(); + var voucherRepository = BeanFactoryAnnotationUtils.qualifiedBeanOfType(applicationContext.getBeanFactory(), VoucherRepository.class, "memory"); + var voucher = voucherRepository.insert(new FixedAmountVoucher(UUID.randomUUID(), 10L)); + + Assert.isTrue(order.totalAmount() == 90L, MessageFormat.format("totalAmount {0} is not 90L", order.totalAmount())); + + applicationContext.close(); + } +} diff --git a/src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java b/src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java new file mode 100644 index 0000000000..c24f0dd4e8 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java @@ -0,0 +1,17 @@ +package org.prgrms.kdt.app.configuration; + +import org.prgrms.kdt.app.configuration.YamlPropertiesFactory; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +@Configuration +@ComponentScan( + basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.user", "org.prgrms.kdt.voucher"} +) +@PropertySource(value = "application.yaml", factory = YamlPropertiesFactory.class) +@EnableConfigurationProperties +public class AppConfiguration { +} + diff --git a/src/main/java/org/prgrms/kdt/app/configuration/YamlPropertiesFactory.java b/src/main/java/org/prgrms/kdt/app/configuration/YamlPropertiesFactory.java new file mode 100644 index 0000000000..1ae2c469da --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/YamlPropertiesFactory.java @@ -0,0 +1,22 @@ +package org.prgrms.kdt.app.configuration; + +import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; +import org.springframework.core.env.PropertiesPropertySource; +import org.springframework.core.env.PropertySource; +import org.springframework.core.io.support.EncodedResource; +import org.springframework.core.io.support.PropertySourceFactory; + +import java.io.IOException; + +public class YamlPropertiesFactory implements PropertySourceFactory { + + @Override + public PropertySource createPropertySource(String s, EncodedResource encodedResource) throws IOException { + var yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean(); + yamlPropertiesFactoryBean.setResources(encodedResource.getResource()); + + var properties = yamlPropertiesFactoryBean.getObject(); + return new PropertiesPropertySource(encodedResource.getResource().getFilename(), properties); + } + +} diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java new file mode 100644 index 0000000000..1c05dbd728 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java @@ -0,0 +1,18 @@ +package org.prgrms.kdt.app.configuration.io; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; + +@Component +public class ConsoleInputHandler implements InputHandler{ + + BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); + + @Override + public String inputString() throws IOException { + return br.readLine(); + } +} diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java new file mode 100644 index 0000000000..d9b789dd42 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java @@ -0,0 +1,21 @@ +package org.prgrms.kdt.app.configuration.io; + +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Component; + +@Component +public class ConsoleOutputHandler implements OutputHandler{ + + @Override + public void outputStartMessage() { + System.out.println("=== Voucher Program ==="); + System.out.println("Type exit to exit the program."); + System.out.println("Type create to create a new voucher."); + System.out.println("Type list to list all vouchers."); + } + + @Override + public void outputSystemMessage(String message) { + + } +} diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java new file mode 100644 index 0000000000..62524299dd --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java @@ -0,0 +1,8 @@ +package org.prgrms.kdt.app.configuration.io; + +import java.io.IOException; + +public interface InputHandler { + + String inputString() throws IOException; +} diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java new file mode 100644 index 0000000000..ab05384b56 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java @@ -0,0 +1,8 @@ +package org.prgrms.kdt.app.configuration.io; + +public interface OutputHandler { + + void outputStartMessage(); + + void outputSystemMessage(String message); +} diff --git a/src/main/java/org/prgrms/kdt/user/controller/UserController.java b/src/main/java/org/prgrms/kdt/user/controller/UserController.java new file mode 100644 index 0000000000..d43d75e99c --- /dev/null +++ b/src/main/java/org/prgrms/kdt/user/controller/UserController.java @@ -0,0 +1,8 @@ +package org.prgrms.kdt.user.controller; + +import org.springframework.stereotype.Controller; + +@Controller +public class UserController { + +} diff --git a/src/main/java/org/prgrms/kdt/user/domain/User.java b/src/main/java/org/prgrms/kdt/user/domain/User.java new file mode 100644 index 0000000000..b8bb2d9063 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/user/domain/User.java @@ -0,0 +1,5 @@ +package org.prgrms.kdt.user.domain; + +public class User { + +} diff --git a/src/main/java/org/prgrms/kdt/user/repository/UserRepository.java b/src/main/java/org/prgrms/kdt/user/repository/UserRepository.java new file mode 100644 index 0000000000..eca44f3f99 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/user/repository/UserRepository.java @@ -0,0 +1,5 @@ +package org.prgrms.kdt.user.repository; + +public class UserRepository { + +} diff --git a/src/main/java/org/prgrms/kdt/user/service/UserService.java b/src/main/java/org/prgrms/kdt/user/service/UserService.java new file mode 100644 index 0000000000..92c915cd1b --- /dev/null +++ b/src/main/java/org/prgrms/kdt/user/service/UserService.java @@ -0,0 +1,5 @@ +package org.prgrms.kdt.user.service; + +public class UserService { + +} diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java new file mode 100644 index 0000000000..d9769e1e51 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -0,0 +1,24 @@ +package org.prgrms.kdt.voucher.controller; + +import org.prgrms.kdt.app.configuration.io.InputHandler; +import org.prgrms.kdt.app.configuration.io.OutputHandler; +import org.prgrms.kdt.voucher.service.VoucherService; +import org.springframework.stereotype.Controller; + +@Controller +public class VoucherController { + + private final InputHandler inputHandler; + private final OutputHandler outputHandler; + private final VoucherService voucherService; + + public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { + this.inputHandler = inputHandler; + this.outputHandler = outputHandler; + this.voucherService = voucherService; + } + + public void + + +} diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java new file mode 100644 index 0000000000..7f6b8b677e --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -0,0 +1,24 @@ +package org.prgrms.kdt.voucher.domain; + +import org.prgrms.kdt.order.Voucher; + +import java.util.UUID; + +public class FixedAmountVoucher implements Voucher { + private final UUID voucherId; + private final long amount; + + public FixedAmountVoucher(UUID voucherId, long amount) { + this.voucherId = voucherId; + this.amount = amount; + } + + @Override + public UUID getVoucherId() { + return voucherId; + } + + public long discount(long beforeDiscount) { + return beforeDiscount - amount; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java new file mode 100644 index 0000000000..7f7bc7b783 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -0,0 +1,24 @@ +package org.prgrms.kdt.voucher.domain; + +import java.util.UUID; +import org.prgrms.kdt.order.Voucher; + +public class PercentDiscountVoucher implements Voucher { + private final UUID voucherId; + private final long percent; + + public PercentDiscountVoucher(UUID voucherId, long percent) { + this.voucherId = voucherId; + this.percent = percent; + } + + @Override + public UUID getVoucherId() { + return voucherId; + } + + @Override + public long discount(long beforeDiscount) { + return beforeDiscount * (percent / 100); + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java new file mode 100644 index 0000000000..ef766f5c78 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java @@ -0,0 +1,29 @@ +package org.prgrms.kdt.voucher.repository; + +import org.prgrms.kdt.order.Voucher; +import org.prgrms.kdt.voucher.VoucherRepository; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +@Repository +@Qualifier("jdbc") +public class JdbcVoucherRepository implements VoucherRepository { + + private final Map storage = new ConcurrentHashMap<>(); + + @Override + public Optional findById(UUID voucherId) { + return Optional.ofNullable(storage.get(voucherId)); + } + + @Override + public Voucher insert(Voucher voucher) { + storage.put(voucher.getVoucherId(), voucher); + return voucher; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java new file mode 100644 index 0000000000..549bf1b4f7 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -0,0 +1,32 @@ +package org.prgrms.kdt.voucher.repository; + +import org.prgrms.kdt.order.Voucher; +import org.prgrms.kdt.voucher.VoucherRepository; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Repository; + +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +@Repository +@Qualifier("memory") +public class MemoryVoucherRepository implements VoucherRepository { + + private final Map storage = new ConcurrentHashMap<>(); + + @Override + public Optional findById(UUID voucherId) { + return Optional.ofNullable(storage.get(voucherId)); + } + + @Override + public Voucher insert(Voucher voucher) { + storage.put(voucher.getVoucherId(), voucher); + return voucher; + } + +} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java new file mode 100644 index 0000000000..db01e1adfd --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -0,0 +1,10 @@ +package org.prgrms.kdt.voucher.repository; + +import java.util.Optional; +import java.util.UUID; +import org.prgrms.kdt.order.Voucher; + +public interface VoucherRepository { + Optional findById(UUID voucherId); + Voucher insert(Voucher voucher); +} diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java new file mode 100644 index 0000000000..d1792a1b45 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -0,0 +1,30 @@ +package org.prgrms.kdt.voucher.service; + +import org.prgrms.kdt.order.Voucher; +import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; + +import java.text.MessageFormat; +import java.util.UUID; + +@Service +public class VoucherService { + + private final VoucherRepository voucherRepository; + + public VoucherService(@Qualifier("memory") VoucherRepository voucherRepository) { + this.voucherRepository = voucherRepository; + } + + public Voucher getVoucher(UUID voucherId) { + return voucherRepository + .findById(voucherId) + .orElseThrow(() -> new RuntimeException(MessageFormat.format("Can not find a voucher for {0}", voucherId))); + } + + public void useVoucher(Voucher voucher) { + + } + +} diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml new file mode 100644 index 0000000000..3bad555f7c --- /dev/null +++ b/src/main/resources/application-local.yaml @@ -0,0 +1,7 @@ +kdt: + version: "v1.0-local" + minimum-order-amount: 0 + support-vendors: + - a + description: |- + line 1 \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000000..e6a71141de --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,7 @@ +#version = v1.0.0 +# +#kdt.version = v1.0.0 +# +#kdt.support-vendors = a, b, c, d, e, f, g +# +#kdt.minimum-order-amount = 1 \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000000..39fa3a5c92 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +kdt: + version: "v1.0" + minimum-order-amount: 1 + support-vendors: + - a + - b + - c + - d + description: |- + line 1 hello world + line 2 xxxx + line 3 \ No newline at end of file diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt new file mode 100644 index 0000000000..8dd791ec47 --- /dev/null +++ b/src/main/resources/banner.txt @@ -0,0 +1,9 @@ + +db dD d8888b. d888888b .d8b. d8888b. d8888b. .o88b. db d888888b .d8b. d888888b d888888b .d88b. d8b db +88 ,8P' 88 `8D `~~88~~' d8' `8b 88 `8D 88 `8D d8P Y8 88 `88' d8' `8b `~~88~~' `88' .8P Y8. 888o 88 +88,8P 88 88 88 88ooo88 88oodD' 88oodD' 8P 88 88 88ooo88 88 88 88 88 88V8o 88 +88`8b 88 88 88 88~~~88 88~~~ 88~~~ 8b 88 88 88~~~88 88 88 88 88 88 V8o88 +88 `88. 88 .8D 88 88 88 88 88 Y8b d8 88booo. .88. 88 88 88 .88. `8b d8' 88 V888 +YP YD Y8888D' YP YP YP 88 88 `Y88P' Y88888P Y888888P YP YP YP Y888888P `Y88P' VP V8P + + diff --git a/src/main/resources/logback-backup.xml b/src/main/resources/logback-backup.xml new file mode 100644 index 0000000000..ee410022d8 --- /dev/null +++ b/src/main/resources/logback-backup.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + + + + + + + + logs/access.log + + logs/access-%d{yyyy-MM-dd}.log + + + + ${FILE_LOG_PATTERN} + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000000..4cdae7c312 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties new file mode 100644 index 0000000000..13f582fa9f --- /dev/null +++ b/src/main/resources/version.properties @@ -0,0 +1 @@ +version = v1.0.0-RELEASE \ No newline at end of file diff --git a/src/test/java/org/prgrms/kdt/KdtApplicationTests.java b/src/test/java/org/prgrms/kdt/KdtApplicationTests.java new file mode 100644 index 0000000000..1a16b12a27 --- /dev/null +++ b/src/test/java/org/prgrms/kdt/KdtApplicationTests.java @@ -0,0 +1,13 @@ +package org.prgrms.kdt; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class KdtApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/test/sample.txt b/test/sample.txt new file mode 100644 index 0000000000..126129b2ee --- /dev/null +++ b/test/sample.txt @@ -0,0 +1,2 @@ +hello I'm a sample file! +Hi hi \ No newline at end of file From cfd8342803fbc1e30975680e72bd0388a6fd91e6 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 00:31:27 +0900 Subject: [PATCH 02/28] =?UTF-8?q?feat:=20outputhandler=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/ConsoleOutputHandler.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java index d9b789dd42..bf106f335f 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java @@ -6,16 +6,26 @@ @Component public class ConsoleOutputHandler implements OutputHandler{ + private static final String lineSeparator = System.lineSeparator(); + @Override public void outputStartMessage() { - System.out.println("=== Voucher Program ==="); - System.out.println("Type exit to exit the program."); - System.out.println("Type create to create a new voucher."); - System.out.println("Type list to list all vouchers."); + StringBuilder sb = new StringBuilder(); + sb.append("=== Voucher Program ==="); + sb.append(lineSeparator); + sb.append("Type exit to exit the program."); + sb.append(lineSeparator); + sb.append("Type create to create a new voucher."); + sb.append(lineSeparator); + sb.append("Type list to list all vouchers."); + sb.append(lineSeparator); + sb.append(lineSeparator); + + System.out.println(sb.toString()); } @Override public void outputSystemMessage(String message) { - + System.out.println(message); } } From 9028c1be85b7954f6e03517655352e04672af0b9 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 02:24:12 +0900 Subject: [PATCH 03/28] feat: VoucherController --- .../java/org/prgrms/kdt/KdtApplication.java | 25 ++++++++++------- src/main/java/org/prgrms/kdt/OrderTester.java | 27 +++++++------------ .../configuration/io/ConsoleInputHandler.java | 1 - .../voucher/controller/VoucherController.java | 19 +++++++++++-- .../voucher/domain/FixedAmountVoucher.java | 2 -- .../domain/PercentDiscountVoucher.java | 1 - .../prgrms/kdt/voucher/domain/Voucher.java | 9 +++++++ .../repository/JdbcVoucherRepository.java | 8 +++--- .../repository/MemoryVoucherRepository.java | 10 +++---- .../voucher/repository/VoucherRepository.java | 2 +- .../kdt/voucher/service/VoucherService.java | 7 ++++- 11 files changed, 65 insertions(+), 46 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index 0deaf14639..1faf2979cb 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -1,7 +1,8 @@ package org.prgrms.kdt; +import java.io.IOException; import org.prgrms.kdt.app.configuration.YamlPropertiesFactory; -import org.prgrms.kdt.order.OrderProperties; +import org.prgrms.kdt.voucher.controller.VoucherController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; @@ -20,15 +21,21 @@ public class KdtApplication { private static final Logger logger = LoggerFactory.getLogger(KdtApplication.class); - public static void main(String[] args) { + public static void main(String[] args) throws IOException { var applicationContext = SpringApplication.run(KdtApplication.class, args); - var orderProperties = applicationContext.getBean(OrderProperties.class); - logger.error("logger name => {}", logger.getName()); - logger.warn("version -> {}", orderProperties.getVersion()); - logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); - logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); - logger.warn("description -> {}", orderProperties.getDescription()); + var voucherController = applicationContext.getBean(VoucherController.class); - } + boolean isRepeat = true; + + while(isRepeat){ + isRepeat = voucherController.startVoucherMenu(); + } +// var orderProperties = applicationContext.getBean(OrderProperties.class); +// logger.error("logger name => {}", logger.getName()); +// logger.warn("version -> {}", orderProperties.getVersion()); +// logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); +// logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); +// logger.warn("description -> {}", orderProperties.getDescription()); + } } diff --git a/src/main/java/org/prgrms/kdt/OrderTester.java b/src/main/java/org/prgrms/kdt/OrderTester.java index 37a6890b5d..1aace85b17 100644 --- a/src/main/java/org/prgrms/kdt/OrderTester.java +++ b/src/main/java/org/prgrms/kdt/OrderTester.java @@ -1,11 +1,8 @@ package org.prgrms.kdt; +import java.io.IOException; +import java.util.UUID; import org.prgrms.kdt.app.configuration.AppConfiguration; -import org.prgrms.kdt.order.OrderItem; -import org.prgrms.kdt.order.OrderProperties; -import org.prgrms.kdt.order.OrderService; -import org.prgrms.kdt.voucher.FixedAmountVoucher; -import org.prgrms.kdt.voucher.VoucherRepository; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; import org.slf4j.Logger; @@ -13,11 +10,6 @@ import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils; import org.springframework.boot.ansi.AnsiOutput; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.util.Assert; - -import java.io.IOException; -import java.text.MessageFormat; -import java.util.UUID; public class OrderTester { @@ -36,18 +28,19 @@ public static void main(String[] args) throws IOException { // System.out.println(MessageFormat.format("minimumOrderAmount -> {0}", minimumOrderAmount)); // System.out.println(MessageFormat.format("supportVendors -> {0}", supportVendors)); // System.out.println(MessageFormat.format("description -> {0}", description)); - var orderProperties = applicationContext.getBean(OrderProperties.class); - logger.error("logger name => {}", logger.getName()); - logger.warn("version -> {}", orderProperties.getVersion()); - logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); - logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); - logger.warn("description -> {}", orderProperties.getDescription()); + +// var orderProperties = applicationContext.getBean(OrderProperties.class); +// logger.error("logger name => {}", logger.getName()); +// logger.warn("version -> {}", orderProperties.getVersion()); +// logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); +// logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); +// logger.warn("description -> {}", orderProperties.getDescription()); var customerId = UUID.randomUUID(); var voucherRepository = BeanFactoryAnnotationUtils.qualifiedBeanOfType(applicationContext.getBeanFactory(), VoucherRepository.class, "memory"); var voucher = voucherRepository.insert(new FixedAmountVoucher(UUID.randomUUID(), 10L)); - Assert.isTrue(order.totalAmount() == 90L, MessageFormat.format("totalAmount {0} is not 90L", order.totalAmount())); +// Assert.isTrue(order.totalAmount() == 90L, MessageFormat.format("totalAmount {0} is not 90L", order.totalAmount())); applicationContext.close(); } diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java index 1c05dbd728..3197ceedc0 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java @@ -3,7 +3,6 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index d9769e1e51..8174e6e9a5 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -1,5 +1,6 @@ package org.prgrms.kdt.voucher.controller; +import java.io.IOException; import org.prgrms.kdt.app.configuration.io.InputHandler; import org.prgrms.kdt.app.configuration.io.OutputHandler; import org.prgrms.kdt.voucher.service.VoucherService; @@ -11,6 +12,9 @@ public class VoucherController { private final InputHandler inputHandler; private final OutputHandler outputHandler; private final VoucherService voucherService; + private final String EXIT = "exit"; + private final String CREATE = "create"; + private final String LIST = "list"; public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { this.inputHandler = inputHandler; @@ -18,7 +22,18 @@ public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, this.voucherService = voucherService; } - public void - + public boolean startVoucherMenu() throws IOException { + outputHandler.outputStartMessage(); + String menu = inputHandler.inputString(); + if(menu.equals(EXIT)){ + return false; + }else if(menu.equals(CREATE)) { + voucherService.createVoucher(); + return true; + }else if(menu.equals(LIST)){ + voucherService.getAllVoucher(); + return true; + } + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index 7f6b8b677e..8b06155b9b 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -1,7 +1,5 @@ package org.prgrms.kdt.voucher.domain; -import org.prgrms.kdt.order.Voucher; - import java.util.UUID; public class FixedAmountVoucher implements Voucher { diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index 7f7bc7b783..b65b406d8a 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -1,7 +1,6 @@ package org.prgrms.kdt.voucher.domain; import java.util.UUID; -import org.prgrms.kdt.order.Voucher; public class PercentDiscountVoucher implements Voucher { private final UUID voucherId; diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java new file mode 100644 index 0000000000..46c7178f34 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java @@ -0,0 +1,9 @@ +package org.prgrms.kdt.voucher.domain; + +import java.util.UUID; + +public interface Voucher { + UUID getVoucherId(); + + long discount(long beforeDiscount); +} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java index ef766f5c78..67c3b1df2b 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java @@ -1,14 +1,12 @@ package org.prgrms.kdt.voucher.repository; -import org.prgrms.kdt.order.Voucher; -import org.prgrms.kdt.voucher.VoucherRepository; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; - import java.util.Map; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import org.prgrms.kdt.voucher.domain.Voucher; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; @Repository @Qualifier("jdbc") diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java index 549bf1b4f7..c327423958 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -1,16 +1,12 @@ package org.prgrms.kdt.voucher.repository; -import org.prgrms.kdt.order.Voucher; -import org.prgrms.kdt.voucher.VoucherRepository; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Repository; - import java.util.Map; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import org.prgrms.kdt.voucher.domain.Voucher; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; @Repository @Qualifier("memory") diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index db01e1adfd..560a90f25e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -2,7 +2,7 @@ import java.util.Optional; import java.util.UUID; -import org.prgrms.kdt.order.Voucher; +import org.prgrms.kdt.voucher.domain.Voucher; public interface VoucherRepository { Optional findById(UUID voucherId); diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index d1792a1b45..a4a7822ac6 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -1,6 +1,6 @@ package org.prgrms.kdt.voucher.service; -import org.prgrms.kdt.order.Voucher; +import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -27,4 +27,9 @@ public void useVoucher(Voucher voucher) { } + public void createVoucher() { + } + + public void getAllVoucher() { + } } From 8e4db6cc8ca5e3c6b04e87d1ffeb37ab394d9529 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 15:54:56 +0900 Subject: [PATCH 04/28] =?UTF-8?q?feat:=20findAll=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/repository/MemoryVoucherRepository.java | 12 ++++++++---- .../kdt/voucher/repository/VoucherRepository.java | 8 +++++++- .../prgrms/kdt/voucher/service/VoucherService.java | 8 ++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java index c327423958..7cf87a2cd8 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -1,13 +1,12 @@ package org.prgrms.kdt.voucher.repository; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; import org.prgrms.kdt.voucher.domain.Voucher; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + @Repository @Qualifier("memory") public class MemoryVoucherRepository implements VoucherRepository { @@ -25,4 +24,9 @@ public Voucher insert(Voucher voucher) { return voucher; } + @Override + public List findAll() { + return (List) storage.values(); + } + } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index 560a90f25e..84d34b78e6 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -1,10 +1,16 @@ package org.prgrms.kdt.voucher.repository; +import org.prgrms.kdt.voucher.domain.Voucher; + +import java.util.Collection; import java.util.Optional; import java.util.UUID; -import org.prgrms.kdt.voucher.domain.Voucher; public interface VoucherRepository { + Optional findById(UUID voucherId); + Voucher insert(Voucher voucher); + + Collection findAll(); } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index a4a7822ac6..09b63a1941 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -6,12 +6,15 @@ import org.springframework.stereotype.Service; import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; @Service public class VoucherService { private final VoucherRepository voucherRepository; + private List voucherList = new ArrayList<>(); public VoucherService(@Qualifier("memory") VoucherRepository voucherRepository) { this.voucherRepository = voucherRepository; @@ -24,12 +27,13 @@ public Voucher getVoucher(UUID voucherId) { } public void useVoucher(Voucher voucher) { - } public void createVoucher() { + } - public void getAllVoucher() { + public List getAllVoucher() { + return voucherRepository.findAll(); } } From 1c1d3c56b2450f80813bde7fc2d7f36ec38395a7 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 16:24:26 +0900 Subject: [PATCH 05/28] =?UTF-8?q?feat:=20enum=20=EB=A9=94=EC=8B=9C?= =?UTF-8?q?=EC=A7=80,=20=EB=AA=A8=EB=93=A0=20=EB=B0=94=EC=9A=B0=EC=B2=98?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C,=20=EB=B0=94=EC=9A=B0=EC=B2=98=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/io/ConsoleInputHandler.java | 9 +++++++- .../io/ConsoleOutputHandler.java | 5 ++-- .../app/configuration/io/InputHandler.java | 2 ++ .../app/configuration/io/SystemMessage.java | 23 +++++++++++++++++++ .../voucher/controller/VoucherController.java | 19 +++++++++++++-- .../kdt/voucher/service/VoucherService.java | 8 +++---- 6 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java index 3197ceedc0..a83f72c8a5 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java @@ -1,9 +1,10 @@ package org.prgrms.kdt.app.configuration.io; +import org.springframework.stereotype.Component; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import org.springframework.stereotype.Component; @Component public class ConsoleInputHandler implements InputHandler{ @@ -14,4 +15,10 @@ public class ConsoleInputHandler implements InputHandler{ public String inputString() throws IOException { return br.readLine(); } + + @Override + public int inputInt() throws IOException { + return Integer.parseInt(br.readLine()); + } + } diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java index bf106f335f..0fac3b11e3 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java @@ -1,6 +1,5 @@ package org.prgrms.kdt.app.configuration.io; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; @Component @@ -21,11 +20,11 @@ public void outputStartMessage() { sb.append(lineSeparator); sb.append(lineSeparator); - System.out.println(sb.toString()); + System.out.print(sb.toString()); } @Override public void outputSystemMessage(String message) { - System.out.println(message); + System.out.print(message + lineSeparator); } } diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java index 62524299dd..09abed6ce9 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java @@ -5,4 +5,6 @@ public interface InputHandler { String inputString() throws IOException; + + int inputInt() throws IOException; } diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java new file mode 100644 index 0000000000..5eb6aa9600 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java @@ -0,0 +1,23 @@ +package org.prgrms.kdt.app.configuration.io; + +public enum SystemMessage { + EXIT_PROGRAM("프로그램을 종료합니다."), + CREATE_BOUCHER_TYPE("fixed, percent 중 어떤 타입의 바우처를 만드시겠습니까?"), + CREATE_FIXED_BOUCHER("고정으로 할인되는 비용을 입력하세요."), + CREATE_PERCENT_BOUCHER("할인되는 퍼센트를 정수로 입력하세요."), + EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), + EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 음수일 수 없습니다."), + EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), + EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 음수일 수 없습니다."), + EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."); + + private final String message; + + public String getMessage() { + return message; + } + + SystemMessage(String message) { + this.message = message; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index 8174e6e9a5..cb29656d6e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -3,9 +3,12 @@ import java.io.IOException; import org.prgrms.kdt.app.configuration.io.InputHandler; import org.prgrms.kdt.app.configuration.io.OutputHandler; +import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.service.VoucherService; import org.springframework.stereotype.Controller; +import static org.prgrms.kdt.app.configuration.io.SystemMessage.*; + @Controller public class VoucherController { @@ -15,6 +18,8 @@ public class VoucherController { private final String EXIT = "exit"; private final String CREATE = "create"; private final String LIST = "list"; + private final String FIXED = "fixed"; + private final String PERCENT = "percent"; public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { this.inputHandler = inputHandler; @@ -27,12 +32,22 @@ public boolean startVoucherMenu() throws IOException { String menu = inputHandler.inputString(); if(menu.equals(EXIT)){ + outputHandler.outputSystemMessage(EXIT_PROGRAM.getMessage()); return false; }else if(menu.equals(CREATE)) { - voucherService.createVoucher(); + outputHandler.outputSystemMessage(CREATE_BOUCHER_TYPE.getMessage()); + String voucherType = inputHandler.inputString(); + + if(voucherType.equals(FIXED)){ + + } + outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); + outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); + Voucher voucher = + voucherService.createVoucher(voucher); return true; }else if(menu.equals(LIST)){ - voucherService.getAllVoucher(); + voucherService.getAllVouchers(); return true; } } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index 09b63a1941..cd6ff66397 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -29,11 +29,11 @@ public Voucher getVoucher(UUID voucherId) { public void useVoucher(Voucher voucher) { } - public void createVoucher() { - + public void createVoucher(Voucher voucher) { + voucherRepository.insert(voucher); } - public List getAllVoucher() { - return voucherRepository.findAll(); + public List getAllVouchers() { + return (List) voucherRepository.findAll(); } } From 84c986605197a50073b4aebed22744961801ae27 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 17:19:49 +0900 Subject: [PATCH 06/28] =?UTF-8?q?feat:=20dto=20=EC=83=9D=EC=84=B1,=20?= =?UTF-8?q?=EB=B0=94=EC=9A=B0=EC=B2=98=20controller=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/KdtApplication.java | 5 +- .../app/configuration/io/SystemMessage.java | 2 +- .../controller/FixedAmountVoucherDto.java | 21 ++++++++ .../controller/PercentDiscountVoucherDto.java | 21 ++++++++ .../voucher/controller/VoucherController.java | 50 ++++++++++++++----- .../domain/PercentDiscountVoucher.java | 4 +- .../repository/JdbcVoucherRepository.java | 13 +++-- .../repository/MemoryVoucherRepository.java | 1 - .../kdt/voucher/service/VoucherService.java | 12 ++++- 9 files changed, 107 insertions(+), 22 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/voucher/controller/FixedAmountVoucherDto.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/controller/PercentDiscountVoucherDto.java diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index 1faf2979cb..7c8c48d4ee 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -1,6 +1,5 @@ package org.prgrms.kdt; -import java.io.IOException; import org.prgrms.kdt.app.configuration.YamlPropertiesFactory; import org.prgrms.kdt.voucher.controller.VoucherController; import org.slf4j.Logger; @@ -11,6 +10,8 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.PropertySource; +import java.io.IOException; + @SpringBootApplication @ComponentScan( basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.user", "org.prgrms.kdt.voucher"} @@ -25,7 +26,7 @@ public static void main(String[] args) throws IOException { var applicationContext = SpringApplication.run(KdtApplication.class, args); var voucherController = applicationContext.getBean(VoucherController.class); - boolean isRepeat = true; + var isRepeat = true; while(isRepeat){ isRepeat = voucherController.startVoucherMenu(); diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java index 5eb6aa9600..c5e2d20cfc 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java @@ -6,7 +6,7 @@ public enum SystemMessage { CREATE_FIXED_BOUCHER("고정으로 할인되는 비용을 입력하세요."), CREATE_PERCENT_BOUCHER("할인되는 퍼센트를 정수로 입력하세요."), EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), - EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 음수일 수 없습니다."), + EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 음수일 수 없습니다."), EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."); diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/FixedAmountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/controller/FixedAmountVoucherDto.java new file mode 100644 index 0000000000..0a8b5177c2 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/controller/FixedAmountVoucherDto.java @@ -0,0 +1,21 @@ +package org.prgrms.kdt.voucher.controller; + +import java.util.UUID; + +public class FixedAmountVoucherDto { + private final UUID voucherId; + private final long amount; + + public FixedAmountVoucherDto(UUID voucherId, long amount) { + this.voucherId = voucherId; + this.amount = amount; + } + + public UUID getVoucherId() { + return voucherId; + } + + public long getAmount() { + return amount; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/PercentDiscountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/controller/PercentDiscountVoucherDto.java new file mode 100644 index 0000000000..1c8827ca61 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/controller/PercentDiscountVoucherDto.java @@ -0,0 +1,21 @@ +package org.prgrms.kdt.voucher.controller; + +import java.util.UUID; + +public class PercentDiscountVoucherDto { + private final UUID voucherId; + private final int percent; + + public PercentDiscountVoucherDto(UUID voucherId, int percent) { + this.voucherId = voucherId; + this.percent = percent; + } + + public UUID getVoucherId() { + return voucherId; + } + + public int getPercent() { + return percent; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index cb29656d6e..7b871ef9f3 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -1,12 +1,13 @@ package org.prgrms.kdt.voucher.controller; -import java.io.IOException; import org.prgrms.kdt.app.configuration.io.InputHandler; import org.prgrms.kdt.app.configuration.io.OutputHandler; -import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.service.VoucherService; import org.springframework.stereotype.Controller; +import java.io.IOException; +import java.util.UUID; + import static org.prgrms.kdt.app.configuration.io.SystemMessage.*; @Controller @@ -29,26 +30,51 @@ public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, public boolean startVoucherMenu() throws IOException { outputHandler.outputStartMessage(); - String menu = inputHandler.inputString(); + var menu = inputHandler.inputString(); - if(menu.equals(EXIT)){ + if(menu.equals(EXIT)) { outputHandler.outputSystemMessage(EXIT_PROGRAM.getMessage()); return false; - }else if(menu.equals(CREATE)) { + } + else if(menu.equals(CREATE)) + { outputHandler.outputSystemMessage(CREATE_BOUCHER_TYPE.getMessage()); - String voucherType = inputHandler.inputString(); + var createVoucherType = inputHandler.inputString(); + + if(createVoucherType.equals(FIXED)){ + outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); + + var amount = 0; + while(true) { + amount = inputHandler.inputInt(); - if(voucherType.equals(FIXED)){ + if(amount <= 0){ + outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_MINUS.getMessage()); + continue; + } + if(amount >= 100_000){ + outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_OVER.getMessage()); + continue; + } + break; + } + var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); + voucherService.createVoucher(fixedAmountVoucherDto); } - outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); - outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); - Voucher voucher = - voucherService.createVoucher(voucher); + +// outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); + return true; - }else if(menu.equals(LIST)){ + } + else if(menu.equals(LIST)) + { voucherService.getAllVouchers(); return true; } + else{ + outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); + return false; + } } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index b65b406d8a..9aba99c6db 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -4,9 +4,9 @@ public class PercentDiscountVoucher implements Voucher { private final UUID voucherId; - private final long percent; + private final int percent; - public PercentDiscountVoucher(UUID voucherId, long percent) { + public PercentDiscountVoucher(UUID voucherId, int percent) { this.voucherId = voucherId; this.percent = percent; } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java index 67c3b1df2b..afdcdb1f28 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java @@ -1,12 +1,14 @@ package org.prgrms.kdt.voucher.repository; +import org.prgrms.kdt.voucher.domain.Voucher; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Repository; + +import java.util.Collection; import java.util.Map; import java.util.Optional; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import org.prgrms.kdt.voucher.domain.Voucher; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Repository; @Repository @Qualifier("jdbc") @@ -24,4 +26,9 @@ public Voucher insert(Voucher voucher) { storage.put(voucher.getVoucherId(), voucher); return voucher; } + + @Override + public Collection findAll() { + return null; + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java index 7cf87a2cd8..3f95214493 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -28,5 +28,4 @@ public Voucher insert(Voucher voucher) { public List findAll() { return (List) storage.values(); } - } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index cd6ff66397..08048dcac8 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -1,5 +1,9 @@ package org.prgrms.kdt.voucher.service; +import org.prgrms.kdt.voucher.controller.FixedAmountVoucherDto; +import org.prgrms.kdt.voucher.controller.PercentDiscountVoucherDto; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; import org.springframework.beans.factory.annotation.Qualifier; @@ -29,7 +33,13 @@ public Voucher getVoucher(UUID voucherId) { public void useVoucher(Voucher voucher) { } - public void createVoucher(Voucher voucher) { + public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { + var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); + voucherRepository.insert(voucher); + } + + public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { + var voucher = new PercentDiscountVoucher(percentDiscountVoucherDto.getVoucherId(), percentDiscountVoucherDto.getPercent()); voucherRepository.insert(voucher); } From 573b02c58b8141f7e964b04c1c75d8a2ac55a0f2 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 17:38:47 +0900 Subject: [PATCH 07/28] =?UTF-8?q?feat:=20findAll=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/io/ConsoleOutputHandler.java | 15 +++++++++++++++ .../kdt/app/configuration/io/OutputHandler.java | 6 ++++++ .../kdt/voucher/controller/VoucherController.java | 14 +++++++------- .../kdt/voucher/domain/FixedAmountVoucher.java | 8 ++++++++ .../voucher/domain/PercentDiscountVoucher.java | 8 ++++++++ .../repository/MemoryVoucherRepository.java | 2 +- .../kdt/voucher/service/VoucherService.java | 6 +++--- 7 files changed, 48 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java index 0fac3b11e3..2a2c0c3738 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java @@ -1,7 +1,10 @@ package org.prgrms.kdt.app.configuration.io; +import org.prgrms.kdt.voucher.domain.Voucher; import org.springframework.stereotype.Component; +import java.util.List; + @Component public class ConsoleOutputHandler implements OutputHandler{ @@ -27,4 +30,16 @@ public void outputStartMessage() { public void outputSystemMessage(String message) { System.out.print(message + lineSeparator); } + + @Override + public void outputVouchers(List voucherList) { + StringBuilder sb = new StringBuilder(); + + voucherList.forEach(voucher -> { + sb.append(voucher); + sb.append(lineSeparator); + }); + + System.out.println(sb.toString()); + } } diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java index ab05384b56..e508c0de6d 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java @@ -1,8 +1,14 @@ package org.prgrms.kdt.app.configuration.io; +import org.prgrms.kdt.voucher.domain.Voucher; + +import java.util.List; + public interface OutputHandler { void outputStartMessage(); void outputSystemMessage(String message); + + void outputVouchers(List voucherList); } diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index 7b871ef9f3..7cf1791aa8 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -2,10 +2,12 @@ import org.prgrms.kdt.app.configuration.io.InputHandler; import org.prgrms.kdt.app.configuration.io.OutputHandler; +import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.service.VoucherService; import org.springframework.stereotype.Controller; import java.io.IOException; +import java.util.List; import java.util.UUID; import static org.prgrms.kdt.app.configuration.io.SystemMessage.*; @@ -66,15 +68,13 @@ else if(menu.equals(CREATE)) // outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); return true; - } - else if(menu.equals(LIST)) - { - voucherService.getAllVouchers(); + } else if(menu.equals(LIST)) { + List voucherList = voucherService.getAllVouchers(); + outputHandler.outputVouchers(voucherList); return true; - } - else{ + } else { outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); - return false; + return true; } } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index 8b06155b9b..4ffd4df746 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -19,4 +19,12 @@ public UUID getVoucherId() { public long discount(long beforeDiscount) { return beforeDiscount - amount; } + + @Override + public String toString() { + return "FixedAmountVoucher{" + + "voucherId=" + voucherId + + ", amount=" + amount + + '}'; + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index 9aba99c6db..4edafb99fd 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -20,4 +20,12 @@ public UUID getVoucherId() { public long discount(long beforeDiscount) { return beforeDiscount * (percent / 100); } + + @Override + public String toString() { + return "PercentDiscountVoucher{" + + "voucherId=" + voucherId + + ", percent=" + percent + + '}'; + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java index 3f95214493..f6705ffd08 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -26,6 +26,6 @@ public Voucher insert(Voucher voucher) { @Override public List findAll() { - return (List) storage.values(); + return new ArrayList<>(storage.values()); } } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index 08048dcac8..4e8f35b298 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -30,9 +30,6 @@ public Voucher getVoucher(UUID voucherId) { .orElseThrow(() -> new RuntimeException(MessageFormat.format("Can not find a voucher for {0}", voucherId))); } - public void useVoucher(Voucher voucher) { - } - public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); voucherRepository.insert(voucher); @@ -46,4 +43,7 @@ public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { public List getAllVouchers() { return (List) voucherRepository.findAll(); } + + public void useVoucher(Voucher voucher) { + } } From e5332a50f84252c22031d69469cb878d68cc1817 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 18:02:43 +0900 Subject: [PATCH 08/28] =?UTF-8?q?feat:=20findAll=20=ED=8F=AC=EB=A7=B7?= =?UTF-8?q?=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/configuration/io/SystemMessage.java | 3 +- .../voucher/controller/VoucherController.java | 68 ++++++++++++------- .../voucher/domain/FixedAmountVoucher.java | 37 +++++----- .../domain/PercentDiscountVoucher.java | 39 +++++------ .../repository/JdbcVoucherRepository.java | 7 +- .../repository/MemoryVoucherRepository.java | 28 ++++---- .../voucher/repository/VoucherRepository.java | 4 +- .../kdt/voucher/service/VoucherService.java | 64 +++++++++-------- 8 files changed, 135 insertions(+), 115 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java index c5e2d20cfc..e57693259c 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java @@ -5,10 +5,11 @@ public enum SystemMessage { CREATE_BOUCHER_TYPE("fixed, percent 중 어떤 타입의 바우처를 만드시겠습니까?"), CREATE_FIXED_BOUCHER("고정으로 할인되는 비용을 입력하세요."), CREATE_PERCENT_BOUCHER("할인되는 퍼센트를 정수로 입력하세요."), + FOUND_VOUCHER_IS_EMPTY("조회한 바우처가 하나도 존재하지 않습니다."), EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), - EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 음수일 수 없습니다."), + EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 0보다 커야합니다."), EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."); private final String message; diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index 7cf1791aa8..047c4bce2a 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -34,41 +34,61 @@ public boolean startVoucherMenu() throws IOException { outputHandler.outputStartMessage(); var menu = inputHandler.inputString(); - if(menu.equals(EXIT)) { + if (menu.equals(EXIT)) { outputHandler.outputSystemMessage(EXIT_PROGRAM.getMessage()); return false; - } - else if(menu.equals(CREATE)) - { + } else if (menu.equals(CREATE)) { outputHandler.outputSystemMessage(CREATE_BOUCHER_TYPE.getMessage()); var createVoucherType = inputHandler.inputString(); - if(createVoucherType.equals(FIXED)){ - outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); + while (true) { + if (createVoucherType.equals(FIXED)) { + outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); - var amount = 0; - while(true) { - amount = inputHandler.inputInt(); + var amount = 0; + while (true) { + amount = inputHandler.inputInt(); - if(amount <= 0){ - outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_MINUS.getMessage()); - continue; - } - if(amount >= 100_000){ - outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_OVER.getMessage()); - continue; + if (amount <= 0) { + outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_MINUS.getMessage()); + continue; + } + if (amount >= 100_000) { + outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_OVER.getMessage()); + continue; + } + break; } + + var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); + voucherService.createVoucher(fixedAmountVoucherDto); break; - } + } else if (createVoucherType.equals(PERCENT)) { + outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); - var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); - voucherService.createVoucher(fixedAmountVoucherDto); - } + var percent = 0; + while (true) { + percent = inputHandler.inputInt(); -// outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); + if (percent <= 0) { + outputHandler.outputSystemMessage(EXCEPTION_PERCENT_MINUS.getMessage()); + continue; + } + if (percent >= 100) { + outputHandler.outputSystemMessage(EXCEPTION_PERCENT_OVER.getMessage()); + continue; + } + break; + } - return true; - } else if(menu.equals(LIST)) { + var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent); + voucherService.createVoucher(percentDiscountVoucherDto); + break; + } else { + outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); + } + } + } else if (menu.equals(LIST)) { List voucherList = voucherService.getAllVouchers(); outputHandler.outputVouchers(voucherList); return true; @@ -76,5 +96,7 @@ else if(menu.equals(CREATE)) outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); return true; } + + return true; } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index 4ffd4df746..4d29e71345 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -3,28 +3,25 @@ import java.util.UUID; public class FixedAmountVoucher implements Voucher { - private final UUID voucherId; - private final long amount; + private final UUID voucherId; + private final long amount; - public FixedAmountVoucher(UUID voucherId, long amount) { - this.voucherId = voucherId; - this.amount = amount; - } + public FixedAmountVoucher(UUID voucherId, long amount) { + this.voucherId = voucherId; + this.amount = amount; + } - @Override - public UUID getVoucherId() { - return voucherId; - } + @Override + public UUID getVoucherId() { + return voucherId; + } - public long discount(long beforeDiscount) { - return beforeDiscount - amount; - } + public long discount(long beforeDiscount) { + return beforeDiscount - amount; + } - @Override - public String toString() { - return "FixedAmountVoucher{" + - "voucherId=" + voucherId + - ", amount=" + amount + - '}'; - } + @Override + public String toString() { + return String.format("FixedAmountVoucher '{voucherId = %-40s, amount = %s}'", voucherId, amount); + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index 4edafb99fd..ab96c517b7 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -3,29 +3,26 @@ import java.util.UUID; public class PercentDiscountVoucher implements Voucher { - private final UUID voucherId; - private final int percent; + private final UUID voucherId; + private final int percent; - public PercentDiscountVoucher(UUID voucherId, int percent) { - this.voucherId = voucherId; - this.percent = percent; - } + public PercentDiscountVoucher(UUID voucherId, int percent) { + this.voucherId = voucherId; + this.percent = percent; + } - @Override - public UUID getVoucherId() { - return voucherId; - } + @Override + public UUID getVoucherId() { + return voucherId; + } - @Override - public long discount(long beforeDiscount) { - return beforeDiscount * (percent / 100); - } + @Override + public long discount(long beforeDiscount) { + return beforeDiscount * (percent / 100); + } - @Override - public String toString() { - return "PercentDiscountVoucher{" + - "voucherId=" + voucherId + - ", percent=" + percent + - '}'; - } + @Override + public String toString() { + return String.format("PercentDiscountVoucher'{voucherId = %-40s, percent = %s}'", voucherId, percent); + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java index afdcdb1f28..28cf88cd4f 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java @@ -4,10 +4,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; -import java.util.Collection; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; @Repository @@ -28,7 +25,7 @@ public Voucher insert(Voucher voucher) { } @Override - public Collection findAll() { + public List findAll() { return null; } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java index f6705ffd08..f5c0d2b20d 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -11,21 +11,21 @@ @Qualifier("memory") public class MemoryVoucherRepository implements VoucherRepository { - private final Map storage = new ConcurrentHashMap<>(); + private final Map storage = new ConcurrentHashMap<>(); - @Override - public Optional findById(UUID voucherId) { - return Optional.ofNullable(storage.get(voucherId)); - } + @Override + public Optional findById(UUID voucherId) { + return Optional.ofNullable(storage.get(voucherId)); + } - @Override - public Voucher insert(Voucher voucher) { - storage.put(voucher.getVoucherId(), voucher); - return voucher; - } + @Override + public Voucher insert(Voucher voucher) { + storage.put(voucher.getVoucherId(), voucher); + return voucher; + } - @Override - public List findAll() { - return new ArrayList<>(storage.values()); - } + @Override + public List findAll() { + return new ArrayList<>(storage.values()); + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index 84d34b78e6..95c9bb13f8 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -2,7 +2,7 @@ import org.prgrms.kdt.voucher.domain.Voucher; -import java.util.Collection; +import java.util.List; import java.util.Optional; import java.util.UUID; @@ -12,5 +12,5 @@ public interface VoucherRepository { Voucher insert(Voucher voucher); - Collection findAll(); + List findAll(); } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index 4e8f35b298..0a9305b266 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -14,36 +14,42 @@ import java.util.List; import java.util.UUID; +import static org.prgrms.kdt.app.configuration.io.SystemMessage.FOUND_VOUCHER_IS_EMPTY; + @Service public class VoucherService { - private final VoucherRepository voucherRepository; - private List voucherList = new ArrayList<>(); - - public VoucherService(@Qualifier("memory") VoucherRepository voucherRepository) { - this.voucherRepository = voucherRepository; - } - - public Voucher getVoucher(UUID voucherId) { - return voucherRepository - .findById(voucherId) - .orElseThrow(() -> new RuntimeException(MessageFormat.format("Can not find a voucher for {0}", voucherId))); - } - - public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { - var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); - voucherRepository.insert(voucher); - } - - public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { - var voucher = new PercentDiscountVoucher(percentDiscountVoucherDto.getVoucherId(), percentDiscountVoucherDto.getPercent()); - voucherRepository.insert(voucher); - } - - public List getAllVouchers() { - return (List) voucherRepository.findAll(); - } - - public void useVoucher(Voucher voucher) { - } + private final VoucherRepository voucherRepository; + private List voucherList = new ArrayList<>(); + + public VoucherService(@Qualifier("memory") VoucherRepository voucherRepository) { + this.voucherRepository = voucherRepository; + } + + public Voucher getVoucher(UUID voucherId) { + return voucherRepository + .findById(voucherId) + .orElseThrow(() -> new RuntimeException(MessageFormat.format("Can not find a voucher for {0}", voucherId))); + } + + public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { + var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); + voucherRepository.insert(voucher); + } + + public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { + var voucher = new PercentDiscountVoucher(percentDiscountVoucherDto.getVoucherId(), percentDiscountVoucherDto.getPercent()); + voucherRepository.insert(voucher); + } + + public List getAllVouchers() { + var voucherList = voucherRepository.findAll(); + if (voucherList.isEmpty()) { + System.out.println(FOUND_VOUCHER_IS_EMPTY.getMessage()); + } + return voucherList; + } + + public void useVoucher(Voucher voucher) { + } } From b9cce884c8974d35431ea9ab303a2f53a1b8fba1 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 18:05:33 +0900 Subject: [PATCH 09/28] =?UTF-8?q?fix:=20kdtApp=20=EC=96=B4=EB=85=B8?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=88=98=EC=A0=95=20feat:=20logg?= =?UTF-8?q?er=20int=20VoucherController?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/KdtApplication.java | 32 +++++-------------- .../voucher/controller/VoucherController.java | 10 ++++++ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index 7c8c48d4ee..5d11b9cecc 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -1,42 +1,26 @@ package org.prgrms.kdt; -import org.prgrms.kdt.app.configuration.YamlPropertiesFactory; import org.prgrms.kdt.voucher.controller.VoucherController; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.PropertySource; import java.io.IOException; @SpringBootApplication @ComponentScan( - basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.user", "org.prgrms.kdt.voucher"} + basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.user", "org.prgrms.kdt.voucher"} ) -@PropertySource(value = "application.yaml", factory = YamlPropertiesFactory.class) -@EnableConfigurationProperties public class KdtApplication { - private static final Logger logger = LoggerFactory.getLogger(KdtApplication.class); + public static void main(String[] args) throws IOException { + var applicationContext = SpringApplication.run(KdtApplication.class, args); + var voucherController = applicationContext.getBean(VoucherController.class); - public static void main(String[] args) throws IOException { - var applicationContext = SpringApplication.run(KdtApplication.class, args); - var voucherController = applicationContext.getBean(VoucherController.class); + var isRepeat = true; - var isRepeat = true; - - while(isRepeat){ - isRepeat = voucherController.startVoucherMenu(); + while (isRepeat) { + isRepeat = voucherController.startVoucherMenu(); + } } - -// var orderProperties = applicationContext.getBean(OrderProperties.class); -// logger.error("logger name => {}", logger.getName()); -// logger.warn("version -> {}", orderProperties.getVersion()); -// logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); -// logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); -// logger.warn("description -> {}", orderProperties.getDescription()); - } } diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index 047c4bce2a..0f1e7b33bc 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -4,6 +4,8 @@ import org.prgrms.kdt.app.configuration.io.OutputHandler; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.service.VoucherService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import java.io.IOException; @@ -15,6 +17,7 @@ @Controller public class VoucherController { + private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); private final InputHandler inputHandler; private final OutputHandler outputHandler; private final VoucherService voucherService; @@ -99,4 +102,11 @@ public boolean startVoucherMenu() throws IOException { return true; } + + // var orderProperties = applicationContext.getBean(OrderProperties.class); +// logger.error("logger name => {}", logger.getName()); +// logger.warn("version -> {}", orderProperties.getVersion()); +// logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); +// logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); +// logger.warn("description -> {}", orderProperties.getDescription()); } From 733abd4c7be47f9a862160176e993cee7da7c457 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 19:09:33 +0900 Subject: [PATCH 10/28] =?UTF-8?q?fix:=20VoucherController=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/controller/VoucherController.java | 133 ++++++++++-------- 1 file changed, 77 insertions(+), 56 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index 0f1e7b33bc..e9e860e48f 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -37,70 +37,91 @@ public boolean startVoucherMenu() throws IOException { outputHandler.outputStartMessage(); var menu = inputHandler.inputString(); - if (menu.equals(EXIT)) { - outputHandler.outputSystemMessage(EXIT_PROGRAM.getMessage()); - return false; - } else if (menu.equals(CREATE)) { + switch (menu) { + case EXIT: + outputHandler.outputSystemMessage(EXIT_PROGRAM.getMessage()); + return false; + case CREATE: + createVoucher(); + break; + case LIST: + List voucherList = voucherService.getAllVouchers(); + outputHandler.outputVouchers(voucherList); + break; + default: + outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); + break; + } + + return true; + } + + + private void createVoucher() throws IOException { + while (true) { outputHandler.outputSystemMessage(CREATE_BOUCHER_TYPE.getMessage()); var createVoucherType = inputHandler.inputString(); - while (true) { - if (createVoucherType.equals(FIXED)) { - outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); - - var amount = 0; - while (true) { - amount = inputHandler.inputInt(); - - if (amount <= 0) { - outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_MINUS.getMessage()); - continue; - } - if (amount >= 100_000) { - outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_OVER.getMessage()); - continue; - } - break; - } - - var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); - voucherService.createVoucher(fixedAmountVoucherDto); + var isRepeat = true; + + if (createVoucherType.equals(FIXED)) { + isRepeat = createFixedAmountVoucher(); + if(!isRepeat) break; - } else if (createVoucherType.equals(PERCENT)) { - outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); - - var percent = 0; - while (true) { - percent = inputHandler.inputInt(); - - if (percent <= 0) { - outputHandler.outputSystemMessage(EXCEPTION_PERCENT_MINUS.getMessage()); - continue; - } - if (percent >= 100) { - outputHandler.outputSystemMessage(EXCEPTION_PERCENT_OVER.getMessage()); - continue; - } - break; - } - - var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent); - voucherService.createVoucher(percentDiscountVoucherDto); + } else if (createVoucherType.equals(PERCENT)) { + isRepeat = createPercentDiscountVoucher(); + if(!isRepeat) break; - } else { - outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); - } + } else { + outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); } - } else if (menu.equals(LIST)) { - List voucherList = voucherService.getAllVouchers(); - outputHandler.outputVouchers(voucherList); - return true; - } else { - outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); - return true; } + } - return true; + private boolean createFixedAmountVoucher() throws IOException { + outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); + + var amount = 0; + while (true) { + amount = inputHandler.inputInt(); + + if (amount <= 0) { + outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_MINUS.getMessage()); + continue; + } + if (amount >= 100_000) { + outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_OVER.getMessage()); + continue; + } + break; + } + + var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); + voucherService.createVoucher(fixedAmountVoucherDto); + return false; + } + + private boolean createPercentDiscountVoucher() throws IOException { + outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); + + var percent = 0; + while (true) { + percent = inputHandler.inputInt(); + + if (percent <= 0) { + outputHandler.outputSystemMessage(EXCEPTION_PERCENT_MINUS.getMessage()); + continue; + } + if (percent >= 100) { + outputHandler.outputSystemMessage(EXCEPTION_PERCENT_OVER.getMessage()); + continue; + } + break; + } + + var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent); + voucherService.createVoucher(percentDiscountVoucherDto); + return false; } // var orderProperties = applicationContext.getBean(OrderProperties.class); From d271ef94fbfd12328e73fcf95a97e0cf8fa73434 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 22:27:44 +0900 Subject: [PATCH 11/28] =?UTF-8?q?feat:=20jar=20=EC=8B=A4=ED=96=89=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/configuration/io/SystemMessage.java | 3 +- .../voucher/controller/VoucherController.java | 33 +++++++++++-------- .../repository/MemoryVoucherRepository.java | 5 +++ .../kdt/voucher/service/VoucherService.java | 10 +++++- src/main/resources/logback-backup.xml | 10 +----- src/main/resources/logback.xml | 21 ++++++++++-- 6 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java index e57693259c..e54f82bcf8 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java @@ -10,7 +10,8 @@ public enum SystemMessage { EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 0보다 커야합니다."), - EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."); + EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."), + EXCEPTION_FIND_VOUCHER(" -> 해당 id의 바우처를 찾을 수 없습니다."); private final String message; diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index e9e860e48f..fd5ef67d83 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -17,7 +17,6 @@ @Controller public class VoucherController { - private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); private final InputHandler inputHandler; private final OutputHandler outputHandler; private final VoucherService voucherService; @@ -26,6 +25,7 @@ public class VoucherController { private final String LIST = "list"; private final String FIXED = "fixed"; private final String PERCENT = "percent"; + private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { this.inputHandler = inputHandler; @@ -49,7 +49,9 @@ public boolean startVoucherMenu() throws IOException { outputHandler.outputVouchers(voucherList); break; default: - outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); + String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); + logger.error(errorMessage); + outputHandler.outputSystemMessage(errorMessage); break; } @@ -73,7 +75,9 @@ private void createVoucher() throws IOException { if(!isRepeat) break; } else { - outputHandler.outputSystemMessage(EXCEPTION_VOUCHER_TYPE.getMessage()); + String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); + logger.error(errorMessage); + outputHandler.outputSystemMessage(errorMessage); } } } @@ -86,11 +90,15 @@ private boolean createFixedAmountVoucher() throws IOException { amount = inputHandler.inputInt(); if (amount <= 0) { - outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_MINUS.getMessage()); + String errorMessage = EXCEPTION_FIXED_AMOUNT_MINUS.getMessage(); + logger.error(errorMessage); + outputHandler.outputSystemMessage(errorMessage); continue; } if (amount >= 100_000) { - outputHandler.outputSystemMessage(EXCEPTION_FIXED_AMOUNT_OVER.getMessage()); + String errorMessage = EXCEPTION_FIXED_AMOUNT_OVER.getMessage(); + logger.error(errorMessage); + outputHandler.outputSystemMessage(errorMessage); continue; } break; @@ -109,11 +117,15 @@ private boolean createPercentDiscountVoucher() throws IOException { percent = inputHandler.inputInt(); if (percent <= 0) { - outputHandler.outputSystemMessage(EXCEPTION_PERCENT_MINUS.getMessage()); + String errorMessage = EXCEPTION_PERCENT_MINUS.getMessage(); + logger.error(errorMessage); + outputHandler.outputSystemMessage(errorMessage); continue; } if (percent >= 100) { - outputHandler.outputSystemMessage(EXCEPTION_PERCENT_OVER.getMessage()); + String errorMessage = EXCEPTION_PERCENT_OVER.getMessage(); + logger.error(errorMessage); + outputHandler.outputSystemMessage(errorMessage); continue; } break; @@ -123,11 +135,4 @@ private boolean createPercentDiscountVoucher() throws IOException { voucherService.createVoucher(percentDiscountVoucherDto); return false; } - - // var orderProperties = applicationContext.getBean(OrderProperties.class); -// logger.error("logger name => {}", logger.getName()); -// logger.warn("version -> {}", orderProperties.getVersion()); -// logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); -// logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); -// logger.warn("description -> {}", orderProperties.getDescription()); } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java index f5c0d2b20d..538738ea6f 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -1,6 +1,8 @@ package org.prgrms.kdt.voucher.repository; import org.prgrms.kdt.voucher.domain.Voucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; @@ -12,6 +14,7 @@ public class MemoryVoucherRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); + private static final Logger logger = LoggerFactory.getLogger(MemoryVoucherRepository.class); @Override public Optional findById(UUID voucherId) { @@ -21,11 +24,13 @@ public Optional findById(UUID voucherId) { @Override public Voucher insert(Voucher voucher) { storage.put(voucher.getVoucherId(), voucher); + logger.debug("바우처 생성 -> " + voucher.toString()); return voucher; } @Override public List findAll() { + logger.debug("모든 바우처의 갯수 : " + storage.size()); return new ArrayList<>(storage.values()); } } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index 0a9305b266..6c7ef3714e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -6,6 +6,8 @@ import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -14,6 +16,7 @@ import java.util.List; import java.util.UUID; +import static org.prgrms.kdt.app.configuration.io.SystemMessage.EXCEPTION_FIND_VOUCHER; import static org.prgrms.kdt.app.configuration.io.SystemMessage.FOUND_VOUCHER_IS_EMPTY; @Service @@ -21,6 +24,7 @@ public class VoucherService { private final VoucherRepository voucherRepository; private List voucherList = new ArrayList<>(); + private static final Logger logger = LoggerFactory.getLogger(VoucherService.class); public VoucherService(@Qualifier("memory") VoucherRepository voucherRepository) { this.voucherRepository = voucherRepository; @@ -29,7 +33,11 @@ public VoucherService(@Qualifier("memory") VoucherRepository voucherRepository) public Voucher getVoucher(UUID voucherId) { return voucherRepository .findById(voucherId) - .orElseThrow(() -> new RuntimeException(MessageFormat.format("Can not find a voucher for {0}", voucherId))); + .orElseThrow(() -> { + String errorMessage = MessageFormat.format( "{0}" + EXCEPTION_FIND_VOUCHER.getMessage(), voucherId); + logger.error(errorMessage); + return new RuntimeException(errorMessage); + }); } public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { diff --git a/src/main/resources/logback-backup.xml b/src/main/resources/logback-backup.xml index ee410022d8..b9d36e01a4 100644 --- a/src/main/resources/logback-backup.xml +++ b/src/main/resources/logback-backup.xml @@ -15,14 +15,6 @@ - - - - - - - - logs/access.log @@ -41,4 +33,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 4cdae7c312..1be82ff8ed 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -3,9 +3,24 @@ + + logs/access.log + + logs/access-%d{yyyy-MM-dd}.log + + + + ${FILE_LOG_PATTERN} + + + + + + + + + - - - \ No newline at end of file + From d9c67079af8d082767cbc6096259517d5cc347fb Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 23:35:05 +0900 Subject: [PATCH 12/28] =?UTF-8?q?feat:=20=EB=B8=94=EB=9E=99=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++ .../java/org/prgrms/kdt/KdtApplication.java | 2 +- src/main/java/org/prgrms/kdt/OrderTester.java | 47 ------------------- .../app/configuration/AppConfiguration.java | 17 ------- .../io/ConsoleOutputHandler.java | 29 +++++------- .../app/configuration/io/OutputHandler.java | 5 +- .../kdt/app/configuration/io/StartMenu.java | 38 +++++++++++++++ .../controller/CustomerController.java | 28 +++++++++++ .../prgrms/kdt/customer/domain/Customer.java | 31 ++++++++++++ .../repository/CustomerFileRepository.java | 44 +++++++++++++++++ .../repository/CustomerRepository.java | 10 ++++ .../kdt/customer/service/CustomerService.java | 23 +++++++++ .../kdt/user/controller/UserController.java | 8 ---- .../java/org/prgrms/kdt/user/domain/User.java | 5 -- .../kdt/user/repository/UserRepository.java | 5 -- .../prgrms/kdt/user/service/UserService.java | 5 -- .../voucher/controller/VoucherController.java | 15 ++++-- src/main/resources/customer_blacklist.csv | 4 ++ 18 files changed, 211 insertions(+), 109 deletions(-) delete mode 100644 src/main/java/org/prgrms/kdt/OrderTester.java delete mode 100644 src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java create mode 100644 src/main/java/org/prgrms/kdt/app/configuration/io/StartMenu.java create mode 100644 src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java create mode 100644 src/main/java/org/prgrms/kdt/customer/domain/Customer.java create mode 100644 src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java create mode 100644 src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java create mode 100644 src/main/java/org/prgrms/kdt/customer/service/CustomerService.java delete mode 100644 src/main/java/org/prgrms/kdt/user/controller/UserController.java delete mode 100644 src/main/java/org/prgrms/kdt/user/domain/User.java delete mode 100644 src/main/java/org/prgrms/kdt/user/repository/UserRepository.java delete mode 100644 src/main/java/org/prgrms/kdt/user/service/UserService.java create mode 100644 src/main/resources/customer_blacklist.csv diff --git a/pom.xml b/pom.xml index c4dee81cd2..702016ddae 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,10 @@ spring-boot-starter-test test + + org.projectlombok + lombok + diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index 5d11b9cecc..88670cc5e7 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -9,7 +9,7 @@ @SpringBootApplication @ComponentScan( - basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.user", "org.prgrms.kdt.voucher"} + basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.customer", "org.prgrms.kdt.voucher"} ) public class KdtApplication { diff --git a/src/main/java/org/prgrms/kdt/OrderTester.java b/src/main/java/org/prgrms/kdt/OrderTester.java deleted file mode 100644 index 1aace85b17..0000000000 --- a/src/main/java/org/prgrms/kdt/OrderTester.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.prgrms.kdt; - -import java.io.IOException; -import java.util.UUID; -import org.prgrms.kdt.app.configuration.AppConfiguration; -import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; -import org.prgrms.kdt.voucher.repository.VoucherRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils; -import org.springframework.boot.ansi.AnsiOutput; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; - -public class OrderTester { - - private static final Logger logger = LoggerFactory.getLogger(OrderTester.class); - - public static void main(String[] args) throws IOException { - AnsiOutput.setEnabled(AnsiOutput.Enabled.ALWAYS); - var applicationContext = new AnnotationConfigApplicationContext(AppConfiguration.class); - -// var environment = applicationContext.getEnvironment(); -// var version = environment.getProperty("kdt.version"); -// var minimumOrderAmount = environment.getProperty("kdt.minimum-order-amount", Integer.class); -// var supportVendors = environment.getProperty("kdt.support-vendors", List.class); -// var description = environment.getProperty("kdt.description", List.class); -// System.out.println(MessageFormat.format("version -> {0}", version)); -// System.out.println(MessageFormat.format("minimumOrderAmount -> {0}", minimumOrderAmount)); -// System.out.println(MessageFormat.format("supportVendors -> {0}", supportVendors)); -// System.out.println(MessageFormat.format("description -> {0}", description)); - -// var orderProperties = applicationContext.getBean(OrderProperties.class); -// logger.error("logger name => {}", logger.getName()); -// logger.warn("version -> {}", orderProperties.getVersion()); -// logger.warn("minimumOrderAmount -> {}", orderProperties.getMinimumOrderAmount()); -// logger.warn("supportVendors -> {}", orderProperties.getSupportVendors()); -// logger.warn("description -> {}", orderProperties.getDescription()); - - var customerId = UUID.randomUUID(); - var voucherRepository = BeanFactoryAnnotationUtils.qualifiedBeanOfType(applicationContext.getBeanFactory(), VoucherRepository.class, "memory"); - var voucher = voucherRepository.insert(new FixedAmountVoucher(UUID.randomUUID(), 10L)); - -// Assert.isTrue(order.totalAmount() == 90L, MessageFormat.format("totalAmount {0} is not 90L", order.totalAmount())); - - applicationContext.close(); - } -} diff --git a/src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java b/src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java deleted file mode 100644 index c24f0dd4e8..0000000000 --- a/src/main/java/org/prgrms/kdt/app/configuration/AppConfiguration.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.prgrms.kdt.app.configuration; - -import org.prgrms.kdt.app.configuration.YamlPropertiesFactory; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@ComponentScan( - basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.user", "org.prgrms.kdt.voucher"} -) -@PropertySource(value = "application.yaml", factory = YamlPropertiesFactory.class) -@EnableConfigurationProperties -public class AppConfiguration { -} - diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java index 2a2c0c3738..a0aad43e22 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java @@ -1,5 +1,6 @@ package org.prgrms.kdt.app.configuration.io; +import org.prgrms.kdt.customer.domain.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import org.springframework.stereotype.Component; @@ -10,22 +11,6 @@ public class ConsoleOutputHandler implements OutputHandler{ private static final String lineSeparator = System.lineSeparator(); - @Override - public void outputStartMessage() { - StringBuilder sb = new StringBuilder(); - sb.append("=== Voucher Program ==="); - sb.append(lineSeparator); - sb.append("Type exit to exit the program."); - sb.append(lineSeparator); - sb.append("Type create to create a new voucher."); - sb.append(lineSeparator); - sb.append("Type list to list all vouchers."); - sb.append(lineSeparator); - sb.append(lineSeparator); - - System.out.print(sb.toString()); - } - @Override public void outputSystemMessage(String message) { System.out.print(message + lineSeparator); @@ -42,4 +27,16 @@ public void outputVouchers(List voucherList) { System.out.println(sb.toString()); } + + @Override + public void outputBlackList(List customerList) { + StringBuilder sb = new StringBuilder(); + + customerList.forEach(customer -> { + sb.append(customer); + sb.append(lineSeparator); + }); + + System.out.println(sb.toString()); + } } diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java b/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java index e508c0de6d..fa9acb7090 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java @@ -1,14 +1,15 @@ package org.prgrms.kdt.app.configuration.io; +import org.prgrms.kdt.customer.domain.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import java.util.List; public interface OutputHandler { - void outputStartMessage(); - void outputSystemMessage(String message); void outputVouchers(List voucherList); + + void outputBlackList(List customerList); } diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/StartMenu.java b/src/main/java/org/prgrms/kdt/app/configuration/io/StartMenu.java new file mode 100644 index 0000000000..704848099a --- /dev/null +++ b/src/main/java/org/prgrms/kdt/app/configuration/io/StartMenu.java @@ -0,0 +1,38 @@ +package org.prgrms.kdt.app.configuration.io; + +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +public class StartMenu { + + private static final String lineSeparator = System.lineSeparator(); + private final InputHandler inputHandler; + private final OutputHandler outputHandler; + + public StartMenu(InputHandler inputHandler, OutputHandler outputHandler) { + this.inputHandler = inputHandler; + this.outputHandler = outputHandler; + } + + public String startMenu() throws IOException { + StringBuilder sb = new StringBuilder(); + sb.append("=== Voucher Program ==="); + sb.append(lineSeparator); + sb.append("Type 'exit' to exit the program."); + sb.append(lineSeparator); + sb.append("Type 'create' to create a new voucher."); + sb.append(lineSeparator); + sb.append("Type 'list' to list all vouchers."); + sb.append(lineSeparator); + sb.append("Type 'black' to list the blacklisted list."); + sb.append(lineSeparator); + + outputHandler.outputSystemMessage(sb.toString()); + + var menu = inputHandler.inputString(); + return menu; + } + +} diff --git a/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java b/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java new file mode 100644 index 0000000000..f2eb1aeda7 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java @@ -0,0 +1,28 @@ +package org.prgrms.kdt.customer.controller; + +import org.prgrms.kdt.app.configuration.io.InputHandler; +import org.prgrms.kdt.app.configuration.io.OutputHandler; +import org.prgrms.kdt.customer.domain.Customer; +import org.prgrms.kdt.customer.service.CustomerService; +import org.springframework.stereotype.Controller; + +import java.util.List; + +@Controller +public class CustomerController { + + private final CustomerService customerService; + private final OutputHandler outputHandler; + private final InputHandler inputHandler; + + public CustomerController(CustomerService customerService, OutputHandler outputHandler, InputHandler inputHandler) { + this.customerService = customerService; + this.outputHandler = outputHandler; + this.inputHandler = inputHandler; + } + + public void getBlackList() { + List blackList = customerService.getBlackList(); + outputHandler.outputBlackList(blackList); + } +} diff --git a/src/main/java/org/prgrms/kdt/customer/domain/Customer.java b/src/main/java/org/prgrms/kdt/customer/domain/Customer.java new file mode 100644 index 0000000000..03c7089fa9 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/domain/Customer.java @@ -0,0 +1,31 @@ +package org.prgrms.kdt.customer.domain; + +import java.time.LocalDateTime; +import java.util.UUID; + +public class Customer { + private UUID id; + private String name; + private String email; + private LocalDateTime joinedAt; + private boolean isBlacked; + + public Customer(UUID id, String name, String email, LocalDateTime joinedAt, boolean isBlacked) { + this.id = id; + this.name = name; + this.email = email; + this.joinedAt = joinedAt; + this.isBlacked = isBlacked; + } + + @Override + public String toString() { + return "Customer{" + + "id=" + id + + ", name='" + name + '\'' + + ", email='" + email + '\'' + + ", createdAt=" + joinedAt + + ", isBlacked=" + isBlacked + + '}'; + } +} diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java new file mode 100644 index 0000000000..e137384b2c --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java @@ -0,0 +1,44 @@ +package org.prgrms.kdt.customer.repository; + +import org.prgrms.kdt.customer.domain.Customer; +import org.springframework.stereotype.Repository; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +@Repository +public class CustomerFileRepository implements CustomerRepository { + + @Override + public List readFile(String filePath) { + List customers = new ArrayList<>(); + + try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) { + String line; + + while ((line = reader.readLine()) != null) { + String[] data = line.split(","); + + if (data.length == 5) { + UUID id = UUID.fromString(data[0]); + String name = data[1]; + String email = data[2]; + LocalDateTime joinedAt = LocalDateTime.parse(data[3]); + boolean isBlacked = Boolean.parseBoolean(data[4]); + + Customer customer = new Customer(id, name, email, joinedAt, isBlacked); + customers.add(customer); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + + return customers; + } +} diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java new file mode 100644 index 0000000000..87906d1b3f --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java @@ -0,0 +1,10 @@ +package org.prgrms.kdt.customer.repository; + +import org.prgrms.kdt.customer.domain.Customer; + +import java.util.List; + +public interface CustomerRepository { + + List readFile(String filePath); +} diff --git a/src/main/java/org/prgrms/kdt/customer/service/CustomerService.java b/src/main/java/org/prgrms/kdt/customer/service/CustomerService.java new file mode 100644 index 0000000000..72295abde7 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/service/CustomerService.java @@ -0,0 +1,23 @@ +package org.prgrms.kdt.customer.service; + + +import org.prgrms.kdt.customer.domain.Customer; +import org.prgrms.kdt.customer.repository.CustomerRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CustomerService { + + private final CustomerRepository customerRepository; + private final String FILE_PATH = "src/main/resources/customer_blacklist.csv"; + + public CustomerService(CustomerRepository customerRepository) { + this.customerRepository = customerRepository; + } + + public List getBlackList() { + return customerRepository.readFile(FILE_PATH); + } +} diff --git a/src/main/java/org/prgrms/kdt/user/controller/UserController.java b/src/main/java/org/prgrms/kdt/user/controller/UserController.java deleted file mode 100644 index d43d75e99c..0000000000 --- a/src/main/java/org/prgrms/kdt/user/controller/UserController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.prgrms.kdt.user.controller; - -import org.springframework.stereotype.Controller; - -@Controller -public class UserController { - -} diff --git a/src/main/java/org/prgrms/kdt/user/domain/User.java b/src/main/java/org/prgrms/kdt/user/domain/User.java deleted file mode 100644 index b8bb2d9063..0000000000 --- a/src/main/java/org/prgrms/kdt/user/domain/User.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.prgrms.kdt.user.domain; - -public class User { - -} diff --git a/src/main/java/org/prgrms/kdt/user/repository/UserRepository.java b/src/main/java/org/prgrms/kdt/user/repository/UserRepository.java deleted file mode 100644 index eca44f3f99..0000000000 --- a/src/main/java/org/prgrms/kdt/user/repository/UserRepository.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.prgrms.kdt.user.repository; - -public class UserRepository { - -} diff --git a/src/main/java/org/prgrms/kdt/user/service/UserService.java b/src/main/java/org/prgrms/kdt/user/service/UserService.java deleted file mode 100644 index 92c915cd1b..0000000000 --- a/src/main/java/org/prgrms/kdt/user/service/UserService.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.prgrms.kdt.user.service; - -public class UserService { - -} diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index fd5ef67d83..022a698796 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -2,6 +2,8 @@ import org.prgrms.kdt.app.configuration.io.InputHandler; import org.prgrms.kdt.app.configuration.io.OutputHandler; +import org.prgrms.kdt.app.configuration.io.StartMenu; +import org.prgrms.kdt.customer.controller.CustomerController; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.service.VoucherService; import org.slf4j.Logger; @@ -19,23 +21,27 @@ public class VoucherController { private final InputHandler inputHandler; private final OutputHandler outputHandler; + private final StartMenu startMenu; private final VoucherService voucherService; + private final CustomerController customerController; private final String EXIT = "exit"; private final String CREATE = "create"; private final String LIST = "list"; private final String FIXED = "fixed"; private final String PERCENT = "percent"; + private final String BLACK = "black"; private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); - public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { + public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, StartMenu startMenu, VoucherService voucherService, CustomerController customerController) { this.inputHandler = inputHandler; this.outputHandler = outputHandler; + this.startMenu = startMenu; this.voucherService = voucherService; + this.customerController = customerController; } public boolean startVoucherMenu() throws IOException { - outputHandler.outputStartMessage(); - var menu = inputHandler.inputString(); + var menu = startMenu.startMenu(); switch (menu) { case EXIT: @@ -48,6 +54,9 @@ public boolean startVoucherMenu() throws IOException { List voucherList = voucherService.getAllVouchers(); outputHandler.outputVouchers(voucherList); break; + case BLACK: + customerController.getBlackList(); + break; default: String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); logger.error(errorMessage); diff --git a/src/main/resources/customer_blacklist.csv b/src/main/resources/customer_blacklist.csv new file mode 100644 index 0000000000..91ba655393 --- /dev/null +++ b/src/main/resources/customer_blacklist.csv @@ -0,0 +1,4 @@ +f6a39a06-ec14-4d4b-8a71-6a0c97b83be6,John Doe,johndoe@example.com,2023-10-16T10:15:30,true +ac2e569d-b44f-4b0e-83b6-cbbd5d5c4d19,Jane Smith,janesmith@example.com,2023-10-16T14:45:00,false +97c312f8-620a-4e25-8d90-2f75336c05ec,Michael Johnson,michaeljohnson@example.com,2023-10-17T09:30:15,false +e816ff1c-d3eb-4f68-aa4b-0d27a2b14459,Emily Davis,emilydavis@example.com,2023-10-18T15:20:45,true From 5e218dc49c2f03e0ddd1a6c656e49ba25c99bfde Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 23 Oct 2023 23:58:49 +0900 Subject: [PATCH 13/28] =?UTF-8?q?fix:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/{configuration => }/YamlPropertiesFactory.java | 2 +- .../{configuration => }/io/ConsoleInputHandler.java | 2 +- .../{configuration => }/io/ConsoleOutputHandler.java | 2 +- .../kdt/app/{configuration => }/io/InputHandler.java | 2 +- .../kdt/app/{configuration => }/io/OutputHandler.java | 2 +- .../kdt/app/{configuration => }/io/StartMenu.java | 10 +++++----- .../kdt/app/{configuration => }/io/SystemMessage.java | 2 +- .../kdt/customer/controller/CustomerController.java | 4 ++-- .../kdt/voucher/controller/VoucherController.java | 8 ++++---- .../org/prgrms/kdt/voucher/service/VoucherService.java | 4 ++-- src/main/resources/application.properties | 7 ------- src/main/resources/version.properties | 1 - 12 files changed, 19 insertions(+), 27 deletions(-) rename src/main/java/org/prgrms/kdt/app/{configuration => }/YamlPropertiesFactory.java (95%) rename src/main/java/org/prgrms/kdt/app/{configuration => }/io/ConsoleInputHandler.java (91%) rename src/main/java/org/prgrms/kdt/app/{configuration => }/io/ConsoleOutputHandler.java (95%) rename src/main/java/org/prgrms/kdt/app/{configuration => }/io/InputHandler.java (76%) rename src/main/java/org/prgrms/kdt/app/{configuration => }/io/OutputHandler.java (87%) rename src/main/java/org/prgrms/kdt/app/{configuration => }/io/StartMenu.java (76%) rename src/main/java/org/prgrms/kdt/app/{configuration => }/io/SystemMessage.java (96%) delete mode 100644 src/main/resources/application.properties delete mode 100644 src/main/resources/version.properties diff --git a/src/main/java/org/prgrms/kdt/app/configuration/YamlPropertiesFactory.java b/src/main/java/org/prgrms/kdt/app/YamlPropertiesFactory.java similarity index 95% rename from src/main/java/org/prgrms/kdt/app/configuration/YamlPropertiesFactory.java rename to src/main/java/org/prgrms/kdt/app/YamlPropertiesFactory.java index 1ae2c469da..0fbd75b158 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/YamlPropertiesFactory.java +++ b/src/main/java/org/prgrms/kdt/app/YamlPropertiesFactory.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.configuration; +package org.prgrms.kdt.app; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.env.PropertiesPropertySource; diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java b/src/main/java/org/prgrms/kdt/app/io/ConsoleInputHandler.java similarity index 91% rename from src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java rename to src/main/java/org/prgrms/kdt/app/io/ConsoleInputHandler.java index a83f72c8a5..60789778a3 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleInputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/io/ConsoleInputHandler.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.configuration.io; +package org.prgrms.kdt.app.io; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/app/io/ConsoleOutputHandler.java similarity index 95% rename from src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java rename to src/main/java/org/prgrms/kdt/app/io/ConsoleOutputHandler.java index a0aad43e22..7cab391824 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/io/ConsoleOutputHandler.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.configuration.io; +package org.prgrms.kdt.app.io; import org.prgrms.kdt.customer.domain.Customer; import org.prgrms.kdt.voucher.domain.Voucher; diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java b/src/main/java/org/prgrms/kdt/app/io/InputHandler.java similarity index 76% rename from src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java rename to src/main/java/org/prgrms/kdt/app/io/InputHandler.java index 09abed6ce9..14138454ed 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/InputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/io/InputHandler.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.configuration.io; +package org.prgrms.kdt.app.io; import java.io.IOException; diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java b/src/main/java/org/prgrms/kdt/app/io/OutputHandler.java similarity index 87% rename from src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java rename to src/main/java/org/prgrms/kdt/app/io/OutputHandler.java index fa9acb7090..3acb6a9502 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/OutputHandler.java +++ b/src/main/java/org/prgrms/kdt/app/io/OutputHandler.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.configuration.io; +package org.prgrms.kdt.app.io; import org.prgrms.kdt.customer.domain.Customer; import org.prgrms.kdt.voucher.domain.Voucher; diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/StartMenu.java b/src/main/java/org/prgrms/kdt/app/io/StartMenu.java similarity index 76% rename from src/main/java/org/prgrms/kdt/app/configuration/io/StartMenu.java rename to src/main/java/org/prgrms/kdt/app/io/StartMenu.java index 704848099a..24e1a32050 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/StartMenu.java +++ b/src/main/java/org/prgrms/kdt/app/io/StartMenu.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.configuration.io; +package org.prgrms.kdt.app.io; import org.springframework.stereotype.Component; @@ -20,13 +20,13 @@ public String startMenu() throws IOException { StringBuilder sb = new StringBuilder(); sb.append("=== Voucher Program ==="); sb.append(lineSeparator); - sb.append("Type 'exit' to exit the program."); + sb.append("[1] Type 'exit' to exit the program."); sb.append(lineSeparator); - sb.append("Type 'create' to create a new voucher."); + sb.append("[2] Type 'create' to create a new voucher."); sb.append(lineSeparator); - sb.append("Type 'list' to list all vouchers."); + sb.append("[3] Type 'list' to list all vouchers."); sb.append(lineSeparator); - sb.append("Type 'black' to list the blacklisted list."); + sb.append("[4] Type 'black' to list the blacklisted list."); sb.append(lineSeparator); outputHandler.outputSystemMessage(sb.toString()); diff --git a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/app/io/SystemMessage.java similarity index 96% rename from src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java rename to src/main/java/org/prgrms/kdt/app/io/SystemMessage.java index e54f82bcf8..e5fa2e178e 100644 --- a/src/main/java/org/prgrms/kdt/app/configuration/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/app/io/SystemMessage.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.configuration.io; +package org.prgrms.kdt.app.io; public enum SystemMessage { EXIT_PROGRAM("프로그램을 종료합니다."), diff --git a/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java b/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java index f2eb1aeda7..e96af98dd7 100644 --- a/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java +++ b/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java @@ -1,7 +1,7 @@ package org.prgrms.kdt.customer.controller; -import org.prgrms.kdt.app.configuration.io.InputHandler; -import org.prgrms.kdt.app.configuration.io.OutputHandler; +import org.prgrms.kdt.app.io.InputHandler; +import org.prgrms.kdt.app.io.OutputHandler; import org.prgrms.kdt.customer.domain.Customer; import org.prgrms.kdt.customer.service.CustomerService; import org.springframework.stereotype.Controller; diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index 022a698796..2b680dcd6a 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -1,8 +1,8 @@ package org.prgrms.kdt.voucher.controller; -import org.prgrms.kdt.app.configuration.io.InputHandler; -import org.prgrms.kdt.app.configuration.io.OutputHandler; -import org.prgrms.kdt.app.configuration.io.StartMenu; +import org.prgrms.kdt.app.io.InputHandler; +import org.prgrms.kdt.app.io.OutputHandler; +import org.prgrms.kdt.app.io.StartMenu; import org.prgrms.kdt.customer.controller.CustomerController; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.service.VoucherService; @@ -14,7 +14,7 @@ import java.util.List; import java.util.UUID; -import static org.prgrms.kdt.app.configuration.io.SystemMessage.*; +import static org.prgrms.kdt.app.io.SystemMessage.*; @Controller public class VoucherController { diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index 6c7ef3714e..4d7790e370 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.UUID; -import static org.prgrms.kdt.app.configuration.io.SystemMessage.EXCEPTION_FIND_VOUCHER; -import static org.prgrms.kdt.app.configuration.io.SystemMessage.FOUND_VOUCHER_IS_EMPTY; +import static org.prgrms.kdt.app.io.SystemMessage.EXCEPTION_FIND_VOUCHER; +import static org.prgrms.kdt.app.io.SystemMessage.FOUND_VOUCHER_IS_EMPTY; @Service public class VoucherService { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index e6a71141de..0000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,7 +0,0 @@ -#version = v1.0.0 -# -#kdt.version = v1.0.0 -# -#kdt.support-vendors = a, b, c, d, e, f, g -# -#kdt.minimum-order-amount = 1 \ No newline at end of file diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties deleted file mode 100644 index 13f582fa9f..0000000000 --- a/src/main/resources/version.properties +++ /dev/null @@ -1 +0,0 @@ -version = v1.0.0-RELEASE \ No newline at end of file From 46142df4f1305cc64d347af269e8135187a94cbf Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Thu, 26 Oct 2023 23:26:07 +0900 Subject: [PATCH 14/28] =?UTF-8?q?feat:=20KdtApplication=20=EA=B3=A0?= =?UTF-8?q?=EB=AF=BC=EB=90=98=EB=8A=94=20=EC=A3=BC=EC=84=9D=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/prgrms/kdt/KdtApplication.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index 88670cc5e7..c559737617 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -3,14 +3,13 @@ import org.prgrms.kdt.voucher.controller.VoucherController; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; import java.io.IOException; @SpringBootApplication -@ComponentScan( - basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.customer", "org.prgrms.kdt.voucher"} -) +//@ComponentScan( +// basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.customer", "org.prgrms.kdt.voucher"} +//) public class KdtApplication { public static void main(String[] args) throws IOException { @@ -20,6 +19,7 @@ public static void main(String[] args) throws IOException { var isRepeat = true; while (isRepeat) { + // 여기서 메뉴 입력에 따른 VoucherController / CustomerController 로 분배 ?? isRepeat = voucherController.startVoucherMenu(); } } From ae19c45d04a2f8c0208a97055974cf846c0263a3 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Sun, 29 Oct 2023 22:49:28 +0900 Subject: [PATCH 15/28] =?UTF-8?q?feat:=20customer=20/=20=EB=A0=88=ED=8F=AC?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80=20+=20db=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 23 ++- .../java/org/prgrms/kdt/AppConfiguration.java | 33 ++++ .../java/org/prgrms/kdt/KdtApplication.java | 21 ++- .../org/prgrms/kdt/customer/Customer.java | 65 +++++++ .../{controller => }/CustomerController.java | 18 +- .../{service => }/CustomerService.java | 11 +- .../prgrms/kdt/customer/domain/Customer.java | 31 ---- .../repository/CustomerFileRepository.java | 44 ----- .../repository/CustomerJdbcRepository.java | 163 ++++++++++++++++++ .../repository/CustomerRepository.java | 27 ++- .../kdt/{app => }/io/ConsoleInputHandler.java | 2 +- .../{app => }/io/ConsoleOutputHandler.java | 4 +- .../prgrms/kdt/{app => }/io/InputHandler.java | 2 +- .../kdt/{app => }/io/OutputHandler.java | 4 +- .../prgrms/kdt/{app => }/io/StartMenu.java | 2 +- .../kdt/{app => }/io/SystemMessage.java | 2 +- .../kdt/order/MemoryOrderRepository.java | 18 ++ src/main/java/org/prgrms/kdt/order/Order.java | 61 +++++++ .../java/org/prgrms/kdt/order/OrderItem.java | 28 +++ .../org/prgrms/kdt/order/OrderProperties.java | 73 ++++++++ .../org/prgrms/kdt/order/OrderRepository.java | 5 + .../org/prgrms/kdt/order/OrderService.java | 32 ++++ .../org/prgrms/kdt/order/OrderStatus.java | 12 ++ .../{app => util}/YamlPropertiesFactory.java | 2 +- .../FixedAmountVoucherDto.java | 2 +- .../PercentDiscountVoucherDto.java | 2 +- .../{controller => }/VoucherController.java | 17 +- .../voucher/{service => }/VoucherService.java | 13 +- .../repository/JdbcVoucherRepository.java | 40 +++-- .../repository/MemoryVoucherRepository.java | 4 +- .../voucher/repository/VoucherRepository.java | 2 +- src/main/resources/application.yaml | 5 +- src/main/resources/logback.xml | 37 ++-- .../org/prgrms/kdt/KdtSpringContextTests.java | 78 +++++++++ .../customer/CustomerJdbcRepositoryTest.java | 159 +++++++++++++++++ .../prgrms/kdt/order/OrderServiceTest.java | 71 ++++++++ .../kdt/voucher/FixedAmountVoucherTest.java | 65 +++++++ .../kdt/voucher/HamcrestAssertionTests.java | 37 ++++ src/test/resources/logback-test.xml | 11 ++ 39 files changed, 1064 insertions(+), 162 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/AppConfiguration.java create mode 100644 src/main/java/org/prgrms/kdt/customer/Customer.java rename src/main/java/org/prgrms/kdt/customer/{controller => }/CustomerController.java (65%) rename src/main/java/org/prgrms/kdt/customer/{service => }/CustomerService.java (64%) delete mode 100644 src/main/java/org/prgrms/kdt/customer/domain/Customer.java delete mode 100644 src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java create mode 100644 src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java rename src/main/java/org/prgrms/kdt/{app => }/io/ConsoleInputHandler.java (94%) rename src/main/java/org/prgrms/kdt/{app => }/io/ConsoleOutputHandler.java (92%) rename src/main/java/org/prgrms/kdt/{app => }/io/InputHandler.java (82%) rename src/main/java/org/prgrms/kdt/{app => }/io/OutputHandler.java (76%) rename src/main/java/org/prgrms/kdt/{app => }/io/StartMenu.java (97%) rename src/main/java/org/prgrms/kdt/{app => }/io/SystemMessage.java (97%) create mode 100644 src/main/java/org/prgrms/kdt/order/MemoryOrderRepository.java create mode 100644 src/main/java/org/prgrms/kdt/order/Order.java create mode 100644 src/main/java/org/prgrms/kdt/order/OrderItem.java create mode 100644 src/main/java/org/prgrms/kdt/order/OrderProperties.java create mode 100644 src/main/java/org/prgrms/kdt/order/OrderRepository.java create mode 100644 src/main/java/org/prgrms/kdt/order/OrderService.java create mode 100644 src/main/java/org/prgrms/kdt/order/OrderStatus.java rename src/main/java/org/prgrms/kdt/{app => util}/YamlPropertiesFactory.java (96%) rename src/main/java/org/prgrms/kdt/voucher/{controller => Dto}/FixedAmountVoucherDto.java (90%) rename src/main/java/org/prgrms/kdt/voucher/{controller => Dto}/PercentDiscountVoucherDto.java (90%) rename src/main/java/org/prgrms/kdt/voucher/{controller => }/VoucherController.java (93%) rename src/main/java/org/prgrms/kdt/voucher/{service => }/VoucherService.java (80%) create mode 100644 src/test/java/org/prgrms/kdt/KdtSpringContextTests.java create mode 100644 src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java create mode 100644 src/test/java/org/prgrms/kdt/order/OrderServiceTest.java create mode 100644 src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java create mode 100644 src/test/java/org/prgrms/kdt/voucher/HamcrestAssertionTests.java create mode 100644 src/test/resources/logback-test.xml diff --git a/pom.xml b/pom.xml index 702016ddae..3d6cb23ff9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot @@ -24,13 +24,28 @@ org.springframework.boot - spring-boot-starter-test + spring-boot-starter-jdbc + + + + mysql + mysql-connector-java + runtime + + + + com.wix + wix-embedded-mysql + 4.6.1 test + - org.projectlombok - lombok + org.springframework.boot + spring-boot-starter-test + test + diff --git a/src/main/java/org/prgrms/kdt/AppConfiguration.java b/src/main/java/org/prgrms/kdt/AppConfiguration.java new file mode 100644 index 0000000000..8abb06ecf1 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/AppConfiguration.java @@ -0,0 +1,33 @@ +package org.prgrms.kdt; + + +import com.zaxxer.hikari.HikariDataSource; +import org.prgrms.kdt.util.YamlPropertiesFactory; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; + +import javax.sql.DataSource; + +@Configuration +@ComponentScan( + basePackages = {"org.prgrms.kdt.voucher", "org.prgrms.kdt.order", "org.prgrms.kdt.io"} +) +@PropertySource(value = "application.yaml", factory = YamlPropertiesFactory.class) +@EnableConfigurationProperties +public class AppConfiguration { + + @Bean + public DataSource dataSource() { + var dataSource = DataSourceBuilder.create() + .url("jdbc:mysql://localhost:3306/order_mgmt") + .username("root") + .password("110811") + .type(HikariDataSource.class) + .build(); + return dataSource; + } +} diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index c559737617..fafe42bb71 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -1,22 +1,29 @@ package org.prgrms.kdt; -import org.prgrms.kdt.voucher.controller.VoucherController; +import org.prgrms.kdt.voucher.VoucherController; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; import java.io.IOException; @SpringBootApplication -//@ComponentScan( -// basePackages = {"org.prgrms.kdt.app", "org.prgrms.kdt.customer", "org.prgrms.kdt.voucher"} -//) public class KdtApplication { public static void main(String[] args) throws IOException { - var applicationContext = SpringApplication.run(KdtApplication.class, args); - var voucherController = applicationContext.getBean(VoucherController.class); + ConfigurableApplicationContext applicationContext = SpringApplication.run(KdtApplication.class, args); + VoucherController voucherController = applicationContext.getBean(VoucherController.class); - var isRepeat = true; + // 등록된 bean의 이름을 get + String[] beanNames = applicationContext.getBeanDefinitionNames(); + + // bean 이름을 출력 + for(String beanName : beanNames) { + System.out.println(beanName); + } + System.out.println(); + + boolean isRepeat = true; while (isRepeat) { // 여기서 메뉴 입력에 따른 VoucherController / CustomerController 로 분배 ?? diff --git a/src/main/java/org/prgrms/kdt/customer/Customer.java b/src/main/java/org/prgrms/kdt/customer/Customer.java new file mode 100644 index 0000000000..32c7063d13 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/Customer.java @@ -0,0 +1,65 @@ +package org.prgrms.kdt.customer; + +import java.time.LocalDateTime; +import java.util.UUID; + +public class Customer { + + private final UUID customerId; + private String name; + private final String email; + private LocalDateTime lastLoginAt; + private final LocalDateTime createdAt; + + public Customer(UUID customerId, String name, String email, LocalDateTime createdAt) { + validateName(name); + this.name = name; + this.customerId = customerId; + this.email = email; + this.createdAt = createdAt; + } + + private void validateName(String name) { + if (name.isBlank()) { + throw new RuntimeException("Name should not be blank"); + } + } + + public Customer(UUID customerId, String name, String email, LocalDateTime lastLoginAt, LocalDateTime createdAt) { + validateName(name); + this.customerId = customerId; + this.name = name; + this.email = email; + this.lastLoginAt = lastLoginAt; + this.createdAt = createdAt; + } + + public void changeName(String name) { + validateName(name); + this.name = name; + } + + public void login() { + this.lastLoginAt = LocalDateTime.now(); + } + + public UUID getCustomerId() { + return customerId; + } + + public String getName() { + return name; + } + + public String getEmail() { + return email; + } + + public LocalDateTime getLastLoginAt() { + return lastLoginAt; + } + + public LocalDateTime getCreatedAt() { + return createdAt; + } +} diff --git a/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java b/src/main/java/org/prgrms/kdt/customer/CustomerController.java similarity index 65% rename from src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java rename to src/main/java/org/prgrms/kdt/customer/CustomerController.java index e96af98dd7..af32be830a 100644 --- a/src/main/java/org/prgrms/kdt/customer/controller/CustomerController.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerController.java @@ -1,9 +1,8 @@ -package org.prgrms.kdt.customer.controller; +package org.prgrms.kdt.customer; -import org.prgrms.kdt.app.io.InputHandler; -import org.prgrms.kdt.app.io.OutputHandler; -import org.prgrms.kdt.customer.domain.Customer; -import org.prgrms.kdt.customer.service.CustomerService; +import org.prgrms.kdt.io.InputHandler; +import org.prgrms.kdt.io.OutputHandler; +import org.prgrms.kdt.voucher.domain.Voucher; import org.springframework.stereotype.Controller; import java.util.List; @@ -25,4 +24,13 @@ public void getBlackList() { List blackList = customerService.getBlackList(); outputHandler.outputBlackList(blackList); } + + public void getAllVoucher() { + List voucherList = customerService.getAllVoucher(); + outputHandler.outputVouchers(voucherList); + } + + public void removeVoucher() { + + } } diff --git a/src/main/java/org/prgrms/kdt/customer/service/CustomerService.java b/src/main/java/org/prgrms/kdt/customer/CustomerService.java similarity index 64% rename from src/main/java/org/prgrms/kdt/customer/service/CustomerService.java rename to src/main/java/org/prgrms/kdt/customer/CustomerService.java index 72295abde7..7973870d4e 100644 --- a/src/main/java/org/prgrms/kdt/customer/service/CustomerService.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerService.java @@ -1,8 +1,8 @@ -package org.prgrms.kdt.customer.service; +package org.prgrms.kdt.customer; -import org.prgrms.kdt.customer.domain.Customer; import org.prgrms.kdt.customer.repository.CustomerRepository; +import org.prgrms.kdt.voucher.domain.Voucher; import org.springframework.stereotype.Service; import java.util.List; @@ -11,13 +11,16 @@ public class CustomerService { private final CustomerRepository customerRepository; - private final String FILE_PATH = "src/main/resources/customer_blacklist.csv"; public CustomerService(CustomerRepository customerRepository) { this.customerRepository = customerRepository; } public List getBlackList() { - return customerRepository.readFile(FILE_PATH); + return customerRepository.findBlackList(); + } + + public List getAllVoucher() { + return customerRepository.findAllVoucher(); } } diff --git a/src/main/java/org/prgrms/kdt/customer/domain/Customer.java b/src/main/java/org/prgrms/kdt/customer/domain/Customer.java deleted file mode 100644 index 03c7089fa9..0000000000 --- a/src/main/java/org/prgrms/kdt/customer/domain/Customer.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.prgrms.kdt.customer.domain; - -import java.time.LocalDateTime; -import java.util.UUID; - -public class Customer { - private UUID id; - private String name; - private String email; - private LocalDateTime joinedAt; - private boolean isBlacked; - - public Customer(UUID id, String name, String email, LocalDateTime joinedAt, boolean isBlacked) { - this.id = id; - this.name = name; - this.email = email; - this.joinedAt = joinedAt; - this.isBlacked = isBlacked; - } - - @Override - public String toString() { - return "Customer{" + - "id=" + id + - ", name='" + name + '\'' + - ", email='" + email + '\'' + - ", createdAt=" + joinedAt + - ", isBlacked=" + isBlacked + - '}'; - } -} diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java deleted file mode 100644 index e137384b2c..0000000000 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerFileRepository.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.prgrms.kdt.customer.repository; - -import org.prgrms.kdt.customer.domain.Customer; -import org.springframework.stereotype.Repository; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -@Repository -public class CustomerFileRepository implements CustomerRepository { - - @Override - public List readFile(String filePath) { - List customers = new ArrayList<>(); - - try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) { - String line; - - while ((line = reader.readLine()) != null) { - String[] data = line.split(","); - - if (data.length == 5) { - UUID id = UUID.fromString(data[0]); - String name = data[1]; - String email = data[2]; - LocalDateTime joinedAt = LocalDateTime.parse(data[3]); - boolean isBlacked = Boolean.parseBoolean(data[4]); - - Customer customer = new Customer(id, name, email, joinedAt, isBlacked); - customers.add(customer); - } - } - } catch (IOException e) { - e.printStackTrace(); - } - - return customers; - } -} diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java new file mode 100644 index 0000000000..ea60259d44 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java @@ -0,0 +1,163 @@ +package org.prgrms.kdt.customer.repository; + +import org.prgrms.kdt.customer.Customer; +import org.prgrms.kdt.voucher.domain.Voucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.stereotype.Repository; + +import javax.sql.DataSource; +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +@Repository +@Profile("dev") +public class CustomerJdbcRepository implements CustomerRepository { + + private static final Logger logger = LoggerFactory.getLogger(CustomerJdbcRepository.class); + private final DataSource dataSource; + private final JdbcTemplate jdbcTemplate; + private final String FILE_PATH = "src/main/resources/customer_blacklist.csv"; + + private static final RowMapper customerRowMapper = (resultSet, i) -> { + var customerName = resultSet.getString("name"); + var email = resultSet.getString("email"); + var customerId = toUUID(resultSet.getBytes("customer_id")); + var lastLoginAt = resultSet.getTimestamp("last_login_at") != null ? + resultSet.getTimestamp("last_login_at").toLocalDateTime() : null; + var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); + return new Customer(customerId, customerName, email, lastLoginAt, createdAt); + }; + + public CustomerJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { + this.dataSource = dataSource; + this.jdbcTemplate = jdbcTemplate; + } + + @Override + public Customer insert(Customer customer) { + var update = jdbcTemplate.update("INSERT INTO customers(customer_id, name, email, created_at) VALUES (UUID_TO_BIN(?), ?, ?, ?)", + customer.getCustomerId().toString().getBytes(), + customer.getName(), + customer.getEmail(), + Timestamp.valueOf(customer.getCreatedAt())); + if (update != 1) { + throw new RuntimeException("Noting was inserted"); + } + return customer; + } + + @Override + public Customer update(Customer customer) { + var update = jdbcTemplate.update("UPDATE customers SET name = ?, email = ?, last_login_at = ? WHERE customer_id = UUID_TO_BIN(?)", + customer.getName(), + customer.getEmail(), + customer.getLastLoginAt() != null ? Timestamp.valueOf(customer.getLastLoginAt()) : null, + customer.getCustomerId().toString().getBytes() + ); + if (update != 1) { + throw new RuntimeException("Noting was updated"); + } + return customer; + } + + @Override + public int count() { + return jdbcTemplate.queryForObject("select count(*) from customers", Integer.class); + } + + @Override + public List findAll() { + return jdbcTemplate.query("select * from customers", customerRowMapper); + } + + @Override + public Optional findById(UUID customerId) { + try { + return Optional.ofNullable(jdbcTemplate.queryForObject("select * from customers WHERE customer_id = UUID_TO_BIN(?)", + customerRowMapper, + customerId.toString().getBytes())); + } catch (EmptyResultDataAccessException e) { + logger.error("Got empty result", e); + return Optional.empty(); + } + } + + @Override + public Optional findByName(String name) { + try { + return Optional.ofNullable(jdbcTemplate.queryForObject("select * from customers WHERE name = ?", + customerRowMapper, + name)); + } catch (EmptyResultDataAccessException e) { + logger.error("Got empty result", e); + return Optional.empty(); + } + } + + @Override + public Optional findByEmail(String email) { + try { + return Optional.ofNullable(jdbcTemplate.queryForObject("select * from customers WHERE email = ?", + customerRowMapper, + email)); + } catch (EmptyResultDataAccessException e) { + logger.error("Got empty result", e); + return Optional.empty(); + } + } + + @Override + public void deleteAll() { + jdbcTemplate.update("DELETE FROM customers"); + } + + @Override + public List findAllVoucher() { + return null; + } + + @Override + public List findBlackList() { + List customers = new ArrayList<>(); + + try (BufferedReader reader = new BufferedReader(new FileReader(FILE_PATH))) { + String line; + + while ((line = reader.readLine()) != null) { + String[] data = line.split(","); + + if (data.length == 5) { + UUID id = UUID.fromString(data[0]); + String name = data[1]; + String email = data[2]; + LocalDateTime joinedAt = LocalDateTime.parse(data[3]); + + Customer customer = new Customer(id, name, email, joinedAt); + customers.add(customer); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + + return customers; + } + + static UUID toUUID(byte[] bytes) { + var byteBuffer = ByteBuffer.wrap(bytes); + return new UUID(byteBuffer.getLong(), byteBuffer.getLong()); + } +} diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java index 87906d1b3f..a629ce5325 100644 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java @@ -1,10 +1,33 @@ package org.prgrms.kdt.customer.repository; -import org.prgrms.kdt.customer.domain.Customer; +import org.prgrms.kdt.customer.Customer; +import org.prgrms.kdt.voucher.domain.Voucher; import java.util.List; +import java.util.Optional; +import java.util.UUID; public interface CustomerRepository { - List readFile(String filePath); + List findBlackList(); + + Customer insert(Customer customer); + + Customer update(Customer customer); + + // Customer save(Customer customer); + + int count(); + + List findAll(); + + Optional findById(UUID customerId); + + Optional findByName(String name); + + Optional findByEmail(String email); + + void deleteAll(); + + List findAllVoucher(); } diff --git a/src/main/java/org/prgrms/kdt/app/io/ConsoleInputHandler.java b/src/main/java/org/prgrms/kdt/io/ConsoleInputHandler.java similarity index 94% rename from src/main/java/org/prgrms/kdt/app/io/ConsoleInputHandler.java rename to src/main/java/org/prgrms/kdt/io/ConsoleInputHandler.java index 60789778a3..24ac382bfe 100644 --- a/src/main/java/org/prgrms/kdt/app/io/ConsoleInputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/ConsoleInputHandler.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.io; +package org.prgrms.kdt.io; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/prgrms/kdt/app/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java similarity index 92% rename from src/main/java/org/prgrms/kdt/app/io/ConsoleOutputHandler.java rename to src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java index 7cab391824..844e46fa1b 100644 --- a/src/main/java/org/prgrms/kdt/app/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java @@ -1,6 +1,6 @@ -package org.prgrms.kdt.app.io; +package org.prgrms.kdt.io; -import org.prgrms.kdt.customer.domain.Customer; +import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/prgrms/kdt/app/io/InputHandler.java b/src/main/java/org/prgrms/kdt/io/InputHandler.java similarity index 82% rename from src/main/java/org/prgrms/kdt/app/io/InputHandler.java rename to src/main/java/org/prgrms/kdt/io/InputHandler.java index 14138454ed..47cc479ba3 100644 --- a/src/main/java/org/prgrms/kdt/app/io/InputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/InputHandler.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.io; +package org.prgrms.kdt.io; import java.io.IOException; diff --git a/src/main/java/org/prgrms/kdt/app/io/OutputHandler.java b/src/main/java/org/prgrms/kdt/io/OutputHandler.java similarity index 76% rename from src/main/java/org/prgrms/kdt/app/io/OutputHandler.java rename to src/main/java/org/prgrms/kdt/io/OutputHandler.java index 3acb6a9502..508db35f74 100644 --- a/src/main/java/org/prgrms/kdt/app/io/OutputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/OutputHandler.java @@ -1,6 +1,6 @@ -package org.prgrms.kdt.app.io; +package org.prgrms.kdt.io; -import org.prgrms.kdt.customer.domain.Customer; +import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import java.util.List; diff --git a/src/main/java/org/prgrms/kdt/app/io/StartMenu.java b/src/main/java/org/prgrms/kdt/io/StartMenu.java similarity index 97% rename from src/main/java/org/prgrms/kdt/app/io/StartMenu.java rename to src/main/java/org/prgrms/kdt/io/StartMenu.java index 24e1a32050..241f91a6d1 100644 --- a/src/main/java/org/prgrms/kdt/app/io/StartMenu.java +++ b/src/main/java/org/prgrms/kdt/io/StartMenu.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.io; +package org.prgrms.kdt.io; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/prgrms/kdt/app/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/io/SystemMessage.java similarity index 97% rename from src/main/java/org/prgrms/kdt/app/io/SystemMessage.java rename to src/main/java/org/prgrms/kdt/io/SystemMessage.java index e5fa2e178e..5da1eee741 100644 --- a/src/main/java/org/prgrms/kdt/app/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/io/SystemMessage.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app.io; +package org.prgrms.kdt.io; public enum SystemMessage { EXIT_PROGRAM("프로그램을 종료합니다."), diff --git a/src/main/java/org/prgrms/kdt/order/MemoryOrderRepository.java b/src/main/java/org/prgrms/kdt/order/MemoryOrderRepository.java new file mode 100644 index 0000000000..fd60561740 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/order/MemoryOrderRepository.java @@ -0,0 +1,18 @@ +package org.prgrms.kdt.order; + +import org.springframework.stereotype.Repository; + +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +@Repository +public class MemoryOrderRepository implements OrderRepository { + private final Map storage = new ConcurrentHashMap<>(); + + @Override + public Order insert(Order order) { + storage.put(order.getOrderId(), order); + return order; + } +} diff --git a/src/main/java/org/prgrms/kdt/order/Order.java b/src/main/java/org/prgrms/kdt/order/Order.java new file mode 100644 index 0000000000..3563f7ae43 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/order/Order.java @@ -0,0 +1,61 @@ +package org.prgrms.kdt.order; + + +import org.prgrms.kdt.voucher.domain.Voucher; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public class Order { + private final UUID orderId; + private final UUID customerId; + private final List orderItems; + private Optional voucher; + private OrderStatus orderStatus = OrderStatus.ACCEPTED; + + public Order(UUID orderid, UUID customerId, List orderItems) { + this.orderId = orderid; + this.customerId = customerId; + this.orderItems = orderItems; + this.voucher = Optional.empty(); + } + + public Order(UUID orderid, UUID customerId, List orderItems, Voucher voucher) { + this.orderId = orderid; + this.customerId = customerId; + this.orderItems = orderItems; + this.voucher = Optional.of(voucher); + } + + public long totalAmount() { + var beforeDiscount = orderItems.stream() + .map(v -> v.getProductPrice() * v.getQuantity()) + .reduce(0L, Long::sum); + return voucher.map(value -> value.discount(beforeDiscount)).orElse(beforeDiscount); + } + + public void setOrderStatus(OrderStatus orderStatus) { + this.orderStatus = orderStatus; + } + + public UUID getOrderId() { + return orderId; + } + + public Optional getVoucher() { + return voucher; + } + + public OrderStatus getOrderStatus() { + return orderStatus; + } + + public List getOrderItems() { + return orderItems; + } + + public UUID getCustomerId() { + return customerId; + } +} diff --git a/src/main/java/org/prgrms/kdt/order/OrderItem.java b/src/main/java/org/prgrms/kdt/order/OrderItem.java new file mode 100644 index 0000000000..0c8caf4cfe --- /dev/null +++ b/src/main/java/org/prgrms/kdt/order/OrderItem.java @@ -0,0 +1,28 @@ +package org.prgrms.kdt.order; + +import java.util.UUID; + +public class OrderItem { + public final UUID productId; + public final long productPrice; + public final long quantity; + + public OrderItem(UUID productId, long productPrice, int quantity) { + this.productId = productId; + this.productPrice = productPrice; + this.quantity = quantity; + } + + public UUID getProductId() { + return productId; + } + + public long getProductPrice() { + return productPrice; + } + + public long getQuantity() { + return quantity; + } +} + diff --git a/src/main/java/org/prgrms/kdt/order/OrderProperties.java b/src/main/java/org/prgrms/kdt/order/OrderProperties.java new file mode 100644 index 0000000000..6bf9aa5cca --- /dev/null +++ b/src/main/java/org/prgrms/kdt/order/OrderProperties.java @@ -0,0 +1,73 @@ +package org.prgrms.kdt.order; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +@ConfigurationProperties(prefix = "kdt") +public class OrderProperties implements InitializingBean { + + private final static Logger logger = LoggerFactory.getLogger(OrderProperties.class); + + private String version; + + private int minimumOrderAmount; + + private List supportVendors; + + private String description; + + @Value("${JAVA_HOME}") + private String javaHome; + + @Override + public void afterPropertiesSet() throws Exception { + logger.debug("[OrderProperties] version -> {}", version); + logger.debug("[OrderProperties] minimumOrderAmount -> {}", minimumOrderAmount); + logger.debug("[OrderProperties] supportVendors -> {}", supportVendors); + logger.debug("[OrderProperties] javaHome -> {}", javaHome); + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public int getMinimumOrderAmount() { + return minimumOrderAmount; + } + + public void setMinimumOrderAmount(int minimumOrderAmount) { + this.minimumOrderAmount = minimumOrderAmount; + } + + public List getSupportVendors() { + return supportVendors; + } + + public void setSupportVendors(List supportVendors) { + this.supportVendors = supportVendors; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getJavaHome() { + return javaHome; + } + +} diff --git a/src/main/java/org/prgrms/kdt/order/OrderRepository.java b/src/main/java/org/prgrms/kdt/order/OrderRepository.java new file mode 100644 index 0000000000..9f7cf37028 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/order/OrderRepository.java @@ -0,0 +1,5 @@ +package org.prgrms.kdt.order; + +public interface OrderRepository { + Order insert(Order order); +} diff --git a/src/main/java/org/prgrms/kdt/order/OrderService.java b/src/main/java/org/prgrms/kdt/order/OrderService.java new file mode 100644 index 0000000000..54f872bf13 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/order/OrderService.java @@ -0,0 +1,32 @@ +package org.prgrms.kdt.order; + +import org.prgrms.kdt.voucher.VoucherService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.UUID; + +@Service +public class OrderService { + private final VoucherService voucherService; + private final OrderRepository orderRepository; + + public OrderService(VoucherService voucherService, OrderRepository orderRepository) { + this.voucherService = voucherService; + this.orderRepository = orderRepository; + } + + public Order createOrder(UUID customerId, List orderItems) { + var order = new Order(UUID.randomUUID(), customerId, orderItems); + return orderRepository.insert(order); + } + + public Order createOrder(UUID customerId, List orderItems, UUID voucherId) { + var voucher = voucherService.getVoucher(voucherId); + var order = new Order(UUID.randomUUID(), customerId, orderItems, voucher); + orderRepository.insert(order); + voucherService.useVoucher(voucher); + return order; + } + +} diff --git a/src/main/java/org/prgrms/kdt/order/OrderStatus.java b/src/main/java/org/prgrms/kdt/order/OrderStatus.java new file mode 100644 index 0000000000..85b984578a --- /dev/null +++ b/src/main/java/org/prgrms/kdt/order/OrderStatus.java @@ -0,0 +1,12 @@ +package org.prgrms.kdt.order; + +public enum OrderStatus { + ACCEPTED, + PAYMENT_REQUIRED, + PAYMENT_CONFIRMED, + PAYMENT_REJECTED, + READY_FOR_DELIVERY, + SHIPPED, + SETTLED, + CANCELLED +} diff --git a/src/main/java/org/prgrms/kdt/app/YamlPropertiesFactory.java b/src/main/java/org/prgrms/kdt/util/YamlPropertiesFactory.java similarity index 96% rename from src/main/java/org/prgrms/kdt/app/YamlPropertiesFactory.java rename to src/main/java/org/prgrms/kdt/util/YamlPropertiesFactory.java index 0fbd75b158..73825e06b2 100644 --- a/src/main/java/org/prgrms/kdt/app/YamlPropertiesFactory.java +++ b/src/main/java/org/prgrms/kdt/util/YamlPropertiesFactory.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.app; +package org.prgrms.kdt.util; import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; import org.springframework.core.env.PropertiesPropertySource; diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/FixedAmountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java similarity index 90% rename from src/main/java/org/prgrms/kdt/voucher/controller/FixedAmountVoucherDto.java rename to src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java index 0a8b5177c2..b6132e5461 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/FixedAmountVoucherDto.java +++ b/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.voucher.controller; +package org.prgrms.kdt.voucher.Dto; import java.util.UUID; diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/PercentDiscountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java similarity index 90% rename from src/main/java/org/prgrms/kdt/voucher/controller/PercentDiscountVoucherDto.java rename to src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java index 1c8827ca61..d0b7f0e91d 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/PercentDiscountVoucherDto.java +++ b/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.voucher.controller; +package org.prgrms.kdt.voucher.Dto; import java.util.UUID; diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java similarity index 93% rename from src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java rename to src/main/java/org/prgrms/kdt/voucher/VoucherController.java index 2b680dcd6a..fd5ecfc85d 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -1,11 +1,12 @@ -package org.prgrms.kdt.voucher.controller; - -import org.prgrms.kdt.app.io.InputHandler; -import org.prgrms.kdt.app.io.OutputHandler; -import org.prgrms.kdt.app.io.StartMenu; -import org.prgrms.kdt.customer.controller.CustomerController; +package org.prgrms.kdt.voucher; + +import org.prgrms.kdt.io.InputHandler; +import org.prgrms.kdt.io.OutputHandler; +import org.prgrms.kdt.io.StartMenu; +import org.prgrms.kdt.customer.CustomerController; +import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; +import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; import org.prgrms.kdt.voucher.domain.Voucher; -import org.prgrms.kdt.voucher.service.VoucherService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -14,7 +15,7 @@ import java.util.List; import java.util.UUID; -import static org.prgrms.kdt.app.io.SystemMessage.*; +import static org.prgrms.kdt.io.SystemMessage.*; @Controller public class VoucherController { diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java similarity index 80% rename from src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java rename to src/main/java/org/prgrms/kdt/voucher/VoucherService.java index 4d7790e370..3a462b397d 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java @@ -1,14 +1,13 @@ -package org.prgrms.kdt.voucher.service; +package org.prgrms.kdt.voucher; -import org.prgrms.kdt.voucher.controller.FixedAmountVoucherDto; -import org.prgrms.kdt.voucher.controller.PercentDiscountVoucherDto; +import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; +import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import java.text.MessageFormat; @@ -16,8 +15,8 @@ import java.util.List; import java.util.UUID; -import static org.prgrms.kdt.app.io.SystemMessage.EXCEPTION_FIND_VOUCHER; -import static org.prgrms.kdt.app.io.SystemMessage.FOUND_VOUCHER_IS_EMPTY; +import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_FIND_VOUCHER; +import static org.prgrms.kdt.io.SystemMessage.FOUND_VOUCHER_IS_EMPTY; @Service public class VoucherService { @@ -26,7 +25,7 @@ public class VoucherService { private List voucherList = new ArrayList<>(); private static final Logger logger = LoggerFactory.getLogger(VoucherService.class); - public VoucherService(@Qualifier("memory") VoucherRepository voucherRepository) { + public VoucherService(VoucherRepository voucherRepository) { this.voucherRepository = voucherRepository; } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java index 28cf88cd4f..81ae8fedd3 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java @@ -1,31 +1,37 @@ -package org.prgrms.kdt.voucher.repository; +package org.prgrms.kdt.voucher; import org.prgrms.kdt.voucher.domain.Voucher; -import org.springframework.beans.factory.annotation.Qualifier; +import org.prgrms.kdt.voucher.repository.MemoryVoucherRepository; +import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @Repository -@Qualifier("jdbc") +@Profile({"dev", "staging", "production"}) public class JdbcVoucherRepository implements VoucherRepository { - private final Map storage = new ConcurrentHashMap<>(); + private final Map storage = new ConcurrentHashMap<>(); + private static final Logger logger = LoggerFactory.getLogger(MemoryVoucherRepository.class); - @Override - public Optional findById(UUID voucherId) { - return Optional.ofNullable(storage.get(voucherId)); - } + @Override + public Optional findById(UUID voucherId) { + return Optional.ofNullable(storage.get(voucherId)); + } - @Override - public Voucher insert(Voucher voucher) { - storage.put(voucher.getVoucherId(), voucher); - return voucher; - } + @Override + public Voucher insert(Voucher voucher) { + storage.put(voucher.getVoucherId(), voucher); + return voucher; + } - @Override - public List findAll() { - return null; - } + @Override + public List findAll() { + logger.debug("모든 바우처의 갯수 : " + storage.size()); + return new ArrayList<>(storage.values()); + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java index 538738ea6f..5482306b80 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java @@ -3,14 +3,14 @@ import org.prgrms.kdt.voucher.domain.Voucher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @Repository -@Qualifier("memory") +@Profile({"local", "test"}) public class MemoryVoucherRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index 95c9bb13f8..e91e3ecb23 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -12,5 +12,5 @@ public interface VoucherRepository { Voucher insert(Voucher voucher); - List findAll(); + List findAll(); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 39fa3a5c92..d021fd2fe5 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -9,4 +9,7 @@ kdt: description: |- line 1 hello world line 2 xxxx - line 3 \ No newline at end of file + line 3 +spring: + profiles: + active: dev diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 1be82ff8ed..5127e4b4b0 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,26 +1,27 @@ - - + + - - logs/access.log - - logs/access-%d{yyyy-MM-dd}.log - + + logs/access.log + + logs/access-%d{yyyy-MM-dd}.log + - - ${FILE_LOG_PATTERN} - - + + UTF-8 + ${FILE_LOG_PATTERN} + + - - - + + + - + - - - + + + diff --git a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java new file mode 100644 index 0000000000..34d764b88a --- /dev/null +++ b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java @@ -0,0 +1,78 @@ +package org.prgrms.kdt; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.prgrms.kdt.order.OrderItem; +import org.prgrms.kdt.order.OrderService; +import org.prgrms.kdt.order.OrderStatus; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import java.util.List; +import java.util.UUID; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + +@SpringJUnitConfig +@ActiveProfiles("test") +public class KdtSpringContextTests { + + @Configuration + @ComponentScan( + basePackages = {"org.prgrms.kdt"} + ) + static class Config { + } + + @Autowired + ApplicationContext context; + + @Autowired + OrderService orderService; + + @Autowired + VoucherRepository voucherRepository; + + @Test + @DisplayName("applicationContext가 생성 되야한다.") + public void testApplicationContext() { + assertThat(context, notNullValue()); + } + + @Test + @DisplayName("VoucherRepository가 빈으로 등록되어 있어야 한다.") + public void testVoucherRepositoryCreation() { + var bean = context.getBean(VoucherRepository.class); + assertThat(bean, notNullValue()); + } + + @Test + @DisplayName("orderService를 사용해서 주문을 생성할 수 있다.") + public void testOrderService() { + // Given + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); + voucherRepository.insert(fixedAmountVoucher); + + // When + var order = orderService.createOrder( + UUID.randomUUID(), + List.of(new OrderItem(UUID.randomUUID(), 200, 1)), + fixedAmountVoucher.getVoucherId()); + + // Then + assertThat(order.totalAmount(), is(100L)); + assertThat(order.getVoucher().isEmpty(), is(false)); + assertThat(order.getVoucher().get().getVoucherId(), is(fixedAmountVoucher.getVoucherId())); + assertThat(order.getOrderStatus(), is(OrderStatus.ACCEPTED)); + } + + +} diff --git a/src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java b/src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java new file mode 100644 index 0000000000..4ac063916b --- /dev/null +++ b/src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java @@ -0,0 +1,159 @@ +package org.prgrms.kdt.customer; + +import com.wix.mysql.EmbeddedMysql; +import com.zaxxer.hikari.HikariDataSource; +import org.junit.jupiter.api.*; +import org.prgrms.kdt.customer.repository.CustomerJdbcRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.BadSqlGrammarException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import javax.sql.DataSource; +import java.time.LocalDateTime; +import java.util.UUID; + +import static com.wix.mysql.EmbeddedMysql.anEmbeddedMysql; +import static com.wix.mysql.ScriptResolver.classPathScript; +import static com.wix.mysql.config.Charset.UTF8; +import static com.wix.mysql.config.MysqldConfig.aMysqldConfig; +import static com.wix.mysql.distribution.Version.v8_0_11; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; + +@SpringJUnitConfig +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +class CustomerJdbcRepositoryTest { + + @Configuration + @ComponentScan( + basePackages = {"org.prgrms.kdt.customer"} + ) + static class Config { + + @Bean + public DataSource dataSource() { + var dataSource = DataSourceBuilder.create() + .url("jdbc:mysql://localhost:2215/test-order_mgmt") + .username("test") + .password("test1234!") + .type(HikariDataSource.class) + .build(); + dataSource.setMaximumPoolSize(1000); + dataSource.setMinimumIdle(100); + return dataSource; + } + + @Bean + public JdbcTemplate jdbcTemplate(DataSource dataSource) { + return new JdbcTemplate(dataSource); + } + + } + + @Autowired + CustomerJdbcRepository customerJdbcRepository; + + @Autowired + DataSource dataSource; + + Customer newCustomer; + + EmbeddedMysql embeddedMysql; + + @BeforeAll + void setup() { + newCustomer = new Customer(UUID.randomUUID(), "test-user", "test-user@gmail.com", LocalDateTime.now()); + var mysqlConfig = aMysqldConfig(v8_0_11) + .withCharset(UTF8) + .withPort(2215) + .withUser("test", "test1234!") + .withTimeZone("Asia/Seoul") + .build(); + embeddedMysql = anEmbeddedMysql(mysqlConfig) + .addSchema("test-order_mgmt", classPathScript("schema.sql")) + .start(); +// customerJdbcRepository.deleteAll(); + } + + @AfterAll + void cleanup() { + embeddedMysql.stop(); + } + + @Test + @Order(1) + public void testHikariConnectionPool() { + assertThat(dataSource.getClass().getName(), is("com.zaxxer.hikari.HikariDataSource")); + } + + @Test + @Order(2) + @DisplayName("고객을 추가할 수 있다.") + public void testInsert() { + + try { + customerJdbcRepository.insert(newCustomer); + } catch (BadSqlGrammarException e) { + e.getSQLException().getErrorCode(); + } + + + var retrievedCustomer = customerJdbcRepository.findById(newCustomer.getCustomerId()); + assertThat(retrievedCustomer.isEmpty(), is(false)); + assertThat(retrievedCustomer.get(), samePropertyValuesAs(newCustomer)); + } + + @Test + @Order(3) + @DisplayName("전체 고객을 조회할 수 있다.") + public void testFindAll() { + var customers = customerJdbcRepository.findAll(); + assertThat(customers.isEmpty(), is(false)); + } + + @Test + @Order(4) + @DisplayName("이름으로 고객을 조회할 수 있다.") + public void testFindByName() { + var customer = customerJdbcRepository.findByName(newCustomer.getName()); + assertThat(customer.isEmpty(), is(false)); + + var unknown = customerJdbcRepository.findByName("unknown-user"); + assertThat(unknown.isEmpty(), is(true)); + } + + @Test + @Order(5) + @DisplayName("이메일로 고객을 조회할 수 있다.") + public void testFindByEmail() { + var customer = customerJdbcRepository.findByEmail(newCustomer.getEmail()); + assertThat(customer.isEmpty(), is(false)); + + var unknown = customerJdbcRepository.findByEmail("unknown-user@gmail.com"); + assertThat(unknown.isEmpty(), is(true)); + } + + @Test + @Order(6) + @DisplayName("고객을 수정할 수 있다.") + public void testUpdate() { + newCustomer.changeName("updated-user"); + customerJdbcRepository.update(newCustomer); + + var all = customerJdbcRepository.findAll(); + assertThat(all, hasSize(1)); + assertThat(all, everyItem(samePropertyValuesAs(newCustomer))); + + var retrievedCustomer = customerJdbcRepository.findById(newCustomer.getCustomerId()); + assertThat(retrievedCustomer.isEmpty(), is(false)); + assertThat(retrievedCustomer.get(), samePropertyValuesAs(newCustomer)); + } + + +} diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java new file mode 100644 index 0000000000..1c1c54f7f4 --- /dev/null +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -0,0 +1,71 @@ +package org.prgrms.kdt.order; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.prgrms.kdt.voucher.VoucherService; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.repository.MemoryVoucherRepository; + +import java.util.List; +import java.util.UUID; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.mockito.Mockito.*; + +class OrderServiceTest { + + class OrderRepositoryStub implements OrderRepository { + @Override + public Order insert(Order order) { + return null; + } + } + + @Test + @DisplayName("오더가 생성되야한다. (stub)") + void createOrder() { + // Given + var voucherRepository = new MemoryVoucherRepository(); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); + voucherRepository.insert(fixedAmountVoucher); + var sut = new OrderService(new VoucherService(voucherRepository), new OrderRepositoryStub()); + + // When + var order = sut.createOrder(UUID.randomUUID(), List.of(new OrderItem(UUID.randomUUID(), 200, 1)), fixedAmountVoucher.getVoucherId()); + + // Then + assertThat(order.totalAmount(), is(100L)); + assertThat(order.getVoucher().isEmpty(), is(false)); + assertThat(order.getVoucher().get().getVoucherId(), is(fixedAmountVoucher.getVoucherId())); + assertThat(order.getOrderStatus(), is(OrderStatus.ACCEPTED)); + } + + @Test + @DisplayName("오더가 생성되야한다. (mock)") + void createOrderByMock() { + // Given + var voucherServiceMock = mock(VoucherService.class); + var orderRepositoryMock = mock(OrderRepository.class); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); + when(voucherServiceMock.getVoucher(fixedAmountVoucher.getVoucherId())).thenReturn(fixedAmountVoucher); + var sut = new OrderService(voucherServiceMock, orderRepositoryMock); + + // When + var order = sut.createOrder( + UUID.randomUUID(), + List.of(new OrderItem(UUID.randomUUID(), 200, 1)), + fixedAmountVoucher.getVoucherId()); + + // Then + assertThat(order.totalAmount(), is(100L)); + assertThat(order.getVoucher().isEmpty(), is(false)); + var inOrder = inOrder(voucherServiceMock, orderRepositoryMock); + inOrder.verify(voucherServiceMock).getVoucher(fixedAmountVoucher.getVoucherId()); + inOrder.verify(orderRepositoryMock).insert(order); + inOrder.verify(voucherServiceMock).useVoucher(fixedAmountVoucher); + + } + + +} diff --git a/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java b/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java new file mode 100644 index 0000000000..73acd2bfe6 --- /dev/null +++ b/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java @@ -0,0 +1,65 @@ +package org.prgrms.kdt.voucher; + +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.*; + +class FixedAmountVoucherTest { + + private static final Logger logger = LoggerFactory.getLogger(FixedAmountVoucherTest.class); + + @BeforeAll + static void setup() { + logger.info("@BeforeAll - run once"); + } + + @BeforeEach + void init() { + logger.info("@BeforeEach - run before each test method"); + } + + @Test + @DisplayName("기본적인 assertEqual 테스트 🙏") + void testAssertEqual() { + assertEquals(2, 1 + 1); + } + + @Test + @DisplayName("주어진 금액만큼 할인을 해야한다.") + void testDiscount() { + var sut = new FixedAmountVoucher(UUID.randomUUID(), 100); + assertEquals(900, sut.discount(1000)); + } + + @Test + @DisplayName("디스카운트된 금액은 마이너스가 될 수 없다.") + void testMinusDiscountedAmount() { + var sut = new FixedAmountVoucher(UUID.randomUUID(), 1000); + assertEquals(0, sut.discount(900)); + } + + @Test + @DisplayName("할인 금액은 마이너스가 될 수 없다.") + void testWithMinus() { + assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100)); + } + + @Test + @DisplayName("유효한 할인 금액으로만 생성할 수 있다.") + void testVoucherCreation() { + assertAll("FixedAmountVoucher creation", + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 0)), + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100)), + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 1000000)) + ); + } + +} diff --git a/src/test/java/org/prgrms/kdt/voucher/HamcrestAssertionTests.java b/src/test/java/org/prgrms/kdt/voucher/HamcrestAssertionTests.java new file mode 100644 index 0000000000..35db86a61a --- /dev/null +++ b/src/test/java/org/prgrms/kdt/voucher/HamcrestAssertionTests.java @@ -0,0 +1,37 @@ +package org.prgrms.kdt.voucher; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +public class HamcrestAssertionTests { + + @Test + @DisplayName("여러 hamcrest matcher 테스트") + void hamcrestTest() { + assertEquals(2, 1 + 1); + assertThat(1 + 1, equalTo(2)); + assertThat(1 + 1, is(2)); + assertThat(1 + 1, anyOf(is(1), is(2))); + + assertNotEquals(1, 1 + 1); + assertThat(1 + 1, not(equalTo(1))); + } + + @Test + @DisplayName("컬렉션에 대한 matcher 테스트") + void hamcrestListMatcherTest() { + var prices = List.of(2, 3, 4); + assertThat(prices, hasSize(3)); + assertThat(prices, everyItem(greaterThan(1))); + assertThat(prices, containsInAnyOrder(3, 4, 2)); + assertThat(prices, hasItem(greaterThanOrEqualTo(2))); + } + +} diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml new file mode 100644 index 0000000000..b0f8b7c2c7 --- /dev/null +++ b/src/test/resources/logback-test.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file From 2e5f463056568262e6d7ae9ccba2c2c7e4fec5ad Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Sun, 29 Oct 2023 23:12:14 +0900 Subject: [PATCH 16/28] =?UTF-8?q?feat:=20voucher=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EC=83=9D=EC=84=B1=20+=20voucher=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java | 1 + .../org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index 4d29e71345..ffc0847e4b 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -5,6 +5,7 @@ public class FixedAmountVoucher implements Voucher { private final UUID voucherId; private final long amount; + private UUID customerId; public FixedAmountVoucher(UUID voucherId, long amount) { this.voucherId = voucherId; diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index ab96c517b7..4ae6429466 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -5,6 +5,7 @@ public class PercentDiscountVoucher implements Voucher { private final UUID voucherId; private final int percent; + private UUID customerId; public PercentDiscountVoucher(UUID voucherId, int percent) { this.voucherId = voucherId; From 5411e2e0bf08ae5c162276a51fc6ed97851fcdb1 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 30 Oct 2023 02:06:25 +0900 Subject: [PATCH 17/28] =?UTF-8?q?feat:=20VoucherJdbcRepository=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/KdtApplication.java | 16 +-- .../java/org/prgrms/kdt/io/SystemMessage.java | 3 +- .../prgrms/kdt/voucher/VoucherController.java | 5 +- .../voucher/domain/FixedAmountVoucher.java | 32 +++++- .../domain/PercentDiscountVoucher.java | 32 +++++- .../prgrms/kdt/voucher/domain/Voucher.java | 8 ++ .../repository/JdbcVoucherRepository.java | 37 ------ .../repository/VoucherJdbcRepository.java | 106 ++++++++++++++++++ ...tory.java => VoucherMemoryRepository.java} | 6 +- .../prgrms/kdt/order/OrderServiceTest.java | 4 +- 10 files changed, 191 insertions(+), 58 deletions(-) delete mode 100644 src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java rename src/main/java/org/prgrms/kdt/voucher/repository/{MemoryVoucherRepository.java => VoucherMemoryRepository.java} (88%) diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index fafe42bb71..4118afdffa 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -14,14 +14,14 @@ public static void main(String[] args) throws IOException { ConfigurableApplicationContext applicationContext = SpringApplication.run(KdtApplication.class, args); VoucherController voucherController = applicationContext.getBean(VoucherController.class); - // 등록된 bean의 이름을 get - String[] beanNames = applicationContext.getBeanDefinitionNames(); - - // bean 이름을 출력 - for(String beanName : beanNames) { - System.out.println(beanName); - } - System.out.println(); +// // 등록된 bean의 이름을 get +// String[] beanNames = applicationContext.getBeanDefinitionNames(); +// +// // bean 이름을 출력 +// for(String beanName : beanNames) { +// System.out.println(beanName); +// } +// System.out.println(); boolean isRepeat = true; diff --git a/src/main/java/org/prgrms/kdt/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/io/SystemMessage.java index 5da1eee741..abc0a9c994 100644 --- a/src/main/java/org/prgrms/kdt/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/io/SystemMessage.java @@ -11,7 +11,8 @@ public enum SystemMessage { EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 0보다 커야합니다."), EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."), - EXCEPTION_FIND_VOUCHER(" -> 해당 id의 바우처를 찾을 수 없습니다."); + EXCEPTION_FIND_VOUCHER(" -> 해당 id의 바우처를 찾을 수 없습니다."), + EXCEPTION_VOUCHER_ROW_MAPPER("바우처의 ROW MAPPER 가 실패했습니다."); private final String message; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index fd5ecfc85d..96bc342d71 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -31,6 +31,7 @@ public class VoucherController { private final String FIXED = "fixed"; private final String PERCENT = "percent"; private final String BLACK = "black"; + private final String WALLET = "wallet"; private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, StartMenu startMenu, VoucherService voucherService, CustomerController customerController) { @@ -57,6 +58,9 @@ public boolean startVoucherMenu() throws IOException { break; case BLACK: customerController.getBlackList(); + break; + case WALLET: + break; default: String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); @@ -68,7 +72,6 @@ public boolean startVoucherMenu() throws IOException { return true; } - private void createVoucher() throws IOException { while (true) { outputHandler.outputSystemMessage(CREATE_BOUCHER_TYPE.getMessage()); diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index ffc0847e4b..3f72e622f3 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -5,20 +5,46 @@ public class FixedAmountVoucher implements Voucher { private final UUID voucherId; private final long amount; - private UUID customerId; + private UUID customerId = null; public FixedAmountVoucher(UUID voucherId, long amount) { this.voucherId = voucherId; this.amount = amount; } + public FixedAmountVoucher(UUID voucherId, long amount, UUID customerId) { + this.voucherId = voucherId; + this.amount = amount; + this.customerId = customerId; + } + + public long discount(long beforeDiscount) { + return beforeDiscount - amount; + } + @Override public UUID getVoucherId() { return voucherId; } - public long discount(long beforeDiscount) { - return beforeDiscount - amount; + @Override + public long getAmount() { + return amount; + } + + @Override + public int getPercent() { + return 0; + } + + @Override + public UUID getCustomerId() { + return customerId; + } + + @Override + public void setCustomerId(UUID customerId) { + this.customerId = customerId; } @Override diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index 4ae6429466..2440d851be 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -5,21 +5,47 @@ public class PercentDiscountVoucher implements Voucher { private final UUID voucherId; private final int percent; - private UUID customerId; + private UUID customerId = null; public PercentDiscountVoucher(UUID voucherId, int percent) { this.voucherId = voucherId; this.percent = percent; } + public PercentDiscountVoucher(UUID voucherId, int percent, UUID customerId) { + this.voucherId = voucherId; + this.percent = percent; + this.customerId = customerId; + } + + @Override + public long discount(long beforeDiscount) { + return beforeDiscount * (percent / 100); + } + + @Override + public long getAmount() { + return 0; + } + @Override public UUID getVoucherId() { return voucherId; } @Override - public long discount(long beforeDiscount) { - return beforeDiscount * (percent / 100); + public int getPercent() { + return percent; + } + + @Override + public UUID getCustomerId() { + return null; + } + + @Override + public void setCustomerId(UUID customerId) { + this.customerId = customerId; } @Override diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java index 46c7178f34..271bbb4d90 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java @@ -6,4 +6,12 @@ public interface Voucher { UUID getVoucherId(); long discount(long beforeDiscount); + + long getAmount(); + + int getPercent(); + + UUID getCustomerId(); + + void setCustomerId(UUID customerId); } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java deleted file mode 100644 index 81ae8fedd3..0000000000 --- a/src/main/java/org/prgrms/kdt/voucher/repository/JdbcVoucherRepository.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.prgrms.kdt.voucher; - -import org.prgrms.kdt.voucher.domain.Voucher; -import org.prgrms.kdt.voucher.repository.MemoryVoucherRepository; -import org.prgrms.kdt.voucher.repository.VoucherRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Profile; -import org.springframework.stereotype.Repository; - -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; - -@Repository -@Profile({"dev", "staging", "production"}) -public class JdbcVoucherRepository implements VoucherRepository { - - private final Map storage = new ConcurrentHashMap<>(); - private static final Logger logger = LoggerFactory.getLogger(MemoryVoucherRepository.class); - - @Override - public Optional findById(UUID voucherId) { - return Optional.ofNullable(storage.get(voucherId)); - } - - @Override - public Voucher insert(Voucher voucher) { - storage.put(voucher.getVoucherId(), voucher); - return voucher; - } - - @Override - public List findAll() { - logger.debug("모든 바우처의 갯수 : " + storage.size()); - return new ArrayList<>(storage.values()); - } -} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java new file mode 100644 index 0000000000..2dd41bf414 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -0,0 +1,106 @@ +package org.prgrms.kdt.voucher.repository; + +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; +import org.prgrms.kdt.voucher.domain.Voucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Profile; +import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.stereotype.Repository; + +import javax.sql.DataSource; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_VOUCHER_ROW_MAPPER; + +@Repository +@Profile("dev") +public class VoucherJdbcRepository implements VoucherRepository { + + private final Map storage = new ConcurrentHashMap<>(); + private final DataSource dataSource; + private final JdbcTemplate jdbcTemplate; + private static final Logger logger = LoggerFactory.getLogger(VoucherJdbcRepository.class); + private static final RowMapper voucherRowMapper = (resultSet, i) -> { + UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); + Integer amount = resultSet.getInt("amount"); + Integer percent = resultSet.getInt("percent"); + byte[] customerIdBytes = resultSet.getBytes("customer_id"); + UUID customerId = null; + if (customerIdBytes != null) { + customerId = toUUID(customerIdBytes); + } + + if (percent != 0) { + return new PercentDiscountVoucher(voucherId, percent, customerId); + } + if (amount != 0) { + return new FixedAmountVoucher(voucherId, amount, customerId); + } + + logger.error("JdbcVoucherRepository RowMapper Error"); + throw new RuntimeException(EXCEPTION_VOUCHER_ROW_MAPPER.getMessage()); + }; + + public VoucherJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { + this.dataSource = dataSource; + this.jdbcTemplate = jdbcTemplate; + } + + @Override + public Optional findById(UUID voucherId) { + try { + return Optional.ofNullable(jdbcTemplate.queryForObject("select * from vouchers WHERE voucher_id = UUID_TO_BIN(?)", + voucherRowMapper, + voucherId.toString().getBytes())); + } catch (EmptyResultDataAccessException e) { + logger.error("Got empty result", e); + return Optional.empty(); + } + } + + @Override + public Voucher insert(Voucher voucher) { + String voucherType = voucher.getClass().getName(); + int update = 0; + + if (voucherType.equals(PercentDiscountVoucher.class.getName())) { + update = jdbcTemplate.update("INSERT INTO vouchers(voucher_id, amount, percent, customer_id) " + + "VALUES (UUID_TO_BIN(?), ?, ?, UUID_TO_BIN(?))", + voucher.getVoucherId().toString().getBytes(), + 0, + voucher.getPercent(), + voucher.getCustomerId() != null ? voucher.getCustomerId().toString().getBytes() : null); + } else if (voucherType.equals(FixedAmountVoucher.class.getName())) { + update = jdbcTemplate.update("INSERT INTO vouchers(voucher_id, amount, percent, customer_id) " + + "VALUES (UUID_TO_BIN(?), ?, ?, UUID_TO_BIN(?))", + voucher.getVoucherId().toString().getBytes(), + voucher.getAmount(), + 0, + voucher.getCustomerId() != null ? voucher.getCustomerId().toString().getBytes() : null); + } + + if (update != 1) { + throw new RuntimeException("Noting was inserted"); + } + return voucher; + } + + @Override + public List findAll() { + return jdbcTemplate.query("select * from vouchers", voucherRowMapper); + } + + static UUID toUUID(byte[] bytes) { + var byteBuffer = ByteBuffer.wrap(bytes); + return new UUID(byteBuffer.getLong(), byteBuffer.getLong()); + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java similarity index 88% rename from src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java rename to src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java index 5482306b80..820eb2fe68 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java @@ -10,11 +10,11 @@ import java.util.concurrent.ConcurrentHashMap; @Repository -@Profile({"local", "test"}) -public class MemoryVoucherRepository implements VoucherRepository { +@Profile("local") +public class VoucherMemoryRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); - private static final Logger logger = LoggerFactory.getLogger(MemoryVoucherRepository.class); + private static final Logger logger = LoggerFactory.getLogger(VoucherMemoryRepository.class); @Override public Optional findById(UUID voucherId) { diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java index 1c1c54f7f4..c313c6a33b 100644 --- a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.prgrms.kdt.voucher.VoucherService; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; -import org.prgrms.kdt.voucher.repository.MemoryVoucherRepository; +import org.prgrms.kdt.voucher.repository.VoucherMemoryRepository; import java.util.List; import java.util.UUID; @@ -26,7 +26,7 @@ public Order insert(Order order) { @DisplayName("오더가 생성되야한다. (stub)") void createOrder() { // Given - var voucherRepository = new MemoryVoucherRepository(); + var voucherRepository = new VoucherMemoryRepository(); var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); voucherRepository.insert(fixedAmountVoucher); var sut = new OrderService(new VoucherService(voucherRepository), new OrderRepositoryStub()); From e64e75d1b5dea931d8c8aa0ce09458775a52667e Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 30 Oct 2023 02:33:15 +0900 Subject: [PATCH 18/28] =?UTF-8?q?feat:=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20Wallet=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/io/SystemMessage.java | 13 +------- .../prgrms/kdt/voucher/VoucherController.java | 7 ++-- .../prgrms/kdt/voucher/VoucherMessage.java | 25 ++++++++++++++ .../prgrms/kdt/voucher/VoucherService.java | 6 ++-- .../repository/VoucherJdbcRepository.java | 3 +- .../java/org/prgrms/kdt/wallet/Wallet.java | 33 +++++++++++++++++++ .../prgrms/kdt/wallet/WalletController.java | 4 +++ .../kdt/wallet/WalletJdbcRepository.java | 4 +++ .../org/prgrms/kdt/wallet/WalletMessage.java | 19 +++++++++++ .../prgrms/kdt/wallet/WalletRepository.java | 16 +++++++++ .../org/prgrms/kdt/wallet/WalletService.java | 4 +++ 11 files changed, 115 insertions(+), 19 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java create mode 100644 src/main/java/org/prgrms/kdt/wallet/Wallet.java create mode 100644 src/main/java/org/prgrms/kdt/wallet/WalletController.java create mode 100644 src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java create mode 100644 src/main/java/org/prgrms/kdt/wallet/WalletMessage.java create mode 100644 src/main/java/org/prgrms/kdt/wallet/WalletRepository.java create mode 100644 src/main/java/org/prgrms/kdt/wallet/WalletService.java diff --git a/src/main/java/org/prgrms/kdt/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/io/SystemMessage.java index abc0a9c994..78a2768243 100644 --- a/src/main/java/org/prgrms/kdt/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/io/SystemMessage.java @@ -1,18 +1,7 @@ package org.prgrms.kdt.io; public enum SystemMessage { - EXIT_PROGRAM("프로그램을 종료합니다."), - CREATE_BOUCHER_TYPE("fixed, percent 중 어떤 타입의 바우처를 만드시겠습니까?"), - CREATE_FIXED_BOUCHER("고정으로 할인되는 비용을 입력하세요."), - CREATE_PERCENT_BOUCHER("할인되는 퍼센트를 정수로 입력하세요."), - FOUND_VOUCHER_IS_EMPTY("조회한 바우처가 하나도 존재하지 않습니다."), - EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), - EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), - EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), - EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 0보다 커야합니다."), - EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."), - EXCEPTION_FIND_VOUCHER(" -> 해당 id의 바우처를 찾을 수 없습니다."), - EXCEPTION_VOUCHER_ROW_MAPPER("바우처의 ROW MAPPER 가 실패했습니다."); + EXIT_PROGRAM("프로그램을 종료합니다."); private final String message; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index 96bc342d71..735cbf2c3c 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -16,6 +16,7 @@ import java.util.UUID; import static org.prgrms.kdt.io.SystemMessage.*; +import static org.prgrms.kdt.voucher.VoucherMessage.*; @Controller public class VoucherController { @@ -74,7 +75,7 @@ public boolean startVoucherMenu() throws IOException { private void createVoucher() throws IOException { while (true) { - outputHandler.outputSystemMessage(CREATE_BOUCHER_TYPE.getMessage()); + outputHandler.outputSystemMessage(CREATE_VOUCHER_TYPE.getMessage()); var createVoucherType = inputHandler.inputString(); var isRepeat = true; @@ -96,7 +97,7 @@ private void createVoucher() throws IOException { } private boolean createFixedAmountVoucher() throws IOException { - outputHandler.outputSystemMessage(CREATE_FIXED_BOUCHER.getMessage()); + outputHandler.outputSystemMessage(CREATE_FIXED_VOUCHER.getMessage()); var amount = 0; while (true) { @@ -123,7 +124,7 @@ private boolean createFixedAmountVoucher() throws IOException { } private boolean createPercentDiscountVoucher() throws IOException { - outputHandler.outputSystemMessage(CREATE_PERCENT_BOUCHER.getMessage()); + outputHandler.outputSystemMessage(CREATE_PERCENT_VOUCHER.getMessage()); var percent = 0; while (true) { diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java new file mode 100644 index 0000000000..33eba80ce3 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java @@ -0,0 +1,25 @@ +package org.prgrms.kdt.voucher; + +public enum VoucherMessage { + CREATE_VOUCHER_TYPE("fixed, percent 중 어떤 타입의 바우처를 만드시겠습니까?"), + CREATE_FIXED_VOUCHER("고정으로 할인되는 비용을 입력하세요."), + CREATE_PERCENT_VOUCHER("할인되는 퍼센트를 정수로 입력하세요."), + VOUCHER_IS_EMPTY("조회한 바우처가 하나도 존재하지 않습니다."), + EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), + EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), + EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), + EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 0보다 커야합니다."), + EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."), + EXCEPTION_FIND_VOUCHER(" -> 해당 id의 바우처를 찾을 수 없습니다."), + EXCEPTION_VOUCHER_ROW_MAPPER("바우처의 ROW MAPPER 가 실패했습니다."); + + private final String message; + + public String getMessage() { + return message; + } + + VoucherMessage(String message) { + this.message = message; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java index 3a462b397d..67a43f70f1 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java @@ -15,8 +15,8 @@ import java.util.List; import java.util.UUID; -import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_FIND_VOUCHER; -import static org.prgrms.kdt.io.SystemMessage.FOUND_VOUCHER_IS_EMPTY; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIND_VOUCHER; +import static org.prgrms.kdt.voucher.VoucherMessage.VOUCHER_IS_EMPTY; @Service public class VoucherService { @@ -52,7 +52,7 @@ public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { public List getAllVouchers() { var voucherList = voucherRepository.findAll(); if (voucherList.isEmpty()) { - System.out.println(FOUND_VOUCHER_IS_EMPTY.getMessage()); + System.out.println(VOUCHER_IS_EMPTY.getMessage()); } return voucherList; } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index 2dd41bf414..ca4716b1e2 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -19,7 +19,8 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_VOUCHER_ROW_MAPPER; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_VOUCHER_ROW_MAPPER; + @Repository @Profile("dev") diff --git a/src/main/java/org/prgrms/kdt/wallet/Wallet.java b/src/main/java/org/prgrms/kdt/wallet/Wallet.java new file mode 100644 index 0000000000..a237a322cc --- /dev/null +++ b/src/main/java/org/prgrms/kdt/wallet/Wallet.java @@ -0,0 +1,33 @@ +package org.prgrms.kdt.wallet; + +import java.util.UUID; + +public class Wallet { + private final String walletId; + private final String customerId; + private final String voucherId; + + private Wallet(String customerId, String voucherId) { + this.walletId = UUID.randomUUID().toString(); + this.customerId = customerId; + this.voucherId = voucherId; + } + + public Wallet(String walletId, String customerId, String voucherId) { + this.walletId = walletId; + this.customerId = customerId; + this.voucherId = voucherId; + } + + public String getWalletId() { + return walletId; + } + + public String getCustomerId() { + return customerId; + } + + public String getVoucherId() { + return voucherId; + } +} diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletController.java b/src/main/java/org/prgrms/kdt/wallet/WalletController.java new file mode 100644 index 0000000000..f19d46e3fa --- /dev/null +++ b/src/main/java/org/prgrms/kdt/wallet/WalletController.java @@ -0,0 +1,4 @@ +package org.prgrms.kdt.wallet; + +public class WalletController { +} diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java new file mode 100644 index 0000000000..92041db61b --- /dev/null +++ b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java @@ -0,0 +1,4 @@ +package org.prgrms.kdt.wallet; + +public class WalletJdbcRepository { +} diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java b/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java new file mode 100644 index 0000000000..7ee8cebf44 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java @@ -0,0 +1,19 @@ +package org.prgrms.kdt.wallet; + +public enum WalletMessage { + + COMPLETE_ADD("지갑 추가가 완료되었습니다."), + COMPLETE_REMOVE("지갑 제거가 완료되었습니다."), + INPUT_CUSTOMER_ID("등록할 고객 아이디를 입력해주세요 : "), + INPUT_VOUCHER_ID("등록할 바우처 아이디를 입력해주세요 : "); + + private final String message; + + public String getMessage() { + return message; + } + + WalletMessage(String message) { + this.message = message; + } +} diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletRepository.java b/src/main/java/org/prgrms/kdt/wallet/WalletRepository.java new file mode 100644 index 0000000000..00f0a0e758 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/wallet/WalletRepository.java @@ -0,0 +1,16 @@ +package org.prgrms.kdt.wallet; + +import java.util.List; +import java.util.Optional; + +public interface WalletRepository { + Wallet save(Wallet wallet); + + Optional findById(String walletId); + + List findByCustomerId(String customerId); + + List findByVoucherId(String voucherId); + + void deleteByCustomerId(String customerId); +} diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletService.java b/src/main/java/org/prgrms/kdt/wallet/WalletService.java new file mode 100644 index 0000000000..cc35ce7af7 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/wallet/WalletService.java @@ -0,0 +1,4 @@ +package org.prgrms.kdt.wallet; + +public class WalletService { +} From d63a9aacec1d14e83fd034555cd3f1759908a537 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 30 Oct 2023 03:47:19 +0900 Subject: [PATCH 19/28] =?UTF-8?q?feat:=20WalletController=20WalletService?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prgrms/kdt/customer/CustomerMessage.java | 15 +++++ .../repository/CustomerJdbcRepository.java | 2 +- .../repository/CustomerRepository.java | 4 +- .../prgrms/kdt/io/ConsoleInputHandler.java | 18 +++-- .../{StartMenu.java => MenuController.java} | 24 +++++-- .../java/org/prgrms/kdt/io/SystemMessage.java | 4 +- .../prgrms/kdt/voucher/VoucherController.java | 17 +++-- .../prgrms/kdt/voucher/VoucherMessage.java | 3 +- .../prgrms/kdt/voucher/VoucherService.java | 4 +- .../repository/VoucherJdbcRepository.java | 2 +- .../repository/VoucherMemoryRepository.java | 2 +- .../voucher/repository/VoucherRepository.java | 2 +- .../java/org/prgrms/kdt/wallet/Wallet.java | 2 +- .../prgrms/kdt/wallet/WalletController.java | 67 +++++++++++++++++++ .../kdt/wallet/WalletJdbcRepository.java | 58 +++++++++++++++- .../org/prgrms/kdt/wallet/WalletMessage.java | 4 +- .../org/prgrms/kdt/wallet/WalletService.java | 42 ++++++++++++ .../org/prgrms/kdt/KdtSpringContextTests.java | 2 +- .../customer/CustomerJdbcRepositoryTest.java | 2 +- .../prgrms/kdt/order/OrderServiceTest.java | 2 +- 20 files changed, 241 insertions(+), 35 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/customer/CustomerMessage.java rename src/main/java/org/prgrms/kdt/io/{StartMenu.java => MenuController.java} (57%) diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java b/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java new file mode 100644 index 0000000000..75d99b0b39 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java @@ -0,0 +1,15 @@ +package org.prgrms.kdt.customer; + +public enum CustomerMessage { + EXCEPTION_NOT_EXIST_CUSTOMER("존재하지 않는 회원입니다."); + + private final String message; + + public String getMessage() { + return message; + } + + CustomerMessage(String message) { + this.message = message; + } +} diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java index ea60259d44..dd0e19713f 100644 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java @@ -47,7 +47,7 @@ public CustomerJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) } @Override - public Customer insert(Customer customer) { + public Customer save(Customer customer) { var update = jdbcTemplate.update("INSERT INTO customers(customer_id, name, email, created_at) VALUES (UUID_TO_BIN(?), ?, ?, ?)", customer.getCustomerId().toString().getBytes(), customer.getName(), diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java index a629ce5325..b75bea0a44 100644 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java @@ -11,12 +11,10 @@ public interface CustomerRepository { List findBlackList(); - Customer insert(Customer customer); + Customer save(Customer customer); Customer update(Customer customer); - // Customer save(Customer customer); - int count(); List findAll(); diff --git a/src/main/java/org/prgrms/kdt/io/ConsoleInputHandler.java b/src/main/java/org/prgrms/kdt/io/ConsoleInputHandler.java index 24ac382bfe..a2ecfd0db4 100644 --- a/src/main/java/org/prgrms/kdt/io/ConsoleInputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/ConsoleInputHandler.java @@ -6,19 +6,29 @@ import java.io.IOException; import java.io.InputStreamReader; +import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_INPUT; + @Component public class ConsoleInputHandler implements InputHandler{ BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); @Override - public String inputString() throws IOException { - return br.readLine(); + public String inputString() { + try { + return br.readLine(); + } catch (IOException e) { + throw new RuntimeException(EXCEPTION_INPUT.getMessage()); + } } @Override - public int inputInt() throws IOException { - return Integer.parseInt(br.readLine()); + public int inputInt() { + try { + return Integer.parseInt(br.readLine()); + } catch (IOException e) { + throw new RuntimeException(EXCEPTION_INPUT.getMessage()); + } } } diff --git a/src/main/java/org/prgrms/kdt/io/StartMenu.java b/src/main/java/org/prgrms/kdt/io/MenuController.java similarity index 57% rename from src/main/java/org/prgrms/kdt/io/StartMenu.java rename to src/main/java/org/prgrms/kdt/io/MenuController.java index 241f91a6d1..e8f0bccaef 100644 --- a/src/main/java/org/prgrms/kdt/io/StartMenu.java +++ b/src/main/java/org/prgrms/kdt/io/MenuController.java @@ -1,17 +1,17 @@ package org.prgrms.kdt.io; -import org.springframework.stereotype.Component; +import org.springframework.stereotype.Controller; import java.io.IOException; -@Component -public class StartMenu { +@Controller +public class MenuController { private static final String lineSeparator = System.lineSeparator(); private final InputHandler inputHandler; private final OutputHandler outputHandler; - public StartMenu(InputHandler inputHandler, OutputHandler outputHandler) { + public MenuController(InputHandler inputHandler, OutputHandler outputHandler) { this.inputHandler = inputHandler; this.outputHandler = outputHandler; } @@ -31,8 +31,20 @@ public String startMenu() throws IOException { outputHandler.outputSystemMessage(sb.toString()); - var menu = inputHandler.inputString(); - return menu; + return inputHandler.inputString(); } + public String walletMenu() throws IOException { + StringBuilder sb = new StringBuilder(); + sb.append("=== Wallet Program ==="); + sb.append(lineSeparator); + sb.append("[1] Type 'create' to create a new wallet."); + sb.append(lineSeparator); + sb.append("[2] Type 'remove' to remove a wallet."); + sb.append(lineSeparator); + + outputHandler.outputSystemMessage(sb.toString()); + + return inputHandler.inputString(); + } } diff --git a/src/main/java/org/prgrms/kdt/io/SystemMessage.java b/src/main/java/org/prgrms/kdt/io/SystemMessage.java index 78a2768243..b18b9fcbcb 100644 --- a/src/main/java/org/prgrms/kdt/io/SystemMessage.java +++ b/src/main/java/org/prgrms/kdt/io/SystemMessage.java @@ -1,7 +1,9 @@ package org.prgrms.kdt.io; public enum SystemMessage { - EXIT_PROGRAM("프로그램을 종료합니다."); + EXIT_PROGRAM("프로그램을 종료합니다."), + EXCEPTION_INPUT("입력값이 잘못되었습니다."), + EXCEPTION_NOT_EXIST_MENU("올바른 메뉴를 입력해주세요."); private final String message; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index 735cbf2c3c..f8c51dc088 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -2,11 +2,12 @@ import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; -import org.prgrms.kdt.io.StartMenu; +import org.prgrms.kdt.io.MenuController; import org.prgrms.kdt.customer.CustomerController; import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.wallet.WalletController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -23,9 +24,10 @@ public class VoucherController { private final InputHandler inputHandler; private final OutputHandler outputHandler; - private final StartMenu startMenu; + private final MenuController menuController; private final VoucherService voucherService; private final CustomerController customerController; + private final WalletController walletController; private final String EXIT = "exit"; private final String CREATE = "create"; private final String LIST = "list"; @@ -35,16 +37,17 @@ public class VoucherController { private final String WALLET = "wallet"; private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); - public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, StartMenu startMenu, VoucherService voucherService, CustomerController customerController) { + public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, MenuController menuController, VoucherService voucherService, CustomerController customerController, WalletController walletController) { this.inputHandler = inputHandler; this.outputHandler = outputHandler; - this.startMenu = startMenu; + this.menuController = menuController; this.voucherService = voucherService; this.customerController = customerController; + this.walletController = walletController; } public boolean startVoucherMenu() throws IOException { - var menu = startMenu.startMenu(); + String menu = menuController.startMenu(); switch (menu) { case EXIT: @@ -61,10 +64,10 @@ public boolean startVoucherMenu() throws IOException { customerController.getBlackList(); break; case WALLET: - + walletController.walletMenu(); break; default: - String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); + String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); logger.error(errorMessage); outputHandler.outputSystemMessage(errorMessage); break; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java index 33eba80ce3..4c8b305ee2 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java @@ -11,7 +11,8 @@ public enum VoucherMessage { EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 0보다 커야합니다."), EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."), EXCEPTION_FIND_VOUCHER(" -> 해당 id의 바우처를 찾을 수 없습니다."), - EXCEPTION_VOUCHER_ROW_MAPPER("바우처의 ROW MAPPER 가 실패했습니다."); + EXCEPTION_VOUCHER_ROW_MAPPER("바우처의 ROW MAPPER 가 실패했습니다."), + EXCEPTION_NOT_EXIST_VOUCHER("존재하지 않는 바우처입니다.");; private final String message; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java index 67a43f70f1..cf2663ff6e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java @@ -41,12 +41,12 @@ public Voucher getVoucher(UUID voucherId) { public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); - voucherRepository.insert(voucher); + voucherRepository.save(voucher); } public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { var voucher = new PercentDiscountVoucher(percentDiscountVoucherDto.getVoucherId(), percentDiscountVoucherDto.getPercent()); - voucherRepository.insert(voucher); + voucherRepository.save(voucher); } public List getAllVouchers() { diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index ca4716b1e2..cb8c7bb003 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -69,7 +69,7 @@ public Optional findById(UUID voucherId) { } @Override - public Voucher insert(Voucher voucher) { + public Voucher save(Voucher voucher) { String voucherType = voucher.getClass().getName(); int update = 0; diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java index 820eb2fe68..0f87229004 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java @@ -22,7 +22,7 @@ public Optional findById(UUID voucherId) { } @Override - public Voucher insert(Voucher voucher) { + public Voucher save(Voucher voucher) { storage.put(voucher.getVoucherId(), voucher); logger.debug("바우처 생성 -> " + voucher.toString()); return voucher; diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index e91e3ecb23..f0196f8c79 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -10,7 +10,7 @@ public interface VoucherRepository { Optional findById(UUID voucherId); - Voucher insert(Voucher voucher); + Voucher save(Voucher voucher); List findAll(); } diff --git a/src/main/java/org/prgrms/kdt/wallet/Wallet.java b/src/main/java/org/prgrms/kdt/wallet/Wallet.java index a237a322cc..e136243510 100644 --- a/src/main/java/org/prgrms/kdt/wallet/Wallet.java +++ b/src/main/java/org/prgrms/kdt/wallet/Wallet.java @@ -7,7 +7,7 @@ public class Wallet { private final String customerId; private final String voucherId; - private Wallet(String customerId, String voucherId) { + Wallet(String customerId, String voucherId) { this.walletId = UUID.randomUUID().toString(); this.customerId = customerId; this.voucherId = voucherId; diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletController.java b/src/main/java/org/prgrms/kdt/wallet/WalletController.java index f19d46e3fa..4dde5bb585 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletController.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletController.java @@ -1,4 +1,71 @@ package org.prgrms.kdt.wallet; +import org.prgrms.kdt.io.InputHandler; +import org.prgrms.kdt.io.MenuController; +import org.prgrms.kdt.io.OutputHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; + +import java.io.IOException; + +import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; +import static org.prgrms.kdt.wallet.WalletMessage.*; + +@Controller public class WalletController { + + private final WalletService walletService; + private final MenuController menuController; + private final InputHandler inputHandler; + private final OutputHandler outputHandler; + private static final Logger logger = LoggerFactory.getLogger(WalletController.class); + + private final String CREATE = "create"; + private final String REMOVE = "remove"; + + public WalletController(WalletService walletService, MenuController menuController, InputHandler inputHandler, OutputHandler outputHandler) { + this.walletService = walletService; + this.menuController = menuController; + this.inputHandler = inputHandler; + this.outputHandler = outputHandler; + } + + public void walletMenu() throws IOException { + String menu = menuController.walletMenu(); + + switch (menu) { + case CREATE: + addWallet(); + break; + case REMOVE: + removeWalletByCustomerId(); + break; + default: + String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); + logger.error(errorMessage); + outputHandler.outputSystemMessage(errorMessage); + break; + } + } + + private void addWallet() throws IOException { + outputHandler.outputSystemMessage(INPUT_CUSTOMER_ID.getMessage()); + String customerId = inputHandler.inputString(); + outputHandler.outputSystemMessage(INPUT_VOUCHER_ID.getMessage()); + String voucherId = inputHandler.inputString(); + + walletService.addWallet(customerId, voucherId); + + outputHandler.outputSystemMessage(COMPLETE_ADD.getMessage()); + } + + private void removeWalletByCustomerId() throws IOException { + outputHandler.outputSystemMessage(INPUT_CUSTOMER_ID.getMessage()); + String customerId = inputHandler.inputString(); + + walletService.deleteByCustomerId(customerId); + + outputHandler.outputSystemMessage(COMPLETE_REMOVE.getMessage()); + } } diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java index 92041db61b..0d726560e3 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java @@ -1,4 +1,60 @@ package org.prgrms.kdt.wallet; -public class WalletJdbcRepository { +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; +import org.springframework.stereotype.Repository; + +import javax.sql.DataSource; +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +@Repository +public class WalletJdbcRepository implements WalletRepository{ + private static final Logger logger = LoggerFactory.getLogger(WalletJdbcRepository.class); + private final DataSource dataSource; + private final JdbcTemplate jdbcTemplate; + private static final RowMapper walletRowMapper = (resultSet, i) -> { + UUID customerId = toUUID(resultSet.getBytes("customer_id")); + UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); + return new Wallet(customerId.toString(), voucherId.toString()); + }; + + public WalletJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { + this.dataSource = dataSource; + this.jdbcTemplate = jdbcTemplate; + } + + @Override + public Wallet save(Wallet wallet) { + return null; + } + + @Override + public Optional findById(String walletId) { + return Optional.empty(); + } + + @Override + public List findByCustomerId(String customerId) { + return null; + } + + @Override + public List findByVoucherId(String voucherId) { + return null; + } + + @Override + public void deleteByCustomerId(String customerId) { + + } + + static UUID toUUID(byte[] bytes) { + var byteBuffer = ByteBuffer.wrap(bytes); + return new UUID(byteBuffer.getLong(), byteBuffer.getLong()); + } } diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java b/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java index 7ee8cebf44..ec6fe6db55 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java @@ -4,8 +4,8 @@ public enum WalletMessage { COMPLETE_ADD("지갑 추가가 완료되었습니다."), COMPLETE_REMOVE("지갑 제거가 완료되었습니다."), - INPUT_CUSTOMER_ID("등록할 고객 아이디를 입력해주세요 : "), - INPUT_VOUCHER_ID("등록할 바우처 아이디를 입력해주세요 : "); + INPUT_CUSTOMER_ID("바우처가 등록될 고객 아이디를 입력해주세요 : "), + INPUT_VOUCHER_ID("고객에게 등록할 바우처 아이디를 입력해주세요 : "); private final String message; diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletService.java b/src/main/java/org/prgrms/kdt/wallet/WalletService.java index cc35ce7af7..fa0abd9434 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletService.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletService.java @@ -1,4 +1,46 @@ package org.prgrms.kdt.wallet; +import org.prgrms.kdt.customer.repository.CustomerRepository; +import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +import static org.prgrms.kdt.customer.CustomerMessage.EXCEPTION_NOT_EXIST_CUSTOMER; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_NOT_EXIST_VOUCHER; + +@Service public class WalletService { + private final WalletRepository walletRepository; + private final CustomerRepository customerRepository; + private final VoucherRepository voucherRepository; + + public WalletService(WalletRepository walletRepository, CustomerRepository customerRepository, VoucherRepository voucherRepository) { + this.walletRepository = walletRepository; + this.customerRepository = customerRepository; + this.voucherRepository = voucherRepository; + } + + public String addWallet(String customerId, String voucherId) { + validateCustomerExist(customerId); + validateVoucherExist(voucherId); + + Wallet wallet = new Wallet(customerId, voucherId); + return walletRepository.save(wallet).getWalletId(); + } + + public boolean deleteByCustomerId(String customerId) { + walletRepository.deleteByCustomerId(customerId); + return true; + } + + private void validateCustomerExist(String customerId) { + customerRepository.findById(UUID.fromString(customerId)) + .orElseThrow(() -> new RuntimeException(EXCEPTION_NOT_EXIST_CUSTOMER.getMessage())); + } + + private void validateVoucherExist(String voucherId) { + voucherRepository.findById(UUID.fromString(voucherId)) + .orElseThrow(() -> new RuntimeException(EXCEPTION_NOT_EXIST_VOUCHER.getMessage())); + } } diff --git a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java index 34d764b88a..67dd227ef6 100644 --- a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java +++ b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java @@ -59,7 +59,7 @@ public void testVoucherRepositoryCreation() { public void testOrderService() { // Given var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); - voucherRepository.insert(fixedAmountVoucher); + voucherRepository.save(fixedAmountVoucher); // When var order = orderService.createOrder( diff --git a/src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java b/src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java index 4ac063916b..f4ef316ec4 100644 --- a/src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java +++ b/src/test/java/org/prgrms/kdt/customer/CustomerJdbcRepositoryTest.java @@ -98,7 +98,7 @@ public void testHikariConnectionPool() { public void testInsert() { try { - customerJdbcRepository.insert(newCustomer); + customerJdbcRepository.save(newCustomer); } catch (BadSqlGrammarException e) { e.getSQLException().getErrorCode(); } diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java index c313c6a33b..7939586a29 100644 --- a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -28,7 +28,7 @@ void createOrder() { // Given var voucherRepository = new VoucherMemoryRepository(); var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); - voucherRepository.insert(fixedAmountVoucher); + voucherRepository.save(fixedAmountVoucher); var sut = new OrderService(new VoucherService(voucherRepository), new OrderRepositoryStub()); // When From 77814a7cb188506519cde327bee7f3d583336f79 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 30 Oct 2023 05:32:22 +0900 Subject: [PATCH 20/28] =?UTF-8?q?fix:=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?= =?UTF-8?q?=EB=9F=AC=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/KdtApplication.java | 7 +- .../kdt/customer/CustomerController.java | 74 +++++++++++++++-- .../org/prgrms/kdt/customer/CustomerDto.java | 4 + .../prgrms/kdt/customer/CustomerMessage.java | 4 +- .../prgrms/kdt/customer/CustomerService.java | 9 ++- .../repository/CustomerJdbcRepository.java | 29 ++++++- .../repository/CustomerRepository.java | 4 +- .../prgrms/kdt/io/ConsoleOutputHandler.java | 14 +++- .../org/prgrms/kdt/io/MenuController.java | 76 ++++++++++++----- .../java/org/prgrms/kdt/io/OutputHandler.java | 6 +- .../prgrms/kdt/voucher/VoucherController.java | 81 +++++++++---------- .../prgrms/kdt/voucher/VoucherMessage.java | 1 + .../prgrms/kdt/voucher/VoucherService.java | 25 +++--- .../repository/VoucherJdbcRepository.java | 17 ++++ .../repository/VoucherMemoryRepository.java | 6 ++ .../voucher/repository/VoucherRepository.java | 3 + .../prgrms/kdt/wallet/WalletController.java | 35 +++++--- .../org/prgrms/kdt/wallet/WalletService.java | 2 +- 18 files changed, 292 insertions(+), 105 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/customer/CustomerDto.java diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index 4118afdffa..af14453dac 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -1,6 +1,6 @@ package org.prgrms.kdt; -import org.prgrms.kdt.voucher.VoucherController; +import org.prgrms.kdt.io.MenuController; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -12,7 +12,7 @@ public class KdtApplication { public static void main(String[] args) throws IOException { ConfigurableApplicationContext applicationContext = SpringApplication.run(KdtApplication.class, args); - VoucherController voucherController = applicationContext.getBean(VoucherController.class); + MenuController menuController = applicationContext.getBean(MenuController.class); // // 등록된 bean의 이름을 get // String[] beanNames = applicationContext.getBeanDefinitionNames(); @@ -26,8 +26,7 @@ public static void main(String[] args) throws IOException { boolean isRepeat = true; while (isRepeat) { - // 여기서 메뉴 입력에 따른 VoucherController / CustomerController 로 분배 ?? - isRepeat = voucherController.startVoucherMenu(); + isRepeat = menuController.startMenu(); } } } diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerController.java b/src/main/java/org/prgrms/kdt/customer/CustomerController.java index af32be830a..bf04ba3618 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerController.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerController.java @@ -3,9 +3,18 @@ import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; import org.prgrms.kdt.voucher.domain.Voucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; +import java.io.IOException; +import java.time.LocalDateTime; import java.util.List; +import java.util.UUID; + +import static org.prgrms.kdt.customer.CustomerMessage.CREATE_CUSTOMER_EMAIL; +import static org.prgrms.kdt.customer.CustomerMessage.CREATE_CUSTOMER_NAME; +import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; @Controller public class CustomerController { @@ -14,23 +23,74 @@ public class CustomerController { private final OutputHandler outputHandler; private final InputHandler inputHandler; + private static final Logger logger = LoggerFactory.getLogger(CustomerController.class); + private static final String lineSeparator = System.lineSeparator(); + + private final String CREATE = "create"; + private final String VOUCHERS = "vouchers"; + private final String BLACK = "black"; + public CustomerController(CustomerService customerService, OutputHandler outputHandler, InputHandler inputHandler) { this.customerService = customerService; this.outputHandler = outputHandler; this.inputHandler = inputHandler; } - public void getBlackList() { - List blackList = customerService.getBlackList(); - outputHandler.outputBlackList(blackList); + public void customerMenu() throws IOException { + String menu = selectCustomerMenu(); + + switch (menu) { + case CREATE: + createCustomer(); + break; + case VOUCHERS: + getHaveVouchers(); + break; + case BLACK: + getBlackList(); + break; + default: + String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); + logger.error(errorMessage); + outputHandler.outputString(errorMessage); + break; + } } - public void getAllVoucher() { - List voucherList = customerService.getAllVoucher(); - outputHandler.outputVouchers(voucherList); + private String selectCustomerMenu() throws IOException { + StringBuilder sb = new StringBuilder(); + sb.append("=== Customer Program ==="); + sb.append(lineSeparator); + sb.append("[1] Type 'create' to create a new customer."); + sb.append(lineSeparator); + sb.append("[2] Type 'vouchers' to view vouchers held by a specific customer."); + sb.append(lineSeparator); + sb.append("[3] Type 'black' to view the blacklisted list."); + sb.append(lineSeparator); + + outputHandler.outputString(sb.toString()); + + return inputHandler.inputString(); + } + + private void createCustomer() throws IOException { + outputHandler.outputString(CREATE_CUSTOMER_NAME.getMessage()); + String name = inputHandler.inputString(); + outputHandler.outputString(CREATE_CUSTOMER_EMAIL.getMessage()); + String email = inputHandler.inputString(); + + Customer newCustomer = new Customer(UUID.randomUUID(), name, email, LocalDateTime.now()); + customerService.createCustomer(newCustomer); } - public void removeVoucher() { + private void getHaveVouchers() throws IOException { + UUID customerId = UUID.fromString(inputHandler.inputString()); + List voucherList = customerService.getHaveVouchers(customerId); + outputHandler.outputVouchers(voucherList); + } + private void getBlackList() { + List blackList = customerService.getBlackList(); + outputHandler.outputBlackList(blackList); } } diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerDto.java b/src/main/java/org/prgrms/kdt/customer/CustomerDto.java new file mode 100644 index 0000000000..c3a54cd71d --- /dev/null +++ b/src/main/java/org/prgrms/kdt/customer/CustomerDto.java @@ -0,0 +1,4 @@ +package org.prgrms.kdt.customer; + +public class CustomerDto { +} diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java b/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java index 75d99b0b39..22b14a5035 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java @@ -1,7 +1,9 @@ package org.prgrms.kdt.customer; public enum CustomerMessage { - EXCEPTION_NOT_EXIST_CUSTOMER("존재하지 않는 회원입니다."); + EXCEPTION_NOT_EXIST_CUSTOMER("존재하지 않는 회원입니다."), + CREATE_CUSTOMER_NAME("생성할 회원의 이름을 입력해주세요."), + CREATE_CUSTOMER_EMAIL("생성할 회원의 이메일을 입력해주세요."); private final String message; diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerService.java b/src/main/java/org/prgrms/kdt/customer/CustomerService.java index 7973870d4e..20763ab86d 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerService.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerService.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Service; import java.util.List; +import java.util.UUID; @Service public class CustomerService { @@ -16,11 +17,15 @@ public CustomerService(CustomerRepository customerRepository) { this.customerRepository = customerRepository; } + public Customer createCustomer(Customer customer) { + return customerRepository.save(customer); + } + public List getBlackList() { return customerRepository.findBlackList(); } - public List getAllVoucher() { - return customerRepository.findAllVoucher(); + public List getHaveVouchers(UUID customerId) { + return customerRepository.findHaveVouchersById(customerId); } } diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java index dd0e19713f..17e866603c 100644 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java @@ -1,6 +1,8 @@ package org.prgrms.kdt.customer.repository; import org.prgrms.kdt.customer.Customer; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,6 +24,8 @@ import java.util.Optional; import java.util.UUID; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_VOUCHER_ROW_MAPPER; + @Repository @Profile("dev") public class CustomerJdbcRepository implements CustomerRepository { @@ -40,7 +44,26 @@ public class CustomerJdbcRepository implements CustomerRepository { var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); return new Customer(customerId, customerName, email, lastLoginAt, createdAt); }; + private static final RowMapper voucherRowMapper = (resultSet, i) -> { + UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); + Integer amount = resultSet.getInt("amount"); + Integer percent = resultSet.getInt("percent"); + byte[] customerIdBytes = resultSet.getBytes("customer_id"); + UUID customerId = null; + if (customerIdBytes != null) { + customerId = toUUID(customerIdBytes); + } + + if (percent != 0) { + return new PercentDiscountVoucher(voucherId, percent, customerId); + } + if (amount != 0) { + return new FixedAmountVoucher(voucherId, amount, customerId); + } + logger.error("JdbcVoucherRepository RowMapper Error"); + throw new RuntimeException(EXCEPTION_VOUCHER_ROW_MAPPER.getMessage()); + }; public CustomerJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { this.dataSource = dataSource; this.jdbcTemplate = jdbcTemplate; @@ -125,8 +148,10 @@ public void deleteAll() { } @Override - public List findAllVoucher() { - return null; + public List findHaveVouchersById(UUID customerId) { + return jdbcTemplate.query("select * from wallets WHERE customer_id = UUID_TO_BIN(?)", + voucherRowMapper, + customerId.toString().getBytes()); } @Override diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java index b75bea0a44..e4ab03f0dd 100644 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerRepository.java @@ -9,6 +9,8 @@ public interface CustomerRepository { + List findHaveVouchersById(UUID customerId); + List findBlackList(); Customer save(Customer customer); @@ -26,6 +28,4 @@ public interface CustomerRepository { Optional findByEmail(String email); void deleteAll(); - - List findAllVoucher(); } diff --git a/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java index 844e46fa1b..cffc21b878 100644 --- a/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java @@ -12,8 +12,18 @@ public class ConsoleOutputHandler implements OutputHandler{ private static final String lineSeparator = System.lineSeparator(); @Override - public void outputSystemMessage(String message) { - System.out.print(message + lineSeparator); + public void outputString(String string) { + System.out.print(string + lineSeparator); + } + + @Override + public void outputCustomer(Customer customer) { + System.out.println(customer); + } + + @Override + public void outputVoucher(Voucher voucher) { + System.out.println(voucher); } @Override diff --git a/src/main/java/org/prgrms/kdt/io/MenuController.java b/src/main/java/org/prgrms/kdt/io/MenuController.java index e8f0bccaef..e15bd72ad6 100644 --- a/src/main/java/org/prgrms/kdt/io/MenuController.java +++ b/src/main/java/org/prgrms/kdt/io/MenuController.java @@ -1,49 +1,83 @@ package org.prgrms.kdt.io; +import org.prgrms.kdt.customer.CustomerController; +import org.prgrms.kdt.voucher.VoucherController; +import org.prgrms.kdt.wallet.WalletController; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import java.io.IOException; +import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; +import static org.prgrms.kdt.io.SystemMessage.EXIT_PROGRAM; + @Controller public class MenuController { - private static final String lineSeparator = System.lineSeparator(); + private final CustomerController customerController; + private final VoucherController voucherController; + private final WalletController walletController; private final InputHandler inputHandler; private final OutputHandler outputHandler; - public MenuController(InputHandler inputHandler, OutputHandler outputHandler) { + private static final Logger logger = LoggerFactory.getLogger(MenuController.class); + private static final String lineSeparator = System.lineSeparator(); + + private final String CUSTOMER = "customer"; + private final String VOUCHER = "voucher"; + private final String WALLET = "wallet"; + private final String EXIT = "exit"; + + public MenuController(CustomerController customerController, VoucherController voucherController, + WalletController walletController, InputHandler inputHandler, OutputHandler outputHandler) { + this.customerController = customerController; + this.voucherController = voucherController; + this.walletController = walletController; this.inputHandler = inputHandler; this.outputHandler = outputHandler; } - public String startMenu() throws IOException { - StringBuilder sb = new StringBuilder(); - sb.append("=== Voucher Program ==="); - sb.append(lineSeparator); - sb.append("[1] Type 'exit' to exit the program."); - sb.append(lineSeparator); - sb.append("[2] Type 'create' to create a new voucher."); - sb.append(lineSeparator); - sb.append("[3] Type 'list' to list all vouchers."); - sb.append(lineSeparator); - sb.append("[4] Type 'black' to list the blacklisted list."); - sb.append(lineSeparator); + public boolean startMenu() throws IOException { + String menu = selectMenu(); - outputHandler.outputSystemMessage(sb.toString()); + switch (menu) { + case CUSTOMER: + customerController.customerMenu(); + break; + case VOUCHER: + voucherController.voucherMenu(); + break; + case WALLET: + walletController.walletMenu(); + break; + case EXIT: + outputHandler.outputString(EXIT_PROGRAM.getMessage()); + return false; + default: + String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); + logger.error(errorMessage); + outputHandler.outputString(errorMessage); + break; + } - return inputHandler.inputString(); + return true; } - public String walletMenu() throws IOException { + private String selectMenu() throws IOException { StringBuilder sb = new StringBuilder(); - sb.append("=== Wallet Program ==="); + sb.append("=== Program ==="); + sb.append(lineSeparator); + sb.append("[1] Type 'customer' to enter a customer menu."); + sb.append(lineSeparator); + sb.append("[2] Type 'voucher' to enter a voucher menu."); sb.append(lineSeparator); - sb.append("[1] Type 'create' to create a new wallet."); + sb.append("[3] Type 'wallet' to enter a wallet menu."); sb.append(lineSeparator); - sb.append("[2] Type 'remove' to remove a wallet."); + sb.append("[4] Type 'exit' to exit the program."); sb.append(lineSeparator); - outputHandler.outputSystemMessage(sb.toString()); + outputHandler.outputString(sb.toString()); return inputHandler.inputString(); } diff --git a/src/main/java/org/prgrms/kdt/io/OutputHandler.java b/src/main/java/org/prgrms/kdt/io/OutputHandler.java index 508db35f74..2b87434d2f 100644 --- a/src/main/java/org/prgrms/kdt/io/OutputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/OutputHandler.java @@ -7,7 +7,11 @@ public interface OutputHandler { - void outputSystemMessage(String message); + void outputString(String message); + + void outputCustomer(Customer customer); + + void outputVoucher(Voucher voucher); void outputVouchers(List voucherList); diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index f8c51dc088..c7d5a2261f 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -1,22 +1,18 @@ package org.prgrms.kdt.voucher; +import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; -import org.prgrms.kdt.io.MenuController; -import org.prgrms.kdt.customer.CustomerController; import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; -import org.prgrms.kdt.voucher.domain.Voucher; -import org.prgrms.kdt.wallet.WalletController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import java.io.IOException; -import java.util.List; import java.util.UUID; -import static org.prgrms.kdt.io.SystemMessage.*; +import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; import static org.prgrms.kdt.voucher.VoucherMessage.*; @Controller @@ -24,61 +20,64 @@ public class VoucherController { private final InputHandler inputHandler; private final OutputHandler outputHandler; - private final MenuController menuController; private final VoucherService voucherService; - private final CustomerController customerController; - private final WalletController walletController; - private final String EXIT = "exit"; + private final String CREATE = "create"; - private final String LIST = "list"; + private final String OWNER = "owner"; private final String FIXED = "fixed"; private final String PERCENT = "percent"; - private final String BLACK = "black"; - private final String WALLET = "wallet"; + + private static final String lineSeparator = System.lineSeparator(); private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); - public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, MenuController menuController, VoucherService voucherService, CustomerController customerController, WalletController walletController) { + public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { this.inputHandler = inputHandler; this.outputHandler = outputHandler; - this.menuController = menuController; this.voucherService = voucherService; - this.customerController = customerController; - this.walletController = walletController; } - public boolean startVoucherMenu() throws IOException { - String menu = menuController.startMenu(); + public void voucherMenu() throws IOException { + String menu = selectVoucherMenu(); switch (menu) { - case EXIT: - outputHandler.outputSystemMessage(EXIT_PROGRAM.getMessage()); - return false; case CREATE: createVoucher(); break; - case LIST: - List voucherList = voucherService.getAllVouchers(); - outputHandler.outputVouchers(voucherList); - break; - case BLACK: - customerController.getBlackList(); - break; - case WALLET: - walletController.walletMenu(); + case OWNER: + getOwner(); break; default: String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); logger.error(errorMessage); - outputHandler.outputSystemMessage(errorMessage); + outputHandler.outputString(errorMessage); break; } + } + + public String selectVoucherMenu() throws IOException { + StringBuilder sb = new StringBuilder(); + sb.append("=== Voucher Program ==="); + sb.append(lineSeparator); + sb.append("[1] Type 'create' to create a new voucher."); + sb.append(lineSeparator); + sb.append("[2] Type 'owner' to view customer with a specific voucher."); + sb.append(lineSeparator); + + outputHandler.outputString(sb.toString()); + + return inputHandler.inputString(); + } - return true; + private void getOwner() throws IOException { + outputHandler.outputString(GET_OWNER.getMessage()); + UUID voucherId = UUID.fromString(inputHandler.inputString()); + Customer customer = voucherService.getOwner(voucherId); + outputHandler.outputCustomer(customer); } private void createVoucher() throws IOException { while (true) { - outputHandler.outputSystemMessage(CREATE_VOUCHER_TYPE.getMessage()); + outputHandler.outputString(CREATE_VOUCHER_TYPE.getMessage()); var createVoucherType = inputHandler.inputString(); var isRepeat = true; @@ -94,13 +93,13 @@ private void createVoucher() throws IOException { } else { String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); logger.error(errorMessage); - outputHandler.outputSystemMessage(errorMessage); + outputHandler.outputString(errorMessage); } } } private boolean createFixedAmountVoucher() throws IOException { - outputHandler.outputSystemMessage(CREATE_FIXED_VOUCHER.getMessage()); + outputHandler.outputString(CREATE_FIXED_VOUCHER.getMessage()); var amount = 0; while (true) { @@ -109,13 +108,13 @@ private boolean createFixedAmountVoucher() throws IOException { if (amount <= 0) { String errorMessage = EXCEPTION_FIXED_AMOUNT_MINUS.getMessage(); logger.error(errorMessage); - outputHandler.outputSystemMessage(errorMessage); + outputHandler.outputString(errorMessage); continue; } if (amount >= 100_000) { String errorMessage = EXCEPTION_FIXED_AMOUNT_OVER.getMessage(); logger.error(errorMessage); - outputHandler.outputSystemMessage(errorMessage); + outputHandler.outputString(errorMessage); continue; } break; @@ -127,7 +126,7 @@ private boolean createFixedAmountVoucher() throws IOException { } private boolean createPercentDiscountVoucher() throws IOException { - outputHandler.outputSystemMessage(CREATE_PERCENT_VOUCHER.getMessage()); + outputHandler.outputString(CREATE_PERCENT_VOUCHER.getMessage()); var percent = 0; while (true) { @@ -136,13 +135,13 @@ private boolean createPercentDiscountVoucher() throws IOException { if (percent <= 0) { String errorMessage = EXCEPTION_PERCENT_MINUS.getMessage(); logger.error(errorMessage); - outputHandler.outputSystemMessage(errorMessage); + outputHandler.outputString(errorMessage); continue; } if (percent >= 100) { String errorMessage = EXCEPTION_PERCENT_OVER.getMessage(); logger.error(errorMessage); - outputHandler.outputSystemMessage(errorMessage); + outputHandler.outputString(errorMessage); continue; } break; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java index 4c8b305ee2..6176cb9512 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java @@ -4,6 +4,7 @@ public enum VoucherMessage { CREATE_VOUCHER_TYPE("fixed, percent 중 어떤 타입의 바우처를 만드시겠습니까?"), CREATE_FIXED_VOUCHER("고정으로 할인되는 비용을 입력하세요."), CREATE_PERCENT_VOUCHER("할인되는 퍼센트를 정수로 입력하세요."), + GET_OWNER("소유주를 확인할 바우처의 아이디를 입력하세요."), VOUCHER_IS_EMPTY("조회한 바우처가 하나도 존재하지 않습니다."), EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java index cf2663ff6e..59e6c96a1d 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java @@ -1,5 +1,6 @@ package org.prgrms.kdt.voucher; +import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; @@ -29,16 +30,6 @@ public VoucherService(VoucherRepository voucherRepository) { this.voucherRepository = voucherRepository; } - public Voucher getVoucher(UUID voucherId) { - return voucherRepository - .findById(voucherId) - .orElseThrow(() -> { - String errorMessage = MessageFormat.format( "{0}" + EXCEPTION_FIND_VOUCHER.getMessage(), voucherId); - logger.error(errorMessage); - return new RuntimeException(errorMessage); - }); - } - public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); voucherRepository.save(voucher); @@ -49,6 +40,16 @@ public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { voucherRepository.save(voucher); } + public Voucher getVoucher(UUID voucherId) { + return voucherRepository + .findById(voucherId) + .orElseThrow(() -> { + String errorMessage = MessageFormat.format( "{0}" + EXCEPTION_FIND_VOUCHER.getMessage(), voucherId); + logger.error(errorMessage); + return new RuntimeException(errorMessage); + }); + } + public List getAllVouchers() { var voucherList = voucherRepository.findAll(); if (voucherList.isEmpty()) { @@ -57,6 +58,10 @@ public List getAllVouchers() { return voucherList; } + public Customer getOwner(UUID voucherId) { + return voucherRepository.findOwnerById(voucherId); + } + public void useVoucher(Voucher voucher) { } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index cb8c7bb003..8411f16b9e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -1,5 +1,6 @@ package org.prgrms.kdt.voucher.repository; +import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; @@ -50,6 +51,15 @@ public class VoucherJdbcRepository implements VoucherRepository { logger.error("JdbcVoucherRepository RowMapper Error"); throw new RuntimeException(EXCEPTION_VOUCHER_ROW_MAPPER.getMessage()); }; + private static final RowMapper customerRowMapper = (resultSet, i) -> { + var customerName = resultSet.getString("name"); + var email = resultSet.getString("email"); + var customerId = toUUID(resultSet.getBytes("customer_id")); + var lastLoginAt = resultSet.getTimestamp("last_login_at") != null ? + resultSet.getTimestamp("last_login_at").toLocalDateTime() : null; + var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); + return new Customer(customerId, customerName, email, lastLoginAt, createdAt); + }; public VoucherJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { this.dataSource = dataSource; @@ -68,6 +78,13 @@ public Optional findById(UUID voucherId) { } } + @Override + public Customer findOwnerById(UUID voucherId) { + return jdbcTemplate.queryForObject("select * from wallets WHERE voucher_id = UUID_TO_BIN(?)", + customerRowMapper, + voucherId.toString().getBytes()); + } + @Override public Voucher save(Voucher voucher) { String voucherType = voucher.getClass().getName(); diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java index 0f87229004..8da357635e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java @@ -1,5 +1,6 @@ package org.prgrms.kdt.voucher.repository; +import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,6 +17,11 @@ public class VoucherMemoryRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); private static final Logger logger = LoggerFactory.getLogger(VoucherMemoryRepository.class); + @Override + public Customer findOwnerById(UUID voucherId) { + return null; + } + @Override public Optional findById(UUID voucherId) { return Optional.ofNullable(storage.get(voucherId)); diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index f0196f8c79..53f97be423 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -1,5 +1,6 @@ package org.prgrms.kdt.voucher.repository; +import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import java.util.List; @@ -8,6 +9,8 @@ public interface VoucherRepository { + Customer findOwnerById(UUID voucherId); + Optional findById(UUID voucherId); Voucher save(Voucher voucher); diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletController.java b/src/main/java/org/prgrms/kdt/wallet/WalletController.java index 4dde5bb585..cf2a1ff4de 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletController.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletController.java @@ -1,7 +1,6 @@ package org.prgrms.kdt.wallet; import org.prgrms.kdt.io.InputHandler; -import org.prgrms.kdt.io.MenuController; import org.prgrms.kdt.io.OutputHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,23 +15,23 @@ public class WalletController { private final WalletService walletService; - private final MenuController menuController; private final InputHandler inputHandler; private final OutputHandler outputHandler; + private static final Logger logger = LoggerFactory.getLogger(WalletController.class); + private static final String lineSeparator = System.lineSeparator(); private final String CREATE = "create"; private final String REMOVE = "remove"; - public WalletController(WalletService walletService, MenuController menuController, InputHandler inputHandler, OutputHandler outputHandler) { + public WalletController(WalletService walletService, InputHandler inputHandler, OutputHandler outputHandler) { this.walletService = walletService; - this.menuController = menuController; this.inputHandler = inputHandler; this.outputHandler = outputHandler; } public void walletMenu() throws IOException { - String menu = menuController.walletMenu(); + String menu = selectWalletMenu(); switch (menu) { case CREATE: @@ -44,28 +43,42 @@ public void walletMenu() throws IOException { default: String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); logger.error(errorMessage); - outputHandler.outputSystemMessage(errorMessage); + outputHandler.outputString(errorMessage); break; } } + private String selectWalletMenu() throws IOException { + StringBuilder sb = new StringBuilder(); + sb.append("=== Wallet Program ==="); + sb.append(lineSeparator); + sb.append("[1] Type 'create' to create a new wallet."); + sb.append(lineSeparator); + sb.append("[2] Type 'remove' to remove a wallet."); + sb.append(lineSeparator); + + outputHandler.outputString(sb.toString()); + + return inputHandler.inputString(); + } + private void addWallet() throws IOException { - outputHandler.outputSystemMessage(INPUT_CUSTOMER_ID.getMessage()); + outputHandler.outputString(INPUT_CUSTOMER_ID.getMessage()); String customerId = inputHandler.inputString(); - outputHandler.outputSystemMessage(INPUT_VOUCHER_ID.getMessage()); + outputHandler.outputString(INPUT_VOUCHER_ID.getMessage()); String voucherId = inputHandler.inputString(); walletService.addWallet(customerId, voucherId); - outputHandler.outputSystemMessage(COMPLETE_ADD.getMessage()); + outputHandler.outputString(COMPLETE_ADD.getMessage()); } private void removeWalletByCustomerId() throws IOException { - outputHandler.outputSystemMessage(INPUT_CUSTOMER_ID.getMessage()); + outputHandler.outputString(INPUT_CUSTOMER_ID.getMessage()); String customerId = inputHandler.inputString(); walletService.deleteByCustomerId(customerId); - outputHandler.outputSystemMessage(COMPLETE_REMOVE.getMessage()); + outputHandler.outputString(COMPLETE_REMOVE.getMessage()); } } diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletService.java b/src/main/java/org/prgrms/kdt/wallet/WalletService.java index fa0abd9434..8196b7448a 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletService.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletService.java @@ -25,7 +25,7 @@ public String addWallet(String customerId, String voucherId) { validateCustomerExist(customerId); validateVoucherExist(voucherId); - Wallet wallet = new Wallet(customerId, voucherId); + Wallet wallet = new Wallet(UUID.randomUUID().toString(), customerId, voucherId); return walletRepository.save(wallet).getWalletId(); } From 93024ff274d513ee770866743289db5362584c58 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 30 Oct 2023 06:53:48 +0900 Subject: [PATCH 21/28] =?UTF-8?q?feat:=20Wallet=20=EB=AA=A8=EB=91=90=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20&=20=ED=8A=B9=EC=A0=95=20=EA=B3=A0?= =?UTF-8?q?=EA=B0=9D=EC=9D=B4=20=EC=86=8C=EC=9C=A0=ED=95=9C=20=EB=B0=94?= =?UTF-8?q?=EC=9A=B0=EC=B2=98=20=EC=A1=B0=ED=9A=8C=20&=20=ED=8A=B9?= =?UTF-8?q?=EC=A0=95=20=EB=B0=94=EC=9A=B0=EC=B2=98=EB=A5=BC=20=EB=B3=B4?= =?UTF-8?q?=EC=9C=A0=ED=95=9C=20=EA=B3=A0=EA=B0=9D=EC=9D=84=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kdt/customer/CustomerController.java | 10 +-- .../prgrms/kdt/customer/CustomerMessage.java | 5 +- .../prgrms/kdt/customer/CustomerService.java | 11 +-- .../repository/CustomerJdbcRepository.java | 2 +- .../prgrms/kdt/io/ConsoleOutputHandler.java | 19 +++++ .../java/org/prgrms/kdt/io/OutputHandler.java | 6 ++ .../prgrms/kdt/voucher/VoucherController.java | 7 +- .../prgrms/kdt/voucher/VoucherMessage.java | 8 +-- .../prgrms/kdt/voucher/VoucherService.java | 14 ++-- .../repository/VoucherJdbcRepository.java | 7 -- .../repository/VoucherMemoryRepository.java | 6 -- .../voucher/repository/VoucherRepository.java | 3 - .../java/org/prgrms/kdt/wallet/Wallet.java | 9 +++ .../prgrms/kdt/wallet/WalletController.java | 6 +- .../kdt/wallet/WalletJdbcRepository.java | 71 +++++++++++++++++-- .../org/prgrms/kdt/wallet/WalletMessage.java | 5 +- .../prgrms/kdt/wallet/WalletRepository.java | 2 +- .../prgrms/kdt/order/OrderServiceTest.java | 4 +- 18 files changed, 141 insertions(+), 54 deletions(-) diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerController.java b/src/main/java/org/prgrms/kdt/customer/CustomerController.java index bf04ba3618..def69cc13c 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerController.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerController.java @@ -2,7 +2,7 @@ import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; -import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; @@ -12,8 +12,7 @@ import java.util.List; import java.util.UUID; -import static org.prgrms.kdt.customer.CustomerMessage.CREATE_CUSTOMER_EMAIL; -import static org.prgrms.kdt.customer.CustomerMessage.CREATE_CUSTOMER_NAME; +import static org.prgrms.kdt.customer.CustomerMessage.*; import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; @Controller @@ -84,9 +83,10 @@ private void createCustomer() throws IOException { } private void getHaveVouchers() throws IOException { + outputHandler.outputString(GET_HAVE_VOUCHERS.getMessage()); UUID customerId = UUID.fromString(inputHandler.inputString()); - List voucherList = customerService.getHaveVouchers(customerId); - outputHandler.outputVouchers(voucherList); + List walletList = customerService.getHaveVouchers(customerId); + outputHandler.outputWallets(walletList); } private void getBlackList() { diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java b/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java index 22b14a5035..26d050f14a 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerMessage.java @@ -2,8 +2,9 @@ public enum CustomerMessage { EXCEPTION_NOT_EXIST_CUSTOMER("존재하지 않는 회원입니다."), - CREATE_CUSTOMER_NAME("생성할 회원의 이름을 입력해주세요."), - CREATE_CUSTOMER_EMAIL("생성할 회원의 이메일을 입력해주세요."); + GET_HAVE_VOUCHERS("가지고있는 바우처를 모두 조회할 고객의 아이디를 입력해주세요 : "), + CREATE_CUSTOMER_NAME("생성할 회원의 이름을 입력해주세요 : "), + CREATE_CUSTOMER_EMAIL("생성할 회원의 이메일을 입력해주세요 : "); private final String message; diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerService.java b/src/main/java/org/prgrms/kdt/customer/CustomerService.java index 20763ab86d..a9a25d38ee 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerService.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerService.java @@ -2,7 +2,8 @@ import org.prgrms.kdt.customer.repository.CustomerRepository; -import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.wallet.Wallet; +import org.prgrms.kdt.wallet.WalletRepository; import org.springframework.stereotype.Service; import java.util.List; @@ -12,9 +13,11 @@ public class CustomerService { private final CustomerRepository customerRepository; + private final WalletRepository walletRepository; - public CustomerService(CustomerRepository customerRepository) { + public CustomerService(CustomerRepository customerRepository, WalletRepository walletRepository) { this.customerRepository = customerRepository; + this.walletRepository = walletRepository; } public Customer createCustomer(Customer customer) { @@ -25,7 +28,7 @@ public List getBlackList() { return customerRepository.findBlackList(); } - public List getHaveVouchers(UUID customerId) { - return customerRepository.findHaveVouchersById(customerId); + public List getHaveVouchers(UUID customerId) { + return walletRepository.findByCustomerId(customerId.toString()); } } diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java index 17e866603c..9f33ce341a 100644 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java @@ -71,7 +71,7 @@ public CustomerJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) @Override public Customer save(Customer customer) { - var update = jdbcTemplate.update("INSERT INTO customers(customer_id, name, email, created_at) VALUES (UUID_TO_BIN(?), ?, ?, ?)", + int update = jdbcTemplate.update("INSERT INTO customers(customer_id, name, email, created_at) VALUES (UUID_TO_BIN(?), ?, ?, ?)", customer.getCustomerId().toString().getBytes(), customer.getName(), customer.getEmail(), diff --git a/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java b/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java index cffc21b878..734969f85f 100644 --- a/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/ConsoleOutputHandler.java @@ -2,9 +2,11 @@ import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.wallet.Wallet; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Optional; @Component public class ConsoleOutputHandler implements OutputHandler{ @@ -26,6 +28,23 @@ public void outputVoucher(Voucher voucher) { System.out.println(voucher); } + @Override + public void outputWallet(Optional wallet) { + System.out.println(wallet); + } + + @Override + public void outputWallets(List walletList) { + StringBuilder sb = new StringBuilder(); + + walletList.forEach(wallet -> { + sb.append(wallet); + sb.append(lineSeparator); + }); + + System.out.println(sb.toString()); + } + @Override public void outputVouchers(List voucherList) { StringBuilder sb = new StringBuilder(); diff --git a/src/main/java/org/prgrms/kdt/io/OutputHandler.java b/src/main/java/org/prgrms/kdt/io/OutputHandler.java index 2b87434d2f..0810de5d84 100644 --- a/src/main/java/org/prgrms/kdt/io/OutputHandler.java +++ b/src/main/java/org/prgrms/kdt/io/OutputHandler.java @@ -2,8 +2,10 @@ import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.wallet.Wallet; import java.util.List; +import java.util.Optional; public interface OutputHandler { @@ -13,6 +15,10 @@ public interface OutputHandler { void outputVoucher(Voucher voucher); + void outputWallet(Optional wallet); + + void outputWallets(List walletList); + void outputVouchers(List voucherList); void outputBlackList(List customerList); diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index c7d5a2261f..78dfdc2f91 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -1,15 +1,16 @@ package org.prgrms.kdt.voucher; -import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; +import org.prgrms.kdt.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import java.io.IOException; +import java.util.Optional; import java.util.UUID; import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; @@ -71,8 +72,8 @@ public String selectVoucherMenu() throws IOException { private void getOwner() throws IOException { outputHandler.outputString(GET_OWNER.getMessage()); UUID voucherId = UUID.fromString(inputHandler.inputString()); - Customer customer = voucherService.getOwner(voucherId); - outputHandler.outputCustomer(customer); + Optional wallet = voucherService.getOwner(voucherId); + outputHandler.outputWallet(wallet); } private void createVoucher() throws IOException { diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java index 6176cb9512..0b77452a44 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java @@ -1,10 +1,10 @@ package org.prgrms.kdt.voucher; public enum VoucherMessage { - CREATE_VOUCHER_TYPE("fixed, percent 중 어떤 타입의 바우처를 만드시겠습니까?"), - CREATE_FIXED_VOUCHER("고정으로 할인되는 비용을 입력하세요."), - CREATE_PERCENT_VOUCHER("할인되는 퍼센트를 정수로 입력하세요."), - GET_OWNER("소유주를 확인할 바우처의 아이디를 입력하세요."), + CREATE_VOUCHER_TYPE("fixed, percent 중에서 만들 바우처의 타입을 입력해주세요 : "), + CREATE_FIXED_VOUCHER("고정으로 할인되는 비용을 입력해주세요 : "), + CREATE_PERCENT_VOUCHER("할인되는 퍼센트를 정수로 입력해주세요 : "), + GET_OWNER("소유주를 확인할 바우처의 아이디를 입력해주세요 : "), VOUCHER_IS_EMPTY("조회한 바우처가 하나도 존재하지 않습니다."), EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java index 59e6c96a1d..cc68b7cc57 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherService.java @@ -1,19 +1,20 @@ package org.prgrms.kdt.voucher; -import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.prgrms.kdt.wallet.Wallet; +import org.prgrms.kdt.wallet.WalletRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import java.text.MessageFormat; -import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.UUID; import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIND_VOUCHER; @@ -23,11 +24,12 @@ public class VoucherService { private final VoucherRepository voucherRepository; - private List voucherList = new ArrayList<>(); + private final WalletRepository walletRepository; private static final Logger logger = LoggerFactory.getLogger(VoucherService.class); - public VoucherService(VoucherRepository voucherRepository) { + public VoucherService(VoucherRepository voucherRepository, WalletRepository walletRepository) { this.voucherRepository = voucherRepository; + this.walletRepository = walletRepository; } public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { @@ -58,8 +60,8 @@ public List getAllVouchers() { return voucherList; } - public Customer getOwner(UUID voucherId) { - return voucherRepository.findOwnerById(voucherId); + public Optional getOwner(UUID voucherId) { + return walletRepository.findByVoucherId(voucherId.toString()); } public void useVoucher(Voucher voucher) { diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index 8411f16b9e..5660288e38 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -78,13 +78,6 @@ public Optional findById(UUID voucherId) { } } - @Override - public Customer findOwnerById(UUID voucherId) { - return jdbcTemplate.queryForObject("select * from wallets WHERE voucher_id = UUID_TO_BIN(?)", - customerRowMapper, - voucherId.toString().getBytes()); - } - @Override public Voucher save(Voucher voucher) { String voucherType = voucher.getClass().getName(); diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java index 8da357635e..0f87229004 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java @@ -1,6 +1,5 @@ package org.prgrms.kdt.voucher.repository; -import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,11 +16,6 @@ public class VoucherMemoryRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); private static final Logger logger = LoggerFactory.getLogger(VoucherMemoryRepository.class); - @Override - public Customer findOwnerById(UUID voucherId) { - return null; - } - @Override public Optional findById(UUID voucherId) { return Optional.ofNullable(storage.get(voucherId)); diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index 53f97be423..f0196f8c79 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -1,6 +1,5 @@ package org.prgrms.kdt.voucher.repository; -import org.prgrms.kdt.customer.Customer; import org.prgrms.kdt.voucher.domain.Voucher; import java.util.List; @@ -9,8 +8,6 @@ public interface VoucherRepository { - Customer findOwnerById(UUID voucherId); - Optional findById(UUID voucherId); Voucher save(Voucher voucher); diff --git a/src/main/java/org/prgrms/kdt/wallet/Wallet.java b/src/main/java/org/prgrms/kdt/wallet/Wallet.java index e136243510..521eccdbe4 100644 --- a/src/main/java/org/prgrms/kdt/wallet/Wallet.java +++ b/src/main/java/org/prgrms/kdt/wallet/Wallet.java @@ -30,4 +30,13 @@ public String getCustomerId() { public String getVoucherId() { return voucherId; } + + @Override + public String toString() { + return "Wallet{" + + "walletId='" + walletId + '\'' + + ", customerId='" + customerId + '\'' + + ", voucherId='" + voucherId + '\'' + + '}'; + } } diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletController.java b/src/main/java/org/prgrms/kdt/wallet/WalletController.java index cf2a1ff4de..687437f677 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletController.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletController.java @@ -63,9 +63,9 @@ private String selectWalletMenu() throws IOException { } private void addWallet() throws IOException { - outputHandler.outputString(INPUT_CUSTOMER_ID.getMessage()); + outputHandler.outputString(ADD_CUSTOMER_ID.getMessage()); String customerId = inputHandler.inputString(); - outputHandler.outputString(INPUT_VOUCHER_ID.getMessage()); + outputHandler.outputString(ADD_VOUCHER_ID.getMessage()); String voucherId = inputHandler.inputString(); walletService.addWallet(customerId, voucherId); @@ -74,7 +74,7 @@ private void addWallet() throws IOException { } private void removeWalletByCustomerId() throws IOException { - outputHandler.outputString(INPUT_CUSTOMER_ID.getMessage()); + outputHandler.outputString(REMOVE_CUSTOMER_ID.getMessage()); String customerId = inputHandler.inputString(); walletService.deleteByCustomerId(customerId); diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java index 0d726560e3..a73b040ad2 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java @@ -1,7 +1,12 @@ package org.prgrms.kdt.wallet; +import org.prgrms.kdt.customer.Customer; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; +import org.prgrms.kdt.voucher.domain.Voucher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Repository; @@ -12,6 +17,8 @@ import java.util.Optional; import java.util.UUID; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_VOUCHER_ROW_MAPPER; + @Repository public class WalletJdbcRepository implements WalletRepository{ private static final Logger logger = LoggerFactory.getLogger(WalletJdbcRepository.class); @@ -22,6 +29,35 @@ public class WalletJdbcRepository implements WalletRepository{ UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); return new Wallet(customerId.toString(), voucherId.toString()); }; + private static final RowMapper voucherRowMapper = (resultSet, i) -> { + UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); + Integer amount = resultSet.getInt("amount"); + Integer percent = resultSet.getInt("percent"); + byte[] customerIdBytes = resultSet.getBytes("customer_id"); + UUID customerId = null; + if (customerIdBytes != null) { + customerId = toUUID(customerIdBytes); + } + + if (percent != 0) { + return new PercentDiscountVoucher(voucherId, percent, customerId); + } + if (amount != 0) { + return new FixedAmountVoucher(voucherId, amount, customerId); + } + + logger.error("JdbcVoucherRepository RowMapper Error"); + throw new RuntimeException(EXCEPTION_VOUCHER_ROW_MAPPER.getMessage()); + }; + private static final RowMapper customerRowMapper = (resultSet, i) -> { + var customerName = resultSet.getString("name"); + var email = resultSet.getString("email"); + var customerId = toUUID(resultSet.getBytes("customer_id")); + var lastLoginAt = resultSet.getTimestamp("last_login_at") != null ? + resultSet.getTimestamp("last_login_at").toLocalDateTime() : null; + var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); + return new Customer(customerId, customerName, email, lastLoginAt, createdAt); + }; public WalletJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { this.dataSource = dataSource; @@ -30,27 +66,50 @@ public WalletJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { @Override public Wallet save(Wallet wallet) { - return null; + int update = jdbcTemplate.update("INSERT INTO wallets(wallet_id, customer_id, voucher_id) VALUES (UUID_TO_BIN(?), UUID_TO_BIN(?), UUID_TO_BIN(?))", + wallet.getWalletId().toString().getBytes(), + wallet.getCustomerId().toString().getBytes(), + wallet.getVoucherId().toString().getBytes()); + if (update != 1) { + throw new RuntimeException("Noting was inserted"); + } + return wallet; } @Override public Optional findById(String walletId) { - return Optional.empty(); + try { + return Optional.ofNullable(jdbcTemplate.queryForObject("select * from wallets WHERE wallet_id = UUID_TO_BIN(?)", + walletRowMapper, + walletId.getBytes())); + } catch (EmptyResultDataAccessException e) { + logger.error("Got empty result", e); + return Optional.empty(); + } } @Override public List findByCustomerId(String customerId) { - return null; + return jdbcTemplate.query("select * from wallets WHERE customer_id = UUID_TO_BIN(?)", + walletRowMapper, + customerId.getBytes()); } @Override - public List findByVoucherId(String voucherId) { - return null; + public Optional findByVoucherId(String voucherId) { + try { + return Optional.ofNullable(jdbcTemplate.queryForObject("select * from wallets WHERE voucher_id = UUID_TO_BIN(?)", + walletRowMapper, + voucherId.getBytes())); + } catch (EmptyResultDataAccessException e) { + logger.error("Got empty result", e); + return Optional.empty(); + } } @Override public void deleteByCustomerId(String customerId) { - + jdbcTemplate.update("DELETE FROM wallets WHERE customer_id = UUID_TO_BIN(?)", customerId.getBytes()); } static UUID toUUID(byte[] bytes) { diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java b/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java index ec6fe6db55..ae1b412742 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletMessage.java @@ -4,8 +4,9 @@ public enum WalletMessage { COMPLETE_ADD("지갑 추가가 완료되었습니다."), COMPLETE_REMOVE("지갑 제거가 완료되었습니다."), - INPUT_CUSTOMER_ID("바우처가 등록될 고객 아이디를 입력해주세요 : "), - INPUT_VOUCHER_ID("고객에게 등록할 바우처 아이디를 입력해주세요 : "); + REMOVE_CUSTOMER_ID("바우처를 모두 제거할 고객의 아이디를 입력해주세요 : "), + ADD_CUSTOMER_ID("바우처가 등록될 고객 아이디를 입력해주세요 : "), + ADD_VOUCHER_ID("고객에게 등록할 바우처 아이디를 입력해주세요 : "); private final String message; diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletRepository.java b/src/main/java/org/prgrms/kdt/wallet/WalletRepository.java index 00f0a0e758..81d701d3fc 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletRepository.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletRepository.java @@ -10,7 +10,7 @@ public interface WalletRepository { List findByCustomerId(String customerId); - List findByVoucherId(String voucherId); + Optional findByVoucherId(String voucherId); void deleteByCustomerId(String customerId); } diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java index 7939586a29..c7a78cb9f8 100644 --- a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -5,6 +5,7 @@ import org.prgrms.kdt.voucher.VoucherService; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.repository.VoucherMemoryRepository; +import org.prgrms.kdt.wallet.WalletJdbcRepository; import java.util.List; import java.util.UUID; @@ -27,9 +28,10 @@ public Order insert(Order order) { void createOrder() { // Given var voucherRepository = new VoucherMemoryRepository(); + var walletRepository = new WalletJdbcRepository(); var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); voucherRepository.save(fixedAmountVoucher); - var sut = new OrderService(new VoucherService(voucherRepository), new OrderRepositoryStub()); + var sut = new OrderService(new VoucherService(voucherRepository, walletRepository), new OrderRepositoryStub()); // When var order = sut.createOrder(UUID.randomUUID(), List.of(new OrderItem(UUID.randomUUID(), 200, 1)), fixedAmountVoucher.getVoucherId()); From ce698a4e980e0333db110642ed4af395af1a0c0e Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Sat, 4 Nov 2023 23:57:36 +0900 Subject: [PATCH 22/28] =?UTF-8?q?fix:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0,=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=A0=95=EB=A6=AC=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/AppConfiguration.java | 3 +- .../java/org/prgrms/kdt/KdtApplication.java | 15 +--- ...enuController.java => ModeController.java} | 44 +++++----- .../kdt/util/YamlPropertiesFactory.java | 22 ----- .../prgrms/kdt/voucher/VoucherController.java | 13 ++- .../org/prgrms/kdt/voucher/VoucherMenu.java | 6 ++ .../repository/VoucherJdbcRepository.java | 1 - .../org/prgrms/kdt/KdtApplicationTests.java | 13 --- .../voucher/VoucherJdbcRepositoryTest.java | 82 +++++++++++++++++++ 9 files changed, 116 insertions(+), 83 deletions(-) rename src/main/java/org/prgrms/kdt/io/{MenuController.java => ModeController.java} (68%) delete mode 100644 src/main/java/org/prgrms/kdt/util/YamlPropertiesFactory.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java delete mode 100644 src/test/java/org/prgrms/kdt/KdtApplicationTests.java create mode 100644 src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java diff --git a/src/main/java/org/prgrms/kdt/AppConfiguration.java b/src/main/java/org/prgrms/kdt/AppConfiguration.java index 8abb06ecf1..6ab97b44af 100644 --- a/src/main/java/org/prgrms/kdt/AppConfiguration.java +++ b/src/main/java/org/prgrms/kdt/AppConfiguration.java @@ -2,7 +2,6 @@ import com.zaxxer.hikari.HikariDataSource; -import org.prgrms.kdt.util.YamlPropertiesFactory; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.context.annotation.Bean; @@ -16,7 +15,7 @@ @ComponentScan( basePackages = {"org.prgrms.kdt.voucher", "org.prgrms.kdt.order", "org.prgrms.kdt.io"} ) -@PropertySource(value = "application.yaml", factory = YamlPropertiesFactory.class) +@PropertySource(value = "application.yaml") @EnableConfigurationProperties public class AppConfiguration { diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index af14453dac..a380e31d0e 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -1,6 +1,6 @@ package org.prgrms.kdt; -import org.prgrms.kdt.io.MenuController; +import org.prgrms.kdt.io.ModeController; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -12,21 +12,12 @@ public class KdtApplication { public static void main(String[] args) throws IOException { ConfigurableApplicationContext applicationContext = SpringApplication.run(KdtApplication.class, args); - MenuController menuController = applicationContext.getBean(MenuController.class); - -// // 등록된 bean의 이름을 get -// String[] beanNames = applicationContext.getBeanDefinitionNames(); -// -// // bean 이름을 출력 -// for(String beanName : beanNames) { -// System.out.println(beanName); -// } -// System.out.println(); + ModeController modeController = applicationContext.getBean(ModeController.class); boolean isRepeat = true; while (isRepeat) { - isRepeat = menuController.startMenu(); + isRepeat = modeController.modeList(); } } } diff --git a/src/main/java/org/prgrms/kdt/io/MenuController.java b/src/main/java/org/prgrms/kdt/io/ModeController.java similarity index 68% rename from src/main/java/org/prgrms/kdt/io/MenuController.java rename to src/main/java/org/prgrms/kdt/io/ModeController.java index e15bd72ad6..e792ab3661 100644 --- a/src/main/java/org/prgrms/kdt/io/MenuController.java +++ b/src/main/java/org/prgrms/kdt/io/ModeController.java @@ -13,7 +13,7 @@ import static org.prgrms.kdt.io.SystemMessage.EXIT_PROGRAM; @Controller -public class MenuController { +public class ModeController { private final CustomerController customerController; private final VoucherController voucherController; @@ -21,15 +21,15 @@ public class MenuController { private final InputHandler inputHandler; private final OutputHandler outputHandler; - private static final Logger logger = LoggerFactory.getLogger(MenuController.class); + private static final Logger logger = LoggerFactory.getLogger(ModeController.class); private static final String lineSeparator = System.lineSeparator(); - private final String CUSTOMER = "customer"; - private final String VOUCHER = "voucher"; - private final String WALLET = "wallet"; - private final String EXIT = "exit"; + private final String MODE_WALLET = "wallet"; + private final String MODE_CUSTOMER = "customer"; + private final String MODE_VOUCHER = "voucher"; + private final String MODE_EXIT = "mode"; - public MenuController(CustomerController customerController, VoucherController voucherController, + public ModeController(CustomerController customerController, VoucherController voucherController, WalletController walletController, InputHandler inputHandler, OutputHandler outputHandler) { this.customerController = customerController; this.voucherController = voucherController; @@ -38,20 +38,20 @@ public MenuController(CustomerController customerController, VoucherController v this.outputHandler = outputHandler; } - public boolean startMenu() throws IOException { - String menu = selectMenu(); + public boolean modeList() throws IOException { + String menu = modeSelect(); switch (menu) { - case CUSTOMER: + case MODE_CUSTOMER: customerController.customerMenu(); break; - case VOUCHER: + case MODE_VOUCHER: voucherController.voucherMenu(); break; - case WALLET: + case MODE_WALLET: walletController.walletMenu(); break; - case EXIT: + case MODE_EXIT: outputHandler.outputString(EXIT_PROGRAM.getMessage()); return false; default: @@ -64,21 +64,15 @@ public boolean startMenu() throws IOException { return true; } - private String selectMenu() throws IOException { + private String modeSelect() throws IOException { StringBuilder sb = new StringBuilder(); - sb.append("=== Program ==="); - sb.append(lineSeparator); - sb.append("[1] Type 'customer' to enter a customer menu."); - sb.append(lineSeparator); - sb.append("[2] Type 'voucher' to enter a voucher menu."); - sb.append(lineSeparator); - sb.append("[3] Type 'wallet' to enter a wallet menu."); - sb.append(lineSeparator); - sb.append("[4] Type 'exit' to exit the program."); - sb.append(lineSeparator); + sb.append("=== Program ===" + lineSeparator); + sb.append("[1] Type 'customer' to enter a customer menu." + lineSeparator); + sb.append("[2] Type 'voucher' to enter a voucher menu." + lineSeparator); + sb.append("[3] Type 'wallet' to enter a wallet menu." + lineSeparator); + sb.append("[4] Type 'exit' to exit the program." + lineSeparator); outputHandler.outputString(sb.toString()); - return inputHandler.inputString(); } } diff --git a/src/main/java/org/prgrms/kdt/util/YamlPropertiesFactory.java b/src/main/java/org/prgrms/kdt/util/YamlPropertiesFactory.java deleted file mode 100644 index 73825e06b2..0000000000 --- a/src/main/java/org/prgrms/kdt/util/YamlPropertiesFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.prgrms.kdt.util; - -import org.springframework.beans.factory.config.YamlPropertiesFactoryBean; -import org.springframework.core.env.PropertiesPropertySource; -import org.springframework.core.env.PropertySource; -import org.springframework.core.io.support.EncodedResource; -import org.springframework.core.io.support.PropertySourceFactory; - -import java.io.IOException; - -public class YamlPropertiesFactory implements PropertySourceFactory { - - @Override - public PropertySource createPropertySource(String s, EncodedResource encodedResource) throws IOException { - var yamlPropertiesFactoryBean = new YamlPropertiesFactoryBean(); - yamlPropertiesFactoryBean.setResources(encodedResource.getResource()); - - var properties = yamlPropertiesFactoryBean.getObject(); - return new PropertiesPropertySource(encodedResource.getResource().getFilename(), properties); - } - -} diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index 78dfdc2f91..33899218ce 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -57,12 +57,9 @@ public void voucherMenu() throws IOException { public String selectVoucherMenu() throws IOException { StringBuilder sb = new StringBuilder(); - sb.append("=== Voucher Program ==="); - sb.append(lineSeparator); - sb.append("[1] Type 'create' to create a new voucher."); - sb.append(lineSeparator); - sb.append("[2] Type 'owner' to view customer with a specific voucher."); - sb.append(lineSeparator); + sb.append("=== Voucher Program ===" + lineSeparator); + sb.append("[1] Type 'create' to create a new voucher." + lineSeparator); + sb.append("[2] Type 'owner' to view customer with a specific voucher." + lineSeparator); outputHandler.outputString(sb.toString()); @@ -88,7 +85,7 @@ private void createVoucher() throws IOException { if(!isRepeat) break; } else if (createVoucherType.equals(PERCENT)) { - isRepeat = createPercentDiscountVoucher(); + isRepeat = percentDiscountVoucherAdd(); if(!isRepeat) break; } else { @@ -126,7 +123,7 @@ private boolean createFixedAmountVoucher() throws IOException { return false; } - private boolean createPercentDiscountVoucher() throws IOException { + private boolean percentDiscountVoucherAdd() throws IOException { outputHandler.outputString(CREATE_PERCENT_VOUCHER.getMessage()); var percent = 0; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java new file mode 100644 index 0000000000..b03f18353a --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java @@ -0,0 +1,6 @@ +package org.prgrms.kdt.voucher; + +public enum VoucherMenu { + + CREATE; +} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index 5660288e38..8f0c3aea2d 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -22,7 +22,6 @@ import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_VOUCHER_ROW_MAPPER; - @Repository @Profile("dev") public class VoucherJdbcRepository implements VoucherRepository { diff --git a/src/test/java/org/prgrms/kdt/KdtApplicationTests.java b/src/test/java/org/prgrms/kdt/KdtApplicationTests.java deleted file mode 100644 index 1a16b12a27..0000000000 --- a/src/test/java/org/prgrms/kdt/KdtApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.prgrms.kdt; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class KdtApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java new file mode 100644 index 0000000000..d9c0b80c98 --- /dev/null +++ b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java @@ -0,0 +1,82 @@ +package org.prgrms.kdt.voucher; + +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.voucher.repository.VoucherJdbcRepository; +import org.springframework.dao.EmptyResultDataAccessException; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.RowMapper; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + +public class VoucherJdbcRepositoryTest { + + @Mock + private JdbcTemplate jdbcTemplate; + + @InjectMocks + private VoucherJdbcRepository voucherJdbcRepository; + + @Test + public void givenVoucherId_whenFindById_thenReturnVoucher() { + // Mock the behavior of JdbcTemplate.queryForObject to return a Voucher + when(jdbcTemplate.queryForObject(any(String.class), any(RowMapper.class), any(Object.class))).thenReturn( + new FixedAmountVoucher(UUID.randomUUID(), 50) + ); + + UUID voucherId = UUID.randomUUID(); + Optional voucher = voucherJdbcRepository.findById(voucherId); + assertThat(voucher).isPresent(); + } + + @Test + public void givenEmptyVoucherId_whenFindById_thenReturnEmptyOptional() { + // Mock the behavior of JdbcTemplate.queryForObject to return EmptyResultDataAccessException + when(jdbcTemplate.queryForObject(any(String.class), any(RowMapper.class), any(Object.class))) + .thenThrow(new EmptyResultDataAccessException(1)); + + UUID voucherId = UUID.randomUUID(); + Optional voucher = voucherJdbcRepository.findById(voucherId); + assertThat(voucher).isEmpty(); + } + + @Test + public void givenVoucher_whenSave_thenReturnSavedVoucher() { + FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50); + when(jdbcTemplate.update(any(String.class), any(Object.class))).thenReturn(1); + + Voucher savedVoucher = voucherJdbcRepository.save(fixedAmountVoucher); + assertThat(savedVoucher).isEqualTo(fixedAmountVoucher); + } + + @Test + public void givenVoucher_whenSave_thenThrowRuntimeException() { + FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50); + when(jdbcTemplate.update(any(String.class), any(Object.class))).thenReturn(0); + + assertThatThrownBy(() -> voucherJdbcRepository.save(fixedAmountVoucher)) + .isInstanceOf(RuntimeException.class) + .hasMessage("Nothing was inserted"); + } + + @Test + public void whenFindAll_thenReturnListOfVouchers() { + // Mock the behavior of JdbcTemplate.query to return a list of Vouchers + when(jdbcTemplate.query(any(String.class), any(RowMapper.class))).thenReturn( + List.of(new FixedAmountVoucher(UUID.randomUUID(), 50)) + ); + + List vouchers = voucherJdbcRepository.findAll(); + assertThat(vouchers).hasSize(1); + } +} From 9ff2ba8f6bd8cbaf9d2ac4888ae666f6afe944d5 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Sun, 5 Nov 2023 07:02:46 +0900 Subject: [PATCH 23/28] =?UTF-8?q?fix:=20KdtApplication,=20modeController?= =?UTF-8?q?=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81=20&=20VoucherService=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgrms/kdt/KdtApplication.java | 20 ++++- .../org/prgrms/kdt/io/ModeController.java | 6 +- .../org/prgrms/kdt/order/OrderService.java | 2 +- .../prgrms/kdt/voucher/VoucherController.java | 77 ++++++------------- .../org/prgrms/kdt/voucher/VoucherMenu.java | 6 -- .../voucher/repository/VoucherRepository.java | 6 +- .../service/FixedAmountVoucherService.java | 45 +++++++++++ .../PercentDiscountVoucherService.java | 45 +++++++++++ .../voucher/{ => service}/VoucherService.java | 27 +++---- .../prgrms/kdt/order/OrderServiceTest.java | 6 +- 10 files changed, 153 insertions(+), 87 deletions(-) delete mode 100644 src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java rename src/main/java/org/prgrms/kdt/voucher/{ => service}/VoucherService.java (66%) diff --git a/src/main/java/org/prgrms/kdt/KdtApplication.java b/src/main/java/org/prgrms/kdt/KdtApplication.java index a380e31d0e..6d36d76a7f 100644 --- a/src/main/java/org/prgrms/kdt/KdtApplication.java +++ b/src/main/java/org/prgrms/kdt/KdtApplication.java @@ -1,6 +1,7 @@ package org.prgrms.kdt; import org.prgrms.kdt.io.ModeController; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; @@ -10,14 +11,25 @@ @SpringBootApplication public class KdtApplication { + private final ModeController modeController; + + @Autowired + public KdtApplication(ModeController modeController) { + this.modeController = modeController; + } + public static void main(String[] args) throws IOException { ConfigurableApplicationContext applicationContext = SpringApplication.run(KdtApplication.class, args); - ModeController modeController = applicationContext.getBean(ModeController.class); - boolean isRepeat = true; + KdtApplication kdtApplication = applicationContext.getBean(KdtApplication.class); + kdtApplication.run(); + } - while (isRepeat) { - isRepeat = modeController.modeList(); + public void run() throws IOException { + while (true) { + if (!modeController.modeStart()) { + break; + } } } } diff --git a/src/main/java/org/prgrms/kdt/io/ModeController.java b/src/main/java/org/prgrms/kdt/io/ModeController.java index e792ab3661..ab53832c90 100644 --- a/src/main/java/org/prgrms/kdt/io/ModeController.java +++ b/src/main/java/org/prgrms/kdt/io/ModeController.java @@ -38,7 +38,7 @@ public ModeController(CustomerController customerController, VoucherController v this.outputHandler = outputHandler; } - public boolean modeList() throws IOException { + public boolean modeStart() throws IOException { String menu = modeSelect(); switch (menu) { @@ -53,7 +53,7 @@ public boolean modeList() throws IOException { break; case MODE_EXIT: outputHandler.outputString(EXIT_PROGRAM.getMessage()); - return false; + return false; // 프로그램 종료 default: String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); logger.error(errorMessage); @@ -61,7 +61,7 @@ public boolean modeList() throws IOException { break; } - return true; + return true; // 프로그램 유지 } private String modeSelect() throws IOException { diff --git a/src/main/java/org/prgrms/kdt/order/OrderService.java b/src/main/java/org/prgrms/kdt/order/OrderService.java index 54f872bf13..50c6b3d1d3 100644 --- a/src/main/java/org/prgrms/kdt/order/OrderService.java +++ b/src/main/java/org/prgrms/kdt/order/OrderService.java @@ -1,6 +1,6 @@ package org.prgrms.kdt.order; -import org.prgrms.kdt.voucher.VoucherService; +import org.prgrms.kdt.voucher.service.VoucherService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index 33899218ce..a42b74df87 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -2,8 +2,9 @@ import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; -import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; -import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; +import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; +import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; +import org.prgrms.kdt.voucher.service.VoucherService; import org.prgrms.kdt.wallet.Wallet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,6 +23,8 @@ public class VoucherController { private final InputHandler inputHandler; private final OutputHandler outputHandler; private final VoucherService voucherService; + private final FixedAmountVoucherService fixedAmountVoucherService; + private final PercentDiscountVoucherService percentDiscountVoucherService; private final String CREATE = "create"; private final String OWNER = "owner"; @@ -31,10 +34,18 @@ public class VoucherController { private static final String lineSeparator = System.lineSeparator(); private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); - public VoucherController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { + public VoucherController( + InputHandler inputHandler, + OutputHandler outputHandler, + VoucherService voucherService, + FixedAmountVoucherService fixedAmountVoucherService, + PercentDiscountVoucherService percentDiscountVoucherService + ) { this.inputHandler = inputHandler; this.outputHandler = outputHandler; this.voucherService = voucherService; + this.fixedAmountVoucherService = fixedAmountVoucherService; + this.percentDiscountVoucherService = percentDiscountVoucherService; } public void voucherMenu() throws IOException { @@ -42,7 +53,7 @@ public void voucherMenu() throws IOException { switch (menu) { case CREATE: - createVoucher(); + voucherAdd(); break; case OWNER: getOwner(); @@ -73,7 +84,7 @@ private void getOwner() throws IOException { outputHandler.outputWallet(wallet); } - private void createVoucher() throws IOException { + private void voucherAdd() throws IOException { while (true) { outputHandler.outputString(CREATE_VOUCHER_TYPE.getMessage()); var createVoucherType = inputHandler.inputString(); @@ -81,7 +92,7 @@ private void createVoucher() throws IOException { var isRepeat = true; if (createVoucherType.equals(FIXED)) { - isRepeat = createFixedAmountVoucher(); + isRepeat = fixedAmountVoucherAdd(); if(!isRepeat) break; } else if (createVoucherType.equals(PERCENT)) { @@ -96,57 +107,17 @@ private void createVoucher() throws IOException { } } - private boolean createFixedAmountVoucher() throws IOException { + private boolean fixedAmountVoucherAdd() throws IOException { outputHandler.outputString(CREATE_FIXED_VOUCHER.getMessage()); - - var amount = 0; - while (true) { - amount = inputHandler.inputInt(); - - if (amount <= 0) { - String errorMessage = EXCEPTION_FIXED_AMOUNT_MINUS.getMessage(); - logger.error(errorMessage); - outputHandler.outputString(errorMessage); - continue; - } - if (amount >= 100_000) { - String errorMessage = EXCEPTION_FIXED_AMOUNT_OVER.getMessage(); - logger.error(errorMessage); - outputHandler.outputString(errorMessage); - continue; - } - break; - } - - var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); - voucherService.createVoucher(fixedAmountVoucherDto); - return false; + var amount = inputHandler.inputInt(); + fixedAmountVoucherService.createFixedAmountVoucher(amount); + return true; } private boolean percentDiscountVoucherAdd() throws IOException { outputHandler.outputString(CREATE_PERCENT_VOUCHER.getMessage()); - - var percent = 0; - while (true) { - percent = inputHandler.inputInt(); - - if (percent <= 0) { - String errorMessage = EXCEPTION_PERCENT_MINUS.getMessage(); - logger.error(errorMessage); - outputHandler.outputString(errorMessage); - continue; - } - if (percent >= 100) { - String errorMessage = EXCEPTION_PERCENT_OVER.getMessage(); - logger.error(errorMessage); - outputHandler.outputString(errorMessage); - continue; - } - break; - } - - var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent); - voucherService.createVoucher(percentDiscountVoucherDto); - return false; + var percent = inputHandler.inputInt(); + percentDiscountVoucherService.createPercentDiscountVoucher(percent); + return true; } } diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java deleted file mode 100644 index b03f18353a..0000000000 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.prgrms.kdt.voucher; - -public enum VoucherMenu { - - CREATE; -} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index f0196f8c79..1f128f4abc 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -8,9 +8,9 @@ public interface VoucherRepository { - Optional findById(UUID voucherId); + Optional findById(UUID voucherId); - Voucher save(Voucher voucher); + Voucher save(Voucher voucher); - List findAll(); + List findAll(); } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java new file mode 100644 index 0000000000..744585b765 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java @@ -0,0 +1,45 @@ +package org.prgrms.kdt.voucher.service; + +import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIXED_AMOUNT_MINUS; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIXED_AMOUNT_OVER; + +@Service +public class FixedAmountVoucherService { + + private final VoucherRepository voucherRepository; + private static final Logger logger = LoggerFactory.getLogger(FixedAmountVoucherService.class); + + public FixedAmountVoucherService(VoucherRepository voucherRepository) { + this.voucherRepository = voucherRepository; + } + + public void createFixedAmountVoucher(int amount) { + if (amount <= 0) { + String errorMessage = EXCEPTION_FIXED_AMOUNT_MINUS.getMessage(); + logger.error(errorMessage); + throw new IllegalArgumentException(errorMessage); + } + if (amount >= 100_000) { + String errorMessage = EXCEPTION_FIXED_AMOUNT_OVER.getMessage(); + logger.error(errorMessage); + throw new IllegalArgumentException(errorMessage); + } + + var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); + createVoucher(fixedAmountVoucherDto); + } + + private void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { + var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); + voucherRepository.save(voucher); + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java new file mode 100644 index 0000000000..bd3f3c434d --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java @@ -0,0 +1,45 @@ +package org.prgrms.kdt.voucher.service; + +import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; +import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; +import org.prgrms.kdt.voucher.repository.VoucherRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import java.util.UUID; + +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_PERCENT_MINUS; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_PERCENT_OVER; + +@Service +public class PercentDiscountVoucherService { + + private final VoucherRepository voucherRepository; + private static final Logger logger = LoggerFactory.getLogger(PercentDiscountVoucherService.class); + + public PercentDiscountVoucherService(VoucherRepository voucherRepository) { + this.voucherRepository = voucherRepository; + } + + public void createPercentDiscountVoucher(int percent) { + if (percent <= 0) { + String errorMessage = EXCEPTION_PERCENT_MINUS.getMessage(); + logger.error(errorMessage); + throw new IllegalArgumentException(errorMessage); + } + if (percent >= 100) { + String errorMessage = EXCEPTION_PERCENT_OVER.getMessage(); + logger.error(errorMessage); + throw new IllegalArgumentException(errorMessage); + } + + var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent); + createVoucher(percentDiscountVoucherDto); + } + + private void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { + var voucher = new PercentDiscountVoucher(percentDiscountVoucherDto.getVoucherId(), percentDiscountVoucherDto.getPercent()); + voucherRepository.save(voucher); + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java similarity index 66% rename from src/main/java/org/prgrms/kdt/voucher/VoucherService.java rename to src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index cc68b7cc57..856e008494 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -1,9 +1,5 @@ -package org.prgrms.kdt.voucher; +package org.prgrms.kdt.voucher.service; -import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; -import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; -import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; -import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; import org.prgrms.kdt.wallet.Wallet; @@ -25,21 +21,20 @@ public class VoucherService { private final VoucherRepository voucherRepository; private final WalletRepository walletRepository; + private final FixedAmountVoucherService fixedAmountVoucherService; + private final PercentDiscountVoucherService percentDiscountVoucherService; private static final Logger logger = LoggerFactory.getLogger(VoucherService.class); - public VoucherService(VoucherRepository voucherRepository, WalletRepository walletRepository) { + public VoucherService( + VoucherRepository voucherRepository, + WalletRepository walletRepository, + FixedAmountVoucherService fixedAmountVoucherService, + PercentDiscountVoucherService percentDiscountVoucherService + ) { this.voucherRepository = voucherRepository; this.walletRepository = walletRepository; - } - - public void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { - var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); - voucherRepository.save(voucher); - } - - public void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { - var voucher = new PercentDiscountVoucher(percentDiscountVoucherDto.getVoucherId(), percentDiscountVoucherDto.getPercent()); - voucherRepository.save(voucher); + this.fixedAmountVoucherService = fixedAmountVoucherService; + this.percentDiscountVoucherService = percentDiscountVoucherService; } public Voucher getVoucher(UUID voucherId) { diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java index c7a78cb9f8..2e416f3fae 100644 --- a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -2,7 +2,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.prgrms.kdt.voucher.VoucherService; +import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; +import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; +import org.prgrms.kdt.voucher.service.VoucherService; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.repository.VoucherMemoryRepository; import org.prgrms.kdt.wallet.WalletJdbcRepository; @@ -30,6 +32,8 @@ void createOrder() { var voucherRepository = new VoucherMemoryRepository(); var walletRepository = new WalletJdbcRepository(); var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); + FixedAmountVoucherService fixedAmountVoucherService = new FixedAmountVoucherService(); + PercentDiscountVoucherService percentDiscountVoucherService = new PercentDiscountVoucherService(); voucherRepository.save(fixedAmountVoucher); var sut = new OrderService(new VoucherService(voucherRepository, walletRepository), new OrderRepositoryStub()); From 261d0f6d191cf29b68506318008ed423d2af4b3c Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 6 Nov 2023 03:07:15 +0900 Subject: [PATCH 24/28] =?UTF-8?q?feat:=20=EB=B0=94=EC=9A=B0=EC=B2=98=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20&=20=EC=82=AD=EC=A0=9C=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +++ .../org/prgrms/kdt/order/OrderService.java | 2 +- .../org/prgrms/kdt/servlet/TestServlet.java | 32 ++++++++ .../prgrms/kdt/voucher/VoucherController.java | 73 +++++++++++-------- .../prgrms/kdt/voucher/VoucherMessage.java | 11 ++- .../repository/VoucherJdbcRepository.java | 12 +++ .../repository/VoucherMemoryRepository.java | 5 ++ .../voucher/repository/VoucherRepository.java | 2 + .../kdt/voucher/service/VoucherService.java | 7 +- .../kdt/wallet/WalletJdbcRepository.java | 2 - src/main/resources/logback.xml | 2 +- .../templates/customer/customer-new.html | 0 .../templates/voucher/voucher-datail.html | 2 + .../templates/voucher/voucher-new.html | 0 .../templates/voucher/voucher-update.html | 2 + .../resources/templates/voucher/vouchers.html | 0 .../org/prgrms/kdt/KdtSpringContextTests.java | 2 +- .../prgrms/kdt/order/OrderServiceTest.java | 19 +++-- .../voucher/VoucherJdbcRepositoryTest.java | 5 ++ 19 files changed, 139 insertions(+), 49 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/servlet/TestServlet.java create mode 100644 src/main/resources/templates/customer/customer-new.html create mode 100644 src/main/resources/templates/voucher/voucher-datail.html create mode 100644 src/main/resources/templates/voucher/voucher-new.html create mode 100644 src/main/resources/templates/voucher/voucher-update.html create mode 100644 src/main/resources/templates/voucher/vouchers.html diff --git a/pom.xml b/pom.xml index 3d6cb23ff9..ceff5080e2 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,16 @@ spring-boot-starter + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + org.springframework.boot spring-boot-starter-jdbc diff --git a/src/main/java/org/prgrms/kdt/order/OrderService.java b/src/main/java/org/prgrms/kdt/order/OrderService.java index 50c6b3d1d3..66f04a5d15 100644 --- a/src/main/java/org/prgrms/kdt/order/OrderService.java +++ b/src/main/java/org/prgrms/kdt/order/OrderService.java @@ -25,7 +25,7 @@ public Order createOrder(UUID customerId, List orderItems, UUID vouch var voucher = voucherService.getVoucher(voucherId); var order = new Order(UUID.randomUUID(), customerId, orderItems, voucher); orderRepository.insert(order); - voucherService.useVoucher(voucher); + voucherService.removeVoucherById(voucher.getVoucherId()); return order; } diff --git a/src/main/java/org/prgrms/kdt/servlet/TestServlet.java b/src/main/java/org/prgrms/kdt/servlet/TestServlet.java new file mode 100644 index 0000000000..a23a43774f --- /dev/null +++ b/src/main/java/org/prgrms/kdt/servlet/TestServlet.java @@ -0,0 +1,32 @@ +package org.prgrms.kdt.servlet; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.ServletException; +import javax.servlet.annotation.WebServlet; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; + +@WebServlet(value = "/*", loadOnStartup = 1) +public class TestServlet extends HttpServlet { + private static final Logger logger = LoggerFactory.getLogger(TestServlet.class); + + @Override + public void init() throws ServletException { + super.init(); + logger.info("init server!"); + } + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + String requestURI = req.getRequestURI(); + logger.info("Got Request from {}", requestURI); + + PrintWriter writer = resp.getWriter(); + writer.println("Hello Servlet!"); + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java index a42b74df87..cc52ac795f 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherController.java @@ -28,10 +28,12 @@ public class VoucherController { private final String CREATE = "create"; private final String OWNER = "owner"; + private final String FIND = "find"; + private final String DETAILS = "details"; + private final String REMOVE = "remove"; private final String FIXED = "fixed"; private final String PERCENT = "percent"; - private static final String lineSeparator = System.lineSeparator(); private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); public VoucherController( @@ -52,12 +54,21 @@ public void voucherMenu() throws IOException { String menu = selectVoucherMenu(); switch (menu) { + case FIND: + voucherList(); + break; + case DETAILS: + voucherDetails(); + break; case CREATE: voucherAdd(); break; case OWNER: getOwner(); break; + case REMOVE: + voucherRemove(); + break; default: String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); logger.error(errorMessage); @@ -66,58 +77,58 @@ public void voucherMenu() throws IOException { } } - public String selectVoucherMenu() throws IOException { - StringBuilder sb = new StringBuilder(); - sb.append("=== Voucher Program ===" + lineSeparator); - sb.append("[1] Type 'create' to create a new voucher." + lineSeparator); - sb.append("[2] Type 'owner' to view customer with a specific voucher." + lineSeparator); + private void voucherList() { + outputHandler.outputVouchers(voucherService.getAllVouchers()); + } - outputHandler.outputString(sb.toString()); + private void voucherDetails() throws IOException { + outputHandler.outputString(INPUT_VOUCHER_ID.getMessage()); + UUID voucherId = UUID.fromString(inputHandler.inputString()); + outputHandler.outputVoucher(voucherService.getVoucher(voucherId)); + } + private String selectVoucherMenu() throws IOException { + outputHandler.outputString(SELECT_VOUCHER_MENU.getMessage()); return inputHandler.inputString(); } private void getOwner() throws IOException { - outputHandler.outputString(GET_OWNER.getMessage()); + outputHandler.outputString(INPUT_VOUCHER_ID.getMessage()); UUID voucherId = UUID.fromString(inputHandler.inputString()); Optional wallet = voucherService.getOwner(voucherId); outputHandler.outputWallet(wallet); } private void voucherAdd() throws IOException { - while (true) { - outputHandler.outputString(CREATE_VOUCHER_TYPE.getMessage()); - var createVoucherType = inputHandler.inputString(); - - var isRepeat = true; - - if (createVoucherType.equals(FIXED)) { - isRepeat = fixedAmountVoucherAdd(); - if(!isRepeat) - break; - } else if (createVoucherType.equals(PERCENT)) { - isRepeat = percentDiscountVoucherAdd(); - if(!isRepeat) - break; - } else { - String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); - logger.error(errorMessage); - outputHandler.outputString(errorMessage); - } + outputHandler.outputString(CREATE_VOUCHER_TYPE.getMessage()); + var createVoucherType = inputHandler.inputString(); + + if (createVoucherType.equals(FIXED)) { + fixedAmountVoucherAdd(); + } else if (createVoucherType.equals(PERCENT)) { + percentDiscountVoucherAdd(); + } else { + String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); + logger.error(errorMessage); + outputHandler.outputString(errorMessage); } } - private boolean fixedAmountVoucherAdd() throws IOException { + private void fixedAmountVoucherAdd() throws IOException { outputHandler.outputString(CREATE_FIXED_VOUCHER.getMessage()); var amount = inputHandler.inputInt(); fixedAmountVoucherService.createFixedAmountVoucher(amount); - return true; } - private boolean percentDiscountVoucherAdd() throws IOException { + private void percentDiscountVoucherAdd() throws IOException { outputHandler.outputString(CREATE_PERCENT_VOUCHER.getMessage()); var percent = inputHandler.inputInt(); percentDiscountVoucherService.createPercentDiscountVoucher(percent); - return true; + } + + private void voucherRemove() throws IOException { + outputHandler.outputString(INPUT_VOUCHER_ID.getMessage()); + UUID voucherId = UUID.fromString(inputHandler.inputString()); + voucherService.removeVoucherById(voucherId); } } diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java index 0b77452a44..e630b9c5eb 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java @@ -1,10 +1,16 @@ package org.prgrms.kdt.voucher; public enum VoucherMessage { + SELECT_VOUCHER_MENU("=== Voucher Program ===" + System.lineSeparator() + + "[1] Type 'create' to create a new voucher." + System.lineSeparator() + + "[2] Type 'owner' to view customer with a specific voucher." + System.lineSeparator() + + "[3] Type 'remove' to remove a specific voucher." + System.lineSeparator() + + "[4] Type 'find' to find all vouchers." + System.lineSeparator() + + "[5] Type 'details' to view details of a specific voucher." + System.lineSeparator()), CREATE_VOUCHER_TYPE("fixed, percent 중에서 만들 바우처의 타입을 입력해주세요 : "), CREATE_FIXED_VOUCHER("고정으로 할인되는 비용을 입력해주세요 : "), CREATE_PERCENT_VOUCHER("할인되는 퍼센트를 정수로 입력해주세요 : "), - GET_OWNER("소유주를 확인할 바우처의 아이디를 입력해주세요 : "), + INPUT_VOUCHER_ID("바우처의 아이디를 입력해주세요 : "), VOUCHER_IS_EMPTY("조회한 바우처가 하나도 존재하지 않습니다."), EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), @@ -13,9 +19,10 @@ public enum VoucherMessage { EXCEPTION_PERCENT_OVER("할인되는 퍼센트가 100을 넘을 수 없습니다."), EXCEPTION_FIND_VOUCHER(" -> 해당 id의 바우처를 찾을 수 없습니다."), EXCEPTION_VOUCHER_ROW_MAPPER("바우처의 ROW MAPPER 가 실패했습니다."), - EXCEPTION_NOT_EXIST_VOUCHER("존재하지 않는 바우처입니다.");; + EXCEPTION_NOT_EXIST_VOUCHER("존재하지 않는 바우처입니다."); private final String message; + private static final String lineSeparator = System.lineSeparator(); public String getMessage() { return message; diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index 8f0c3aea2d..3ad3a37c66 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -109,6 +109,18 @@ public List findAll() { return jdbcTemplate.query("select * from vouchers", voucherRowMapper); } + @Override + public void deleteById(UUID voucherId) { + int deletedRows = jdbcTemplate.update("DELETE FROM vouchers WHERE voucher_id = UUID_TO_BIN(?)", + voucherId.toString().getBytes()); + + if (deletedRows == 0) { + logger.warn("No voucher with ID: {} was found to delete.", voucherId); + } else { + logger.info("Voucher with ID: {} deleted successfully.", voucherId); + } + } + static UUID toUUID(byte[] bytes) { var byteBuffer = ByteBuffer.wrap(bytes); return new UUID(byteBuffer.getLong(), byteBuffer.getLong()); diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java index 0f87229004..e06564bf95 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java @@ -33,4 +33,9 @@ public List findAll() { logger.debug("모든 바우처의 갯수 : " + storage.size()); return new ArrayList<>(storage.values()); } + + @Override + public void deleteById(UUID voucherId) { + + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index 1f128f4abc..045c66f386 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -13,4 +13,6 @@ public interface VoucherRepository { Voucher save(Voucher voucher); List findAll(); + + void deleteById(UUID voucherId); } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index 856e008494..c63cff06e4 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -21,8 +21,6 @@ public class VoucherService { private final VoucherRepository voucherRepository; private final WalletRepository walletRepository; - private final FixedAmountVoucherService fixedAmountVoucherService; - private final PercentDiscountVoucherService percentDiscountVoucherService; private static final Logger logger = LoggerFactory.getLogger(VoucherService.class); public VoucherService( @@ -33,8 +31,6 @@ public VoucherService( ) { this.voucherRepository = voucherRepository; this.walletRepository = walletRepository; - this.fixedAmountVoucherService = fixedAmountVoucherService; - this.percentDiscountVoucherService = percentDiscountVoucherService; } public Voucher getVoucher(UUID voucherId) { @@ -59,6 +55,7 @@ public Optional getOwner(UUID voucherId) { return walletRepository.findByVoucherId(voucherId.toString()); } - public void useVoucher(Voucher voucher) { + public void removeVoucherById(UUID voucherId) { + voucherRepository.deleteById(voucherId); } } diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java index a73b040ad2..95a3c25464 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java @@ -22,7 +22,6 @@ @Repository public class WalletJdbcRepository implements WalletRepository{ private static final Logger logger = LoggerFactory.getLogger(WalletJdbcRepository.class); - private final DataSource dataSource; private final JdbcTemplate jdbcTemplate; private static final RowMapper walletRowMapper = (resultSet, i) -> { UUID customerId = toUUID(resultSet.getBytes("customer_id")); @@ -60,7 +59,6 @@ public class WalletJdbcRepository implements WalletRepository{ }; public WalletJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { - this.dataSource = dataSource; this.jdbcTemplate = jdbcTemplate; } diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 5127e4b4b0..6372d7d9ba 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -15,7 +15,7 @@ - + diff --git a/src/main/resources/templates/customer/customer-new.html b/src/main/resources/templates/customer/customer-new.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/resources/templates/voucher/voucher-datail.html b/src/main/resources/templates/voucher/voucher-datail.html new file mode 100644 index 0000000000..139597f9cb --- /dev/null +++ b/src/main/resources/templates/voucher/voucher-datail.html @@ -0,0 +1,2 @@ + + diff --git a/src/main/resources/templates/voucher/voucher-new.html b/src/main/resources/templates/voucher/voucher-new.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/main/resources/templates/voucher/voucher-update.html b/src/main/resources/templates/voucher/voucher-update.html new file mode 100644 index 0000000000..139597f9cb --- /dev/null +++ b/src/main/resources/templates/voucher/voucher-update.html @@ -0,0 +1,2 @@ + + diff --git a/src/main/resources/templates/voucher/vouchers.html b/src/main/resources/templates/voucher/vouchers.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java index 67dd227ef6..31c3221c75 100644 --- a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java +++ b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java @@ -22,7 +22,7 @@ import static org.hamcrest.Matchers.notNullValue; @SpringJUnitConfig -@ActiveProfiles("test") +@ActiveProfiles("local") public class KdtSpringContextTests { @Configuration diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java index 2e416f3fae..0a9c54f55a 100644 --- a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -1,13 +1,16 @@ package org.prgrms.kdt.order; +import com.zaxxer.hikari.HikariDataSource; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.repository.VoucherMemoryRepository; import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; import org.prgrms.kdt.voucher.service.VoucherService; -import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; -import org.prgrms.kdt.voucher.repository.VoucherMemoryRepository; import org.prgrms.kdt.wallet.WalletJdbcRepository; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.jdbc.core.JdbcTemplate; import java.util.List; import java.util.UUID; @@ -30,12 +33,16 @@ public Order insert(Order order) { void createOrder() { // Given var voucherRepository = new VoucherMemoryRepository(); - var walletRepository = new WalletJdbcRepository(); + var dataSource = DataSourceBuilder.create().type(HikariDataSource.class).build(); + var jdbcTemplate = new JdbcTemplate(dataSource); + var walletRepository = new WalletJdbcRepository(dataSource, jdbcTemplate); // Provide the necessary dependencies var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); - FixedAmountVoucherService fixedAmountVoucherService = new FixedAmountVoucherService(); - PercentDiscountVoucherService percentDiscountVoucherService = new PercentDiscountVoucherService(); + FixedAmountVoucherService fixedAmountVoucherService = new FixedAmountVoucherService(voucherRepository); + PercentDiscountVoucherService percentDiscountVoucherService = new PercentDiscountVoucherService(voucherRepository); + VoucherService voucherService = new VoucherService(voucherRepository, walletRepository, fixedAmountVoucherService, percentDiscountVoucherService); + voucherRepository.save(fixedAmountVoucher); - var sut = new OrderService(new VoucherService(voucherRepository, walletRepository), new OrderRepositoryStub()); + var sut = new OrderService(voucherService, new OrderRepositoryStub()); // When var order = sut.createOrder(UUID.randomUUID(), List.of(new OrderItem(UUID.randomUUID(), 200, 1)), fixedAmountVoucher.getVoucherId()); diff --git a/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java index d9c0b80c98..2517be00e8 100644 --- a/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java +++ b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java @@ -1,8 +1,11 @@ package org.prgrms.kdt.voucher; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherJdbcRepository; @@ -19,6 +22,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; +@ExtendWith(MockitoExtension.class) public class VoucherJdbcRepositoryTest { @Mock @@ -28,6 +32,7 @@ public class VoucherJdbcRepositoryTest { private VoucherJdbcRepository voucherJdbcRepository; @Test + @DisplayName("id로 바우처를 찾을 수 있어야한다.") public void givenVoucherId_whenFindById_thenReturnVoucher() { // Mock the behavior of JdbcTemplate.queryForObject to return a Voucher when(jdbcTemplate.queryForObject(any(String.class), any(RowMapper.class), any(Object.class))).thenReturn( From ffe676e3deb4988e1cf51a4f288ac929160b0b1f Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Mon, 6 Nov 2023 06:16:50 +0900 Subject: [PATCH 25/28] =?UTF-8?q?feat:=20=EB=B0=94=EC=9A=B0=EC=B2=98=20?= =?UTF-8?q?=ED=83=80=EC=9E=84=EB=A6=AC=ED=94=84=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgrms/kdt/io/ModeController.java | 2 +- .../org/prgrms/kdt/voucher/VoucherMenu.java | 28 +++++++ .../prgrms/kdt/voucher/VoucherMessage.java | 2 + .../{ => controller}/VoucherController.java | 30 ++++---- .../VoucherThymeleafController.java | 75 +++++++++++++++++++ .../voucher/domain/FixedAmountVoucher.java | 5 ++ .../domain/PercentDiscountVoucher.java | 6 ++ .../prgrms/kdt/voucher/domain/Voucher.java | 2 + src/main/resources/application-local.yaml | 7 -- src/main/resources/application.yaml | 3 + src/main/resources/logback-backup.xml | 36 --------- .../templates/voucher/voucher-create.html | 50 +++++++++++++ .../templates/voucher/voucher-datail.html | 2 - .../templates/voucher/voucher-list.html | 65 ++++++++++++++++ .../templates/voucher/voucher-new.html | 0 .../templates/voucher/voucher-update.html | 2 - .../resources/templates/voucher/vouchers.html | 0 17 files changed, 251 insertions(+), 64 deletions(-) create mode 100644 src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java rename src/main/java/org/prgrms/kdt/voucher/{ => controller}/VoucherController.java (86%) create mode 100644 src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java delete mode 100644 src/main/resources/application-local.yaml delete mode 100644 src/main/resources/logback-backup.xml create mode 100644 src/main/resources/templates/voucher/voucher-create.html delete mode 100644 src/main/resources/templates/voucher/voucher-datail.html create mode 100644 src/main/resources/templates/voucher/voucher-list.html delete mode 100644 src/main/resources/templates/voucher/voucher-new.html delete mode 100644 src/main/resources/templates/voucher/voucher-update.html delete mode 100644 src/main/resources/templates/voucher/vouchers.html diff --git a/src/main/java/org/prgrms/kdt/io/ModeController.java b/src/main/java/org/prgrms/kdt/io/ModeController.java index ab53832c90..c5be7f7ed6 100644 --- a/src/main/java/org/prgrms/kdt/io/ModeController.java +++ b/src/main/java/org/prgrms/kdt/io/ModeController.java @@ -1,7 +1,7 @@ package org.prgrms.kdt.io; import org.prgrms.kdt.customer.CustomerController; -import org.prgrms.kdt.voucher.VoucherController; +import org.prgrms.kdt.voucher.controller.VoucherController; import org.prgrms.kdt.wallet.WalletController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java new file mode 100644 index 0000000000..3e75501616 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java @@ -0,0 +1,28 @@ +package org.prgrms.kdt.voucher; + +public enum VoucherMenu { + CREATE("create"), + OWNER("owner"), + FIND("find"), + DETAILS("details"), + REMOVE("remove"); + + private final String value; + + VoucherMenu(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static VoucherMenu fromString(String text) { + for (VoucherMenu menu : VoucherMenu.values()) { + if (menu.value.equalsIgnoreCase(text)) { + return menu; + } + } + return null; // You may handle null as per your requirement + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java index e630b9c5eb..0802c2b099 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java +++ b/src/main/java/org/prgrms/kdt/voucher/VoucherMessage.java @@ -12,7 +12,9 @@ public enum VoucherMessage { CREATE_PERCENT_VOUCHER("할인되는 퍼센트를 정수로 입력해주세요 : "), INPUT_VOUCHER_ID("바우처의 아이디를 입력해주세요 : "), VOUCHER_IS_EMPTY("조회한 바우처가 하나도 존재하지 않습니다."), + EXCEPTION_VOUCHER_TYPE("올바른 바우처 타입을 입력하세요."), + EXCEPTION_VOUCHER_ID("올바른 바우처 아이디를 입력하세요."), EXCEPTION_FIXED_AMOUNT_MINUS("할인되는 비용이 0보다 커야합니다."), EXCEPTION_FIXED_AMOUNT_OVER("할인되는 비용이 너무 큽니다. 10만원 밑으로 설정해주세요."), EXCEPTION_PERCENT_MINUS("할인되는 퍼센트가 0보다 커야합니다."), diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java similarity index 86% rename from src/main/java/org/prgrms/kdt/voucher/VoucherController.java rename to src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java index cc52ac795f..3a834462d2 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java @@ -1,7 +1,8 @@ -package org.prgrms.kdt.voucher; +package org.prgrms.kdt.voucher.controller; import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; +import org.prgrms.kdt.voucher.VoucherMenu; import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; import org.prgrms.kdt.voucher.service.VoucherService; @@ -25,15 +26,6 @@ public class VoucherController { private final VoucherService voucherService; private final FixedAmountVoucherService fixedAmountVoucherService; private final PercentDiscountVoucherService percentDiscountVoucherService; - - private final String CREATE = "create"; - private final String OWNER = "owner"; - private final String FIND = "find"; - private final String DETAILS = "details"; - private final String REMOVE = "remove"; - private final String FIXED = "fixed"; - private final String PERCENT = "percent"; - private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); public VoucherController( @@ -51,7 +43,8 @@ public VoucherController( } public void voucherMenu() throws IOException { - String menu = selectVoucherMenu(); + String userInput = selectVoucherMenu(); + VoucherMenu menu = VoucherMenu.fromString(userInput); switch (menu) { case FIND: @@ -81,15 +74,20 @@ private void voucherList() { outputHandler.outputVouchers(voucherService.getAllVouchers()); } - private void voucherDetails() throws IOException { + private void voucherDetails() { outputHandler.outputString(INPUT_VOUCHER_ID.getMessage()); - UUID voucherId = UUID.fromString(inputHandler.inputString()); + UUID voucherId = null; + try { + voucherId = UUID.fromString(inputHandler.inputString()); + } catch (IOException e) { + throw new RuntimeException(EXCEPTION_VOUCHER_ID.getMessage()); + } outputHandler.outputVoucher(voucherService.getVoucher(voucherId)); } private String selectVoucherMenu() throws IOException { outputHandler.outputString(SELECT_VOUCHER_MENU.getMessage()); - return inputHandler.inputString(); + return inputHandler.inputString().trim().toLowerCase(); // Lowercased to match ignore case } private void getOwner() throws IOException { @@ -103,9 +101,9 @@ private void voucherAdd() throws IOException { outputHandler.outputString(CREATE_VOUCHER_TYPE.getMessage()); var createVoucherType = inputHandler.inputString(); - if (createVoucherType.equals(FIXED)) { + if (createVoucherType.equals("fixed")) { fixedAmountVoucherAdd(); - } else if (createVoucherType.equals(PERCENT)) { + } else if (createVoucherType.equals("percent")) { percentDiscountVoucherAdd(); } else { String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java new file mode 100644 index 0000000000..94b0840956 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java @@ -0,0 +1,75 @@ +package org.prgrms.kdt.voucher.controller; + +import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; +import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; +import org.prgrms.kdt.voucher.service.VoucherService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; +import java.util.UUID; + +@Controller +public class VoucherThymeleafController { + + private final VoucherService voucherService; + private final FixedAmountVoucherService fixedAmountVoucherService; + private final PercentDiscountVoucherService percentDiscountVoucherService; + private static final Logger logger = LoggerFactory.getLogger(VoucherThymeleafController.class); + + public VoucherThymeleafController(VoucherService voucherService, FixedAmountVoucherService fixedAmountVoucherService, PercentDiscountVoucherService percentDiscountVoucherService) { + this.voucherService = voucherService; + this.fixedAmountVoucherService = fixedAmountVoucherService; + this.percentDiscountVoucherService = percentDiscountVoucherService; + } + + @GetMapping("/vouchers") + public String showVouchers(Model model) { + List vouchers = voucherService.getAllVouchers(); + model.addAttribute("vouchers", vouchers); + return "voucher/voucher-list"; + } + + @GetMapping("/vouchers/create") + public String showCreateVoucherForm() { + return "voucher/voucher-create"; + } + + @PostMapping("/vouchers/create") + public String createVoucher(@RequestParam("type") String voucherType, + @RequestParam(value = "amount", required = false) Integer amount, + @RequestParam(value = "percent", required = false) Integer percent + ) { + if (voucherType.equals("fixed")) { + if (amount != null) { + fixedAmountVoucherService.createFixedAmountVoucher(amount); + } else { + logger.error("Amount parameter is missing for fixed voucher creation."); + } + } else if (voucherType.equals("percent")) { + if (percent != null) { + percentDiscountVoucherService.createPercentDiscountVoucher(percent); + } else { + logger.error("Percent parameter is missing for percent voucher creation."); + } + } else { + logger.error("Unknown voucher type: " + voucherType); + } + + return "redirect:/vouchers"; + } + + @PostMapping("/vouchers/remove/{id}") + public String removeVoucher(@PathVariable("id") String voucherId) { + UUID id = UUID.fromString(voucherId); + voucherService.removeVoucherById(id); + return "redirect:/vouchers"; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index 3f72e622f3..3f7b2aafe7 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -5,6 +5,7 @@ public class FixedAmountVoucher implements Voucher { private final UUID voucherId; private final long amount; + private final String type = "fixed"; private UUID customerId = null; public FixedAmountVoucher(UUID voucherId, long amount) { @@ -47,6 +48,10 @@ public void setCustomerId(UUID customerId) { this.customerId = customerId; } + public String getType() { + return type; + } + @Override public String toString() { return String.format("FixedAmountVoucher '{voucherId = %-40s, amount = %s}'", voucherId, amount); diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index 2440d851be..a55c02aa5a 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -5,6 +5,7 @@ public class PercentDiscountVoucher implements Voucher { private final UUID voucherId; private final int percent; + private final String type = "percent"; private UUID customerId = null; public PercentDiscountVoucher(UUID voucherId, int percent) { @@ -48,6 +49,11 @@ public void setCustomerId(UUID customerId) { this.customerId = customerId; } + @Override + public String getType() { + return type; + } + @Override public String toString() { return String.format("PercentDiscountVoucher'{voucherId = %-40s, percent = %s}'", voucherId, percent); diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java index 271bbb4d90..1a1d92f565 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java @@ -14,4 +14,6 @@ public interface Voucher { UUID getCustomerId(); void setCustomerId(UUID customerId); + + String getType(); } diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml deleted file mode 100644 index 3bad555f7c..0000000000 --- a/src/main/resources/application-local.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kdt: - version: "v1.0-local" - minimum-order-amount: 0 - support-vendors: - - a - description: |- - line 1 \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index d021fd2fe5..f670bf8610 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -13,3 +13,6 @@ kdt: spring: profiles: active: dev + thymeleaf: + prefix: classpath:/templates/ + suffix: .html diff --git a/src/main/resources/logback-backup.xml b/src/main/resources/logback-backup.xml deleted file mode 100644 index b9d36e01a4..0000000000 --- a/src/main/resources/logback-backup.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - - - - - logs/access.log - - logs/access-%d{yyyy-MM-dd}.log - - - - ${FILE_LOG_PATTERN} - - - - - - - - - - - diff --git a/src/main/resources/templates/voucher/voucher-create.html b/src/main/resources/templates/voucher/voucher-create.html new file mode 100644 index 0000000000..514a646da3 --- /dev/null +++ b/src/main/resources/templates/voucher/voucher-create.html @@ -0,0 +1,50 @@ + + + + + + Create Voucher + + + + + +
+

Create Voucher

+
+
+ + +
+
+ + +
+ + +
+
+ + + + + diff --git a/src/main/resources/templates/voucher/voucher-datail.html b/src/main/resources/templates/voucher/voucher-datail.html deleted file mode 100644 index 139597f9cb..0000000000 --- a/src/main/resources/templates/voucher/voucher-datail.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/main/resources/templates/voucher/voucher-list.html b/src/main/resources/templates/voucher/voucher-list.html new file mode 100644 index 0000000000..4e7e750bf8 --- /dev/null +++ b/src/main/resources/templates/voucher/voucher-list.html @@ -0,0 +1,65 @@ + + + + + Voucher List + + + + + + +
+

Voucher List

+
+ Create Voucher +
+
+ + + + + + + + + + + + + + + + +
Voucher IDDetailsActions
+ + + + + +
+ +
+
+
+
+ + + diff --git a/src/main/resources/templates/voucher/voucher-new.html b/src/main/resources/templates/voucher/voucher-new.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/main/resources/templates/voucher/voucher-update.html b/src/main/resources/templates/voucher/voucher-update.html deleted file mode 100644 index 139597f9cb..0000000000 --- a/src/main/resources/templates/voucher/voucher-update.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/main/resources/templates/voucher/vouchers.html b/src/main/resources/templates/voucher/vouchers.html deleted file mode 100644 index e69de29bb2..0000000000 From fd38f59ec84a8640023baa96e355eeb46c40d065 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Tue, 7 Nov 2023 01:33:18 +0900 Subject: [PATCH 26/28] =?UTF-8?q?fix:=20voucher=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EC=BB=AC=EB=9F=BC=20Amount=20=EB=A1=9C=20=ED=86=B5?= =?UTF-8?q?=ED=95=A9=20=ED=9B=84=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 +- .../java/org/prgrms/kdt/AppConfiguration.java | 11 +- .../org/prgrms/kdt/customer/CustomerDto.java | 4 - .../CustomerConsoleController.java} | 10 +- .../repository/CustomerJdbcRepository.java | 5 +- src/main/java/org/prgrms/kdt/io/Mode.java | 32 ++++ .../org/prgrms/kdt/io/ModeController.java | 42 ++--- .../servlet/KdtWebApplicationInitializer.java | 163 ++++++++++++++++++ .../org/prgrms/kdt/servlet/TestServlet.java | 32 ---- .../voucher/Dto/FixedAmountVoucherDto.java | 9 +- .../Dto/PercentDiscountVoucherDto.java | 9 +- ...ler.java => VoucherConsoleController.java} | 6 +- .../controller/VoucherRestController.java | 60 +++++++ .../voucher/domain/FixedAmountVoucher.java | 37 ++-- .../domain/PercentDiscountVoucher.java | 47 +++-- .../prgrms/kdt/voucher/domain/Voucher.java | 22 ++- .../kdt/voucher/domain/VoucherType.java | 6 + .../repository/VoucherJdbcRepository.java | 40 ++--- .../service/FixedAmountVoucherService.java | 9 +- .../PercentDiscountVoucherService.java | 9 +- .../kdt/wallet/WalletJdbcRepository.java | 32 +--- .../org/prgrms/kdt/wallet/WalletService.java | 1 + .../org/prgrms/kdt/KdtSpringContextTests.java | 2 +- .../prgrms/kdt/order/OrderServiceTest.java | 4 +- .../kdt/voucher/FixedAmountVoucherTest.java | 12 +- .../voucher/VoucherJdbcRepositoryTest.java | 8 +- 26 files changed, 434 insertions(+), 193 deletions(-) delete mode 100644 src/main/java/org/prgrms/kdt/customer/CustomerDto.java rename src/main/java/org/prgrms/kdt/customer/{CustomerController.java => controller/CustomerConsoleController.java} (90%) create mode 100644 src/main/java/org/prgrms/kdt/io/Mode.java create mode 100644 src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java delete mode 100644 src/main/java/org/prgrms/kdt/servlet/TestServlet.java rename src/main/java/org/prgrms/kdt/voucher/controller/{VoucherController.java => VoucherConsoleController.java} (97%) create mode 100644 src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java diff --git a/pom.xml b/pom.xml index ceff5080e2..90b11895a4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,9 @@ - org.springframework.boot - spring-boot-starter-web + com.thoughtworks.xstream + xstream + 1.4.17 @@ -32,6 +33,16 @@ spring-boot-starter-thymeleaf + + org.springframework + spring-oxm + + + + org.springframework.boot + spring-boot-starter-web + + org.springframework.boot spring-boot-starter-jdbc diff --git a/src/main/java/org/prgrms/kdt/AppConfiguration.java b/src/main/java/org/prgrms/kdt/AppConfiguration.java index 6ab97b44af..26ffa58a97 100644 --- a/src/main/java/org/prgrms/kdt/AppConfiguration.java +++ b/src/main/java/org/prgrms/kdt/AppConfiguration.java @@ -19,14 +19,5 @@ @EnableConfigurationProperties public class AppConfiguration { - @Bean - public DataSource dataSource() { - var dataSource = DataSourceBuilder.create() - .url("jdbc:mysql://localhost:3306/order_mgmt") - .username("root") - .password("110811") - .type(HikariDataSource.class) - .build(); - return dataSource; - } + } diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerDto.java b/src/main/java/org/prgrms/kdt/customer/CustomerDto.java deleted file mode 100644 index c3a54cd71d..0000000000 --- a/src/main/java/org/prgrms/kdt/customer/CustomerDto.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.prgrms.kdt.customer; - -public class CustomerDto { -} diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerController.java b/src/main/java/org/prgrms/kdt/customer/controller/CustomerConsoleController.java similarity index 90% rename from src/main/java/org/prgrms/kdt/customer/CustomerController.java rename to src/main/java/org/prgrms/kdt/customer/controller/CustomerConsoleController.java index def69cc13c..64875709ac 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerController.java +++ b/src/main/java/org/prgrms/kdt/customer/controller/CustomerConsoleController.java @@ -1,5 +1,7 @@ -package org.prgrms.kdt.customer; +package org.prgrms.kdt.customer.controller; +import org.prgrms.kdt.customer.Customer; +import org.prgrms.kdt.customer.CustomerService; import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; import org.prgrms.kdt.wallet.Wallet; @@ -16,20 +18,20 @@ import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; @Controller -public class CustomerController { +public class CustomerConsoleController { private final CustomerService customerService; private final OutputHandler outputHandler; private final InputHandler inputHandler; - private static final Logger logger = LoggerFactory.getLogger(CustomerController.class); + private static final Logger logger = LoggerFactory.getLogger(CustomerConsoleController.class); private static final String lineSeparator = System.lineSeparator(); private final String CREATE = "create"; private final String VOUCHERS = "vouchers"; private final String BLACK = "black"; - public CustomerController(CustomerService customerService, OutputHandler outputHandler, InputHandler inputHandler) { + public CustomerConsoleController(CustomerService customerService, OutputHandler outputHandler, InputHandler inputHandler) { this.customerService = customerService; this.outputHandler = outputHandler; this.inputHandler = inputHandler; diff --git a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java index 9f33ce341a..b77e6f42db 100644 --- a/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/customer/repository/CustomerJdbcRepository.java @@ -49,16 +49,17 @@ public class CustomerJdbcRepository implements CustomerRepository { Integer amount = resultSet.getInt("amount"); Integer percent = resultSet.getInt("percent"); byte[] customerIdBytes = resultSet.getBytes("customer_id"); + var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); UUID customerId = null; if (customerIdBytes != null) { customerId = toUUID(customerIdBytes); } if (percent != 0) { - return new PercentDiscountVoucher(voucherId, percent, customerId); + return new PercentDiscountVoucher(voucherId, percent, createdAt, customerId); } if (amount != 0) { - return new FixedAmountVoucher(voucherId, amount, customerId); + return new FixedAmountVoucher(voucherId, amount, createdAt, customerId); } logger.error("JdbcVoucherRepository RowMapper Error"); diff --git a/src/main/java/org/prgrms/kdt/io/Mode.java b/src/main/java/org/prgrms/kdt/io/Mode.java new file mode 100644 index 0000000000..c0b0f78448 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/io/Mode.java @@ -0,0 +1,32 @@ +package org.prgrms.kdt.io; + +public enum Mode { + MODE_WALLET("wallet"), + MODE_CUSTOMER("customer"), + MODE_VOUCHER("voucher"), + MODE_EXIT("exit"), + MODE_MENU("=== Program ===" + System.lineSeparator() + + "[1] Type 'customer' to enter a customer menu." + System.lineSeparator() + + "[2] Type 'voucher' to enter a voucher menu." + System.lineSeparator() + + "[3] Type 'wallet' to enter a wallet menu." + System.lineSeparator() + + "[4] Type 'exit' to exit the program." + System.lineSeparator()); + + private final String message; + + Mode(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } + + public static Mode fromString(String text) { + for (Mode mode : Mode.values()) { + if (mode.message.equalsIgnoreCase(text)) { + return mode; + } + } + return null; // You may handle null as per your requirement + } +} diff --git a/src/main/java/org/prgrms/kdt/io/ModeController.java b/src/main/java/org/prgrms/kdt/io/ModeController.java index c5be7f7ed6..a874b328e5 100644 --- a/src/main/java/org/prgrms/kdt/io/ModeController.java +++ b/src/main/java/org/prgrms/kdt/io/ModeController.java @@ -1,7 +1,8 @@ package org.prgrms.kdt.io; -import org.prgrms.kdt.customer.CustomerController; -import org.prgrms.kdt.voucher.controller.VoucherController; +import org.prgrms.kdt.customer.controller.CustomerConsoleController; +import org.prgrms.kdt.voucher.VoucherMenu; +import org.prgrms.kdt.voucher.controller.VoucherConsoleController; import org.prgrms.kdt.wallet.WalletController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,51 +10,49 @@ import java.io.IOException; +import static org.prgrms.kdt.io.Mode.MODE_CUSTOMER; +import static org.prgrms.kdt.io.Mode.MODE_MENU; import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; import static org.prgrms.kdt.io.SystemMessage.EXIT_PROGRAM; @Controller public class ModeController { - private final CustomerController customerController; - private final VoucherController voucherController; + private final CustomerConsoleController customerConsoleController; + private final VoucherConsoleController voucherConsoleController; private final WalletController walletController; private final InputHandler inputHandler; private final OutputHandler outputHandler; private static final Logger logger = LoggerFactory.getLogger(ModeController.class); - private static final String lineSeparator = System.lineSeparator(); - private final String MODE_WALLET = "wallet"; - private final String MODE_CUSTOMER = "customer"; - private final String MODE_VOUCHER = "voucher"; - private final String MODE_EXIT = "mode"; - - public ModeController(CustomerController customerController, VoucherController voucherController, + public ModeController(CustomerConsoleController customerConsoleController, VoucherConsoleController voucherConsoleController, WalletController walletController, InputHandler inputHandler, OutputHandler outputHandler) { - this.customerController = customerController; - this.voucherController = voucherController; + this.customerConsoleController = customerConsoleController; + this.voucherConsoleController = voucherConsoleController; this.walletController = walletController; this.inputHandler = inputHandler; this.outputHandler = outputHandler; } public boolean modeStart() throws IOException { - String menu = modeSelect(); + String userInput = modeSelect(); + Mode menu = Mode.fromString(userInput); switch (menu) { case MODE_CUSTOMER: - customerController.customerMenu(); + customerConsoleController.customerMenu(); break; case MODE_VOUCHER: - voucherController.voucherMenu(); + voucherConsoleController.voucherMenu(); break; case MODE_WALLET: walletController.walletMenu(); break; case MODE_EXIT: outputHandler.outputString(EXIT_PROGRAM.getMessage()); - return false; // 프로그램 종료 + System.exit(0); + break; default: String errorMessage = EXCEPTION_NOT_EXIST_MENU.getMessage(); logger.error(errorMessage); @@ -65,14 +64,7 @@ public boolean modeStart() throws IOException { } private String modeSelect() throws IOException { - StringBuilder sb = new StringBuilder(); - sb.append("=== Program ===" + lineSeparator); - sb.append("[1] Type 'customer' to enter a customer menu." + lineSeparator); - sb.append("[2] Type 'voucher' to enter a voucher menu." + lineSeparator); - sb.append("[3] Type 'wallet' to enter a wallet menu." + lineSeparator); - sb.append("[4] Type 'exit' to exit the program." + lineSeparator); - - outputHandler.outputString(sb.toString()); + outputHandler.outputString(MODE_MENU.getMessage()); return inputHandler.inputString(); } } diff --git a/src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java b/src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java new file mode 100644 index 0000000000..31744312b5 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java @@ -0,0 +1,163 @@ +package org.prgrms.kdt.servlet; + +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import com.zaxxer.hikari.HikariDataSource; +import org.prgrms.kdt.customer.controller.CustomerConsoleController; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeansException; +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.http.converter.xml.MarshallingHttpMessageConverter; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.oxm.xstream.XStreamMarshaller; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.web.WebApplicationInitializer; +import org.springframework.web.context.ContextLoaderListener; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.servlet.DispatcherServlet; +import org.springframework.web.servlet.config.annotation.*; +import org.springframework.web.servlet.resource.EncodedResourceResolver; +import org.thymeleaf.spring5.SpringTemplateEngine; +import org.thymeleaf.spring5.templateresolver.SpringResourceTemplateResolver; +import org.thymeleaf.spring5.view.ThymeleafViewResolver; + +import javax.servlet.ServletContext; +import javax.sql.DataSource; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; + +public class KdtWebApplicationInitializer implements WebApplicationInitializer { + private static final Logger logger = LoggerFactory.getLogger(KdtWebApplicationInitializer.class); + + @Configuration + @EnableWebMvc + @ComponentScan(basePackages = "org.prgrms.kdt", + includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = CustomerConsoleController.class), + useDefaultFilters = false + ) + static class ServletConfig implements WebMvcConfigurer, ApplicationContextAware { + + ApplicationContext applicationContext; + +// @Override +// public void configureViewResolvers(ViewResolverRegistry registry) { +// registry.jsp().viewNames("jsp/*"); +// +// var springResourceTemplateResolver = new SpringResourceTemplateResolver(); +// springResourceTemplateResolver.setApplicationContext(applicationContext); +// springResourceTemplateResolver.setPrefix("/WEB-INF/"); +// springResourceTemplateResolver.setSuffix(".html"); +// var springTemplateEngine = new SpringTemplateEngine(); +// springTemplateEngine.setTemplateResolver(springResourceTemplateResolver); +// +// var thymeleafViewResolver = new ThymeleafViewResolver(); +// thymeleafViewResolver.setTemplateEngine(springTemplateEngine); +// thymeleafViewResolver.setOrder(1); +// thymeleafViewResolver.setViewNames(new String[]{"views/*"}); +// registry.viewResolver(thymeleafViewResolver); +// } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/resources/**") + .addResourceLocations("/resources/") + .setCachePeriod(60) + .resourceChain(true) + .addResolver(new EncodedResourceResolver()); + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + this.applicationContext = applicationContext; + } + +// @Override +// public void extendMessageConverters(List> converters) { +// var messageConverter = new MarshallingHttpMessageConverter(); +// var xStreamMarshaller = new XStreamMarshaller(); +// messageConverter.setMarshaller(xStreamMarshaller); +// messageConverter.setUnmarshaller(xStreamMarshaller); +// converters.add(0, messageConverter); +// +// var javaTimeModule = new JavaTimeModule(); +// javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ISO_DATE_TIME)); +// var modules = Jackson2ObjectMapperBuilder.json().modules(javaTimeModule); +// converters.add(1, new MappingJackson2HttpMessageConverter(modules.build())); +// } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/api/**") + .allowedMethods("GET", "POST") + .allowedOrigins("*"); + } + } + + + + @Configuration + @ComponentScan(basePackages = "org.prgrms.kdt", + excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = CustomerConsoleController.class) + ) + @EnableTransactionManagement + static class RootConfig { + + @Bean + public DataSource dataSource() { + var dataSource = DataSourceBuilder.create() + .url("jdbc:mysql://localhost:3306/order_mgmt") + .username("root") + .password("110811") + .type(HikariDataSource.class) + .build(); + return dataSource; + } + + @Bean + public JdbcTemplate jdbcTemplate(DataSource dataSource) { + return new JdbcTemplate(dataSource); + } + + @Bean + public NamedParameterJdbcTemplate namedParameterJdbcTemplate(JdbcTemplate jdbcTemplate) { + return new NamedParameterJdbcTemplate(jdbcTemplate); + } + + @Bean + public PlatformTransactionManager platformTransactionManager(DataSource dataSource) { + return new DataSourceTransactionManager(dataSource); + } + + } + + @Override + public void onStartup(ServletContext servletContext) { + logger.info("Staring Server..."); + var rootApplicationContext = new AnnotationConfigWebApplicationContext(); + rootApplicationContext.register(RootConfig.class); + var loaderListener = new ContextLoaderListener(rootApplicationContext); + servletContext.addListener(loaderListener); + + var applicationContext = new AnnotationConfigWebApplicationContext(); + applicationContext.register(ServletConfig.class); + var dispatcherServlet = new DispatcherServlet(applicationContext); + var servletRegistration = servletContext.addServlet("test", dispatcherServlet); + servletRegistration.addMapping("/"); + servletRegistration.setLoadOnStartup(1); + } + +} diff --git a/src/main/java/org/prgrms/kdt/servlet/TestServlet.java b/src/main/java/org/prgrms/kdt/servlet/TestServlet.java deleted file mode 100644 index a23a43774f..0000000000 --- a/src/main/java/org/prgrms/kdt/servlet/TestServlet.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.prgrms.kdt.servlet; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; - -@WebServlet(value = "/*", loadOnStartup = 1) -public class TestServlet extends HttpServlet { - private static final Logger logger = LoggerFactory.getLogger(TestServlet.class); - - @Override - public void init() throws ServletException { - super.init(); - logger.info("init server!"); - } - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - String requestURI = req.getRequestURI(); - logger.info("Got Request from {}", requestURI); - - PrintWriter writer = resp.getWriter(); - writer.println("Hello Servlet!"); - } -} diff --git a/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java index b6132e5461..53cb4f1656 100644 --- a/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java +++ b/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java @@ -1,14 +1,17 @@ package org.prgrms.kdt.voucher.Dto; +import java.time.LocalDateTime; import java.util.UUID; public class FixedAmountVoucherDto { private final UUID voucherId; private final long amount; + private final LocalDateTime createdAt; - public FixedAmountVoucherDto(UUID voucherId, long amount) { + public FixedAmountVoucherDto(UUID voucherId, long amount, LocalDateTime createdAt) { this.voucherId = voucherId; this.amount = amount; + this.createdAt = createdAt; } public UUID getVoucherId() { @@ -18,4 +21,8 @@ public UUID getVoucherId() { public long getAmount() { return amount; } + + public LocalDateTime getCreatedAt() { + return createdAt; + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java index d0b7f0e91d..223620a7d6 100644 --- a/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java +++ b/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java @@ -1,14 +1,17 @@ package org.prgrms.kdt.voucher.Dto; +import java.time.LocalDateTime; import java.util.UUID; public class PercentDiscountVoucherDto { private final UUID voucherId; private final int percent; + private final LocalDateTime createdAt; - public PercentDiscountVoucherDto(UUID voucherId, int percent) { + public PercentDiscountVoucherDto(UUID voucherId, int percent, LocalDateTime createdAt) { this.voucherId = voucherId; this.percent = percent; + this.createdAt = createdAt; } public UUID getVoucherId() { @@ -18,4 +21,8 @@ public UUID getVoucherId() { public int getPercent() { return percent; } + + public LocalDateTime getCreatedAt() { + return createdAt; + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java similarity index 97% rename from src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java rename to src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java index 3a834462d2..55bc1f8779 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java @@ -19,16 +19,16 @@ import static org.prgrms.kdt.voucher.VoucherMessage.*; @Controller -public class VoucherController { +public class VoucherConsoleController { private final InputHandler inputHandler; private final OutputHandler outputHandler; private final VoucherService voucherService; private final FixedAmountVoucherService fixedAmountVoucherService; private final PercentDiscountVoucherService percentDiscountVoucherService; - private static final Logger logger = LoggerFactory.getLogger(VoucherController.class); + private static final Logger logger = LoggerFactory.getLogger(VoucherConsoleController.class); - public VoucherController( + public VoucherConsoleController( InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService, diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java new file mode 100644 index 0000000000..ac2cc91892 --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java @@ -0,0 +1,60 @@ +package org.prgrms.kdt.voucher.controller; + +import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; +import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; +import org.prgrms.kdt.voucher.service.VoucherService; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.UUID; + +@RestController +@RequestMapping("/api/v1/vouchers") +public class VoucherRestController { + + private final VoucherService voucherService; + private final FixedAmountVoucherService fixedAmountVoucherService; + private final PercentDiscountVoucherService percentDiscountVoucherService; + + public VoucherRestController(VoucherService voucherService, FixedAmountVoucherService fixedAmountVoucherService, PercentDiscountVoucherService percentDiscountVoucherService) { + this.voucherService = voucherService; + this.fixedAmountVoucherService = fixedAmountVoucherService; + this.percentDiscountVoucherService = percentDiscountVoucherService; + } + + @GetMapping + public List getAllVouchers() { + return voucherService.getAllVouchers(); + } + + @PostMapping("/create") + public String createVoucher(@RequestParam("type") String voucherType, + @RequestParam(value = "amount", required = false) Integer amount, + @RequestParam(value = "percent", required = false) Integer percent) { + if (voucherType.equals("fixed")) { + if (amount != null) { + fixedAmountVoucherService.createFixedAmountVoucher(amount); + return "Fixed amount voucher created."; + } else { + return "Amount parameter is missing for fixed voucher creation."; + } + } else if (voucherType.equals("percent")) { + if (percent != null) { + percentDiscountVoucherService.createPercentDiscountVoucher(percent); + return "Percent discount voucher created."; + } else { + return "Percent parameter is missing for percent voucher creation."; + } + } else { + return "Unknown voucher type: " + voucherType; + } + } + + @DeleteMapping("/remove/{id}") + public String removeVoucher(@PathVariable("id") String voucherId) { + UUID id = UUID.fromString(voucherId); + voucherService.removeVoucherById(id); + return "Voucher removed."; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index 3f7b2aafe7..e08b2d02b3 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -1,24 +1,28 @@ package org.prgrms.kdt.voucher.domain; +import java.time.LocalDateTime; import java.util.UUID; -public class FixedAmountVoucher implements Voucher { - private final UUID voucherId; - private final long amount; - private final String type = "fixed"; - private UUID customerId = null; +import static org.prgrms.kdt.voucher.domain.VoucherType.FIXED; - public FixedAmountVoucher(UUID voucherId, long amount) { +public class FixedAmountVoucher extends Voucher { + + private final String type = FIXED.toString(); + + public FixedAmountVoucher(UUID voucherId, long amount, LocalDateTime createdAt) { this.voucherId = voucherId; this.amount = amount; + this.createdAt = createdAt; } - public FixedAmountVoucher(UUID voucherId, long amount, UUID customerId) { + public FixedAmountVoucher(UUID voucherId, long amount, LocalDateTime createdAt, UUID customerId) { this.voucherId = voucherId; this.amount = amount; + this.createdAt = createdAt; this.customerId = customerId; } + @Override public long discount(long beforeDiscount) { return beforeDiscount - amount; } @@ -33,11 +37,6 @@ public long getAmount() { return amount; } - @Override - public int getPercent() { - return 0; - } - @Override public UUID getCustomerId() { return customerId; @@ -48,12 +47,24 @@ public void setCustomerId(UUID customerId) { this.customerId = customerId; } + @Override public String getType() { return type; } + @Override + public LocalDateTime getCreatedAt() { + return createdAt; + } + @Override public String toString() { - return String.format("FixedAmountVoucher '{voucherId = %-40s, amount = %s}'", voucherId, amount); + return "FixedAmountVoucher{" + + "type='" + type + '\'' + + ", voucherId=" + voucherId + + ", amount=" + amount + + ", createdAt=" + createdAt + + ", customerId=" + customerId + + '}'; } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index a55c02aa5a..3f31d39bfd 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -1,27 +1,30 @@ package org.prgrms.kdt.voucher.domain; +import java.time.LocalDateTime; import java.util.UUID; -public class PercentDiscountVoucher implements Voucher { - private final UUID voucherId; - private final int percent; - private final String type = "percent"; - private UUID customerId = null; +import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; - public PercentDiscountVoucher(UUID voucherId, int percent) { +public class PercentDiscountVoucher extends Voucher { + + private final String type = PERCENT.toString(); + + public PercentDiscountVoucher(UUID voucherId, int amount, LocalDateTime createdAt) { this.voucherId = voucherId; - this.percent = percent; + this.amount = amount; + this.createdAt = createdAt; } - public PercentDiscountVoucher(UUID voucherId, int percent, UUID customerId) { + public PercentDiscountVoucher(UUID voucherId, int amount, LocalDateTime createdAt, UUID customerId) { this.voucherId = voucherId; - this.percent = percent; + this.amount = amount; this.customerId = customerId; + this.createdAt = createdAt; } @Override public long discount(long beforeDiscount) { - return beforeDiscount * (percent / 100); + return beforeDiscount * (amount / 100); } @Override @@ -35,27 +38,33 @@ public UUID getVoucherId() { } @Override - public int getPercent() { - return percent; + public UUID getCustomerId() { + return null; } @Override - public UUID getCustomerId() { - return null; + public String getType() { + return type; } @Override - public void setCustomerId(UUID customerId) { - this.customerId = customerId; + public LocalDateTime getCreatedAt() { + return createdAt; } @Override - public String getType() { - return type; + public void setCustomerId(UUID customerId) { + this.customerId = customerId; } @Override public String toString() { - return String.format("PercentDiscountVoucher'{voucherId = %-40s, percent = %s}'", voucherId, percent); + return "PercentDiscountVoucher{" + + "type='" + type + '\'' + + ", voucherId=" + voucherId + + ", amount=" + amount + + ", createdAt=" + createdAt + + ", customerId=" + customerId + + '}'; } } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java index 1a1d92f565..a69f80e2e3 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java @@ -1,19 +1,25 @@ package org.prgrms.kdt.voucher.domain; +import java.time.LocalDateTime; import java.util.UUID; -public interface Voucher { - UUID getVoucherId(); +public abstract class Voucher { + UUID voucherId; + long amount; + LocalDateTime createdAt; + UUID customerId = null; - long discount(long beforeDiscount); + public abstract long discount(long beforeDiscount); - long getAmount(); + public abstract UUID getVoucherId(); - int getPercent(); + public abstract long getAmount(); - UUID getCustomerId(); + public abstract UUID getCustomerId(); - void setCustomerId(UUID customerId); + public abstract void setCustomerId(UUID customerId); - String getType(); + public abstract String getType(); + + public abstract LocalDateTime getCreatedAt(); } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java b/src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java new file mode 100644 index 0000000000..db621cf32e --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java @@ -0,0 +1,6 @@ +package org.prgrms.kdt.voucher.domain; + +public enum VoucherType { + FIXED, + PERCENT; +} diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index 3ad3a37c66..87ed16078a 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -14,6 +14,7 @@ import javax.sql.DataSource; import java.nio.ByteBuffer; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Optional; @@ -21,6 +22,8 @@ import java.util.concurrent.ConcurrentHashMap; import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_VOUCHER_ROW_MAPPER; +import static org.prgrms.kdt.voucher.domain.VoucherType.FIXED; +import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; @Repository @Profile("dev") @@ -32,19 +35,20 @@ public class VoucherJdbcRepository implements VoucherRepository { private static final Logger logger = LoggerFactory.getLogger(VoucherJdbcRepository.class); private static final RowMapper voucherRowMapper = (resultSet, i) -> { UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); + String type = resultSet.getString("type"); Integer amount = resultSet.getInt("amount"); - Integer percent = resultSet.getInt("percent"); + LocalDateTime createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); byte[] customerIdBytes = resultSet.getBytes("customer_id"); UUID customerId = null; if (customerIdBytes != null) { customerId = toUUID(customerIdBytes); } - if (percent != 0) { - return new PercentDiscountVoucher(voucherId, percent, customerId); + if (type.equals(FIXED.toString())) { + return new FixedAmountVoucher(voucherId, amount, createdAt, customerId); } - if (amount != 0) { - return new FixedAmountVoucher(voucherId, amount, customerId); + if (type.equals(PERCENT.toString())) { + return new PercentDiscountVoucher(voucherId, amount, createdAt, customerId); } logger.error("JdbcVoucherRepository RowMapper Error"); @@ -79,24 +83,14 @@ public Optional findById(UUID voucherId) { @Override public Voucher save(Voucher voucher) { - String voucherType = voucher.getClass().getName(); - int update = 0; - - if (voucherType.equals(PercentDiscountVoucher.class.getName())) { - update = jdbcTemplate.update("INSERT INTO vouchers(voucher_id, amount, percent, customer_id) " - + "VALUES (UUID_TO_BIN(?), ?, ?, UUID_TO_BIN(?))", - voucher.getVoucherId().toString().getBytes(), - 0, - voucher.getPercent(), - voucher.getCustomerId() != null ? voucher.getCustomerId().toString().getBytes() : null); - } else if (voucherType.equals(FixedAmountVoucher.class.getName())) { - update = jdbcTemplate.update("INSERT INTO vouchers(voucher_id, amount, percent, customer_id) " - + "VALUES (UUID_TO_BIN(?), ?, ?, UUID_TO_BIN(?))", - voucher.getVoucherId().toString().getBytes(), - voucher.getAmount(), - 0, - voucher.getCustomerId() != null ? voucher.getCustomerId().toString().getBytes() : null); - } + int update = jdbcTemplate.update("INSERT INTO vouchers(voucher_id, type, amount, created_at, customer_id) " + + "VALUES (UUID_TO_BIN(?), ?, ?, ?, UUID_TO_BIN(?))", + voucher.getVoucherId().toString().getBytes(), + voucher.getType(), + voucher.getAmount(), + voucher.getCreatedAt(), + voucher.getCustomerId() != null ? voucher.getCustomerId().toString().getBytes() : null + ); if (update != 1) { throw new RuntimeException("Noting was inserted"); diff --git a/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java index 744585b765..30cd2a6ccb 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java @@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.UUID; import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIXED_AMOUNT_MINUS; @@ -34,12 +35,16 @@ public void createFixedAmountVoucher(int amount) { throw new IllegalArgumentException(errorMessage); } - var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount); + var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount, LocalDateTime.now()); createVoucher(fixedAmountVoucherDto); } private void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { - var voucher = new FixedAmountVoucher(fixedAmountVoucherDto.getVoucherId(), fixedAmountVoucherDto.getAmount()); + var voucher = new FixedAmountVoucher( + fixedAmountVoucherDto.getVoucherId(), + fixedAmountVoucherDto.getAmount(), + fixedAmountVoucherDto.getCreatedAt() + ); voucherRepository.save(voucher); } } diff --git a/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java index bd3f3c434d..ba91bf1fd0 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java @@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.UUID; import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_PERCENT_MINUS; @@ -34,12 +35,16 @@ public void createPercentDiscountVoucher(int percent) { throw new IllegalArgumentException(errorMessage); } - var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent); + var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent, LocalDateTime.now()); createVoucher(percentDiscountVoucherDto); } private void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { - var voucher = new PercentDiscountVoucher(percentDiscountVoucherDto.getVoucherId(), percentDiscountVoucherDto.getPercent()); + var voucher = new PercentDiscountVoucher( + percentDiscountVoucherDto.getVoucherId(), + percentDiscountVoucherDto.getPercent(), + percentDiscountVoucherDto.getCreatedAt() + ); voucherRepository.save(voucher); } } diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java index 95a3c25464..dbd82cd346 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletJdbcRepository.java @@ -13,11 +13,14 @@ import javax.sql.DataSource; import java.nio.ByteBuffer; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_VOUCHER_ROW_MAPPER; +import static org.prgrms.kdt.voucher.domain.VoucherType.FIXED; +import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; @Repository public class WalletJdbcRepository implements WalletRepository{ @@ -28,35 +31,6 @@ public class WalletJdbcRepository implements WalletRepository{ UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); return new Wallet(customerId.toString(), voucherId.toString()); }; - private static final RowMapper voucherRowMapper = (resultSet, i) -> { - UUID voucherId = toUUID(resultSet.getBytes("voucher_id")); - Integer amount = resultSet.getInt("amount"); - Integer percent = resultSet.getInt("percent"); - byte[] customerIdBytes = resultSet.getBytes("customer_id"); - UUID customerId = null; - if (customerIdBytes != null) { - customerId = toUUID(customerIdBytes); - } - - if (percent != 0) { - return new PercentDiscountVoucher(voucherId, percent, customerId); - } - if (amount != 0) { - return new FixedAmountVoucher(voucherId, amount, customerId); - } - - logger.error("JdbcVoucherRepository RowMapper Error"); - throw new RuntimeException(EXCEPTION_VOUCHER_ROW_MAPPER.getMessage()); - }; - private static final RowMapper customerRowMapper = (resultSet, i) -> { - var customerName = resultSet.getString("name"); - var email = resultSet.getString("email"); - var customerId = toUUID(resultSet.getBytes("customer_id")); - var lastLoginAt = resultSet.getTimestamp("last_login_at") != null ? - resultSet.getTimestamp("last_login_at").toLocalDateTime() : null; - var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); - return new Customer(customerId, customerName, email, lastLoginAt, createdAt); - }; public WalletJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { this.jdbcTemplate = jdbcTemplate; diff --git a/src/main/java/org/prgrms/kdt/wallet/WalletService.java b/src/main/java/org/prgrms/kdt/wallet/WalletService.java index 8196b7448a..a6d8fd3ad3 100644 --- a/src/main/java/org/prgrms/kdt/wallet/WalletService.java +++ b/src/main/java/org/prgrms/kdt/wallet/WalletService.java @@ -29,6 +29,7 @@ public String addWallet(String customerId, String voucherId) { return walletRepository.save(wallet).getWalletId(); } + public boolean deleteByCustomerId(String customerId) { walletRepository.deleteByCustomerId(customerId); return true; diff --git a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java index 31c3221c75..ecedbd7141 100644 --- a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java +++ b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java @@ -58,7 +58,7 @@ public void testVoucherRepositoryCreation() { @DisplayName("orderService를 사용해서 주문을 생성할 수 있다.") public void testOrderService() { // Given - var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); voucherRepository.save(fixedAmountVoucher); // When diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java index 0a9c54f55a..c05ab0bfc5 100644 --- a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -36,7 +36,7 @@ void createOrder() { var dataSource = DataSourceBuilder.create().type(HikariDataSource.class).build(); var jdbcTemplate = new JdbcTemplate(dataSource); var walletRepository = new WalletJdbcRepository(dataSource, jdbcTemplate); // Provide the necessary dependencies - var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); FixedAmountVoucherService fixedAmountVoucherService = new FixedAmountVoucherService(voucherRepository); PercentDiscountVoucherService percentDiscountVoucherService = new PercentDiscountVoucherService(voucherRepository); VoucherService voucherService = new VoucherService(voucherRepository, walletRepository, fixedAmountVoucherService, percentDiscountVoucherService); @@ -60,7 +60,7 @@ void createOrderByMock() { // Given var voucherServiceMock = mock(VoucherService.class); var orderRepositoryMock = mock(OrderRepository.class); - var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); when(voucherServiceMock.getVoucher(fixedAmountVoucher.getVoucherId())).thenReturn(fixedAmountVoucher); var sut = new OrderService(voucherServiceMock, orderRepositoryMock); diff --git a/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java b/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java index 73acd2bfe6..8dbe5f6c01 100644 --- a/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java +++ b/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java @@ -35,30 +35,30 @@ void testAssertEqual() { @Test @DisplayName("주어진 금액만큼 할인을 해야한다.") void testDiscount() { - var sut = new FixedAmountVoucher(UUID.randomUUID(), 100); + var sut = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); assertEquals(900, sut.discount(1000)); } @Test @DisplayName("디스카운트된 금액은 마이너스가 될 수 없다.") void testMinusDiscountedAmount() { - var sut = new FixedAmountVoucher(UUID.randomUUID(), 1000); + var sut = new FixedAmountVoucher(UUID.randomUUID(), 1000, createdAt); assertEquals(0, sut.discount(900)); } @Test @DisplayName("할인 금액은 마이너스가 될 수 없다.") void testWithMinus() { - assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100)); + assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100, createdAt)); } @Test @DisplayName("유효한 할인 금액으로만 생성할 수 있다.") void testVoucherCreation() { assertAll("FixedAmountVoucher creation", - () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 0)), - () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100)), - () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 1000000)) + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 0, createdAt)), + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100, createdAt)), + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 1000000, createdAt)) ); } diff --git a/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java index 2517be00e8..b16c157527 100644 --- a/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java +++ b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java @@ -36,7 +36,7 @@ public class VoucherJdbcRepositoryTest { public void givenVoucherId_whenFindById_thenReturnVoucher() { // Mock the behavior of JdbcTemplate.queryForObject to return a Voucher when(jdbcTemplate.queryForObject(any(String.class), any(RowMapper.class), any(Object.class))).thenReturn( - new FixedAmountVoucher(UUID.randomUUID(), 50) + new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt) ); UUID voucherId = UUID.randomUUID(); @@ -57,7 +57,7 @@ public void givenEmptyVoucherId_whenFindById_thenReturnEmptyOptional() { @Test public void givenVoucher_whenSave_thenReturnSavedVoucher() { - FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50); + FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt); when(jdbcTemplate.update(any(String.class), any(Object.class))).thenReturn(1); Voucher savedVoucher = voucherJdbcRepository.save(fixedAmountVoucher); @@ -66,7 +66,7 @@ public void givenVoucher_whenSave_thenReturnSavedVoucher() { @Test public void givenVoucher_whenSave_thenThrowRuntimeException() { - FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50); + FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt); when(jdbcTemplate.update(any(String.class), any(Object.class))).thenReturn(0); assertThatThrownBy(() -> voucherJdbcRepository.save(fixedAmountVoucher)) @@ -78,7 +78,7 @@ public void givenVoucher_whenSave_thenThrowRuntimeException() { public void whenFindAll_thenReturnListOfVouchers() { // Mock the behavior of JdbcTemplate.query to return a list of Vouchers when(jdbcTemplate.query(any(String.class), any(RowMapper.class))).thenReturn( - List.of(new FixedAmountVoucher(UUID.randomUUID(), 50)) + List.of(new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt)) ); List vouchers = voucherJdbcRepository.findAll(); From 701aba4137fe38ad6369400a1df4413ecff3afb5 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Tue, 7 Nov 2023 04:23:51 +0900 Subject: [PATCH 27/28] =?UTF-8?q?fix:=20enum=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/Dto/FixedAmountVoucherDto.java | 28 ----------- .../Dto/PercentDiscountVoucherDto.java | 28 ----------- .../controller/VoucherConsoleController.java | 26 +++------- .../controller/VoucherRestController.java | 12 ++--- .../VoucherThymeleafController.java | 27 +++------- .../voucher/domain/FixedAmountVoucher.java | 22 +++++++- .../domain/PercentDiscountVoucher.java | 24 ++++++++- .../prgrms/kdt/voucher/domain/VoucherDto.java | 47 +++++++++++++++++ .../kdt/voucher/domain/VoucherType.java | 14 +++++- .../repository/VoucherJdbcRepository.java | 25 +++++----- .../repository/VoucherMemoryRepository.java | 15 +++++- .../voucher/repository/VoucherRepository.java | 3 +- .../service/FixedAmountVoucherService.java | 50 ------------------- .../PercentDiscountVoucherService.java | 50 ------------------- .../kdt/voucher/service/VoucherService.java | 26 +++++++--- .../templates/voucher/voucher-list.html | 8 +-- .../org/prgrms/kdt/KdtSpringContextTests.java | 3 +- .../prgrms/kdt/order/OrderServiceTest.java | 15 +++--- .../kdt/voucher/FixedAmountVoucherTest.java | 13 ++--- .../voucher/VoucherJdbcRepositoryTest.java | 9 ++-- 20 files changed, 188 insertions(+), 257 deletions(-) delete mode 100644 src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java delete mode 100644 src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java create mode 100644 src/main/java/org/prgrms/kdt/voucher/domain/VoucherDto.java delete mode 100644 src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java delete mode 100644 src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java diff --git a/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java deleted file mode 100644 index 53cb4f1656..0000000000 --- a/src/main/java/org/prgrms/kdt/voucher/Dto/FixedAmountVoucherDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.prgrms.kdt.voucher.Dto; - -import java.time.LocalDateTime; -import java.util.UUID; - -public class FixedAmountVoucherDto { - private final UUID voucherId; - private final long amount; - private final LocalDateTime createdAt; - - public FixedAmountVoucherDto(UUID voucherId, long amount, LocalDateTime createdAt) { - this.voucherId = voucherId; - this.amount = amount; - this.createdAt = createdAt; - } - - public UUID getVoucherId() { - return voucherId; - } - - public long getAmount() { - return amount; - } - - public LocalDateTime getCreatedAt() { - return createdAt; - } -} diff --git a/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java deleted file mode 100644 index 223620a7d6..0000000000 --- a/src/main/java/org/prgrms/kdt/voucher/Dto/PercentDiscountVoucherDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.prgrms.kdt.voucher.Dto; - -import java.time.LocalDateTime; -import java.util.UUID; - -public class PercentDiscountVoucherDto { - private final UUID voucherId; - private final int percent; - private final LocalDateTime createdAt; - - public PercentDiscountVoucherDto(UUID voucherId, int percent, LocalDateTime createdAt) { - this.voucherId = voucherId; - this.percent = percent; - this.createdAt = createdAt; - } - - public UUID getVoucherId() { - return voucherId; - } - - public int getPercent() { - return percent; - } - - public LocalDateTime getCreatedAt() { - return createdAt; - } -} diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java index 55bc1f8779..f660cac699 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java @@ -3,8 +3,6 @@ import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; import org.prgrms.kdt.voucher.VoucherMenu; -import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; -import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; import org.prgrms.kdt.voucher.service.VoucherService; import org.prgrms.kdt.wallet.Wallet; import org.slf4j.Logger; @@ -17,6 +15,8 @@ import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; import static org.prgrms.kdt.voucher.VoucherMessage.*; +import static org.prgrms.kdt.voucher.domain.VoucherType.FIXED; +import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; @Controller public class VoucherConsoleController { @@ -24,22 +24,12 @@ public class VoucherConsoleController { private final InputHandler inputHandler; private final OutputHandler outputHandler; private final VoucherService voucherService; - private final FixedAmountVoucherService fixedAmountVoucherService; - private final PercentDiscountVoucherService percentDiscountVoucherService; private static final Logger logger = LoggerFactory.getLogger(VoucherConsoleController.class); - public VoucherConsoleController( - InputHandler inputHandler, - OutputHandler outputHandler, - VoucherService voucherService, - FixedAmountVoucherService fixedAmountVoucherService, - PercentDiscountVoucherService percentDiscountVoucherService - ) { + public VoucherConsoleController(InputHandler inputHandler, OutputHandler outputHandler, VoucherService voucherService) { this.inputHandler = inputHandler; this.outputHandler = outputHandler; this.voucherService = voucherService; - this.fixedAmountVoucherService = fixedAmountVoucherService; - this.percentDiscountVoucherService = percentDiscountVoucherService; } public void voucherMenu() throws IOException { @@ -101,9 +91,9 @@ private void voucherAdd() throws IOException { outputHandler.outputString(CREATE_VOUCHER_TYPE.getMessage()); var createVoucherType = inputHandler.inputString(); - if (createVoucherType.equals("fixed")) { + if (createVoucherType.equals(FIXED.getType())) { fixedAmountVoucherAdd(); - } else if (createVoucherType.equals("percent")) { + } else if (createVoucherType.equals(PERCENT.getType())) { percentDiscountVoucherAdd(); } else { String errorMessage = EXCEPTION_VOUCHER_TYPE.getMessage(); @@ -115,13 +105,13 @@ private void voucherAdd() throws IOException { private void fixedAmountVoucherAdd() throws IOException { outputHandler.outputString(CREATE_FIXED_VOUCHER.getMessage()); var amount = inputHandler.inputInt(); - fixedAmountVoucherService.createFixedAmountVoucher(amount); + voucherService.createFixedAmountVoucher(amount); } private void percentDiscountVoucherAdd() throws IOException { outputHandler.outputString(CREATE_PERCENT_VOUCHER.getMessage()); - var percent = inputHandler.inputInt(); - percentDiscountVoucherService.createPercentDiscountVoucher(percent); + var amount = inputHandler.inputInt(); + voucherService.createPercentDiscountVoucher(amount); } private void voucherRemove() throws IOException { diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java index ac2cc91892..a643b00468 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java @@ -1,8 +1,6 @@ package org.prgrms.kdt.voucher.controller; import org.prgrms.kdt.voucher.domain.Voucher; -import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; -import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; import org.prgrms.kdt.voucher.service.VoucherService; import org.springframework.web.bind.annotation.*; @@ -14,13 +12,9 @@ public class VoucherRestController { private final VoucherService voucherService; - private final FixedAmountVoucherService fixedAmountVoucherService; - private final PercentDiscountVoucherService percentDiscountVoucherService; - public VoucherRestController(VoucherService voucherService, FixedAmountVoucherService fixedAmountVoucherService, PercentDiscountVoucherService percentDiscountVoucherService) { + public VoucherRestController(VoucherService voucherService) { this.voucherService = voucherService; - this.fixedAmountVoucherService = fixedAmountVoucherService; - this.percentDiscountVoucherService = percentDiscountVoucherService; } @GetMapping @@ -34,14 +28,14 @@ public String createVoucher(@RequestParam("type") String voucherType, @RequestParam(value = "percent", required = false) Integer percent) { if (voucherType.equals("fixed")) { if (amount != null) { - fixedAmountVoucherService.createFixedAmountVoucher(amount); + voucherService.createFixedAmountVoucher(amount); return "Fixed amount voucher created."; } else { return "Amount parameter is missing for fixed voucher creation."; } } else if (voucherType.equals("percent")) { if (percent != null) { - percentDiscountVoucherService.createPercentDiscountVoucher(percent); + voucherService.createPercentDiscountVoucher(percent); return "Percent discount voucher created."; } else { return "Percent parameter is missing for percent voucher creation."; diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java index 94b0840956..caba2853ca 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java @@ -1,8 +1,6 @@ package org.prgrms.kdt.voucher.controller; import org.prgrms.kdt.voucher.domain.Voucher; -import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; -import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; import org.prgrms.kdt.voucher.service.VoucherService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,18 +14,17 @@ import java.util.List; import java.util.UUID; +import static org.prgrms.kdt.voucher.domain.VoucherType.FIXED; +import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; + @Controller public class VoucherThymeleafController { private final VoucherService voucherService; - private final FixedAmountVoucherService fixedAmountVoucherService; - private final PercentDiscountVoucherService percentDiscountVoucherService; private static final Logger logger = LoggerFactory.getLogger(VoucherThymeleafController.class); - public VoucherThymeleafController(VoucherService voucherService, FixedAmountVoucherService fixedAmountVoucherService, PercentDiscountVoucherService percentDiscountVoucherService) { + public VoucherThymeleafController(VoucherService voucherService) { this.voucherService = voucherService; - this.fixedAmountVoucherService = fixedAmountVoucherService; - this.percentDiscountVoucherService = percentDiscountVoucherService; } @GetMapping("/vouchers") @@ -47,18 +44,10 @@ public String createVoucher(@RequestParam("type") String voucherType, @RequestParam(value = "amount", required = false) Integer amount, @RequestParam(value = "percent", required = false) Integer percent ) { - if (voucherType.equals("fixed")) { - if (amount != null) { - fixedAmountVoucherService.createFixedAmountVoucher(amount); - } else { - logger.error("Amount parameter is missing for fixed voucher creation."); - } - } else if (voucherType.equals("percent")) { - if (percent != null) { - percentDiscountVoucherService.createPercentDiscountVoucher(percent); - } else { - logger.error("Percent parameter is missing for percent voucher creation."); - } + if (voucherType.equals(FIXED.getType())) { + voucherService.createFixedAmountVoucher(amount); + } else if (voucherType.equals(PERCENT.getType())) { + voucherService.createPercentDiscountVoucher(percent); } else { logger.error("Unknown voucher type: " + voucherType); } diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java index e08b2d02b3..b8a944489f 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/FixedAmountVoucher.java @@ -7,7 +7,7 @@ public class FixedAmountVoucher extends Voucher { - private final String type = FIXED.toString(); + private final String type = FIXED.getType(); public FixedAmountVoucher(UUID voucherId, long amount, LocalDateTime createdAt) { this.voucherId = voucherId; @@ -22,6 +22,26 @@ public FixedAmountVoucher(UUID voucherId, long amount, LocalDateTime createdAt, this.customerId = customerId; } + public static FixedAmountVoucher fromDto(VoucherDto voucherDto) { + if (voucherDto == null) { + throw new IllegalArgumentException("Voucher DTO cannot be null"); + } + + if (voucherDto.getAmount() <= 0) { + throw new IllegalArgumentException("Amount should be greater than 0"); + } + + if (voucherDto.getAmount() >= 100_000) { + throw new IllegalArgumentException("Amount should be less than 100,000"); + } + + if (!FIXED.getType().equals(voucherDto.getType())) { + throw new IllegalArgumentException("Invalid voucher type for FixedAmountVoucher"); + } + + return new FixedAmountVoucher(voucherDto.getVoucherId(), voucherDto.getAmount(), voucherDto.getCreatedAt()); + } + @Override public long discount(long beforeDiscount) { return beforeDiscount - amount; diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java index 3f31d39bfd..3dde75c25b 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/PercentDiscountVoucher.java @@ -7,7 +7,7 @@ public class PercentDiscountVoucher extends Voucher { - private final String type = PERCENT.toString(); + private final String type = PERCENT.getType(); public PercentDiscountVoucher(UUID voucherId, int amount, LocalDateTime createdAt) { this.voucherId = voucherId; @@ -22,6 +22,26 @@ public PercentDiscountVoucher(UUID voucherId, int amount, LocalDateTime createdA this.createdAt = createdAt; } + public static PercentDiscountVoucher fromDto(VoucherDto voucherDto) { + if (voucherDto == null) { + throw new IllegalArgumentException("Voucher DTO cannot be null"); + } + + if (voucherDto.getAmount() <= 0) { + throw new IllegalArgumentException("Amount should be greater than 0"); + } + + if (voucherDto.getAmount() >= 100) { + throw new IllegalArgumentException("Amount should be less than 100"); + } + + if (!"percent".equals(voucherDto.getType())) { + throw new IllegalArgumentException("Invalid voucher type for PercentDiscountVoucher"); + } + + return new PercentDiscountVoucher(voucherDto.getVoucherId(), voucherDto.getAmount(), voucherDto.getCreatedAt()); + } + @Override public long discount(long beforeDiscount) { return beforeDiscount * (amount / 100); @@ -29,7 +49,7 @@ public long discount(long beforeDiscount) { @Override public long getAmount() { - return 0; + return amount; } @Override diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/VoucherDto.java b/src/main/java/org/prgrms/kdt/voucher/domain/VoucherDto.java new file mode 100644 index 0000000000..612db0244c --- /dev/null +++ b/src/main/java/org/prgrms/kdt/voucher/domain/VoucherDto.java @@ -0,0 +1,47 @@ +package org.prgrms.kdt.voucher.domain; + +import java.time.LocalDateTime; +import java.util.UUID; + +public class VoucherDto { + private final UUID voucherId; + private final int amount; + private final LocalDateTime createdAt; + private final String type; + private UUID customerId; + + public VoucherDto(UUID voucherId, int amount, String type, LocalDateTime createdAt) { + this.voucherId = voucherId; + this.amount = amount; + this.type = type; + this.createdAt = createdAt; + } + + public VoucherDto(UUID voucherId, int amount, LocalDateTime createdAt, String type, UUID customerId) { + this.voucherId = voucherId; + this.amount = amount; + this.createdAt = createdAt; + this.type = type; + this.customerId = customerId; + } + + public UUID getVoucherId() { + return voucherId; + } + + public int getAmount() { + return amount; + } + + public LocalDateTime getCreatedAt() { + return createdAt; + } + + public String getType() { + return type; + } + + public UUID getCustomerId() { + return customerId; + } +} diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java b/src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java index db621cf32e..02203036ec 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/VoucherType.java @@ -1,6 +1,16 @@ package org.prgrms.kdt.voucher.domain; public enum VoucherType { - FIXED, - PERCENT; + FIXED("fixed"), + PERCENT("percent"); + + VoucherType(String type) { + this.type = type; + } + + private final String type; + + public String getType() { + return type; + } } diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java index 87ed16078a..66803d5cbd 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherJdbcRepository.java @@ -4,6 +4,7 @@ import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.voucher.domain.VoucherDto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -29,7 +30,6 @@ @Profile("dev") public class VoucherJdbcRepository implements VoucherRepository { - private final Map storage = new ConcurrentHashMap<>(); private final DataSource dataSource; private final JdbcTemplate jdbcTemplate; private static final Logger logger = LoggerFactory.getLogger(VoucherJdbcRepository.class); @@ -44,25 +44,16 @@ public class VoucherJdbcRepository implements VoucherRepository { customerId = toUUID(customerIdBytes); } - if (type.equals(FIXED.toString())) { + if (type.equals(FIXED.getType())) { return new FixedAmountVoucher(voucherId, amount, createdAt, customerId); } - if (type.equals(PERCENT.toString())) { + if (type.equals(PERCENT.getType())) { return new PercentDiscountVoucher(voucherId, amount, createdAt, customerId); } logger.error("JdbcVoucherRepository RowMapper Error"); throw new RuntimeException(EXCEPTION_VOUCHER_ROW_MAPPER.getMessage()); }; - private static final RowMapper customerRowMapper = (resultSet, i) -> { - var customerName = resultSet.getString("name"); - var email = resultSet.getString("email"); - var customerId = toUUID(resultSet.getBytes("customer_id")); - var lastLoginAt = resultSet.getTimestamp("last_login_at") != null ? - resultSet.getTimestamp("last_login_at").toLocalDateTime() : null; - var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime(); - return new Customer(customerId, customerName, email, lastLoginAt, createdAt); - }; public VoucherJdbcRepository(DataSource dataSource, JdbcTemplate jdbcTemplate) { this.dataSource = dataSource; @@ -82,7 +73,15 @@ public Optional findById(UUID voucherId) { } @Override - public Voucher save(Voucher voucher) { + public Voucher save(VoucherDto voucherDto) { + Voucher voucher = null; + if(voucherDto.getType().equals(FIXED.getType())){ + voucher = FixedAmountVoucher.fromDto(voucherDto); + } + if(voucherDto.getType().equals(PERCENT.getType())){ + voucher = PercentDiscountVoucher.fromDto(voucherDto); + } + int update = jdbcTemplate.update("INSERT INTO vouchers(voucher_id, type, amount, created_at, customer_id) " + "VALUES (UUID_TO_BIN(?), ?, ?, ?, UUID_TO_BIN(?))", voucher.getVoucherId().toString().getBytes(), diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java index e06564bf95..a62edcaf0d 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherMemoryRepository.java @@ -1,6 +1,9 @@ package org.prgrms.kdt.voucher.repository; +import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; +import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.voucher.domain.VoucherDto; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; @@ -9,6 +12,9 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; +import static org.prgrms.kdt.voucher.domain.VoucherType.FIXED; +import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; + @Repository @Profile("local") public class VoucherMemoryRepository implements VoucherRepository { @@ -22,7 +28,14 @@ public Optional findById(UUID voucherId) { } @Override - public Voucher save(Voucher voucher) { + public Voucher save(VoucherDto voucherDto) { + Voucher voucher = null; + if(voucherDto.getType().equals(FIXED.getType())){ + voucher = FixedAmountVoucher.fromDto(voucherDto); + } + if(voucherDto.getType().equals(PERCENT.getType())){ + voucher = PercentDiscountVoucher.fromDto(voucherDto); + } storage.put(voucher.getVoucherId(), voucher); logger.debug("바우처 생성 -> " + voucher.toString()); return voucher; diff --git a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java index 045c66f386..c92d5377c9 100644 --- a/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgrms/kdt/voucher/repository/VoucherRepository.java @@ -1,6 +1,7 @@ package org.prgrms.kdt.voucher.repository; import org.prgrms.kdt.voucher.domain.Voucher; +import org.prgrms.kdt.voucher.domain.VoucherDto; import java.util.List; import java.util.Optional; @@ -10,7 +11,7 @@ public interface VoucherRepository { Optional findById(UUID voucherId); - Voucher save(Voucher voucher); + Voucher save(VoucherDto voucherDto); List findAll(); diff --git a/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java deleted file mode 100644 index 30cd2a6ccb..0000000000 --- a/src/main/java/org/prgrms/kdt/voucher/service/FixedAmountVoucherService.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.prgrms.kdt.voucher.service; - -import org.prgrms.kdt.voucher.Dto.FixedAmountVoucherDto; -import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; -import org.prgrms.kdt.voucher.repository.VoucherRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.UUID; - -import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIXED_AMOUNT_MINUS; -import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIXED_AMOUNT_OVER; - -@Service -public class FixedAmountVoucherService { - - private final VoucherRepository voucherRepository; - private static final Logger logger = LoggerFactory.getLogger(FixedAmountVoucherService.class); - - public FixedAmountVoucherService(VoucherRepository voucherRepository) { - this.voucherRepository = voucherRepository; - } - - public void createFixedAmountVoucher(int amount) { - if (amount <= 0) { - String errorMessage = EXCEPTION_FIXED_AMOUNT_MINUS.getMessage(); - logger.error(errorMessage); - throw new IllegalArgumentException(errorMessage); - } - if (amount >= 100_000) { - String errorMessage = EXCEPTION_FIXED_AMOUNT_OVER.getMessage(); - logger.error(errorMessage); - throw new IllegalArgumentException(errorMessage); - } - - var fixedAmountVoucherDto = new FixedAmountVoucherDto(UUID.randomUUID(), amount, LocalDateTime.now()); - createVoucher(fixedAmountVoucherDto); - } - - private void createVoucher(FixedAmountVoucherDto fixedAmountVoucherDto) { - var voucher = new FixedAmountVoucher( - fixedAmountVoucherDto.getVoucherId(), - fixedAmountVoucherDto.getAmount(), - fixedAmountVoucherDto.getCreatedAt() - ); - voucherRepository.save(voucher); - } -} diff --git a/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java deleted file mode 100644 index ba91bf1fd0..0000000000 --- a/src/main/java/org/prgrms/kdt/voucher/service/PercentDiscountVoucherService.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.prgrms.kdt.voucher.service; - -import org.prgrms.kdt.voucher.Dto.PercentDiscountVoucherDto; -import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; -import org.prgrms.kdt.voucher.repository.VoucherRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.UUID; - -import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_PERCENT_MINUS; -import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_PERCENT_OVER; - -@Service -public class PercentDiscountVoucherService { - - private final VoucherRepository voucherRepository; - private static final Logger logger = LoggerFactory.getLogger(PercentDiscountVoucherService.class); - - public PercentDiscountVoucherService(VoucherRepository voucherRepository) { - this.voucherRepository = voucherRepository; - } - - public void createPercentDiscountVoucher(int percent) { - if (percent <= 0) { - String errorMessage = EXCEPTION_PERCENT_MINUS.getMessage(); - logger.error(errorMessage); - throw new IllegalArgumentException(errorMessage); - } - if (percent >= 100) { - String errorMessage = EXCEPTION_PERCENT_OVER.getMessage(); - logger.error(errorMessage); - throw new IllegalArgumentException(errorMessage); - } - - var percentDiscountVoucherDto = new PercentDiscountVoucherDto(UUID.randomUUID(), percent, LocalDateTime.now()); - createVoucher(percentDiscountVoucherDto); - } - - private void createVoucher(PercentDiscountVoucherDto percentDiscountVoucherDto) { - var voucher = new PercentDiscountVoucher( - percentDiscountVoucherDto.getVoucherId(), - percentDiscountVoucherDto.getPercent(), - percentDiscountVoucherDto.getCreatedAt() - ); - voucherRepository.save(voucher); - } -} diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index c63cff06e4..f03de6ca3c 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -1,5 +1,7 @@ package org.prgrms.kdt.voucher.service; +import org.prgrms.kdt.voucher.domain.VoucherDto; +import org.prgrms.kdt.voucher.domain.PercentDiscountVoucher; import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.repository.VoucherRepository; import org.prgrms.kdt.wallet.Wallet; @@ -9,12 +11,15 @@ import org.springframework.stereotype.Service; import java.text.MessageFormat; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; -import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIND_VOUCHER; -import static org.prgrms.kdt.voucher.VoucherMessage.VOUCHER_IS_EMPTY; +import static org.prgrms.kdt.voucher.VoucherMessage.*; +import static org.prgrms.kdt.voucher.VoucherMessage.EXCEPTION_FIXED_AMOUNT_OVER; +import static org.prgrms.kdt.voucher.domain.VoucherType.FIXED; +import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; @Service public class VoucherService { @@ -23,16 +28,21 @@ public class VoucherService { private final WalletRepository walletRepository; private static final Logger logger = LoggerFactory.getLogger(VoucherService.class); - public VoucherService( - VoucherRepository voucherRepository, - WalletRepository walletRepository, - FixedAmountVoucherService fixedAmountVoucherService, - PercentDiscountVoucherService percentDiscountVoucherService - ) { + public VoucherService(VoucherRepository voucherRepository, WalletRepository walletRepository) { this.voucherRepository = voucherRepository; this.walletRepository = walletRepository; } + public void createFixedAmountVoucher(int amount) { + VoucherDto voucherDto = new VoucherDto(UUID.randomUUID(), amount, FIXED.getType(), LocalDateTime.now()); + voucherRepository.save(voucherDto); + } + + public void createPercentDiscountVoucher(int amount) { + VoucherDto voucherDto = new VoucherDto(UUID.randomUUID(), amount, PERCENT.getType(), LocalDateTime.now()); + voucherRepository.save(voucherDto); + } + public Voucher getVoucher(UUID voucherId) { return voucherRepository .findById(voucherId) diff --git a/src/main/resources/templates/voucher/voucher-list.html b/src/main/resources/templates/voucher/voucher-list.html index 4e7e750bf8..2df73cce35 100644 --- a/src/main/resources/templates/voucher/voucher-list.html +++ b/src/main/resources/templates/voucher/voucher-list.html @@ -43,13 +43,7 @@

Voucher List

- - - - - - - +
diff --git a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java index ecedbd7141..dfc9c6737f 100644 --- a/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java +++ b/src/test/java/org/prgrms/kdt/KdtSpringContextTests.java @@ -14,6 +14,7 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import java.time.LocalDateTime; import java.util.List; import java.util.UUID; @@ -58,7 +59,7 @@ public void testVoucherRepositoryCreation() { @DisplayName("orderService를 사용해서 주문을 생성할 수 있다.") public void testOrderService() { // Given - var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, LocalDateTime.now()); voucherRepository.save(fixedAmountVoucher); // When diff --git a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java index c05ab0bfc5..60e3265eda 100644 --- a/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java +++ b/src/test/java/org/prgrms/kdt/order/OrderServiceTest.java @@ -5,13 +5,12 @@ import org.junit.jupiter.api.Test; import org.prgrms.kdt.voucher.domain.FixedAmountVoucher; import org.prgrms.kdt.voucher.repository.VoucherMemoryRepository; -import org.prgrms.kdt.voucher.service.FixedAmountVoucherService; -import org.prgrms.kdt.voucher.service.PercentDiscountVoucherService; import org.prgrms.kdt.voucher.service.VoucherService; import org.prgrms.kdt.wallet.WalletJdbcRepository; import org.springframework.boot.jdbc.DataSourceBuilder; import org.springframework.jdbc.core.JdbcTemplate; +import java.time.LocalDateTime; import java.util.List; import java.util.UUID; @@ -35,11 +34,9 @@ void createOrder() { var voucherRepository = new VoucherMemoryRepository(); var dataSource = DataSourceBuilder.create().type(HikariDataSource.class).build(); var jdbcTemplate = new JdbcTemplate(dataSource); - var walletRepository = new WalletJdbcRepository(dataSource, jdbcTemplate); // Provide the necessary dependencies - var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); - FixedAmountVoucherService fixedAmountVoucherService = new FixedAmountVoucherService(voucherRepository); - PercentDiscountVoucherService percentDiscountVoucherService = new PercentDiscountVoucherService(voucherRepository); - VoucherService voucherService = new VoucherService(voucherRepository, walletRepository, fixedAmountVoucherService, percentDiscountVoucherService); + var walletRepository = new WalletJdbcRepository(dataSource, jdbcTemplate); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, LocalDateTime.now()); + VoucherService voucherService = new VoucherService(voucherRepository, walletRepository); voucherRepository.save(fixedAmountVoucher); var sut = new OrderService(voucherService, new OrderRepositoryStub()); @@ -60,7 +57,7 @@ void createOrderByMock() { // Given var voucherServiceMock = mock(VoucherService.class); var orderRepositoryMock = mock(OrderRepository.class); - var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); + var fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 100, LocalDateTime.now()); when(voucherServiceMock.getVoucher(fixedAmountVoucher.getVoucherId())).thenReturn(fixedAmountVoucher); var sut = new OrderService(voucherServiceMock, orderRepositoryMock); @@ -76,7 +73,7 @@ void createOrderByMock() { var inOrder = inOrder(voucherServiceMock, orderRepositoryMock); inOrder.verify(voucherServiceMock).getVoucher(fixedAmountVoucher.getVoucherId()); inOrder.verify(orderRepositoryMock).insert(order); - inOrder.verify(voucherServiceMock).useVoucher(fixedAmountVoucher); + inOrder.verify(voucherServiceMock).removeVoucherById(fixedAmountVoucher.getVoucherId()); } diff --git a/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java b/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java index 8dbe5f6c01..c2c08945d1 100644 --- a/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java +++ b/src/test/java/org/prgrms/kdt/voucher/FixedAmountVoucherTest.java @@ -8,6 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.time.LocalDateTime; import java.util.UUID; import static org.junit.jupiter.api.Assertions.*; @@ -35,30 +36,30 @@ void testAssertEqual() { @Test @DisplayName("주어진 금액만큼 할인을 해야한다.") void testDiscount() { - var sut = new FixedAmountVoucher(UUID.randomUUID(), 100, createdAt); + var sut = new FixedAmountVoucher(UUID.randomUUID(), 100, LocalDateTime.now()); assertEquals(900, sut.discount(1000)); } @Test @DisplayName("디스카운트된 금액은 마이너스가 될 수 없다.") void testMinusDiscountedAmount() { - var sut = new FixedAmountVoucher(UUID.randomUUID(), 1000, createdAt); + var sut = new FixedAmountVoucher(UUID.randomUUID(), 1000, LocalDateTime.now()); assertEquals(0, sut.discount(900)); } @Test @DisplayName("할인 금액은 마이너스가 될 수 없다.") void testWithMinus() { - assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100, createdAt)); + assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100, LocalDateTime.now())); } @Test @DisplayName("유효한 할인 금액으로만 생성할 수 있다.") void testVoucherCreation() { assertAll("FixedAmountVoucher creation", - () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 0, createdAt)), - () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100, createdAt)), - () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 1000000, createdAt)) + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 0, LocalDateTime.now())), + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), -100, LocalDateTime.now())), + () -> assertThrows(IllegalArgumentException.class, () -> new FixedAmountVoucher(UUID.randomUUID(), 1000000, LocalDateTime.now())) ); } diff --git a/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java index b16c157527..0de0776ac1 100644 --- a/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java +++ b/src/test/java/org/prgrms/kdt/voucher/VoucherJdbcRepositoryTest.java @@ -13,6 +13,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; +import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -36,7 +37,7 @@ public class VoucherJdbcRepositoryTest { public void givenVoucherId_whenFindById_thenReturnVoucher() { // Mock the behavior of JdbcTemplate.queryForObject to return a Voucher when(jdbcTemplate.queryForObject(any(String.class), any(RowMapper.class), any(Object.class))).thenReturn( - new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt) + new FixedAmountVoucher(UUID.randomUUID(), 50, LocalDateTime.now()) ); UUID voucherId = UUID.randomUUID(); @@ -57,7 +58,7 @@ public void givenEmptyVoucherId_whenFindById_thenReturnEmptyOptional() { @Test public void givenVoucher_whenSave_thenReturnSavedVoucher() { - FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt); + Voucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50, LocalDateTime.now()); when(jdbcTemplate.update(any(String.class), any(Object.class))).thenReturn(1); Voucher savedVoucher = voucherJdbcRepository.save(fixedAmountVoucher); @@ -66,7 +67,7 @@ public void givenVoucher_whenSave_thenReturnSavedVoucher() { @Test public void givenVoucher_whenSave_thenThrowRuntimeException() { - FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt); + FixedAmountVoucher fixedAmountVoucher = new FixedAmountVoucher(UUID.randomUUID(), 50, LocalDateTime.now()); when(jdbcTemplate.update(any(String.class), any(Object.class))).thenReturn(0); assertThatThrownBy(() -> voucherJdbcRepository.save(fixedAmountVoucher)) @@ -78,7 +79,7 @@ public void givenVoucher_whenSave_thenThrowRuntimeException() { public void whenFindAll_thenReturnListOfVouchers() { // Mock the behavior of JdbcTemplate.query to return a list of Vouchers when(jdbcTemplate.query(any(String.class), any(RowMapper.class))).thenReturn( - List.of(new FixedAmountVoucher(UUID.randomUUID(), 50, createdAt)) + List.of(new FixedAmountVoucher(UUID.randomUUID(), 50, LocalDateTime.now())) ); List vouchers = voucherJdbcRepository.findAll(); From a0925086ea1291f2af99a5dd7c9a704143a0cc36 Mon Sep 17 00:00:00 2001 From: ParkJuHan94 <1004sunye@naver.com> Date: Thu, 9 Nov 2023 04:49:54 +0900 Subject: [PATCH 28/28] =?UTF-8?q?feat:=20api=20=EC=85=8B=ED=8C=85=20?= =?UTF-8?q?=EB=B0=8F=20=EC=B6=94=EA=B0=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prgrms/kdt/customer/CustomerService.java | 2 +- .../controller/CustomerConsoleController.java | 2 +- .../org/prgrms/kdt/io/ModeController.java | 2 - .../servlet/KdtWebApplicationInitializer.java | 67 ++++-------------- .../controller/VoucherConsoleController.java | 1 - .../voucher/{ => controller}/VoucherMenu.java | 2 +- .../controller/VoucherRestController.java | 68 +++++++++++-------- .../VoucherThymeleafController.java | 14 ++-- .../prgrms/kdt/voucher/domain/Voucher.java | 1 + .../kdt/voucher/service/VoucherService.java | 15 ++++ 10 files changed, 80 insertions(+), 94 deletions(-) rename src/main/java/org/prgrms/kdt/voucher/{ => controller}/VoucherMenu.java (93%) diff --git a/src/main/java/org/prgrms/kdt/customer/CustomerService.java b/src/main/java/org/prgrms/kdt/customer/CustomerService.java index a9a25d38ee..886a264534 100644 --- a/src/main/java/org/prgrms/kdt/customer/CustomerService.java +++ b/src/main/java/org/prgrms/kdt/customer/CustomerService.java @@ -28,7 +28,7 @@ public List getBlackList() { return customerRepository.findBlackList(); } - public List getHaveVouchers(UUID customerId) { + public List getVouchersById(UUID customerId) { return walletRepository.findByCustomerId(customerId.toString()); } } diff --git a/src/main/java/org/prgrms/kdt/customer/controller/CustomerConsoleController.java b/src/main/java/org/prgrms/kdt/customer/controller/CustomerConsoleController.java index 64875709ac..380b00b66a 100644 --- a/src/main/java/org/prgrms/kdt/customer/controller/CustomerConsoleController.java +++ b/src/main/java/org/prgrms/kdt/customer/controller/CustomerConsoleController.java @@ -87,7 +87,7 @@ private void createCustomer() throws IOException { private void getHaveVouchers() throws IOException { outputHandler.outputString(GET_HAVE_VOUCHERS.getMessage()); UUID customerId = UUID.fromString(inputHandler.inputString()); - List walletList = customerService.getHaveVouchers(customerId); + List walletList = customerService.getVouchersById(customerId); outputHandler.outputWallets(walletList); } diff --git a/src/main/java/org/prgrms/kdt/io/ModeController.java b/src/main/java/org/prgrms/kdt/io/ModeController.java index a874b328e5..c3ad7cf66c 100644 --- a/src/main/java/org/prgrms/kdt/io/ModeController.java +++ b/src/main/java/org/prgrms/kdt/io/ModeController.java @@ -1,7 +1,6 @@ package org.prgrms.kdt.io; import org.prgrms.kdt.customer.controller.CustomerConsoleController; -import org.prgrms.kdt.voucher.VoucherMenu; import org.prgrms.kdt.voucher.controller.VoucherConsoleController; import org.prgrms.kdt.wallet.WalletController; import org.slf4j.Logger; @@ -10,7 +9,6 @@ import java.io.IOException; -import static org.prgrms.kdt.io.Mode.MODE_CUSTOMER; import static org.prgrms.kdt.io.Mode.MODE_MENU; import static org.prgrms.kdt.io.SystemMessage.EXCEPTION_NOT_EXIST_MENU; import static org.prgrms.kdt.io.SystemMessage.EXIT_PROGRAM; diff --git a/src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java b/src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java index 31744312b5..619dcb622a 100644 --- a/src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java +++ b/src/main/java/org/prgrms/kdt/servlet/KdtWebApplicationInitializer.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.zaxxer.hikari.HikariDataSource; import org.prgrms.kdt.customer.controller.CustomerConsoleController; +import org.prgrms.kdt.voucher.controller.VoucherRestController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -46,64 +47,30 @@ public class KdtWebApplicationInitializer implements WebApplicationInitializer { @Configuration @EnableWebMvc @ComponentScan(basePackages = "org.prgrms.kdt", - includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = CustomerConsoleController.class), + includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = VoucherRestController.class), useDefaultFilters = false ) static class ServletConfig implements WebMvcConfigurer, ApplicationContextAware { ApplicationContext applicationContext; -// @Override -// public void configureViewResolvers(ViewResolverRegistry registry) { -// registry.jsp().viewNames("jsp/*"); -// -// var springResourceTemplateResolver = new SpringResourceTemplateResolver(); -// springResourceTemplateResolver.setApplicationContext(applicationContext); -// springResourceTemplateResolver.setPrefix("/WEB-INF/"); -// springResourceTemplateResolver.setSuffix(".html"); -// var springTemplateEngine = new SpringTemplateEngine(); -// springTemplateEngine.setTemplateResolver(springResourceTemplateResolver); -// -// var thymeleafViewResolver = new ThymeleafViewResolver(); -// thymeleafViewResolver.setTemplateEngine(springTemplateEngine); -// thymeleafViewResolver.setOrder(1); -// thymeleafViewResolver.setViewNames(new String[]{"views/*"}); -// registry.viewResolver(thymeleafViewResolver); -// } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/resources/**") - .addResourceLocations("/resources/") - .setCachePeriod(60) - .resourceChain(true) - .addResolver(new EncodedResourceResolver()); - } - @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } -// @Override -// public void extendMessageConverters(List> converters) { -// var messageConverter = new MarshallingHttpMessageConverter(); -// var xStreamMarshaller = new XStreamMarshaller(); -// messageConverter.setMarshaller(xStreamMarshaller); -// messageConverter.setUnmarshaller(xStreamMarshaller); -// converters.add(0, messageConverter); -// -// var javaTimeModule = new JavaTimeModule(); -// javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ISO_DATE_TIME)); -// var modules = Jackson2ObjectMapperBuilder.json().modules(javaTimeModule); -// converters.add(1, new MappingJackson2HttpMessageConverter(modules.build())); -// } - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/api/**") - .allowedMethods("GET", "POST") - .allowedOrigins("*"); + public void extendMessageConverters(List> converters) { + var messageConverter = new MarshallingHttpMessageConverter(); + var xStreamMarshaller = new XStreamMarshaller(); + messageConverter.setMarshaller(xStreamMarshaller); + messageConverter.setUnmarshaller(xStreamMarshaller); + converters.add(0, messageConverter); + + var javaTimeModule = new JavaTimeModule(); + javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ISO_DATE_TIME)); + var modules = Jackson2ObjectMapperBuilder.json().modules(javaTimeModule); + converters.add(1, new MappingJackson2HttpMessageConverter(modules.build())); } } @@ -118,13 +85,12 @@ static class RootConfig { @Bean public DataSource dataSource() { - var dataSource = DataSourceBuilder.create() + return DataSourceBuilder.create() .url("jdbc:mysql://localhost:3306/order_mgmt") .username("root") .password("110811") .type(HikariDataSource.class) .build(); - return dataSource; } @Bean @@ -132,11 +98,6 @@ public JdbcTemplate jdbcTemplate(DataSource dataSource) { return new JdbcTemplate(dataSource); } - @Bean - public NamedParameterJdbcTemplate namedParameterJdbcTemplate(JdbcTemplate jdbcTemplate) { - return new NamedParameterJdbcTemplate(jdbcTemplate); - } - @Bean public PlatformTransactionManager platformTransactionManager(DataSource dataSource) { return new DataSourceTransactionManager(dataSource); diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java index f660cac699..a9490837d2 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherConsoleController.java @@ -2,7 +2,6 @@ import org.prgrms.kdt.io.InputHandler; import org.prgrms.kdt.io.OutputHandler; -import org.prgrms.kdt.voucher.VoucherMenu; import org.prgrms.kdt.voucher.service.VoucherService; import org.prgrms.kdt.wallet.Wallet; import org.slf4j.Logger; diff --git a/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherMenu.java similarity index 93% rename from src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java rename to src/main/java/org/prgrms/kdt/voucher/controller/VoucherMenu.java index 3e75501616..cac12b794e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/VoucherMenu.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherMenu.java @@ -1,4 +1,4 @@ -package org.prgrms.kdt.voucher; +package org.prgrms.kdt.voucher.controller; public enum VoucherMenu { CREATE("create"), diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java index a643b00468..6772299cbf 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherRestController.java @@ -2,13 +2,17 @@ import org.prgrms.kdt.voucher.domain.Voucher; import org.prgrms.kdt.voucher.service.VoucherService; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; +import org.springframework.http.ResponseEntity; +import org.springframework.http.HttpStatus; +import java.time.LocalDateTime; import java.util.List; import java.util.UUID; @RestController -@RequestMapping("/api/v1/vouchers") +@RequestMapping(value = "/api/v1/vouchers", produces = MediaType.APPLICATION_JSON_VALUE) // xml로 변경 가능 public class VoucherRestController { private final VoucherService voucherService; @@ -17,38 +21,48 @@ public VoucherRestController(VoucherService voucherService) { this.voucherService = voucherService; } - @GetMapping - public List getAllVouchers() { - return voucherService.getAllVouchers(); + @GetMapping("") + public ResponseEntity> getAllVouchers() { + List vouchers = voucherService.getAllVouchers(); + if (vouchers.isEmpty()) { + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + return new ResponseEntity<>(vouchers, HttpStatus.OK); } @PostMapping("/create") - public String createVoucher(@RequestParam("type") String voucherType, - @RequestParam(value = "amount", required = false) Integer amount, - @RequestParam(value = "percent", required = false) Integer percent) { - if (voucherType.equals("fixed")) { - if (amount != null) { - voucherService.createFixedAmountVoucher(amount); - return "Fixed amount voucher created."; - } else { - return "Amount parameter is missing for fixed voucher creation."; - } - } else if (voucherType.equals("percent")) { - if (percent != null) { - voucherService.createPercentDiscountVoucher(percent); - return "Percent discount voucher created."; - } else { - return "Percent parameter is missing for percent voucher creation."; - } + public ResponseEntity createVoucher(@RequestParam String type, @RequestParam int amount) { + if (type.equals("fixed")) { + voucherService.createFixedAmountVoucher(amount); + return new ResponseEntity<>("Fixed amount voucher created successfully", HttpStatus.CREATED); + } else if (type.equals("percent")) { + voucherService.createPercentDiscountVoucher(amount); + return new ResponseEntity<>("Percent discount voucher created successfully", HttpStatus.CREATED); } else { - return "Unknown voucher type: " + voucherType; + return new ResponseEntity<>("Invalid voucher type", HttpStatus.BAD_REQUEST); } } - @DeleteMapping("/remove/{id}") - public String removeVoucher(@PathVariable("id") String voucherId) { - UUID id = UUID.fromString(voucherId); - voucherService.removeVoucherById(id); - return "Voucher removed."; + @DeleteMapping("/{voucherId}") + public ResponseEntity removeVoucher(@PathVariable UUID voucherId) { + voucherService.removeVoucherById(voucherId); + return new ResponseEntity<>("Voucher removed successfully", HttpStatus.OK); + } + + @GetMapping("/{voucherId}") + public ResponseEntity getVoucherById(@PathVariable UUID voucherId) { + Voucher voucher = voucherService.getVoucher(voucherId); + return new ResponseEntity<>(voucher, HttpStatus.OK); + } + + @GetMapping("/criteria") + public ResponseEntity> getVouchersByCriteria(@RequestParam String startDate, @RequestParam String endDate, @RequestParam String voucherType) { + LocalDateTime start = LocalDateTime.parse(startDate); + LocalDateTime end = LocalDateTime.parse(endDate); + List vouchers = voucherService.getVouchersByCriteria(start, end, voucherType); + if (vouchers.isEmpty()) { + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + return new ResponseEntity<>(vouchers, HttpStatus.OK); } } diff --git a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java index caba2853ca..cbdf555962 100644 --- a/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java +++ b/src/main/java/org/prgrms/kdt/voucher/controller/VoucherThymeleafController.java @@ -6,10 +6,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.UUID; @@ -18,6 +15,7 @@ import static org.prgrms.kdt.voucher.domain.VoucherType.PERCENT; @Controller +@RequestMapping("/vouchers") public class VoucherThymeleafController { private final VoucherService voucherService; @@ -27,19 +25,19 @@ public VoucherThymeleafController(VoucherService voucherService) { this.voucherService = voucherService; } - @GetMapping("/vouchers") + @GetMapping("") public String showVouchers(Model model) { List vouchers = voucherService.getAllVouchers(); model.addAttribute("vouchers", vouchers); return "voucher/voucher-list"; } - @GetMapping("/vouchers/create") + @GetMapping("/create") public String showCreateVoucherForm() { return "voucher/voucher-create"; } - @PostMapping("/vouchers/create") + @PostMapping("/create") public String createVoucher(@RequestParam("type") String voucherType, @RequestParam(value = "amount", required = false) Integer amount, @RequestParam(value = "percent", required = false) Integer percent @@ -55,7 +53,7 @@ public String createVoucher(@RequestParam("type") String voucherType, return "redirect:/vouchers"; } - @PostMapping("/vouchers/remove/{id}") + @PostMapping("/remove/{id}") public String removeVoucher(@PathVariable("id") String voucherId) { UUID id = UUID.fromString(voucherId); voucherService.removeVoucherById(id); diff --git a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java index a69f80e2e3..2014123a7e 100644 --- a/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java +++ b/src/main/java/org/prgrms/kdt/voucher/domain/Voucher.java @@ -4,6 +4,7 @@ import java.util.UUID; public abstract class Voucher { + UUID voucherId; long amount; LocalDateTime createdAt; diff --git a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java index f03de6ca3c..734c602a8c 100644 --- a/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java +++ b/src/main/java/org/prgrms/kdt/voucher/service/VoucherService.java @@ -12,6 +12,7 @@ import java.text.MessageFormat; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -68,4 +69,18 @@ public Optional getOwner(UUID voucherId) { public void removeVoucherById(UUID voucherId) { voucherRepository.deleteById(voucherId); } + + public List getVouchersByCriteria(LocalDateTime startDate, LocalDateTime endDate, String voucherType) { + List vouchersByCriteria = new ArrayList<>(); + List allVouchers = voucherRepository.findAll(); + + for (Voucher voucher : allVouchers) { + if ((voucher.getCreatedAt().isAfter(startDate) || voucher.getCreatedAt().isEqual(startDate)) + && (voucher.getCreatedAt().isBefore(endDate) || voucher.getCreatedAt().isEqual(endDate)) + && voucher.getType().equals(voucherType)) { + vouchersByCriteria.add(voucher); + } + } + return vouchersByCriteria; + } }