From f76a61aba01591e89dbbe8312c0a0582b45f7902 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 02:13:04 +0900 Subject: [PATCH 01/62] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=B4=88=EA=B8=B0=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 14 + .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes .mvn/wrapper/maven-wrapper.properties | 2 + docs/README.md | 33 ++ mvnw | 316 ++++++++++++++++++ mvnw.cmd | 188 +++++++++++ pom.xml | 41 +++ .../voucher/SpringVoucherApplication.java | 13 + src/main/resources/application.properties | 1 + .../SpringVoucherApplicationTests.java | 13 + 10 files changed, 621 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 docs/README.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/org/prgms/voucher/SpringVoucherApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/org/prgms/voucher/SpringVoucherApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..bc39340647 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +# Mac +.DS_Store diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..b7cb93e705 --- /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.4/apache-maven-3.8.4-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000000..fc01f4d597 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,33 @@ +- SpringBoot Part1 Weekly Mission + + (기본) **바우처 관리 애플리케이션** + + - [ ] Maven / Gradle 로 프로젝트를 실제로 구성하고 이때 Spring Boot CLI를 개발PC에 설치해서 명령어들을 사용해보고 프로젝트를 만든다. 그리고 IDE (IntelliJ)에서 + 실행시켜 본다. + - [ ] 바우처 관리 Command-line Application을 만들어본다. + - + 참고: [https://dzone.com/articles/interactive-console-applications-in-java](https://dzone.com/articles/interactive-console-applications-in-java) + - [ ] 스프링부트 애플리케이션으로 만든다. (Web기능이 없이만듭니다. 즉, 서버가 띄지 않고 커맨드라인 애플리케이션으로 동작해야한다.) + - [ ] 프로그램이 시작하면 다음과 같이 지원가능한 명령어를 알려준다. + + ```bash + === Voucher Program === + Type **exit** to exit the program. + Type **create** to create a new voucher. + Type **list** to list all vouchers. + ``` + + - [ ] create / list 커맨드를 지원한다. + - create 커맨드를 통해 바우처를 생성할수 있다. (FixedAmountVoucher, PercentDiscountVoucher) + - list 커맨드를 통해 만들어진 바우처를 조회할 수 있다. + - 바우처 정보를 매모리에 관리한다. 어플리케이션이 종료가 되어 데이터가 모두 사라져도 괜찮습니다. (나중에 영속성을 가지도록 변경할거에요 걱정마세요!) + - [ ] 적절한 로그를 기록하고 `logback` 설정을해서 에러는 파일로 기록된다. + - [ ] 실행가능한 `jar` 파일을 생성한다. + + (심화) 파일을 통한 데이터관리 기능과 고객 블랙 리스트 명단 관리기능 + + - [ ] 메모리 관리가 아닌 파일로 관리가 되는 Repository를 한번 만들어보세요. + - 기존 메모리 레포지토리는 지우지 말고 개발 프로파일에서만 동작하게 해보세요. + - [ ] 고객 블랙 리스트 명단을 작성한다. + - customer_blacklist.csv 파일을 만들고 스프링 애플리케이션에서 해당 파일을 읽을 수 있고 블랙 리스트조회 할 수있다 (추가할 필요는 없어요. 블랙리스트는 파일로만 관리된다고 가정합니다.) + - [ ] YAML 프라퍼티를 만들고 어떤 설정을 만들수 있을지 고민해본다. diff --git a/mvnw b/mvnw new file mode 100755 index 0000000000..8a8fb2282d --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/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 /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + 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="`\\unset -f command; \\command -v 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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ + $MAVEN_DEBUG_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..1d8ab018ea --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000..e1c1ca85a9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.6 + + + org.prgms + spring-voucher + 0.0.1-SNAPSHOT + spring-voucher + spring-voucher + + 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/prgms/voucher/SpringVoucherApplication.java b/src/main/java/org/prgms/voucher/SpringVoucherApplication.java new file mode 100644 index 0000000000..6fb8413604 --- /dev/null +++ b/src/main/java/org/prgms/voucher/SpringVoucherApplication.java @@ -0,0 +1,13 @@ +package org.prgms.voucher; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringVoucherApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringVoucherApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/org/prgms/voucher/SpringVoucherApplicationTests.java b/src/test/java/org/prgms/voucher/SpringVoucherApplicationTests.java new file mode 100644 index 0000000000..2cd1d14bc0 --- /dev/null +++ b/src/test/java/org/prgms/voucher/SpringVoucherApplicationTests.java @@ -0,0 +1,13 @@ +package org.prgms.voucher; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SpringVoucherApplicationTests { + + @Test + void contextLoads() { + } + +} From 8e8c35b145b80d43b082ca1362df13b545f43aab Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 14:29:34 +0900 Subject: [PATCH 02/62] =?UTF-8?q?docs:=20docs/README.md=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/README.md | 68 ++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/docs/README.md b/docs/README.md index fc01f4d597..3e6e16b2e5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,33 +1,35 @@ -- SpringBoot Part1 Weekly Mission - - (기본) **바우처 관리 애플리케이션** - - - [ ] Maven / Gradle 로 프로젝트를 실제로 구성하고 이때 Spring Boot CLI를 개발PC에 설치해서 명령어들을 사용해보고 프로젝트를 만든다. 그리고 IDE (IntelliJ)에서 - 실행시켜 본다. - - [ ] 바우처 관리 Command-line Application을 만들어본다. - - - 참고: [https://dzone.com/articles/interactive-console-applications-in-java](https://dzone.com/articles/interactive-console-applications-in-java) - - [ ] 스프링부트 애플리케이션으로 만든다. (Web기능이 없이만듭니다. 즉, 서버가 띄지 않고 커맨드라인 애플리케이션으로 동작해야한다.) - - [ ] 프로그램이 시작하면 다음과 같이 지원가능한 명령어를 알려준다. - - ```bash - === Voucher Program === - Type **exit** to exit the program. - Type **create** to create a new voucher. - Type **list** to list all vouchers. - ``` - - - [ ] create / list 커맨드를 지원한다. - - create 커맨드를 통해 바우처를 생성할수 있다. (FixedAmountVoucher, PercentDiscountVoucher) - - list 커맨드를 통해 만들어진 바우처를 조회할 수 있다. - - 바우처 정보를 매모리에 관리한다. 어플리케이션이 종료가 되어 데이터가 모두 사라져도 괜찮습니다. (나중에 영속성을 가지도록 변경할거에요 걱정마세요!) - - [ ] 적절한 로그를 기록하고 `logback` 설정을해서 에러는 파일로 기록된다. - - [ ] 실행가능한 `jar` 파일을 생성한다. - - (심화) 파일을 통한 데이터관리 기능과 고객 블랙 리스트 명단 관리기능 - - - [ ] 메모리 관리가 아닌 파일로 관리가 되는 Repository를 한번 만들어보세요. - - 기존 메모리 레포지토리는 지우지 말고 개발 프로파일에서만 동작하게 해보세요. - - [ ] 고객 블랙 리스트 명단을 작성한다. - - customer_blacklist.csv 파일을 만들고 스프링 애플리케이션에서 해당 파일을 읽을 수 있고 블랙 리스트조회 할 수있다 (추가할 필요는 없어요. 블랙리스트는 파일로만 관리된다고 가정합니다.) - - [ ] YAML 프라퍼티를 만들고 어떤 설정을 만들수 있을지 고민해본다. +## SpringBoot Part1 Weekly Mission + +(기본) **바우처 관리 애플리케이션** + +- [x] Maven / Gradle 로 프로젝트를 실제로 구성하고 이때 Spring Boot CLI를 개발PC에 설치해서 명령어들을 사용해보고 프로젝트를 만든다. 그리고 IDE (IntelliJ)에서 실행시켜 본다. + +- [ ] 바우처 관리 Command-line Application을 만들어본다. + + - 참고: [https://dzone.com/articles/interactive-console-applications-in-java](https://dzone.com/articles/interactive-console-applications-in-java) + - [ ] 스프링부트 애플리케이션으로 만든다. (Web기능이 없이만듭니다. 즉, 서버가 띄지 않고 커맨드라인 애플리케이션으로 동작해야한다.) + - [ ] 프로그램이 시작하면 다음과 같이 지원가능한 명령어를 알려준다. + + ```bash + === Voucher Program === + Type **exit** to exit the program. + Type **create** to create a new voucher. + Type **list** to list all vouchers. + ``` + + - [ ] create / list 커맨드를 지원한다. + - create 커맨드를 통해 바우처를 생성할수 있다. (FixedAmountVoucher, PercentDiscountVoucher) + - list 커맨드를 통해 만들어진 바우처를 조회할 수 있다. + - 바우처 정보를 매모리에 관리한다. 어플리케이션이 종료가 되어 데이터가 모두 사라져도 괜찮습니다. (나중에 영속성을 가지도록 변경할거에요 걱정마세요!) + +- [ ] 적절한 로그를 기록하고 `logback` 설정을해서 에러는 파일로 기록된다. + +- [ ] 실행가능한 `jar` 파일을 생성한다. + +(심화) 파일을 통한 데이터관리 기능과 고객 블랙 리스트 명단 관리기능 + +- [ ] 메모리 관리가 아닌 파일로 관리가 되는 Repository를 한번 만들어보세요. + - 기존 메모리 레포지토리는 지우지 말고 개발 프로파일에서만 동작하게 해보세요. +- [ ] 고객 블랙 리스트 명단을 작성한다. +- customer_blacklist.csv 파일을 만들고 스프링 애플리케이션에서 해당 파일을 읽을 수 있고 블랙 리스트조회 할 수있다 (추가할 필요는 없어요. 블랙리스트는 파일로만 관리된다고 가정합니다.) +- [ ] YAML 프라퍼티를 만들고 어떤 설정을 만들수 있을지 고민해본다. From bbb343aa0eb3ac302b31ad0f439a820eef1388dd Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 17:13:12 +0900 Subject: [PATCH 03/62] =?UTF-8?q?feat:=20=EA=B8=88=EC=95=A1=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=ED=95=A0=EC=9D=B8=ED=95=98=EB=8A=94=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/entity/FixedAmountVoucher.java | 33 +++++++++++++++++++ .../org/prgms/voucher/entity/Voucher.java | 9 +++++ .../ZeroDiscountAmountException.java | 7 ++++ .../entity/FixedAmountVoucherTest.java | 32 ++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java create mode 100644 src/main/java/org/prgms/voucher/entity/Voucher.java create mode 100644 src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java create mode 100644 src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java diff --git a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java new file mode 100644 index 0000000000..85f231297d --- /dev/null +++ b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java @@ -0,0 +1,33 @@ +package org.prgms.voucher.entity; + +import java.util.UUID; + +import org.prgms.voucher.exception.ZeroDiscountAmountException; + +public class FixedAmountVoucher implements Voucher { + + private final UUID voucherId; + private final long discountAmount; + + public FixedAmountVoucher(UUID voucherId, long discountAmount) throws ZeroDiscountAmountException { + validateDiscountAmount(discountAmount); + this.voucherId = voucherId; + this.discountAmount = discountAmount; + } + + private void validateDiscountAmount(long discountAmount) throws ZeroDiscountAmountException { + if (discountAmount == 0) { + throw new ZeroDiscountAmountException(); + } + } + + @Override + public long discount(long beforeDiscount) { + return beforeDiscount - discountAmount; + } + + @Override + public UUID getVoucherId() { + return voucherId; + } +} diff --git a/src/main/java/org/prgms/voucher/entity/Voucher.java b/src/main/java/org/prgms/voucher/entity/Voucher.java new file mode 100644 index 0000000000..1458509c91 --- /dev/null +++ b/src/main/java/org/prgms/voucher/entity/Voucher.java @@ -0,0 +1,9 @@ +package org.prgms.voucher.entity; + +import java.util.UUID; + +public interface Voucher { + long discount(long beforeDiscount); + + UUID getVoucherId(); +} diff --git a/src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java b/src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java new file mode 100644 index 0000000000..237aa1a90a --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class ZeroDiscountAmountException extends Exception { + public ZeroDiscountAmountException() { + super("[ERROR] 할인금액이 0원입니다."); + } +} diff --git a/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java b/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java new file mode 100644 index 0000000000..538fa4cac8 --- /dev/null +++ b/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java @@ -0,0 +1,32 @@ +package org.prgms.voucher.entity; + +import static org.assertj.core.api.Assertions.*; + +import java.util.UUID; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.prgms.voucher.exception.ZeroDiscountAmountException; + +class FixedAmountVoucherTest { + + @DisplayName("할인금액이 0인 경우 예외를 발생한다.") + @Test + void FixedAmount_AmountIsZero_ThrowsException() { + assertThatThrownBy(() -> new FixedAmountVoucher(UUID.randomUUID(), 0)) + .isInstanceOf(ZeroDiscountAmountException.class) + .hasMessage("[ERROR] 할인금액이 0원입니다."); + } + + @DisplayName("정해진 할인금액으로 할인한다.") + @ParameterizedTest + @CsvSource(value = {"1000,100,900", "500,300,200", "10000,5000,5000"}) + void discount_Amount_ReturnDiscountAmount(long beforeDiscount, long discountAmount, long result) throws + ZeroDiscountAmountException { + Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), discountAmount); + long discountPrice = voucher.discount(beforeDiscount); + assertThat(discountPrice).isEqualTo(result); + } +} From fb53b16e0b038b5f5610d26bcdd5390012fcbd45 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 17:13:24 +0900 Subject: [PATCH 04/62] =?UTF-8?q?docs:=20docs/README.md=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/README.md | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 3e6e16b2e5..d2312c5fbc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,12 +1,16 @@ ## SpringBoot Part1 Weekly Mission +### 미션 내용 + (기본) **바우처 관리 애플리케이션** -- [x] Maven / Gradle 로 프로젝트를 실제로 구성하고 이때 Spring Boot CLI를 개발PC에 설치해서 명령어들을 사용해보고 프로젝트를 만든다. 그리고 IDE (IntelliJ)에서 실행시켜 본다. +- [x] Maven / Gradle 로 프로젝트를 실제로 구성하고 이때 Spring Boot CLI를 개발PC에 설치해서 명령어들을 사용해보고 프로젝트를 만든다. 그리고 IDE (IntelliJ)에서 실행시켜 + 본다. - [ ] 바우처 관리 Command-line Application을 만들어본다. - - 참고: [https://dzone.com/articles/interactive-console-applications-in-java](https://dzone.com/articles/interactive-console-applications-in-java) + - + 참고: [https://dzone.com/articles/interactive-console-applications-in-java](https://dzone.com/articles/interactive-console-applications-in-java) - [ ] 스프링부트 애플리케이션으로 만든다. (Web기능이 없이만듭니다. 즉, 서버가 띄지 않고 커맨드라인 애플리케이션으로 동작해야한다.) - [ ] 프로그램이 시작하면 다음과 같이 지원가능한 명령어를 알려준다. @@ -33,3 +37,25 @@ - [ ] 고객 블랙 리스트 명단을 작성한다. - customer_blacklist.csv 파일을 만들고 스프링 애플리케이션에서 해당 파일을 읽을 수 있고 블랙 리스트조회 할 수있다 (추가할 필요는 없어요. 블랙리스트는 파일로만 관리된다고 가정합니다.) - [ ] YAML 프라퍼티를 만들고 어떤 설정을 만들수 있을지 고민해본다. + +### 구현해야 할 기능 목록 + +- [ ] 입력 + - [ ] 메뉴 커맨드 + - [ ] Enum으로 관리 + - [ ] create 커맨드 + - [x] FixedAmountVoucher + - [x] 할인 금액 + - [x] 0일 경우 예외 발생 + - [ ] PercentDiscountVoucher + - [ ] 할인 퍼센트 + - [ ] 0일 경우 예외 발생 + - [ ] 입력이 잘못되면 예외 발생 + +- [ ] 출력 + - [ ] 바우처 조회 + +- [ ] 바우처 + - [ ] 원하는 바우처로 생성 + - [ ] + - [ ] 바우처 정보 저장 From 6f85729cfac3243b926f922898c5301b26911065 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 17:44:29 +0900 Subject: [PATCH 05/62] =?UTF-8?q?feat:=20=ED=8D=BC=EC=84=BC=ED=8A=B8?= =?UTF-8?q?=EB=A1=9C=20=ED=95=A0=EC=9D=B8=ED=95=98=EB=8A=94=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PercentDiscountVoucher.java | 28 ++++++++++++++++ .../ZeroDiscountPercentException.java | 7 ++++ .../entity/PercentDiscountVoucherTest.java | 33 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java create mode 100644 src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java create mode 100644 src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java new file mode 100644 index 0000000000..99f6488672 --- /dev/null +++ b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java @@ -0,0 +1,28 @@ +package org.prgms.voucher.entity; + +import java.util.UUID; + +import org.prgms.voucher.exception.ZeroDiscountPercentException; + +public class PercentDiscountVoucher implements Voucher { + private final UUID voucherId; + private final long discountPercent; + + public PercentDiscountVoucher(UUID voucherId, long discountPercent) throws ZeroDiscountPercentException { + if (discountPercent == 0) { + throw new ZeroDiscountPercentException(); + } + this.voucherId = voucherId; + this.discountPercent = discountPercent; + } + + @Override + public long discount(long beforeDiscount) { + return (long)(beforeDiscount * (1 - (discountPercent / 100.0))); + } + + @Override + public UUID getVoucherId() { + return voucherId; + } +} diff --git a/src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java b/src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java new file mode 100644 index 0000000000..c81607813c --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class ZeroDiscountPercentException extends Exception { + public ZeroDiscountPercentException() { + super("[ERROR] 할인퍼센트가 0입니다."); + } +} diff --git a/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java b/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java new file mode 100644 index 0000000000..1a80e6bf82 --- /dev/null +++ b/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java @@ -0,0 +1,33 @@ +package org.prgms.voucher.entity; + +import static org.assertj.core.api.Assertions.*; + +import java.util.UUID; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.prgms.voucher.exception.ZeroDiscountPercentException; + +class PercentDiscountVoucherTest { + + @DisplayName("할인퍼센트가 0이면 예외를 발생한다.") + @Test + void percentDiscount_PercentIsZero_ThrowsException() { + assertThatThrownBy(() -> new PercentDiscountVoucher(UUID.randomUUID(), 0)) + .isInstanceOf(ZeroDiscountPercentException.class) + .hasMessage("[ERROR] 할인퍼센트가 0입니다."); + } + + @DisplayName("정해진 할인퍼센트로 할인한다.") + @ParameterizedTest + @CsvSource(value = {"1000,10,900", "2000,20,1600", "532,30,372"}) + void discount_Percent_ReturnDiscountPrice(long beforeDiscount, long discountPercent, long result) throws + ZeroDiscountPercentException { + Voucher voucher = new PercentDiscountVoucher(UUID.randomUUID(), discountPercent); + long discountPrice = voucher.discount(beforeDiscount); + assertThat(discountPrice).isEqualTo(result); + } + +} From b000b44acbf62ccafca1d0d07fa63b4870b48d4c Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 18:28:10 +0900 Subject: [PATCH 06/62] =?UTF-8?q?feat:=20=EB=A9=94=EB=AA=A8=EB=A6=AC=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/MemoryVoucherRepository.java | 25 ++++++++++ .../voucher/repository/VoucherRepository.java | 11 +++++ .../MemoryVoucherRepositoryTest.java | 46 +++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java create mode 100644 src/main/java/org/prgms/voucher/repository/VoucherRepository.java create mode 100644 src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java diff --git a/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java new file mode 100644 index 0000000000..f65905435e --- /dev/null +++ b/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java @@ -0,0 +1,25 @@ +package org.prgms.voucher.repository; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import org.prgms.voucher.entity.Voucher; + +public class MemoryVoucherRepository implements VoucherRepository { + + private final Map storage = new ConcurrentHashMap<>(); + + @Override + public Voucher insert(Voucher voucher) { + storage.put(voucher.getVoucherId(), voucher); + return voucher; + } + + @Override + public List findAll() { + return new ArrayList<>(storage.values()); + } +} diff --git a/src/main/java/org/prgms/voucher/repository/VoucherRepository.java b/src/main/java/org/prgms/voucher/repository/VoucherRepository.java new file mode 100644 index 0000000000..7de5a2365e --- /dev/null +++ b/src/main/java/org/prgms/voucher/repository/VoucherRepository.java @@ -0,0 +1,11 @@ +package org.prgms.voucher.repository; + +import java.util.List; + +import org.prgms.voucher.entity.Voucher; + +public interface VoucherRepository { + Voucher insert(Voucher voucher); + + List findAll(); +} diff --git a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java new file mode 100644 index 0000000000..f889d4bdfe --- /dev/null +++ b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java @@ -0,0 +1,46 @@ +package org.prgms.voucher.repository; + +import static org.assertj.core.api.Assertions.*; + +import java.util.UUID; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.prgms.voucher.entity.FixedAmountVoucher; +import org.prgms.voucher.entity.PercentDiscountVoucher; +import org.prgms.voucher.entity.Voucher; +import org.prgms.voucher.exception.ZeroDiscountAmountException; +import org.prgms.voucher.exception.ZeroDiscountPercentException; + +class MemoryVoucherRepositoryTest { + + VoucherRepository repository = new MemoryVoucherRepository(); + + @DisplayName("Voucher를 저장한다.") + @Test + void insert_Voucher() throws ZeroDiscountAmountException { + // given + Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), 10); + // when + Voucher insertVoucher = repository.insert(voucher); + // then + assertThat(voucher).isEqualTo(insertVoucher); + assertThat(repository.findAll()).hasSize(1) + .contains(voucher); + } + + @DisplayName("저장되어 있는 모든 Voucher를 List형으로 반환한다.") + @Test + void findAll_ReturnAllVoucher() throws ZeroDiscountAmountException, ZeroDiscountPercentException { + // given + Voucher voucherOne = new FixedAmountVoucher(UUID.randomUUID(), 20); + Voucher voucherTwo = new PercentDiscountVoucher(UUID.randomUUID(), 20); + // when + repository.insert(voucherOne); + repository.insert(voucherTwo); + // then + assertThat(repository.findAll()).hasSize(2) + .contains(voucherOne, voucherTwo); + } + +} From 7827314f52658e4037ca98caca9c2427589b97cc Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 21:51:04 +0900 Subject: [PATCH 07/62] =?UTF-8?q?refactor:=20Percent,=20Amount=20=EA=B0=92?= =?UTF-8?q?=20=EA=B2=80=EC=A6=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/entity/FixedAmountVoucher.java | 11 ++++++----- .../entity/PercentDiscountVoucher.java | 17 ++++++++++++----- .../WrongDiscountAmountException.java | 7 +++++++ .../WrongDiscountPercentException.java | 7 +++++++ .../ZeroDiscountAmountException.java | 7 ------- .../ZeroDiscountPercentException.java | 7 ------- .../entity/FixedAmountVoucherTest.java | 19 ++++++++++--------- .../entity/PercentDiscountVoucherTest.java | 19 ++++++++++--------- .../MemoryVoucherRepositoryTest.java | 9 ++++----- 9 files changed, 56 insertions(+), 47 deletions(-) create mode 100644 src/main/java/org/prgms/voucher/exception/WrongDiscountAmountException.java create mode 100644 src/main/java/org/prgms/voucher/exception/WrongDiscountPercentException.java delete mode 100644 src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java delete mode 100644 src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java diff --git a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java index 85f231297d..d4e878e9f4 100644 --- a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java @@ -2,22 +2,23 @@ import java.util.UUID; -import org.prgms.voucher.exception.ZeroDiscountAmountException; +import org.prgms.voucher.exception.WrongDiscountAmountException; public class FixedAmountVoucher implements Voucher { + public static final int MIN_AMOUNT = 1; private final UUID voucherId; private final long discountAmount; - public FixedAmountVoucher(UUID voucherId, long discountAmount) throws ZeroDiscountAmountException { + public FixedAmountVoucher(UUID voucherId, long discountAmount) throws WrongDiscountAmountException { validateDiscountAmount(discountAmount); this.voucherId = voucherId; this.discountAmount = discountAmount; } - private void validateDiscountAmount(long discountAmount) throws ZeroDiscountAmountException { - if (discountAmount == 0) { - throw new ZeroDiscountAmountException(); + private void validateDiscountAmount(long discountAmount) throws WrongDiscountAmountException { + if (discountAmount < MIN_AMOUNT) { + throw new WrongDiscountAmountException(); } } diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java index 99f6488672..8b1276565a 100644 --- a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java @@ -2,20 +2,27 @@ import java.util.UUID; -import org.prgms.voucher.exception.ZeroDiscountPercentException; +import org.prgms.voucher.exception.WrongDiscountPercentException; public class PercentDiscountVoucher implements Voucher { + public static final long MIN_PERCENT = 1; + public static final long MAX_PERCENT = 100; + private final UUID voucherId; private final long discountPercent; - public PercentDiscountVoucher(UUID voucherId, long discountPercent) throws ZeroDiscountPercentException { - if (discountPercent == 0) { - throw new ZeroDiscountPercentException(); - } + public PercentDiscountVoucher(UUID voucherId, long discountPercent) throws WrongDiscountPercentException { + validateDiscountPercent(discountPercent); this.voucherId = voucherId; this.discountPercent = discountPercent; } + private void validateDiscountPercent(long discountPercent) throws WrongDiscountPercentException { + if (MAX_PERCENT < discountPercent || discountPercent < MIN_PERCENT) { + throw new WrongDiscountPercentException(); + } + } + @Override public long discount(long beforeDiscount) { return (long)(beforeDiscount * (1 - (discountPercent / 100.0))); diff --git a/src/main/java/org/prgms/voucher/exception/WrongDiscountAmountException.java b/src/main/java/org/prgms/voucher/exception/WrongDiscountAmountException.java new file mode 100644 index 0000000000..ad1dab88e6 --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/WrongDiscountAmountException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class WrongDiscountAmountException extends Exception { + public WrongDiscountAmountException() { + super("[ERROR] 올바른 할인금액이 아닙니다."); + } +} diff --git a/src/main/java/org/prgms/voucher/exception/WrongDiscountPercentException.java b/src/main/java/org/prgms/voucher/exception/WrongDiscountPercentException.java new file mode 100644 index 0000000000..c4a62bd4af --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/WrongDiscountPercentException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class WrongDiscountPercentException extends Exception { + public WrongDiscountPercentException() { + super("[ERROR] 올바른 할인퍼센트가 아닙니다."); + } +} diff --git a/src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java b/src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java deleted file mode 100644 index 237aa1a90a..0000000000 --- a/src/main/java/org/prgms/voucher/exception/ZeroDiscountAmountException.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.prgms.voucher.exception; - -public class ZeroDiscountAmountException extends Exception { - public ZeroDiscountAmountException() { - super("[ERROR] 할인금액이 0원입니다."); - } -} diff --git a/src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java b/src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java deleted file mode 100644 index c81607813c..0000000000 --- a/src/main/java/org/prgms/voucher/exception/ZeroDiscountPercentException.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.prgms.voucher.exception; - -public class ZeroDiscountPercentException extends Exception { - public ZeroDiscountPercentException() { - super("[ERROR] 할인퍼센트가 0입니다."); - } -} diff --git a/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java b/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java index 538fa4cac8..b62e685472 100644 --- a/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java +++ b/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java @@ -5,26 +5,27 @@ import java.util.UUID; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import org.prgms.voucher.exception.ZeroDiscountAmountException; +import org.junit.jupiter.params.provider.ValueSource; +import org.prgms.voucher.exception.WrongDiscountAmountException; class FixedAmountVoucherTest { - @DisplayName("할인금액이 0인 경우 예외를 발생한다.") - @Test - void FixedAmount_AmountIsZero_ThrowsException() { - assertThatThrownBy(() -> new FixedAmountVoucher(UUID.randomUUID(), 0)) - .isInstanceOf(ZeroDiscountAmountException.class) - .hasMessage("[ERROR] 할인금액이 0원입니다."); + @DisplayName("할인퍼센트가 1미만일때 예외를 발생한다.") + @ParameterizedTest + @ValueSource(longs = {-1, 0, -100}) + void FixedAmount_AmountLessOne_ThrowsException(long discountAmount) { + assertThatThrownBy(() -> new FixedAmountVoucher(UUID.randomUUID(), discountAmount)) + .isInstanceOf(WrongDiscountAmountException.class) + .hasMessage("[ERROR] 올바른 할인금액이 아닙니다."); } @DisplayName("정해진 할인금액으로 할인한다.") @ParameterizedTest @CsvSource(value = {"1000,100,900", "500,300,200", "10000,5000,5000"}) void discount_Amount_ReturnDiscountAmount(long beforeDiscount, long discountAmount, long result) throws - ZeroDiscountAmountException { + WrongDiscountAmountException { Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), discountAmount); long discountPrice = voucher.discount(beforeDiscount); assertThat(discountPrice).isEqualTo(result); diff --git a/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java b/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java index 1a80e6bf82..dad1b97f08 100644 --- a/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java +++ b/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java @@ -5,26 +5,27 @@ import java.util.UUID; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import org.prgms.voucher.exception.ZeroDiscountPercentException; +import org.junit.jupiter.params.provider.ValueSource; +import org.prgms.voucher.exception.WrongDiscountPercentException; class PercentDiscountVoucherTest { - @DisplayName("할인퍼센트가 0이면 예외를 발생한다.") - @Test - void percentDiscount_PercentIsZero_ThrowsException() { - assertThatThrownBy(() -> new PercentDiscountVoucher(UUID.randomUUID(), 0)) - .isInstanceOf(ZeroDiscountPercentException.class) - .hasMessage("[ERROR] 할인퍼센트가 0입니다."); + @DisplayName("할인퍼센트가 1미만이거나 100초과이면 예외를 발생한다.") + @ParameterizedTest + @ValueSource(longs = {-1, 0, 140, 1000}) + void percentDiscount_PercentIsOverHundredOrLessOne_ThrowsException(long discountPercent) { + assertThatThrownBy(() -> new PercentDiscountVoucher(UUID.randomUUID(), discountPercent)) + .isInstanceOf(WrongDiscountPercentException.class) + .hasMessage("[ERROR] 올바른 할인퍼센트가 아닙니다."); } @DisplayName("정해진 할인퍼센트로 할인한다.") @ParameterizedTest @CsvSource(value = {"1000,10,900", "2000,20,1600", "532,30,372"}) void discount_Percent_ReturnDiscountPrice(long beforeDiscount, long discountPercent, long result) throws - ZeroDiscountPercentException { + WrongDiscountPercentException { Voucher voucher = new PercentDiscountVoucher(UUID.randomUUID(), discountPercent); long discountPrice = voucher.discount(beforeDiscount); assertThat(discountPrice).isEqualTo(result); diff --git a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java index f889d4bdfe..25e5b4463a 100644 --- a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java +++ b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java @@ -9,8 +9,8 @@ import org.prgms.voucher.entity.FixedAmountVoucher; import org.prgms.voucher.entity.PercentDiscountVoucher; import org.prgms.voucher.entity.Voucher; -import org.prgms.voucher.exception.ZeroDiscountAmountException; -import org.prgms.voucher.exception.ZeroDiscountPercentException; +import org.prgms.voucher.exception.WrongDiscountAmountException; +import org.prgms.voucher.exception.WrongDiscountPercentException; class MemoryVoucherRepositoryTest { @@ -18,7 +18,7 @@ class MemoryVoucherRepositoryTest { @DisplayName("Voucher를 저장한다.") @Test - void insert_Voucher() throws ZeroDiscountAmountException { + void insert_Voucher() throws WrongDiscountAmountException { // given Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), 10); // when @@ -31,7 +31,7 @@ void insert_Voucher() throws ZeroDiscountAmountException { @DisplayName("저장되어 있는 모든 Voucher를 List형으로 반환한다.") @Test - void findAll_ReturnAllVoucher() throws ZeroDiscountAmountException, ZeroDiscountPercentException { + void findAll_ReturnAllVoucher() throws WrongDiscountAmountException, WrongDiscountPercentException { // given Voucher voucherOne = new FixedAmountVoucher(UUID.randomUUID(), 20); Voucher voucherTwo = new PercentDiscountVoucher(UUID.randomUUID(), 20); @@ -42,5 +42,4 @@ void findAll_ReturnAllVoucher() throws ZeroDiscountAmountException, ZeroDiscount assertThat(repository.findAll()).hasSize(2) .contains(voucherOne, voucherTwo); } - } From f4bede41f570d2059f44e5d3b885f044c5b8e27b Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 21:51:20 +0900 Subject: [PATCH 08/62] =?UTF-8?q?feat:=20=EC=8A=A4=ED=85=8C=EB=A0=88?= =?UTF-8?q?=EC=98=A4=ED=83=80=EC=9E=85=20=EC=84=A0=EC=96=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/repository/MemoryVoucherRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java index f65905435e..d5c8cc3a07 100644 --- a/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java @@ -7,7 +7,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.prgms.voucher.entity.Voucher; +import org.springframework.stereotype.Repository; +@Repository public class MemoryVoucherRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); From 285e8cff4bbec323674eaf4c92be7d21db4aaa42 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Wed, 6 Apr 2022 23:19:51 +0900 Subject: [PATCH 09/62] =?UTF-8?q?feat:=20VoucherService=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 --- .../org/prgms/voucher/entity/VoucherType.java | 22 ++++++ .../exception/WrongCommandInputException.java | 7 ++ .../prgms/voucher/service/VoucherService.java | 48 +++++++++++++ .../prgms/voucher/entity/VoucherTypeTest.java | 14 ++++ .../voucher/service/VoucherServiceTest.java | 71 +++++++++++++++++++ 5 files changed, 162 insertions(+) create mode 100644 src/main/java/org/prgms/voucher/entity/VoucherType.java create mode 100644 src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java create mode 100644 src/main/java/org/prgms/voucher/service/VoucherService.java create mode 100644 src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java create mode 100644 src/test/java/org/prgms/voucher/service/VoucherServiceTest.java diff --git a/src/main/java/org/prgms/voucher/entity/VoucherType.java b/src/main/java/org/prgms/voucher/entity/VoucherType.java new file mode 100644 index 0000000000..1eaf42c389 --- /dev/null +++ b/src/main/java/org/prgms/voucher/entity/VoucherType.java @@ -0,0 +1,22 @@ +package org.prgms.voucher.entity; + +import java.util.Arrays; + +public enum VoucherType { + FIXED_AMOUNT("1"), + PERCENT_DISCOUNT("2"), + EMPTY(""); + + private final String command; + + VoucherType(String command) { + this.command = command; + } + + public static VoucherType of(String command) { + return Arrays.stream(VoucherType.values()) + .filter(type -> type.command.equals(command)) + .findFirst() + .orElse(VoucherType.EMPTY); + } +} diff --git a/src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java b/src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java new file mode 100644 index 0000000000..45993b5072 --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class WrongCommandInputException extends Exception { + public WrongCommandInputException() { + super("[ERROR] 올바른 커맨드가 아닙니다."); + } +} diff --git a/src/main/java/org/prgms/voucher/service/VoucherService.java b/src/main/java/org/prgms/voucher/service/VoucherService.java new file mode 100644 index 0000000000..ce5a42188f --- /dev/null +++ b/src/main/java/org/prgms/voucher/service/VoucherService.java @@ -0,0 +1,48 @@ +package org.prgms.voucher.service; + +import java.util.List; +import java.util.UUID; + +import org.prgms.voucher.entity.FixedAmountVoucher; +import org.prgms.voucher.entity.PercentDiscountVoucher; +import org.prgms.voucher.entity.Voucher; +import org.prgms.voucher.entity.VoucherType; +import org.prgms.voucher.exception.WrongCommandInputException; +import org.prgms.voucher.exception.WrongDiscountAmountException; +import org.prgms.voucher.exception.WrongDiscountPercentException; +import org.prgms.voucher.repository.VoucherRepository; +import org.springframework.stereotype.Service; + +@Service +public class VoucherService { + + private final VoucherRepository repository; + + public VoucherService(VoucherRepository repository) { + this.repository = repository; + } + + public Voucher create(VoucherType voucherType, long value) throws + WrongDiscountAmountException, + WrongDiscountPercentException, WrongCommandInputException { + Voucher voucher = getVoucher(voucherType, value); + return repository.insert(voucher); + } + + private Voucher getVoucher(VoucherType voucherType, long value) throws + WrongDiscountAmountException, + WrongDiscountPercentException, WrongCommandInputException { + switch (voucherType) { + case FIXED_AMOUNT: + return new FixedAmountVoucher(UUID.randomUUID(), value); + case PERCENT_DISCOUNT: + return new PercentDiscountVoucher(UUID.randomUUID(), value); + default: + throw new WrongCommandInputException(); + } + } + + public List getVouchers() { + return repository.findAll(); + } +} diff --git a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java new file mode 100644 index 0000000000..6fd20c3fe6 --- /dev/null +++ b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java @@ -0,0 +1,14 @@ +package org.prgms.voucher.entity; + +import static org.assertj.core.api.Assertions.*; + +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +class VoucherTypeTest { + @ParameterizedTest + @CsvSource(value = {"1,FIXED_AMOUNT", "2,PERCENT_DISCOUNT", "asd,EMPTY", ",EMPTY"}) + void of_VoucherCommand_ReturnVoucherType(String command, VoucherType voucherType) { + assertThat(VoucherType.of(command)).isEqualTo(voucherType); + } +} diff --git a/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java b/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java new file mode 100644 index 0000000000..d8bb48410d --- /dev/null +++ b/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java @@ -0,0 +1,71 @@ +package org.prgms.voucher.service; + +import static org.assertj.core.api.Assertions.*; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.prgms.voucher.entity.FixedAmountVoucher; +import org.prgms.voucher.entity.PercentDiscountVoucher; +import org.prgms.voucher.entity.Voucher; +import org.prgms.voucher.entity.VoucherType; +import org.prgms.voucher.exception.WrongCommandInputException; +import org.prgms.voucher.exception.WrongDiscountAmountException; +import org.prgms.voucher.exception.WrongDiscountPercentException; +import org.prgms.voucher.repository.VoucherRepository; + +class VoucherServiceTest { + + VoucherService voucherService = new VoucherService(new VoucherRepository() { + @Override + public Voucher insert(Voucher voucher) { + return voucher; + } + + @Override + public List findAll() { + try { + return Arrays.asList(new FixedAmountVoucher(UUID.randomUUID(), 10L), + new PercentDiscountVoucher(UUID.randomUUID(), 20L)); + } catch (Exception ignored) { + } + return null; + } + }); + + @DisplayName("FixedAmountVoucerType을 주면 FixedAmountVoucher를 반환한다.") + @Test + void create_FixedAmountVoucherType_ReturnFixedAmountVoucher() throws + WrongDiscountPercentException, + WrongCommandInputException, + WrongDiscountAmountException { + + Voucher voucher = voucherService.create(VoucherType.FIXED_AMOUNT, 10L); + + assertThat(voucher).isInstanceOf(FixedAmountVoucher.class); + assertThat(voucher.discount(100L)).isEqualTo(90L); + } + + @DisplayName("PercentDiscountVoucerType을 주면 PercentDiscountVoucher를 반환한다.") + @Test + void create_PercentDiscountType_ReturnPercentDiscountVoucher() throws + WrongDiscountPercentException, + WrongCommandInputException, + WrongDiscountAmountException { + Voucher voucher = voucherService.create(VoucherType.PERCENT_DISCOUNT, 10L); + + assertThat(voucher).isInstanceOf(PercentDiscountVoucher.class); + assertThat(voucher.discount(1000L)).isEqualTo(900L); + } + + @DisplayName("모든 바우처를 반환한다.") + @Test + void findAll_ReturnAllVoucher() { + List vouchers = voucherService.getVouchers(); + + assertThat(vouchers).hasSize(2); + } +} From 552437e8b2089ecab6c71a3c6bd2eb4a5a890ec9 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 00:09:08 +0900 Subject: [PATCH 10/62] =?UTF-8?q?style:=20@DisplayName=20=EC=96=B4?= =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java index 6fd20c3fe6..442fb6f9da 100644 --- a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java +++ b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java @@ -2,10 +2,12 @@ import static org.assertj.core.api.Assertions.*; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; class VoucherTypeTest { + @DisplayName("해당하는 VoucherType을 반환한다.") @ParameterizedTest @CsvSource(value = {"1,FIXED_AMOUNT", "2,PERCENT_DISCOUNT", "asd,EMPTY", ",EMPTY"}) void of_VoucherCommand_ReturnVoucherType(String command, VoucherType voucherType) { From 03810f4ea51709b5071fde0a3cbcd3cb9180c14e Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 00:11:27 +0900 Subject: [PATCH 11/62] =?UTF-8?q?feat:=20Enum=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/entity/MenuType.java | 24 ++++++++++++++++++ .../prgms/voucher/entity/MenuTypeTest.java | 25 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 src/main/java/org/prgms/voucher/entity/MenuType.java create mode 100644 src/test/java/org/prgms/voucher/entity/MenuTypeTest.java diff --git a/src/main/java/org/prgms/voucher/entity/MenuType.java b/src/main/java/org/prgms/voucher/entity/MenuType.java new file mode 100644 index 0000000000..368a8d39ee --- /dev/null +++ b/src/main/java/org/prgms/voucher/entity/MenuType.java @@ -0,0 +1,24 @@ +package org.prgms.voucher.entity; + +import java.util.Arrays; + +import org.prgms.voucher.exception.WrongInputMenuException; + +public enum MenuType { + EXIT("exit"), + CREATE("create"), + LIST("list"); + + private final String command; + + MenuType(String command) { + this.command = command; + } + + public static MenuType of(String command) throws WrongInputMenuException { + return Arrays.stream(MenuType.values()) + .filter(type -> type.command.equals(command)) + .findFirst() + .orElseThrow(WrongInputMenuException::new); + } +} diff --git a/src/test/java/org/prgms/voucher/entity/MenuTypeTest.java b/src/test/java/org/prgms/voucher/entity/MenuTypeTest.java new file mode 100644 index 0000000000..f226761686 --- /dev/null +++ b/src/test/java/org/prgms/voucher/entity/MenuTypeTest.java @@ -0,0 +1,25 @@ +package org.prgms.voucher.entity; + +import static org.assertj.core.api.Assertions.*; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; +import org.prgms.voucher.exception.WrongInputMenuException; + +class MenuTypeTest { + @DisplayName("해당하는 MenuType을 반환한다.") + @ParameterizedTest + @CsvSource(value = {"create,CREATE", "list,LIST", "exit,EXIT"}) + void of_MenuCommand_ReturnMenuType(String command, MenuType menuType) throws WrongInputMenuException { + assertThat(MenuType.of(command)).isEqualTo(menuType); + } + + @DisplayName("올바르지 않은 command은 예외를 발생한다.") + @ParameterizedTest + @ValueSource(strings = {"asd", "", " ", "lists"}) + void of_WrongMenuCommand_ThrowsException(String command) { + assertThatThrownBy(() -> MenuType.of(command)); + } +} From 4cb88bba1038d89aa0b6b6e63a33b231d6d017a3 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 00:42:31 +0900 Subject: [PATCH 12/62] =?UTF-8?q?refactor:=20VoucherType=EC=97=90=EC=84=9C?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=EA=B0=92=20=EA=B2=80=EC=A6=9D=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/entity/VoucherType.java | 9 +++++---- .../prgms/voucher/service/VoucherService.java | 18 +++++++----------- .../prgms/voucher/entity/VoucherTypeTest.java | 14 ++++++++++++-- .../voucher/service/VoucherServiceTest.java | 5 +---- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/prgms/voucher/entity/VoucherType.java b/src/main/java/org/prgms/voucher/entity/VoucherType.java index 1eaf42c389..648c1e308a 100644 --- a/src/main/java/org/prgms/voucher/entity/VoucherType.java +++ b/src/main/java/org/prgms/voucher/entity/VoucherType.java @@ -2,10 +2,11 @@ import java.util.Arrays; +import org.prgms.voucher.exception.WrongInputVoucherCommandException; + public enum VoucherType { FIXED_AMOUNT("1"), - PERCENT_DISCOUNT("2"), - EMPTY(""); + PERCENT_DISCOUNT("2"); private final String command; @@ -13,10 +14,10 @@ public enum VoucherType { this.command = command; } - public static VoucherType of(String command) { + public static VoucherType of(String command) throws WrongInputVoucherCommandException { return Arrays.stream(VoucherType.values()) .filter(type -> type.command.equals(command)) .findFirst() - .orElse(VoucherType.EMPTY); + .orElseThrow(WrongInputVoucherCommandException::new); } } diff --git a/src/main/java/org/prgms/voucher/service/VoucherService.java b/src/main/java/org/prgms/voucher/service/VoucherService.java index ce5a42188f..2c7883537c 100644 --- a/src/main/java/org/prgms/voucher/service/VoucherService.java +++ b/src/main/java/org/prgms/voucher/service/VoucherService.java @@ -7,7 +7,6 @@ import org.prgms.voucher.entity.PercentDiscountVoucher; import org.prgms.voucher.entity.Voucher; import org.prgms.voucher.entity.VoucherType; -import org.prgms.voucher.exception.WrongCommandInputException; import org.prgms.voucher.exception.WrongDiscountAmountException; import org.prgms.voucher.exception.WrongDiscountPercentException; import org.prgms.voucher.repository.VoucherRepository; @@ -24,25 +23,22 @@ public VoucherService(VoucherRepository repository) { public Voucher create(VoucherType voucherType, long value) throws WrongDiscountAmountException, - WrongDiscountPercentException, WrongCommandInputException { + WrongDiscountPercentException { Voucher voucher = getVoucher(voucherType, value); return repository.insert(voucher); } private Voucher getVoucher(VoucherType voucherType, long value) throws WrongDiscountAmountException, - WrongDiscountPercentException, WrongCommandInputException { - switch (voucherType) { - case FIXED_AMOUNT: - return new FixedAmountVoucher(UUID.randomUUID(), value); - case PERCENT_DISCOUNT: - return new PercentDiscountVoucher(UUID.randomUUID(), value); - default: - throw new WrongCommandInputException(); + WrongDiscountPercentException { + if (voucherType == VoucherType.FIXED_AMOUNT) { + return new FixedAmountVoucher(UUID.randomUUID(), value); } + + return new PercentDiscountVoucher(UUID.randomUUID(), value); } - public List getVouchers() { + public List findAllVoucher() { return repository.findAll(); } } diff --git a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java index 442fb6f9da..0f0ede4717 100644 --- a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java +++ b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java @@ -5,12 +5,22 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; +import org.prgms.voucher.exception.WrongInputVoucherCommandException; class VoucherTypeTest { @DisplayName("해당하는 VoucherType을 반환한다.") @ParameterizedTest - @CsvSource(value = {"1,FIXED_AMOUNT", "2,PERCENT_DISCOUNT", "asd,EMPTY", ",EMPTY"}) - void of_VoucherCommand_ReturnVoucherType(String command, VoucherType voucherType) { + @CsvSource(value = {"1,FIXED_AMOUNT", "2,PERCENT_DISCOUNT"}) + void of_VoucherCommand_ReturnVoucherType(String command, VoucherType voucherType) throws + WrongInputVoucherCommandException { assertThat(VoucherType.of(command)).isEqualTo(voucherType); } + + @DisplayName("올바르지 않은 command은 예외를 발생한다.") + @ParameterizedTest + @ValueSource(strings = {"asd", "", " ", "lists"}) + void of_WrongVoucherCommand_ThrowsException(String command) { + assertThatThrownBy(() -> VoucherType.of(command)); + } } diff --git a/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java b/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java index d8bb48410d..965c2217ec 100644 --- a/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java +++ b/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java @@ -12,7 +12,6 @@ import org.prgms.voucher.entity.PercentDiscountVoucher; import org.prgms.voucher.entity.Voucher; import org.prgms.voucher.entity.VoucherType; -import org.prgms.voucher.exception.WrongCommandInputException; import org.prgms.voucher.exception.WrongDiscountAmountException; import org.prgms.voucher.exception.WrongDiscountPercentException; import org.prgms.voucher.repository.VoucherRepository; @@ -40,7 +39,6 @@ public List findAll() { @Test void create_FixedAmountVoucherType_ReturnFixedAmountVoucher() throws WrongDiscountPercentException, - WrongCommandInputException, WrongDiscountAmountException { Voucher voucher = voucherService.create(VoucherType.FIXED_AMOUNT, 10L); @@ -53,7 +51,6 @@ void create_FixedAmountVoucherType_ReturnFixedAmountVoucher() throws @Test void create_PercentDiscountType_ReturnPercentDiscountVoucher() throws WrongDiscountPercentException, - WrongCommandInputException, WrongDiscountAmountException { Voucher voucher = voucherService.create(VoucherType.PERCENT_DISCOUNT, 10L); @@ -64,7 +61,7 @@ void create_PercentDiscountType_ReturnPercentDiscountVoucher() throws @DisplayName("모든 바우처를 반환한다.") @Test void findAll_ReturnAllVoucher() { - List vouchers = voucherService.getVouchers(); + List vouchers = voucherService.findAllVoucher(); assertThat(vouchers).hasSize(2); } From 670f5fd691ed8d3b2882d8534f2ac80cda91aa35 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 00:58:32 +0900 Subject: [PATCH 13/62] =?UTF-8?q?feat:=20=EC=BB=A4=EC=8A=A4=ED=85=80=20Exc?= =?UTF-8?q?eption=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/exception/WrongCommandInputException.java | 7 ------- .../prgms/voucher/exception/WrongInputMenuException.java | 7 +++++++ .../exception/WrongInputVoucherCommandException.java | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java create mode 100644 src/main/java/org/prgms/voucher/exception/WrongInputMenuException.java create mode 100644 src/main/java/org/prgms/voucher/exception/WrongInputVoucherCommandException.java diff --git a/src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java b/src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java deleted file mode 100644 index 45993b5072..0000000000 --- a/src/main/java/org/prgms/voucher/exception/WrongCommandInputException.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.prgms.voucher.exception; - -public class WrongCommandInputException extends Exception { - public WrongCommandInputException() { - super("[ERROR] 올바른 커맨드가 아닙니다."); - } -} diff --git a/src/main/java/org/prgms/voucher/exception/WrongInputMenuException.java b/src/main/java/org/prgms/voucher/exception/WrongInputMenuException.java new file mode 100644 index 0000000000..916a9f1984 --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/WrongInputMenuException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class WrongInputMenuException extends Exception { + public WrongInputMenuException() { + super("[ERROR] 올바른 메뉴 입력이 아닙니다."); + } +} diff --git a/src/main/java/org/prgms/voucher/exception/WrongInputVoucherCommandException.java b/src/main/java/org/prgms/voucher/exception/WrongInputVoucherCommandException.java new file mode 100644 index 0000000000..6deff5cf73 --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/WrongInputVoucherCommandException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class WrongInputVoucherCommandException extends Exception { + public WrongInputVoucherCommandException() { + super("[ERROR] 올바른 바우처 커맨드가 아닙니다."); + } +} From 0139c98b448ffeac43cb150698a8906914a4ec11 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 00:59:19 +0900 Subject: [PATCH 14/62] =?UTF-8?q?feat:=20View=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgms/voucher/view/Console.java | 73 +++++++++++++++++++ .../org/prgms/voucher/view/InputView.java | 12 +++ .../org/prgms/voucher/view/OutputView.java | 14 ++++ 3 files changed, 99 insertions(+) create mode 100644 src/main/java/org/prgms/voucher/view/Console.java create mode 100644 src/main/java/org/prgms/voucher/view/InputView.java create mode 100644 src/main/java/org/prgms/voucher/view/OutputView.java diff --git a/src/main/java/org/prgms/voucher/view/Console.java b/src/main/java/org/prgms/voucher/view/Console.java new file mode 100644 index 0000000000..c16d5c04c9 --- /dev/null +++ b/src/main/java/org/prgms/voucher/view/Console.java @@ -0,0 +1,73 @@ +package org.prgms.voucher.view; + +import java.util.List; +import java.util.Scanner; + +import org.prgms.voucher.entity.Voucher; +import org.prgms.voucher.entity.VoucherType; +import org.springframework.stereotype.Component; + +@Component +public class Console implements InputView, OutputView { + private static final String REQUEST_INPUT_COMMAND = "=== Voucher Program ===\nType **exit** to exit the program.\nType **create** to create a new voucher.\nType **list** to list all vouchers."; + private static final String REQUEST_INPUT_VOUCHER_TYPE = "Select a voucher type\n 1:FixedAmountVoucher 2:PercentDiscountVoucher"; + private static final String REQUEST_INPUT_DISCOUNT_AMOUNT = "Input voucher discount amount : "; + private static final String REQUEST_INPUT_DISCOUNT_PERCENTAGE = "Input voucher discount percentage : "; + private static final String EMPTY_VOUCHERS = "Empty Vouchers"; + private static final String ERROR_INPUT_NUMBER_TYPE = "[ERROR] 정수만 입력가능합니다."; + + private final Scanner scanner = new Scanner(System.in); + + @Override + public String inputMenu() { + System.out.println(REQUEST_INPUT_COMMAND); + return scanner.nextLine().trim().toLowerCase(); + } + + @Override + public String inputVoucherCommand() { + System.out.println(REQUEST_INPUT_VOUCHER_TYPE); + return scanner.nextLine().trim().toLowerCase(); + } + + @Override + public long inputDiscountValue(VoucherType voucherType) { + String message = REQUEST_INPUT_DISCOUNT_PERCENTAGE; + + if (voucherType == VoucherType.FIXED_AMOUNT) { + message = REQUEST_INPUT_DISCOUNT_AMOUNT; + } + + System.out.println(message); + return convertToLong(scanner.nextLine().trim()); + } + + private Long convertToLong(String input) { + try { + return Long.parseLong(input); + } catch (NumberFormatException e) { + throw new IllegalArgumentException(ERROR_INPUT_NUMBER_TYPE); + } + } + + @Override + public void printVoucher(Voucher voucher) { + System.out.println(voucher); + } + + @Override + public void printAllVoucher(List vouchers) { + if (vouchers.isEmpty()) { + System.out.println(EMPTY_VOUCHERS); + } + + for (Voucher voucher : vouchers) { + System.out.println(voucher); + } + } + + @Override + public void printError(String message) { + System.out.println(message); + } +} diff --git a/src/main/java/org/prgms/voucher/view/InputView.java b/src/main/java/org/prgms/voucher/view/InputView.java new file mode 100644 index 0000000000..049faf50be --- /dev/null +++ b/src/main/java/org/prgms/voucher/view/InputView.java @@ -0,0 +1,12 @@ +package org.prgms.voucher.view; + +import org.prgms.voucher.entity.VoucherType; + +public interface InputView { + + String inputMenu(); + + String inputVoucherCommand(); + + long inputDiscountValue(VoucherType voucherType); +} diff --git a/src/main/java/org/prgms/voucher/view/OutputView.java b/src/main/java/org/prgms/voucher/view/OutputView.java new file mode 100644 index 0000000000..184279dc4e --- /dev/null +++ b/src/main/java/org/prgms/voucher/view/OutputView.java @@ -0,0 +1,14 @@ +package org.prgms.voucher.view; + +import java.util.List; + +import org.prgms.voucher.entity.Voucher; + +public interface OutputView { + + void printVoucher(Voucher voucher); + + void printAllVoucher(List vouchers); + + void printError(String message); +} From 5b180e0a48e70f0f0c8ff857ff0893a3e6d56cb6 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 00:59:31 +0900 Subject: [PATCH 15/62] =?UTF-8?q?feat:=20Voucher=20toString()=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/prgms/voucher/entity/FixedAmountVoucher.java | 5 +++++ .../org/prgms/voucher/entity/PercentDiscountVoucher.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java index d4e878e9f4..f0145074bc 100644 --- a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java @@ -31,4 +31,9 @@ public long discount(long beforeDiscount) { public UUID getVoucherId() { return voucherId; } + + @Override + public String toString() { + return String.format("FixedAmountVoucher : voucherId=%s, discountAmount=%d", voucherId, discountAmount); + } } diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java index 8b1276565a..3c3911689b 100644 --- a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java @@ -32,4 +32,9 @@ public long discount(long beforeDiscount) { public UUID getVoucherId() { return voucherId; } + + @Override + public String toString() { + return String.format("PercentDiscountVoucher : voucherId=%s, discountPercent=%d", voucherId, discountPercent); + } } From 309f18797238f56112d369f52d79e9b9a7b8cde0 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 01:01:43 +0900 Subject: [PATCH 16/62] =?UTF-8?q?feat:=20=EB=A1=9C=EC=A7=81=EC=97=90=20?= =?UTF-8?q?=EB=A7=9E=EA=B2=8C=20=EC=8B=A4=ED=96=89=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/SpringVoucherApplication.java | 7 +- .../org/prgms/voucher/VoucherProgram.java | 71 +++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/prgms/voucher/VoucherProgram.java diff --git a/src/main/java/org/prgms/voucher/SpringVoucherApplication.java b/src/main/java/org/prgms/voucher/SpringVoucherApplication.java index 6fb8413604..5858dc39aa 100644 --- a/src/main/java/org/prgms/voucher/SpringVoucherApplication.java +++ b/src/main/java/org/prgms/voucher/SpringVoucherApplication.java @@ -1,13 +1,14 @@ package org.prgms.voucher; -import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; @SpringBootApplication public class SpringVoucherApplication { public static void main(String[] args) { - SpringApplication.run(SpringVoucherApplication.class, args); + ApplicationContext applicationContext = new AnnotationConfigApplicationContext(SpringVoucherApplication.class); + applicationContext.getBean(VoucherProgram.class).run(); } - } diff --git a/src/main/java/org/prgms/voucher/VoucherProgram.java b/src/main/java/org/prgms/voucher/VoucherProgram.java new file mode 100644 index 0000000000..97d06d1ede --- /dev/null +++ b/src/main/java/org/prgms/voucher/VoucherProgram.java @@ -0,0 +1,71 @@ +package org.prgms.voucher; + +import org.prgms.voucher.entity.MenuType; +import org.prgms.voucher.entity.Voucher; +import org.prgms.voucher.entity.VoucherType; +import org.prgms.voucher.service.VoucherService; +import org.prgms.voucher.view.Console; +import org.prgms.voucher.view.InputView; +import org.prgms.voucher.view.OutputView; +import org.springframework.stereotype.Component; + +@Component +public class VoucherProgram { + private final VoucherService voucherService; + private final InputView inputView; + private final OutputView outputView; + + public VoucherProgram(VoucherService voucherService, Console console) { + this.voucherService = voucherService; + this.inputView = console; + this.outputView = console; + } + + public void run() { + boolean isNotEndProgram = true; + + while (isNotEndProgram) { + MenuType menuType = inputMenu(); + switch (menuType) { + case EXIT: + isNotEndProgram = false; + break; + case LIST: + outputView.printAllVoucher(voucherService.findAllVoucher()); + break; + case CREATE: + VoucherType voucherType = inputVoucherCommand(); + Voucher voucher = createVoucher(voucherType); + outputView.printVoucher(voucher); + } + } + } + + private Voucher createVoucher(VoucherType voucherType) { + try { + long discountValue = inputView.inputDiscountValue(voucherType); + return voucherService.create(voucherType, discountValue); + } catch (Exception e) { + outputView.printError(e.getMessage()); + } + return createVoucher(voucherType); + } + + private VoucherType inputVoucherCommand() { + try { + return VoucherType.of(inputView.inputVoucherCommand()); + } catch (Exception e) { + outputView.printError(e.getMessage()); + } + return inputVoucherCommand(); + } + + private MenuType inputMenu() { + try { + return MenuType.of(inputView.inputMenu()); + } catch (Exception e) { + outputView.printError(e.getMessage()); + } + return inputMenu(); + } +} From 9c4822038744b8a1feb89512f046cec32b6ebc84 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 01:01:55 +0900 Subject: [PATCH 17/62] =?UTF-8?q?docs:=20docs/README.md=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/README.md | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/docs/README.md b/docs/README.md index d2312c5fbc..59f861fc4b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -11,8 +11,8 @@ - 참고: [https://dzone.com/articles/interactive-console-applications-in-java](https://dzone.com/articles/interactive-console-applications-in-java) - - [ ] 스프링부트 애플리케이션으로 만든다. (Web기능이 없이만듭니다. 즉, 서버가 띄지 않고 커맨드라인 애플리케이션으로 동작해야한다.) - - [ ] 프로그램이 시작하면 다음과 같이 지원가능한 명령어를 알려준다. + - [x] 스프링부트 애플리케이션으로 만든다. (Web기능이 없이만듭니다. 즉, 서버가 띄지 않고 커맨드라인 애플리케이션으로 동작해야한다.) + - [x] 프로그램이 시작하면 다음과 같이 지원가능한 명령어를 알려준다. ```bash === Voucher Program === @@ -21,7 +21,7 @@ Type **list** to list all vouchers. ``` - - [ ] create / list 커맨드를 지원한다. + - [x] create / list 커맨드를 지원한다. - create 커맨드를 통해 바우처를 생성할수 있다. (FixedAmountVoucher, PercentDiscountVoucher) - list 커맨드를 통해 만들어진 바우처를 조회할 수 있다. - 바우처 정보를 매모리에 관리한다. 어플리케이션이 종료가 되어 데이터가 모두 사라져도 괜찮습니다. (나중에 영속성을 가지도록 변경할거에요 걱정마세요!) @@ -40,22 +40,21 @@ ### 구현해야 할 기능 목록 -- [ ] 입력 - - [ ] 메뉴 커맨드 - - [ ] Enum으로 관리 - - [ ] create 커맨드 +- [x] 입력 + - [x] 메뉴 커맨드 + - [x] Enum으로 관리 + - [x] create 커맨드 - [x] FixedAmountVoucher - [x] 할인 금액 + - [x] 0이하일 경우 + - [x] PercentDiscountVoucher + - [x] 할인 퍼센트 - [x] 0일 경우 예외 발생 - - [ ] PercentDiscountVoucher - - [ ] 할인 퍼센트 - - [ ] 0일 경우 예외 발생 - - [ ] 입력이 잘못되면 예외 발생 - -- [ ] 출력 - - [ ] 바우처 조회 - -- [ ] 바우처 - - [ ] 원하는 바우처로 생성 - - [ ] - - [ ] 바우처 정보 저장 + - [x] 입력이 잘못되면 예외 발생 + +- [x] 출력 + - [x] 바우처 조회 + +- [x] 바우처 + - [x] 원하는 바우처로 생성 + - [x] 바우처 정보 저장 From 30229190d4bed9ab2c88e6a90f00e2de0843d276 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 01:15:45 +0900 Subject: [PATCH 18/62] =?UTF-8?q?style:=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EC=95=8C=EB=A7=9E=EA=B2=8C=20=EC=B6=9C=EB=A0=A5=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgms/voucher/view/Console.java | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/prgms/voucher/view/Console.java b/src/main/java/org/prgms/voucher/view/Console.java index c16d5c04c9..340d1c6e0f 100644 --- a/src/main/java/org/prgms/voucher/view/Console.java +++ b/src/main/java/org/prgms/voucher/view/Console.java @@ -9,24 +9,26 @@ @Component public class Console implements InputView, OutputView { - private static final String REQUEST_INPUT_COMMAND = "=== Voucher Program ===\nType **exit** to exit the program.\nType **create** to create a new voucher.\nType **list** to list all vouchers."; - private static final String REQUEST_INPUT_VOUCHER_TYPE = "Select a voucher type\n 1:FixedAmountVoucher 2:PercentDiscountVoucher"; - private static final String REQUEST_INPUT_DISCOUNT_AMOUNT = "Input voucher discount amount : "; - private static final String REQUEST_INPUT_DISCOUNT_PERCENTAGE = "Input voucher discount percentage : "; + private static final String PROMPT = "> "; + private static final String REQUEST_INPUT_COMMAND = "=== Voucher Program ===\nType \"exit\" to exit the program.\nType \"create\" to create a new voucher.\nType \"list\" to list all vouchers."; + private static final String REQUEST_INPUT_VOUCHER_TYPE = "\nSelect a voucher type\nType \"1\" to create a new FixedAmountVoucher\nType \"2\" to create a new PercentDiscountVoucher"; + private static final String REQUEST_INPUT_DISCOUNT_AMOUNT = "\nInput voucher discount amount : "; + private static final String REQUEST_INPUT_DISCOUNT_PERCENTAGE = "\nInput voucher discount percentage : "; private static final String EMPTY_VOUCHERS = "Empty Vouchers"; private static final String ERROR_INPUT_NUMBER_TYPE = "[ERROR] 정수만 입력가능합니다."; - private final Scanner scanner = new Scanner(System.in); @Override public String inputMenu() { System.out.println(REQUEST_INPUT_COMMAND); + System.out.print(PROMPT); return scanner.nextLine().trim().toLowerCase(); } @Override public String inputVoucherCommand() { System.out.println(REQUEST_INPUT_VOUCHER_TYPE); + System.out.print(PROMPT); return scanner.nextLine().trim().toLowerCase(); } @@ -38,7 +40,7 @@ public long inputDiscountValue(VoucherType voucherType) { message = REQUEST_INPUT_DISCOUNT_AMOUNT; } - System.out.println(message); + System.out.print(message); return convertToLong(scanner.nextLine().trim()); } @@ -52,22 +54,25 @@ private Long convertToLong(String input) { @Override public void printVoucher(Voucher voucher) { - System.out.println(voucher); + System.out.printf("%s\n%n", voucher); } @Override public void printAllVoucher(List vouchers) { if (vouchers.isEmpty()) { - System.out.println(EMPTY_VOUCHERS); + System.out.printf("\n%s%n\n", EMPTY_VOUCHERS); + return; } + System.out.println(); for (Voucher voucher : vouchers) { System.out.println(voucher); } + System.out.println(); } @Override public void printError(String message) { - System.out.println(message); + System.out.println("\n" + message + "\n"); } } From bb3eb4fc00cd96dac5f3992b4efd6bc848562e08 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 01:20:42 +0900 Subject: [PATCH 19/62] =?UTF-8?q?style:=20insert=20->=20save=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=84=A4=EC=9E=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prgms/voucher/repository/MemoryVoucherRepository.java | 2 +- .../org/prgms/voucher/repository/VoucherRepository.java | 2 +- .../java/org/prgms/voucher/service/VoucherService.java | 2 +- .../voucher/repository/MemoryVoucherRepositoryTest.java | 8 ++++---- .../org/prgms/voucher/service/VoucherServiceTest.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java index d5c8cc3a07..ca7d2bf52e 100644 --- a/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java @@ -15,7 +15,7 @@ public class MemoryVoucherRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); @Override - public Voucher insert(Voucher voucher) { + public Voucher save(Voucher voucher) { storage.put(voucher.getVoucherId(), voucher); return voucher; } diff --git a/src/main/java/org/prgms/voucher/repository/VoucherRepository.java b/src/main/java/org/prgms/voucher/repository/VoucherRepository.java index 7de5a2365e..e4c3a23287 100644 --- a/src/main/java/org/prgms/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgms/voucher/repository/VoucherRepository.java @@ -5,7 +5,7 @@ import org.prgms.voucher.entity.Voucher; public interface VoucherRepository { - Voucher insert(Voucher voucher); + Voucher save(Voucher voucher); List findAll(); } diff --git a/src/main/java/org/prgms/voucher/service/VoucherService.java b/src/main/java/org/prgms/voucher/service/VoucherService.java index 2c7883537c..dde9d9411a 100644 --- a/src/main/java/org/prgms/voucher/service/VoucherService.java +++ b/src/main/java/org/prgms/voucher/service/VoucherService.java @@ -25,7 +25,7 @@ public Voucher create(VoucherType voucherType, long value) throws WrongDiscountAmountException, WrongDiscountPercentException { Voucher voucher = getVoucher(voucherType, value); - return repository.insert(voucher); + return repository.save(voucher); } private Voucher getVoucher(VoucherType voucherType, long value) throws diff --git a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java index 25e5b4463a..63e1ce7c29 100644 --- a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java +++ b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java @@ -18,11 +18,11 @@ class MemoryVoucherRepositoryTest { @DisplayName("Voucher를 저장한다.") @Test - void insert_Voucher() throws WrongDiscountAmountException { + void save_Voucher() throws WrongDiscountAmountException { // given Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), 10); // when - Voucher insertVoucher = repository.insert(voucher); + Voucher insertVoucher = repository.save(voucher); // then assertThat(voucher).isEqualTo(insertVoucher); assertThat(repository.findAll()).hasSize(1) @@ -36,8 +36,8 @@ void findAll_ReturnAllVoucher() throws WrongDiscountAmountException, WrongDiscou Voucher voucherOne = new FixedAmountVoucher(UUID.randomUUID(), 20); Voucher voucherTwo = new PercentDiscountVoucher(UUID.randomUUID(), 20); // when - repository.insert(voucherOne); - repository.insert(voucherTwo); + repository.save(voucherOne); + repository.save(voucherTwo); // then assertThat(repository.findAll()).hasSize(2) .contains(voucherOne, voucherTwo); diff --git a/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java b/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java index 965c2217ec..2252d8454c 100644 --- a/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java +++ b/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java @@ -20,7 +20,7 @@ class VoucherServiceTest { VoucherService voucherService = new VoucherService(new VoucherRepository() { @Override - public Voucher insert(Voucher voucher) { + public Voucher save(Voucher voucher) { return voucher; } From 58793efd3e9ad70e92f0508b03a2abb6ef603a62 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 14:06:31 +0900 Subject: [PATCH 20/62] =?UTF-8?q?feat:=20VoucherType=20=EB=B0=94=EC=9A=B0?= =?UTF-8?q?=EC=B2=98=20=EC=9D=B4=EB=A6=84=EC=9C=BC=EB=A1=9C=20=EC=B0=BE?= =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/VoucherProgram.java | 2 +- .../org/prgms/voucher/entity/VoucherType.java | 22 +++++++++++--- .../exception/WrongVoucherNameException.java | 7 +++++ .../prgms/voucher/entity/VoucherTypeTest.java | 30 +++++++++++++++---- 4 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java diff --git a/src/main/java/org/prgms/voucher/VoucherProgram.java b/src/main/java/org/prgms/voucher/VoucherProgram.java index 97d06d1ede..cc034c5ee8 100644 --- a/src/main/java/org/prgms/voucher/VoucherProgram.java +++ b/src/main/java/org/prgms/voucher/VoucherProgram.java @@ -53,7 +53,7 @@ private Voucher createVoucher(VoucherType voucherType) { private VoucherType inputVoucherCommand() { try { - return VoucherType.of(inputView.inputVoucherCommand()); + return VoucherType.findByCommand(inputView.inputVoucherCommand()); } catch (Exception e) { outputView.printError(e.getMessage()); } diff --git a/src/main/java/org/prgms/voucher/entity/VoucherType.java b/src/main/java/org/prgms/voucher/entity/VoucherType.java index 648c1e308a..801fa2c952 100644 --- a/src/main/java/org/prgms/voucher/entity/VoucherType.java +++ b/src/main/java/org/prgms/voucher/entity/VoucherType.java @@ -3,21 +3,35 @@ import java.util.Arrays; import org.prgms.voucher.exception.WrongInputVoucherCommandException; +import org.prgms.voucher.exception.WrongVoucherNameException; public enum VoucherType { - FIXED_AMOUNT("1"), - PERCENT_DISCOUNT("2"); + FIXED_AMOUNT("1", "FIXED_AMOUNT"), + PERCENT_DISCOUNT("2", "PERCENT_DISCOUNT"); private final String command; + private final String voucherName; - VoucherType(String command) { + VoucherType(String command, String voucherName) { this.command = command; + this.voucherName = voucherName; } - public static VoucherType of(String command) throws WrongInputVoucherCommandException { + public static VoucherType findByCommand(String command) throws WrongInputVoucherCommandException { return Arrays.stream(VoucherType.values()) .filter(type -> type.command.equals(command)) .findFirst() .orElseThrow(WrongInputVoucherCommandException::new); } + + public static VoucherType findByName(String voucherName) throws WrongVoucherNameException { + return Arrays.stream(VoucherType.values()) + .filter(type -> type.voucherName.equals(voucherName)) + .findFirst() + .orElseThrow(WrongVoucherNameException::new); + } + + public String getVoucherName() { + return voucherName; + } } diff --git a/src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java b/src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java new file mode 100644 index 0000000000..ff8d9ec14a --- /dev/null +++ b/src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java @@ -0,0 +1,7 @@ +package org.prgms.voucher.exception; + +public class WrongVoucherNameException extends Exception { + public WrongVoucherNameException() { + super("[ERROR] 올바른 바우처 이름이 아닙니다."); + } +} diff --git a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java index 0f0ede4717..675371bf6f 100644 --- a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java +++ b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java @@ -7,20 +7,40 @@ import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; import org.prgms.voucher.exception.WrongInputVoucherCommandException; +import org.prgms.voucher.exception.WrongVoucherNameException; class VoucherTypeTest { - @DisplayName("해당하는 VoucherType을 반환한다.") + @DisplayName("command를 통해 해당하는 VoucherType을 반환한다.") @ParameterizedTest @CsvSource(value = {"1,FIXED_AMOUNT", "2,PERCENT_DISCOUNT"}) - void of_VoucherCommand_ReturnVoucherType(String command, VoucherType voucherType) throws + void findByCommand_VoucherCommand_ReturnVoucherType(String command, VoucherType voucherType) throws WrongInputVoucherCommandException { - assertThat(VoucherType.of(command)).isEqualTo(voucherType); + assertThat(VoucherType.findByCommand(command)).isEqualTo(voucherType); } @DisplayName("올바르지 않은 command은 예외를 발생한다.") @ParameterizedTest @ValueSource(strings = {"asd", "", " ", "lists"}) - void of_WrongVoucherCommand_ThrowsException(String command) { - assertThatThrownBy(() -> VoucherType.of(command)); + void findByCommand_WrongVoucherCommand_ThrowsException(String command) { + assertThatThrownBy(() -> VoucherType.findByCommand(command)) + .isInstanceOf(WrongInputVoucherCommandException.class) + .hasMessage("[ERROR] 올바른 바우처 커맨드가 아닙니다."); + } + + @DisplayName("이름을 통해 해당하는 VoucherType을 반환한다.") + @ParameterizedTest + @CsvSource(value = {"FIXED_AMOUNT,FIXED_AMOUNT", "PERCENT_DISCOUNT,PERCENT_DISCOUNT"}) + void findByName_VoucherName_ReturnVoucherType(String name, VoucherType voucherType) throws + WrongVoucherNameException { + assertThat(VoucherType.findByName(name)).isEqualTo(voucherType); + } + + @DisplayName("올바르지 않은 이름을 통해 해당하는 VoucherType을 반환한다.") + @ParameterizedTest + @ValueSource(strings = {"fixed", "sdf", "", " ", "chas", "123"}) + void findByName_WrongVoucherName_ThrowsException(String name) { + assertThatThrownBy(() -> VoucherType.findByName(name)) + .isInstanceOf(WrongVoucherNameException.class) + .hasMessage(("[ERROR] 올바른 바우처 이름이 아닙니다.")); } } From cd848435233046ad746aff67f0ccaf22d344509f Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 15:05:08 +0900 Subject: [PATCH 21/62] =?UTF-8?q?style:=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/MemoryVoucherRepositoryTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java index 63e1ce7c29..b06bff1e65 100644 --- a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java +++ b/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java @@ -14,7 +14,7 @@ class MemoryVoucherRepositoryTest { - VoucherRepository repository = new MemoryVoucherRepository(); + VoucherRepository voucherRepository = new MemoryVoucherRepository(); @DisplayName("Voucher를 저장한다.") @Test @@ -22,10 +22,10 @@ void save_Voucher() throws WrongDiscountAmountException { // given Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), 10); // when - Voucher insertVoucher = repository.save(voucher); + Voucher saveVoucher = voucherRepository.save(voucher); // then - assertThat(voucher).isEqualTo(insertVoucher); - assertThat(repository.findAll()).hasSize(1) + assertThat(saveVoucher).isEqualTo(voucher); + assertThat(voucherRepository.findAll()).hasSize(1) .contains(voucher); } @@ -36,10 +36,10 @@ void findAll_ReturnAllVoucher() throws WrongDiscountAmountException, WrongDiscou Voucher voucherOne = new FixedAmountVoucher(UUID.randomUUID(), 20); Voucher voucherTwo = new PercentDiscountVoucher(UUID.randomUUID(), 20); // when - repository.save(voucherOne); - repository.save(voucherTwo); + voucherRepository.save(voucherOne); + voucherRepository.save(voucherTwo); // then - assertThat(repository.findAll()).hasSize(2) + assertThat(voucherRepository.findAll()).hasSize(2) .contains(voucherOne, voucherTwo); } } From 3922f90a4eff5f89dbfc023d4ae4c7cb7de3b1f1 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 15:20:32 +0900 Subject: [PATCH 22/62] =?UTF-8?q?style:=20Voucher=20toString=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java | 2 +- .../java/org/prgms/voucher/entity/PercentDiscountVoucher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java index f0145074bc..8d90ab1b6f 100644 --- a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java @@ -34,6 +34,6 @@ public UUID getVoucherId() { @Override public String toString() { - return String.format("FixedAmountVoucher : voucherId=%s, discountAmount=%d", voucherId, discountAmount); + return String.format("%s\t%s\t%d", VoucherType.FIXED_AMOUNT.getVoucherName(), voucherId, discountAmount); } } diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java index 3c3911689b..c6f138a925 100644 --- a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java @@ -35,6 +35,6 @@ public UUID getVoucherId() { @Override public String toString() { - return String.format("PercentDiscountVoucher : voucherId=%s, discountPercent=%d", voucherId, discountPercent); + return String.format("%s\t%s\t%d%%", VoucherType.FIXED_AMOUNT.getVoucherName(), voucherId, discountPercent); } } From a8cd3059bb86f90a5fa70d4a1478244d3f1f76c0 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 15:30:39 +0900 Subject: [PATCH 23/62] =?UTF-8?q?refactor:=20VoucherType=20=EB=B0=94?= =?UTF-8?q?=EC=9A=B0=EC=B2=98=20=EC=9D=B4=EB=A6=84=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=B0=BE=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/entity/VoucherType.java | 8 -------- .../exception/WrongVoucherNameException.java | 7 ------- .../prgms/voucher/entity/VoucherTypeTest.java | 18 ------------------ 3 files changed, 33 deletions(-) delete mode 100644 src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java diff --git a/src/main/java/org/prgms/voucher/entity/VoucherType.java b/src/main/java/org/prgms/voucher/entity/VoucherType.java index 801fa2c952..4bed597f8a 100644 --- a/src/main/java/org/prgms/voucher/entity/VoucherType.java +++ b/src/main/java/org/prgms/voucher/entity/VoucherType.java @@ -3,7 +3,6 @@ import java.util.Arrays; import org.prgms.voucher.exception.WrongInputVoucherCommandException; -import org.prgms.voucher.exception.WrongVoucherNameException; public enum VoucherType { FIXED_AMOUNT("1", "FIXED_AMOUNT"), @@ -24,13 +23,6 @@ public static VoucherType findByCommand(String command) throws WrongInputVoucher .orElseThrow(WrongInputVoucherCommandException::new); } - public static VoucherType findByName(String voucherName) throws WrongVoucherNameException { - return Arrays.stream(VoucherType.values()) - .filter(type -> type.voucherName.equals(voucherName)) - .findFirst() - .orElseThrow(WrongVoucherNameException::new); - } - public String getVoucherName() { return voucherName; } diff --git a/src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java b/src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java deleted file mode 100644 index ff8d9ec14a..0000000000 --- a/src/main/java/org/prgms/voucher/exception/WrongVoucherNameException.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.prgms.voucher.exception; - -public class WrongVoucherNameException extends Exception { - public WrongVoucherNameException() { - super("[ERROR] 올바른 바우처 이름이 아닙니다."); - } -} diff --git a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java index 675371bf6f..eb21296ff8 100644 --- a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java +++ b/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; import org.prgms.voucher.exception.WrongInputVoucherCommandException; -import org.prgms.voucher.exception.WrongVoucherNameException; class VoucherTypeTest { @DisplayName("command를 통해 해당하는 VoucherType을 반환한다.") @@ -26,21 +25,4 @@ void findByCommand_WrongVoucherCommand_ThrowsException(String command) { .isInstanceOf(WrongInputVoucherCommandException.class) .hasMessage("[ERROR] 올바른 바우처 커맨드가 아닙니다."); } - - @DisplayName("이름을 통해 해당하는 VoucherType을 반환한다.") - @ParameterizedTest - @CsvSource(value = {"FIXED_AMOUNT,FIXED_AMOUNT", "PERCENT_DISCOUNT,PERCENT_DISCOUNT"}) - void findByName_VoucherName_ReturnVoucherType(String name, VoucherType voucherType) throws - WrongVoucherNameException { - assertThat(VoucherType.findByName(name)).isEqualTo(voucherType); - } - - @DisplayName("올바르지 않은 이름을 통해 해당하는 VoucherType을 반환한다.") - @ParameterizedTest - @ValueSource(strings = {"fixed", "sdf", "", " ", "chas", "123"}) - void findByName_WrongVoucherName_ThrowsException(String name) { - assertThatThrownBy(() -> VoucherType.findByName(name)) - .isInstanceOf(WrongVoucherNameException.class) - .hasMessage(("[ERROR] 올바른 바우처 이름이 아닙니다.")); - } } From 5efb78be3d219d81898300697c52c5e0edd04134 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 16:02:13 +0900 Subject: [PATCH 24/62] =?UTF-8?q?fix:=20toString=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgms/voucher/entity/PercentDiscountVoucher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java index c6f138a925..8da96a8e00 100644 --- a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java @@ -35,6 +35,6 @@ public UUID getVoucherId() { @Override public String toString() { - return String.format("%s\t%s\t%d%%", VoucherType.FIXED_AMOUNT.getVoucherName(), voucherId, discountPercent); + return String.format("%s\t%s\t%d%%", VoucherType.PERCENT_DISCOUNT.getVoucherName(), voucherId, discountPercent); } } From 676357352d0a3cc5138d3b2f88dcdec40c6eefbd Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Thu, 7 Apr 2022 16:02:46 +0900 Subject: [PATCH 25/62] =?UTF-8?q?feat:=20Voucher=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=A0=80=EC=9E=A5=ED=95=98=EB=8A=94=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/entity/Voucher.java | 3 +- .../repository/FileVoucherRepository.java | 67 +++++++++++++++++++ .../repository/FileVoucherRepositoryTest.java | 54 +++++++++++++++ 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java create mode 100644 src/test/java/org/prgms/voucher/repository/FileVoucherRepositoryTest.java diff --git a/src/main/java/org/prgms/voucher/entity/Voucher.java b/src/main/java/org/prgms/voucher/entity/Voucher.java index 1458509c91..e69770f9af 100644 --- a/src/main/java/org/prgms/voucher/entity/Voucher.java +++ b/src/main/java/org/prgms/voucher/entity/Voucher.java @@ -1,8 +1,9 @@ package org.prgms.voucher.entity; +import java.io.Serializable; import java.util.UUID; -public interface Voucher { +public interface Voucher extends Serializable { long discount(long beforeDiscount); UUID getVoucherId(); diff --git a/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java b/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java new file mode 100644 index 0000000000..b15e94dc19 --- /dev/null +++ b/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java @@ -0,0 +1,67 @@ +package org.prgms.voucher.repository; + +import java.io.EOFException; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.List; + +import org.prgms.voucher.entity.Voucher; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Repository; + +@Repository +@Primary +public class FileVoucherRepository implements VoucherRepository { + + public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucher/repository/filedata"; + public static final String FILE_NAME = FILE_LOCATION + "/voucherData.txt"; + private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 파일이 아닙니다."; + + static { + File file = new File(FILE_LOCATION); + if (!file.exists()) { + file.mkdirs(); + } + } + + @Override + public Voucher save(Voucher voucher) { + saveVoucherAtFile(voucher); + return voucher; + } + + private void saveVoucherAtFile(Voucher voucher) { + try ( + ObjectOutputStream objectOutputStream = new ObjectOutputStream( + new FileOutputStream(FILE_NAME, true)) + ) { + objectOutputStream.writeObject(voucher); + } catch (IOException e) { + throw new IllegalArgumentException(ERROR_WRONG_FILE); + } + } + + @Override + public List findAll() { + List vouchers = new ArrayList<>(); + try ( + FileInputStream fileInputStream = new FileInputStream(FILE_NAME) + ) { + while (true) { + ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream); + Voucher voucher = (Voucher)objectInputStream.readObject(); + vouchers.add(voucher); + } + } catch (EOFException | FileNotFoundException e) { + return vouchers; + } catch (IOException | ClassNotFoundException e) { + throw new IllegalArgumentException(ERROR_WRONG_FILE); + } + } +} diff --git a/src/test/java/org/prgms/voucher/repository/FileVoucherRepositoryTest.java b/src/test/java/org/prgms/voucher/repository/FileVoucherRepositoryTest.java new file mode 100644 index 0000000000..b7ff4739a0 --- /dev/null +++ b/src/test/java/org/prgms/voucher/repository/FileVoucherRepositoryTest.java @@ -0,0 +1,54 @@ +package org.prgms.voucher.repository; + +import static org.assertj.core.api.Assertions.*; + +import java.io.File; +import java.util.UUID; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.prgms.voucher.entity.FixedAmountVoucher; +import org.prgms.voucher.entity.PercentDiscountVoucher; +import org.prgms.voucher.entity.Voucher; +import org.prgms.voucher.exception.WrongDiscountAmountException; +import org.prgms.voucher.exception.WrongDiscountPercentException; + +class FileVoucherRepositoryTest { + + VoucherRepository voucherRepository = new FileVoucherRepository(); + + @AfterEach + void tearDown() { + File file = new File(FileVoucherRepository.FILE_NAME); + file.delete(); + } + + @DisplayName("Voucher를 파일에 저장한다.") + @Test + void save_Voucher_File() throws WrongDiscountPercentException, WrongDiscountAmountException { + // given + Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), 10L); + // when + Voucher saveVoucher = voucherRepository.save(voucher); + // then + assertThat(saveVoucher).isEqualTo(voucher); + assertThat(voucherRepository.findAll()).hasSize(1) + .extracting("voucherId").contains(voucher.getVoucherId()); + + } + + @DisplayName("파일에 저장되어 있는 모든 Voucher를 List형으로 반환한다.") + @Test + void findAll_ReturnAllVoucher() throws WrongDiscountAmountException, WrongDiscountPercentException { + // given + Voucher voucherOne = new FixedAmountVoucher(UUID.randomUUID(), 20L); + Voucher voucherTwo = new PercentDiscountVoucher(UUID.randomUUID(), 20L); + // when + voucherRepository.save(voucherOne); + voucherRepository.save(voucherTwo); + // then + assertThat(voucherRepository.findAll()).hasSize(2) + .extracting("voucherId").contains(voucherOne.getVoucherId(), voucherTwo.getVoucherId()); + } +} From 012eb0018eea752e0ffe7560adfa11acd38133e6 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sat, 9 Apr 2022 12:36:06 +0900 Subject: [PATCH 26/62] =?UTF-8?q?refactor:=20=EC=9E=AC=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=20=EC=9E=AC=EA=B7=80=EB=AC=B8=20->=20while=EB=AC=B8=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/VoucherProgram.java | 35 ++++++++++--------- .../entity/PercentDiscountVoucher.java | 2 +- .../repository/FileVoucherRepository.java | 4 +-- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/prgms/voucher/VoucherProgram.java b/src/main/java/org/prgms/voucher/VoucherProgram.java index cc034c5ee8..2b66c1a6cd 100644 --- a/src/main/java/org/prgms/voucher/VoucherProgram.java +++ b/src/main/java/org/prgms/voucher/VoucherProgram.java @@ -42,30 +42,33 @@ public void run() { } private Voucher createVoucher(VoucherType voucherType) { - try { - long discountValue = inputView.inputDiscountValue(voucherType); - return voucherService.create(voucherType, discountValue); - } catch (Exception e) { - outputView.printError(e.getMessage()); + while (true) { + try { + long discountValue = inputView.inputDiscountValue(voucherType); + return voucherService.create(voucherType, discountValue); + } catch (Exception e) { + outputView.printError(e.getMessage()); + } } - return createVoucher(voucherType); } private VoucherType inputVoucherCommand() { - try { - return VoucherType.findByCommand(inputView.inputVoucherCommand()); - } catch (Exception e) { - outputView.printError(e.getMessage()); + while (true) { + try { + return VoucherType.findByCommand(inputView.inputVoucherCommand()); + } catch (Exception e) { + outputView.printError(e.getMessage()); + } } - return inputVoucherCommand(); } private MenuType inputMenu() { - try { - return MenuType.of(inputView.inputMenu()); - } catch (Exception e) { - outputView.printError(e.getMessage()); + while (true) { + try { + return MenuType.of(inputView.inputMenu()); + } catch (Exception e) { + outputView.printError(e.getMessage()); + } } - return inputMenu(); } } diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java index 8da96a8e00..a2c42971c1 100644 --- a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java @@ -16,7 +16,7 @@ public PercentDiscountVoucher(UUID voucherId, long discountPercent) throws Wrong this.voucherId = voucherId; this.discountPercent = discountPercent; } - + private void validateDiscountPercent(long discountPercent) throws WrongDiscountPercentException { if (MAX_PERCENT < discountPercent || discountPercent < MIN_PERCENT) { throw new WrongDiscountPercentException(); diff --git a/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java b/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java index b15e94dc19..759c3909ea 100644 --- a/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java @@ -25,9 +25,7 @@ public class FileVoucherRepository implements VoucherRepository { static { File file = new File(FILE_LOCATION); - if (!file.exists()) { - file.mkdirs(); - } + file.mkdirs(); } @Override From 821cb36ec872d51ef180e0d6b079b3b9a48a3020 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sat, 9 Apr 2022 23:00:29 +0900 Subject: [PATCH 27/62] =?UTF-8?q?refactor:=20VoucherType=20name=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucher/entity/FixedAmountVoucher.java | 2 +- .../prgms/voucher/entity/PercentDiscountVoucher.java | 4 ++-- .../java/org/prgms/voucher/entity/VoucherType.java | 12 +++--------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java index 8d90ab1b6f..3aece035f8 100644 --- a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java @@ -34,6 +34,6 @@ public UUID getVoucherId() { @Override public String toString() { - return String.format("%s\t%s\t%d", VoucherType.FIXED_AMOUNT.getVoucherName(), voucherId, discountAmount); + return String.format("%s\t%s\t%d", VoucherType.FIXED_AMOUNT, voucherId, discountAmount); } } diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java index a2c42971c1..7e9e05ac6f 100644 --- a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java @@ -16,7 +16,7 @@ public PercentDiscountVoucher(UUID voucherId, long discountPercent) throws Wrong this.voucherId = voucherId; this.discountPercent = discountPercent; } - + private void validateDiscountPercent(long discountPercent) throws WrongDiscountPercentException { if (MAX_PERCENT < discountPercent || discountPercent < MIN_PERCENT) { throw new WrongDiscountPercentException(); @@ -35,6 +35,6 @@ public UUID getVoucherId() { @Override public String toString() { - return String.format("%s\t%s\t%d%%", VoucherType.PERCENT_DISCOUNT.getVoucherName(), voucherId, discountPercent); + return String.format("%s\t%s\t%d%%", VoucherType.PERCENT_DISCOUNT, voucherId, discountPercent); } } diff --git a/src/main/java/org/prgms/voucher/entity/VoucherType.java b/src/main/java/org/prgms/voucher/entity/VoucherType.java index 4bed597f8a..2dc82ff79d 100644 --- a/src/main/java/org/prgms/voucher/entity/VoucherType.java +++ b/src/main/java/org/prgms/voucher/entity/VoucherType.java @@ -5,15 +5,13 @@ import org.prgms.voucher.exception.WrongInputVoucherCommandException; public enum VoucherType { - FIXED_AMOUNT("1", "FIXED_AMOUNT"), - PERCENT_DISCOUNT("2", "PERCENT_DISCOUNT"); + FIXED_AMOUNT("1"), + PERCENT_DISCOUNT("2"); private final String command; - private final String voucherName; - VoucherType(String command, String voucherName) { + VoucherType(String command) { this.command = command; - this.voucherName = voucherName; } public static VoucherType findByCommand(String command) throws WrongInputVoucherCommandException { @@ -22,8 +20,4 @@ public static VoucherType findByCommand(String command) throws WrongInputVoucher .findFirst() .orElseThrow(WrongInputVoucherCommandException::new); } - - public String getVoucherName() { - return voucherName; - } } From a6cf82c0e57e40bc8e88f8777803d0b9e07d549e Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sat, 9 Apr 2022 23:21:12 +0900 Subject: [PATCH 28/62] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringVoucherApplication.java | 2 +- .../VoucherProgram.java | 16 ++++++++-------- .../entity/MenuType.java | 4 ++-- .../entity/voucher}/FixedAmountVoucher.java | 4 ++-- .../entity/voucher}/PercentDiscountVoucher.java | 4 ++-- .../entity/voucher}/Voucher.java | 2 +- .../entity/voucher}/VoucherType.java | 4 ++-- .../exception/WrongDiscountAmountException.java | 2 +- .../exception/WrongDiscountPercentException.java | 2 +- .../exception/WrongInputMenuException.java | 2 +- .../WrongInputVoucherCommandException.java | 2 +- .../voucher}/FileVoucherRepository.java | 4 ++-- .../voucher}/MemoryVoucherRepository.java | 4 ++-- .../repository/voucher}/VoucherRepository.java | 4 ++-- .../service/VoucherService.java | 16 ++++++++-------- .../view/Console.java | 6 +++--- .../view/InputView.java | 4 ++-- .../view/OutputView.java | 4 ++-- .../SpringVoucherApplicationTests.java | 2 +- .../entity/MenuTypeTest.java | 4 ++-- .../entity/voucher}/FixedAmountVoucherTest.java | 4 ++-- .../voucher}/PercentDiscountVoucherTest.java | 4 ++-- .../entity/voucher}/VoucherTypeTest.java | 4 ++-- .../voucher}/FileVoucherRepositoryTest.java | 14 +++++++------- .../voucher}/MemoryVoucherRepositoryTest.java | 12 ++++++------ .../service/VoucherServiceTest.java | 16 ++++++++-------- 26 files changed, 73 insertions(+), 73 deletions(-) rename src/main/java/org/prgms/{voucher => voucherProgram}/SpringVoucherApplication.java (93%) rename src/main/java/org/prgms/{voucher => voucherProgram}/VoucherProgram.java (83%) rename src/main/java/org/prgms/{voucher => voucherProgram}/entity/MenuType.java (81%) rename src/main/java/org/prgms/{voucher/entity => voucherProgram/entity/voucher}/FixedAmountVoucher.java (89%) rename src/main/java/org/prgms/{voucher/entity => voucherProgram/entity/voucher}/PercentDiscountVoucher.java (90%) rename src/main/java/org/prgms/{voucher/entity => voucherProgram/entity/voucher}/Voucher.java (77%) rename src/main/java/org/prgms/{voucher/entity => voucherProgram/entity/voucher}/VoucherType.java (80%) rename src/main/java/org/prgms/{voucher => voucherProgram}/exception/WrongDiscountAmountException.java (80%) rename src/main/java/org/prgms/{voucher => voucherProgram}/exception/WrongDiscountPercentException.java (80%) rename src/main/java/org/prgms/{voucher => voucherProgram}/exception/WrongInputMenuException.java (79%) rename src/main/java/org/prgms/{voucher => voucherProgram}/exception/WrongInputVoucherCommandException.java (81%) rename src/main/java/org/prgms/{voucher/repository => voucherProgram/repository/voucher}/FileVoucherRepository.java (94%) rename src/main/java/org/prgms/{voucher/repository => voucherProgram/repository/voucher}/MemoryVoucherRepository.java (84%) rename src/main/java/org/prgms/{voucher/repository => voucherProgram/repository/voucher}/VoucherRepository.java (54%) rename src/main/java/org/prgms/{voucher => voucherProgram}/service/VoucherService.java (66%) rename src/main/java/org/prgms/{voucher => voucherProgram}/view/Console.java (94%) rename src/main/java/org/prgms/{voucher => voucherProgram}/view/InputView.java (59%) rename src/main/java/org/prgms/{voucher => voucherProgram}/view/OutputView.java (66%) rename src/test/java/org/prgms/{voucher => voucherProgram}/SpringVoucherApplicationTests.java (85%) rename src/test/java/org/prgms/{voucher => voucherProgram}/entity/MenuTypeTest.java (89%) rename src/test/java/org/prgms/{voucher/entity => voucherProgram/entity/voucher}/FixedAmountVoucherTest.java (91%) rename src/test/java/org/prgms/{voucher/entity => voucherProgram/entity/voucher}/PercentDiscountVoucherTest.java (91%) rename src/test/java/org/prgms/{voucher/entity => voucherProgram/entity/voucher}/VoucherTypeTest.java (90%) rename src/test/java/org/prgms/{voucher/repository => voucherProgram/repository/voucher}/FileVoucherRepositoryTest.java (77%) rename src/test/java/org/prgms/{voucher/repository => voucherProgram/repository/voucher}/MemoryVoucherRepositoryTest.java (77%) rename src/test/java/org/prgms/{voucher => voucherProgram}/service/VoucherServiceTest.java (78%) diff --git a/src/main/java/org/prgms/voucher/SpringVoucherApplication.java b/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java similarity index 93% rename from src/main/java/org/prgms/voucher/SpringVoucherApplication.java rename to src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java index 5858dc39aa..344214fc8e 100644 --- a/src/main/java/org/prgms/voucher/SpringVoucherApplication.java +++ b/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java @@ -1,4 +1,4 @@ -package org.prgms.voucher; +package org.prgms.voucherProgram; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/org/prgms/voucher/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java similarity index 83% rename from src/main/java/org/prgms/voucher/VoucherProgram.java rename to src/main/java/org/prgms/voucherProgram/VoucherProgram.java index 2b66c1a6cd..7eb005e727 100644 --- a/src/main/java/org/prgms/voucher/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -1,12 +1,12 @@ -package org.prgms.voucher; +package org.prgms.voucherProgram; -import org.prgms.voucher.entity.MenuType; -import org.prgms.voucher.entity.Voucher; -import org.prgms.voucher.entity.VoucherType; -import org.prgms.voucher.service.VoucherService; -import org.prgms.voucher.view.Console; -import org.prgms.voucher.view.InputView; -import org.prgms.voucher.view.OutputView; +import org.prgms.voucherProgram.entity.MenuType; +import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.prgms.voucherProgram.entity.voucher.VoucherType; +import org.prgms.voucherProgram.service.VoucherService; +import org.prgms.voucherProgram.view.Console; +import org.prgms.voucherProgram.view.InputView; +import org.prgms.voucherProgram.view.OutputView; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/prgms/voucher/entity/MenuType.java b/src/main/java/org/prgms/voucherProgram/entity/MenuType.java similarity index 81% rename from src/main/java/org/prgms/voucher/entity/MenuType.java rename to src/main/java/org/prgms/voucherProgram/entity/MenuType.java index 368a8d39ee..9ce68be582 100644 --- a/src/main/java/org/prgms/voucher/entity/MenuType.java +++ b/src/main/java/org/prgms/voucherProgram/entity/MenuType.java @@ -1,8 +1,8 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity; import java.util.Arrays; -import org.prgms.voucher.exception.WrongInputMenuException; +import org.prgms.voucherProgram.exception.WrongInputMenuException; public enum MenuType { EXIT("exit"), diff --git a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java similarity index 89% rename from src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java rename to src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java index 3aece035f8..590af6ec09 100644 --- a/src/main/java/org/prgms/voucher/entity/FixedAmountVoucher.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java @@ -1,8 +1,8 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity.voucher; import java.util.UUID; -import org.prgms.voucher.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; public class FixedAmountVoucher implements Voucher { public static final int MIN_AMOUNT = 1; diff --git a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java similarity index 90% rename from src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java rename to src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java index 7e9e05ac6f..07dbc5225f 100644 --- a/src/main/java/org/prgms/voucher/entity/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java @@ -1,8 +1,8 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity.voucher; import java.util.UUID; -import org.prgms.voucher.exception.WrongDiscountPercentException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; public class PercentDiscountVoucher implements Voucher { public static final long MIN_PERCENT = 1; diff --git a/src/main/java/org/prgms/voucher/entity/Voucher.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/Voucher.java similarity index 77% rename from src/main/java/org/prgms/voucher/entity/Voucher.java rename to src/main/java/org/prgms/voucherProgram/entity/voucher/Voucher.java index e69770f9af..09fb691ed4 100644 --- a/src/main/java/org/prgms/voucher/entity/Voucher.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/Voucher.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity.voucher; import java.io.Serializable; import java.util.UUID; diff --git a/src/main/java/org/prgms/voucher/entity/VoucherType.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/VoucherType.java similarity index 80% rename from src/main/java/org/prgms/voucher/entity/VoucherType.java rename to src/main/java/org/prgms/voucherProgram/entity/voucher/VoucherType.java index 2dc82ff79d..8678155449 100644 --- a/src/main/java/org/prgms/voucher/entity/VoucherType.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/VoucherType.java @@ -1,8 +1,8 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity.voucher; import java.util.Arrays; -import org.prgms.voucher.exception.WrongInputVoucherCommandException; +import org.prgms.voucherProgram.exception.WrongInputVoucherCommandException; public enum VoucherType { FIXED_AMOUNT("1"), diff --git a/src/main/java/org/prgms/voucher/exception/WrongDiscountAmountException.java b/src/main/java/org/prgms/voucherProgram/exception/WrongDiscountAmountException.java similarity index 80% rename from src/main/java/org/prgms/voucher/exception/WrongDiscountAmountException.java rename to src/main/java/org/prgms/voucherProgram/exception/WrongDiscountAmountException.java index ad1dab88e6..fea0804db4 100644 --- a/src/main/java/org/prgms/voucher/exception/WrongDiscountAmountException.java +++ b/src/main/java/org/prgms/voucherProgram/exception/WrongDiscountAmountException.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.exception; +package org.prgms.voucherProgram.exception; public class WrongDiscountAmountException extends Exception { public WrongDiscountAmountException() { diff --git a/src/main/java/org/prgms/voucher/exception/WrongDiscountPercentException.java b/src/main/java/org/prgms/voucherProgram/exception/WrongDiscountPercentException.java similarity index 80% rename from src/main/java/org/prgms/voucher/exception/WrongDiscountPercentException.java rename to src/main/java/org/prgms/voucherProgram/exception/WrongDiscountPercentException.java index c4a62bd4af..f245488c75 100644 --- a/src/main/java/org/prgms/voucher/exception/WrongDiscountPercentException.java +++ b/src/main/java/org/prgms/voucherProgram/exception/WrongDiscountPercentException.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.exception; +package org.prgms.voucherProgram.exception; public class WrongDiscountPercentException extends Exception { public WrongDiscountPercentException() { diff --git a/src/main/java/org/prgms/voucher/exception/WrongInputMenuException.java b/src/main/java/org/prgms/voucherProgram/exception/WrongInputMenuException.java similarity index 79% rename from src/main/java/org/prgms/voucher/exception/WrongInputMenuException.java rename to src/main/java/org/prgms/voucherProgram/exception/WrongInputMenuException.java index 916a9f1984..0027f83a05 100644 --- a/src/main/java/org/prgms/voucher/exception/WrongInputMenuException.java +++ b/src/main/java/org/prgms/voucherProgram/exception/WrongInputMenuException.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.exception; +package org.prgms.voucherProgram.exception; public class WrongInputMenuException extends Exception { public WrongInputMenuException() { diff --git a/src/main/java/org/prgms/voucher/exception/WrongInputVoucherCommandException.java b/src/main/java/org/prgms/voucherProgram/exception/WrongInputVoucherCommandException.java similarity index 81% rename from src/main/java/org/prgms/voucher/exception/WrongInputVoucherCommandException.java rename to src/main/java/org/prgms/voucherProgram/exception/WrongInputVoucherCommandException.java index 6deff5cf73..150913d6f6 100644 --- a/src/main/java/org/prgms/voucher/exception/WrongInputVoucherCommandException.java +++ b/src/main/java/org/prgms/voucherProgram/exception/WrongInputVoucherCommandException.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.exception; +package org.prgms.voucherProgram.exception; public class WrongInputVoucherCommandException extends Exception { public WrongInputVoucherCommandException() { diff --git a/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java similarity index 94% rename from src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java rename to src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index 759c3909ea..b4175c8d77 100644 --- a/src/main/java/org/prgms/voucher/repository/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.repository; +package org.prgms.voucherProgram.repository.voucher; import java.io.EOFException; import java.io.File; @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import org.prgms.voucher.entity.Voucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Repository; diff --git a/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java similarity index 84% rename from src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java rename to src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java index ca7d2bf52e..38cfe78e37 100644 --- a/src/main/java/org/prgms/voucher/repository/MemoryVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.repository; +package org.prgms.voucherProgram.repository.voucher; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; -import org.prgms.voucher.entity.Voucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; import org.springframework.stereotype.Repository; @Repository diff --git a/src/main/java/org/prgms/voucher/repository/VoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/VoucherRepository.java similarity index 54% rename from src/main/java/org/prgms/voucher/repository/VoucherRepository.java rename to src/main/java/org/prgms/voucherProgram/repository/voucher/VoucherRepository.java index e4c3a23287..b7d01a9e9a 100644 --- a/src/main/java/org/prgms/voucher/repository/VoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/VoucherRepository.java @@ -1,8 +1,8 @@ -package org.prgms.voucher.repository; +package org.prgms.voucherProgram.repository.voucher; import java.util.List; -import org.prgms.voucher.entity.Voucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; public interface VoucherRepository { Voucher save(Voucher voucher); diff --git a/src/main/java/org/prgms/voucher/service/VoucherService.java b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java similarity index 66% rename from src/main/java/org/prgms/voucher/service/VoucherService.java rename to src/main/java/org/prgms/voucherProgram/service/VoucherService.java index dde9d9411a..0d23cc6754 100644 --- a/src/main/java/org/prgms/voucher/service/VoucherService.java +++ b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java @@ -1,15 +1,15 @@ -package org.prgms.voucher.service; +package org.prgms.voucherProgram.service; import java.util.List; import java.util.UUID; -import org.prgms.voucher.entity.FixedAmountVoucher; -import org.prgms.voucher.entity.PercentDiscountVoucher; -import org.prgms.voucher.entity.Voucher; -import org.prgms.voucher.entity.VoucherType; -import org.prgms.voucher.exception.WrongDiscountAmountException; -import org.prgms.voucher.exception.WrongDiscountPercentException; -import org.prgms.voucher.repository.VoucherRepository; +import org.prgms.voucherProgram.entity.voucher.FixedAmountVoucher; +import org.prgms.voucherProgram.entity.voucher.PercentDiscountVoucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.prgms.voucherProgram.entity.voucher.VoucherType; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; +import org.prgms.voucherProgram.repository.voucher.VoucherRepository; import org.springframework.stereotype.Service; @Service diff --git a/src/main/java/org/prgms/voucher/view/Console.java b/src/main/java/org/prgms/voucherProgram/view/Console.java similarity index 94% rename from src/main/java/org/prgms/voucher/view/Console.java rename to src/main/java/org/prgms/voucherProgram/view/Console.java index 340d1c6e0f..38d14f5366 100644 --- a/src/main/java/org/prgms/voucher/view/Console.java +++ b/src/main/java/org/prgms/voucherProgram/view/Console.java @@ -1,10 +1,10 @@ -package org.prgms.voucher.view; +package org.prgms.voucherProgram.view; import java.util.List; import java.util.Scanner; -import org.prgms.voucher.entity.Voucher; -import org.prgms.voucher.entity.VoucherType; +import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.prgms.voucherProgram.entity.voucher.VoucherType; import org.springframework.stereotype.Component; @Component diff --git a/src/main/java/org/prgms/voucher/view/InputView.java b/src/main/java/org/prgms/voucherProgram/view/InputView.java similarity index 59% rename from src/main/java/org/prgms/voucher/view/InputView.java rename to src/main/java/org/prgms/voucherProgram/view/InputView.java index 049faf50be..5b7525e421 100644 --- a/src/main/java/org/prgms/voucher/view/InputView.java +++ b/src/main/java/org/prgms/voucherProgram/view/InputView.java @@ -1,6 +1,6 @@ -package org.prgms.voucher.view; +package org.prgms.voucherProgram.view; -import org.prgms.voucher.entity.VoucherType; +import org.prgms.voucherProgram.entity.voucher.VoucherType; public interface InputView { diff --git a/src/main/java/org/prgms/voucher/view/OutputView.java b/src/main/java/org/prgms/voucherProgram/view/OutputView.java similarity index 66% rename from src/main/java/org/prgms/voucher/view/OutputView.java rename to src/main/java/org/prgms/voucherProgram/view/OutputView.java index 184279dc4e..a15776934f 100644 --- a/src/main/java/org/prgms/voucher/view/OutputView.java +++ b/src/main/java/org/prgms/voucherProgram/view/OutputView.java @@ -1,8 +1,8 @@ -package org.prgms.voucher.view; +package org.prgms.voucherProgram.view; import java.util.List; -import org.prgms.voucher.entity.Voucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; public interface OutputView { diff --git a/src/test/java/org/prgms/voucher/SpringVoucherApplicationTests.java b/src/test/java/org/prgms/voucherProgram/SpringVoucherApplicationTests.java similarity index 85% rename from src/test/java/org/prgms/voucher/SpringVoucherApplicationTests.java rename to src/test/java/org/prgms/voucherProgram/SpringVoucherApplicationTests.java index 2cd1d14bc0..b872dbd7d4 100644 --- a/src/test/java/org/prgms/voucher/SpringVoucherApplicationTests.java +++ b/src/test/java/org/prgms/voucherProgram/SpringVoucherApplicationTests.java @@ -1,4 +1,4 @@ -package org.prgms.voucher; +package org.prgms.voucherProgram; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/src/test/java/org/prgms/voucher/entity/MenuTypeTest.java b/src/test/java/org/prgms/voucherProgram/entity/MenuTypeTest.java similarity index 89% rename from src/test/java/org/prgms/voucher/entity/MenuTypeTest.java rename to src/test/java/org/prgms/voucherProgram/entity/MenuTypeTest.java index f226761686..430df625bc 100644 --- a/src/test/java/org/prgms/voucher/entity/MenuTypeTest.java +++ b/src/test/java/org/prgms/voucherProgram/entity/MenuTypeTest.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity; import static org.assertj.core.api.Assertions.*; @@ -6,7 +6,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; -import org.prgms.voucher.exception.WrongInputMenuException; +import org.prgms.voucherProgram.exception.WrongInputMenuException; class MenuTypeTest { @DisplayName("해당하는 MenuType을 반환한다.") diff --git a/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java b/src/test/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucherTest.java similarity index 91% rename from src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java rename to src/test/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucherTest.java index b62e685472..8b29ede144 100644 --- a/src/test/java/org/prgms/voucher/entity/FixedAmountVoucherTest.java +++ b/src/test/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucherTest.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity.voucher; import static org.assertj.core.api.Assertions.*; @@ -8,7 +8,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; -import org.prgms.voucher.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; class FixedAmountVoucherTest { diff --git a/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java b/src/test/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucherTest.java similarity index 91% rename from src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java rename to src/test/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucherTest.java index dad1b97f08..5b6cf1c618 100644 --- a/src/test/java/org/prgms/voucher/entity/PercentDiscountVoucherTest.java +++ b/src/test/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucherTest.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity.voucher; import static org.assertj.core.api.Assertions.*; @@ -8,7 +8,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; -import org.prgms.voucher.exception.WrongDiscountPercentException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; class PercentDiscountVoucherTest { diff --git a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java b/src/test/java/org/prgms/voucherProgram/entity/voucher/VoucherTypeTest.java similarity index 90% rename from src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java rename to src/test/java/org/prgms/voucherProgram/entity/voucher/VoucherTypeTest.java index eb21296ff8..77463f27ce 100644 --- a/src/test/java/org/prgms/voucher/entity/VoucherTypeTest.java +++ b/src/test/java/org/prgms/voucherProgram/entity/voucher/VoucherTypeTest.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.entity; +package org.prgms.voucherProgram.entity.voucher; import static org.assertj.core.api.Assertions.*; @@ -6,7 +6,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; -import org.prgms.voucher.exception.WrongInputVoucherCommandException; +import org.prgms.voucherProgram.exception.WrongInputVoucherCommandException; class VoucherTypeTest { @DisplayName("command를 통해 해당하는 VoucherType을 반환한다.") diff --git a/src/test/java/org/prgms/voucher/repository/FileVoucherRepositoryTest.java b/src/test/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepositoryTest.java similarity index 77% rename from src/test/java/org/prgms/voucher/repository/FileVoucherRepositoryTest.java rename to src/test/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepositoryTest.java index b7ff4739a0..4aaf40ddef 100644 --- a/src/test/java/org/prgms/voucher/repository/FileVoucherRepositoryTest.java +++ b/src/test/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepositoryTest.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.repository; +package org.prgms.voucherProgram.repository.voucher; import static org.assertj.core.api.Assertions.*; @@ -8,11 +8,11 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.prgms.voucher.entity.FixedAmountVoucher; -import org.prgms.voucher.entity.PercentDiscountVoucher; -import org.prgms.voucher.entity.Voucher; -import org.prgms.voucher.exception.WrongDiscountAmountException; -import org.prgms.voucher.exception.WrongDiscountPercentException; +import org.prgms.voucherProgram.entity.voucher.FixedAmountVoucher; +import org.prgms.voucherProgram.entity.voucher.PercentDiscountVoucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; class FileVoucherRepositoryTest { @@ -26,7 +26,7 @@ void tearDown() { @DisplayName("Voucher를 파일에 저장한다.") @Test - void save_Voucher_File() throws WrongDiscountPercentException, WrongDiscountAmountException { + void save_Voucher_File() throws WrongDiscountAmountException { // given Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), 10L); // when diff --git a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java b/src/test/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepositoryTest.java similarity index 77% rename from src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java rename to src/test/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepositoryTest.java index b06bff1e65..bd125ff693 100644 --- a/src/test/java/org/prgms/voucher/repository/MemoryVoucherRepositoryTest.java +++ b/src/test/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepositoryTest.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.repository; +package org.prgms.voucherProgram.repository.voucher; import static org.assertj.core.api.Assertions.*; @@ -6,11 +6,11 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.prgms.voucher.entity.FixedAmountVoucher; -import org.prgms.voucher.entity.PercentDiscountVoucher; -import org.prgms.voucher.entity.Voucher; -import org.prgms.voucher.exception.WrongDiscountAmountException; -import org.prgms.voucher.exception.WrongDiscountPercentException; +import org.prgms.voucherProgram.entity.voucher.FixedAmountVoucher; +import org.prgms.voucherProgram.entity.voucher.PercentDiscountVoucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; class MemoryVoucherRepositoryTest { diff --git a/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java similarity index 78% rename from src/test/java/org/prgms/voucher/service/VoucherServiceTest.java rename to src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java index 2252d8454c..598c8d4bba 100644 --- a/src/test/java/org/prgms/voucher/service/VoucherServiceTest.java +++ b/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java @@ -1,4 +1,4 @@ -package org.prgms.voucher.service; +package org.prgms.voucherProgram.service; import static org.assertj.core.api.Assertions.*; @@ -8,13 +8,13 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.prgms.voucher.entity.FixedAmountVoucher; -import org.prgms.voucher.entity.PercentDiscountVoucher; -import org.prgms.voucher.entity.Voucher; -import org.prgms.voucher.entity.VoucherType; -import org.prgms.voucher.exception.WrongDiscountAmountException; -import org.prgms.voucher.exception.WrongDiscountPercentException; -import org.prgms.voucher.repository.VoucherRepository; +import org.prgms.voucherProgram.entity.voucher.FixedAmountVoucher; +import org.prgms.voucherProgram.entity.voucher.PercentDiscountVoucher; +import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.prgms.voucherProgram.entity.voucher.VoucherType; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; +import org.prgms.voucherProgram.repository.voucher.VoucherRepository; class VoucherServiceTest { From 2ae26ff4ed9e693cb0b6ce2d86da7efb045ecf14 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:00:10 +0900 Subject: [PATCH 29/62] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/voucher/FileVoucherRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index b4175c8d77..c76279e041 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -19,7 +19,7 @@ @Primary public class FileVoucherRepository implements VoucherRepository { - public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucher/repository/filedata"; + public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; public static final String FILE_NAME = FILE_LOCATION + "/voucherData.txt"; private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 파일이 아닙니다."; From 83eb98679a2cb23d160f732a2d8c5eed160b9666 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:01:23 +0900 Subject: [PATCH 30/62] =?UTF-8?q?feat:=20=EA=B3=A0=EA=B0=9D=20=EB=B8=94?= =?UTF-8?q?=EB=9E=99=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=AA=85=EB=8B=A8=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucherProgram/entity/user/User.java | 18 +++++++++ .../filedata/customer_blacklist.csv | 3 ++ .../repository/user/FileUserRepository.java | 37 +++++++++++++++++++ .../user/FileUserRepositoryTest.java | 17 +++++++++ 4 files changed, 75 insertions(+) create mode 100644 src/main/java/org/prgms/voucherProgram/entity/user/User.java create mode 100644 src/main/java/org/prgms/voucherProgram/repository/filedata/customer_blacklist.csv create mode 100644 src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java create mode 100644 src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java diff --git a/src/main/java/org/prgms/voucherProgram/entity/user/User.java b/src/main/java/org/prgms/voucherProgram/entity/user/User.java new file mode 100644 index 0000000000..f3aefc6a33 --- /dev/null +++ b/src/main/java/org/prgms/voucherProgram/entity/user/User.java @@ -0,0 +1,18 @@ +package org.prgms.voucherProgram.entity.user; + +import java.util.UUID; + +public class User { + private final UUID userId; + private final String name; + + public User(UUID userId, String name) { + this.userId = userId; + this.name = name; + } + + @Override + public String toString() { + return "userId=" + userId + ", name='" + name; + } +} diff --git a/src/main/java/org/prgms/voucherProgram/repository/filedata/customer_blacklist.csv b/src/main/java/org/prgms/voucherProgram/repository/filedata/customer_blacklist.csv new file mode 100644 index 0000000000..5bcc9e501c --- /dev/null +++ b/src/main/java/org/prgms/voucherProgram/repository/filedata/customer_blacklist.csv @@ -0,0 +1,3 @@ +75bd8613-e6cf-44f4-87cc-b8a697a62254,hwan +9b58be8c-20ca-435c-909e-63853743a85e,pobi +791d1c95-ced1-4cd9-b380-d411e8309ac5,jin diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java new file mode 100644 index 0000000000..ed9264385a --- /dev/null +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -0,0 +1,37 @@ +package org.prgms.voucherProgram.repository.user; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import org.prgms.voucherProgram.entity.user.User; + +public class FileUserRepository { + public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; + public static final String FILE_NAME = FILE_LOCATION + "/customer_blacklist.csv"; + private static final String DELIMITER = ","; + private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 유저 파일이 아닙니다."; + private static final int USER_ID_INDEX = 0; + private static final int USER_NAEM_INDEX = 1; + + public List findAll() { + List users = new ArrayList<>(); + + try (BufferedReader bufferedReader = new BufferedReader(new FileReader(FILE_NAME))) { + String line; + + while ((line = bufferedReader.readLine()) != null) { + String[] splitLine = line.split(DELIMITER); + UUID userId = UUID.fromString(splitLine[USER_ID_INDEX].trim()); + String userName = splitLine[USER_NAEM_INDEX].trim(); + users.add(new User(userId, userName)); + } + } catch (IOException e) { + throw new IllegalArgumentException(ERROR_WRONG_FILE); + } + return users; + } +} diff --git a/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java new file mode 100644 index 0000000000..8208b139a4 --- /dev/null +++ b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java @@ -0,0 +1,17 @@ +package org.prgms.voucherProgram.repository.user; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class FileUserRepositoryTest { + + FileUserRepository fileUserRepository = new FileUserRepository(); + + @DisplayName("파일에 저장되어 있는 모든 User를 List형으로 반환한다.") + @Test + void findAll_ReturnAllUser() { + Assertions.assertThat(fileUserRepository.findAll()).hasSize(3) + .extracting("name").contains("hwan", "jin", "pobi"); + } +} From 26aac9b26aa0d128b04316910dd655609baa0819 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:06:49 +0900 Subject: [PATCH 31/62] =?UTF-8?q?feat:=20UserRepository=20=EC=9D=B8?= =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/user/FileUserRepository.java | 2 +- .../voucherProgram/repository/user/UserRepository.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index ed9264385a..160a5586bf 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -9,7 +9,7 @@ import org.prgms.voucherProgram.entity.user.User; -public class FileUserRepository { +public class FileUserRepository implements UserRepository { public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; public static final String FILE_NAME = FILE_LOCATION + "/customer_blacklist.csv"; private static final String DELIMITER = ","; diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java new file mode 100644 index 0000000000..67cfda2d50 --- /dev/null +++ b/src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java @@ -0,0 +1,9 @@ +package org.prgms.voucherProgram.repository.user; + +import java.util.List; + +import org.prgms.voucherProgram.entity.user.User; + +public interface UserRepository { + List findAll(); +} From db8eb47de93175876cfa0748e344648075b7f91f Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:11:16 +0900 Subject: [PATCH 32/62] =?UTF-8?q?feat:=20UserService=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucherProgram/service/UserService.java | 19 ++++++++++++ .../service/UserServiceTest.java | 30 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 src/main/java/org/prgms/voucherProgram/service/UserService.java create mode 100644 src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java diff --git a/src/main/java/org/prgms/voucherProgram/service/UserService.java b/src/main/java/org/prgms/voucherProgram/service/UserService.java new file mode 100644 index 0000000000..bff121bcc5 --- /dev/null +++ b/src/main/java/org/prgms/voucherProgram/service/UserService.java @@ -0,0 +1,19 @@ +package org.prgms.voucherProgram.service; + +import java.util.List; + +import org.prgms.voucherProgram.entity.user.User; +import org.prgms.voucherProgram.repository.user.FileUserRepository; +import org.prgms.voucherProgram.repository.user.UserRepository; + +public class UserService { + private final UserRepository fileUserRepository; + + public UserService(FileUserRepository fileUserRepository) { + this.fileUserRepository = fileUserRepository; + } + + public List findBlackList() { + return fileUserRepository.findAll(); + } +} diff --git a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java new file mode 100644 index 0000000000..1948da2e69 --- /dev/null +++ b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java @@ -0,0 +1,30 @@ +package org.prgms.voucherProgram.service; + +import static org.assertj.core.api.Assertions.*; + +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.prgms.voucherProgram.entity.user.User; +import org.prgms.voucherProgram.repository.user.UserRepository; + +class UserServiceTest { + UserRepository userRepository = new UserRepository() { + @Override + public List findAll() { + return Arrays.asList(new User(UUID.randomUUID(), "jin"), + new User(UUID.randomUUID(), "hwan"), + new User(UUID.randomUUID(), "pobi")); + } + }; + + @DisplayName("모든 유저를 반환한다.") + @Test + void findAll_ReturnAllVoucher() { + assertThat(userRepository.findAll()).hasSize(3) + .extracting("name").contains("hwan", "jin", "pobi"); + } +} From 869ca424a8093021ba482d5cbc9d4806c6787617 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:20:07 +0900 Subject: [PATCH 33/62] =?UTF-8?q?feat:=20blacklist=20=EC=BB=A4=EB=A7=A8?= =?UTF-8?q?=EB=93=9C=20=EC=9E=85=EB=A0=A5=20=EC=8B=9C=20=EB=B8=94=EB=9E=99?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prgms/voucherProgram/VoucherProgram.java | 8 +++++++- .../prgms/voucherProgram/entity/MenuType.java | 3 ++- .../prgms/voucherProgram/entity/user/User.java | 2 +- .../repository/user/FileUserRepository.java | 2 ++ .../voucherProgram/service/UserService.java | 2 ++ .../org/prgms/voucherProgram/view/Console.java | 18 +++++++++++++++++- .../prgms/voucherProgram/view/OutputView.java | 3 +++ 7 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java index 7eb005e727..048fd5f9d8 100644 --- a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -3,6 +3,7 @@ import org.prgms.voucherProgram.entity.MenuType; import org.prgms.voucherProgram.entity.voucher.Voucher; import org.prgms.voucherProgram.entity.voucher.VoucherType; +import org.prgms.voucherProgram.service.UserService; import org.prgms.voucherProgram.service.VoucherService; import org.prgms.voucherProgram.view.Console; import org.prgms.voucherProgram.view.InputView; @@ -12,11 +13,13 @@ @Component public class VoucherProgram { private final VoucherService voucherService; + private final UserService userService; private final InputView inputView; private final OutputView outputView; - public VoucherProgram(VoucherService voucherService, Console console) { + public VoucherProgram(VoucherService voucherService, UserService userService, Console console) { this.voucherService = voucherService; + this.userService = userService; this.inputView = console; this.outputView = console; } @@ -37,6 +40,9 @@ public void run() { VoucherType voucherType = inputVoucherCommand(); Voucher voucher = createVoucher(voucherType); outputView.printVoucher(voucher); + break; + case BLACKLIST: + outputView.printAllUser(userService.findBlackList()); } } } diff --git a/src/main/java/org/prgms/voucherProgram/entity/MenuType.java b/src/main/java/org/prgms/voucherProgram/entity/MenuType.java index 9ce68be582..db8973de87 100644 --- a/src/main/java/org/prgms/voucherProgram/entity/MenuType.java +++ b/src/main/java/org/prgms/voucherProgram/entity/MenuType.java @@ -7,7 +7,8 @@ public enum MenuType { EXIT("exit"), CREATE("create"), - LIST("list"); + LIST("list"), + BLACKLIST("blacklist"); private final String command; diff --git a/src/main/java/org/prgms/voucherProgram/entity/user/User.java b/src/main/java/org/prgms/voucherProgram/entity/user/User.java index f3aefc6a33..782f93f117 100644 --- a/src/main/java/org/prgms/voucherProgram/entity/user/User.java +++ b/src/main/java/org/prgms/voucherProgram/entity/user/User.java @@ -13,6 +13,6 @@ public User(UUID userId, String name) { @Override public String toString() { - return "userId=" + userId + ", name='" + name; + return "userId=" + userId + ", name=" + name; } } diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index 160a5586bf..f70b6dc199 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -8,7 +8,9 @@ import java.util.UUID; import org.prgms.voucherProgram.entity.user.User; +import org.springframework.stereotype.Repository; +@Repository public class FileUserRepository implements UserRepository { public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; public static final String FILE_NAME = FILE_LOCATION + "/customer_blacklist.csv"; diff --git a/src/main/java/org/prgms/voucherProgram/service/UserService.java b/src/main/java/org/prgms/voucherProgram/service/UserService.java index bff121bcc5..2682e835f1 100644 --- a/src/main/java/org/prgms/voucherProgram/service/UserService.java +++ b/src/main/java/org/prgms/voucherProgram/service/UserService.java @@ -5,7 +5,9 @@ import org.prgms.voucherProgram.entity.user.User; import org.prgms.voucherProgram.repository.user.FileUserRepository; import org.prgms.voucherProgram.repository.user.UserRepository; +import org.springframework.stereotype.Service; +@Service public class UserService { private final UserRepository fileUserRepository; diff --git a/src/main/java/org/prgms/voucherProgram/view/Console.java b/src/main/java/org/prgms/voucherProgram/view/Console.java index 38d14f5366..e2de41ca80 100644 --- a/src/main/java/org/prgms/voucherProgram/view/Console.java +++ b/src/main/java/org/prgms/voucherProgram/view/Console.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.Scanner; +import org.prgms.voucherProgram.entity.user.User; import org.prgms.voucherProgram.entity.voucher.Voucher; import org.prgms.voucherProgram.entity.voucher.VoucherType; import org.springframework.stereotype.Component; @@ -10,11 +11,12 @@ @Component public class Console implements InputView, OutputView { private static final String PROMPT = "> "; - private static final String REQUEST_INPUT_COMMAND = "=== Voucher Program ===\nType \"exit\" to exit the program.\nType \"create\" to create a new voucher.\nType \"list\" to list all vouchers."; + private static final String REQUEST_INPUT_COMMAND = "=== Voucher Program ===\nType \"exit\" to exit the program.\nType \"create\" to create a new voucher.\nType \"list\" to list all vouchers.\nType \"blacklist\" to list all black user."; private static final String REQUEST_INPUT_VOUCHER_TYPE = "\nSelect a voucher type\nType \"1\" to create a new FixedAmountVoucher\nType \"2\" to create a new PercentDiscountVoucher"; private static final String REQUEST_INPUT_DISCOUNT_AMOUNT = "\nInput voucher discount amount : "; private static final String REQUEST_INPUT_DISCOUNT_PERCENTAGE = "\nInput voucher discount percentage : "; private static final String EMPTY_VOUCHERS = "Empty Vouchers"; + private static final String EMPTY_USERS = "Empty Users"; private static final String ERROR_INPUT_NUMBER_TYPE = "[ERROR] 정수만 입력가능합니다."; private final Scanner scanner = new Scanner(System.in); @@ -71,6 +73,20 @@ public void printAllVoucher(List vouchers) { System.out.println(); } + @Override + public void printAllUser(List users) { + if (users.isEmpty()) { + System.out.printf("\n%s%n\n", EMPTY_USERS); + return; + } + + System.out.println(); + for (User user : users) { + System.out.println(user); + } + System.out.println(); + } + @Override public void printError(String message) { System.out.println("\n" + message + "\n"); diff --git a/src/main/java/org/prgms/voucherProgram/view/OutputView.java b/src/main/java/org/prgms/voucherProgram/view/OutputView.java index a15776934f..5b35327414 100644 --- a/src/main/java/org/prgms/voucherProgram/view/OutputView.java +++ b/src/main/java/org/prgms/voucherProgram/view/OutputView.java @@ -2,6 +2,7 @@ import java.util.List; +import org.prgms.voucherProgram.entity.user.User; import org.prgms.voucherProgram.entity.voucher.Voucher; public interface OutputView { @@ -10,5 +11,7 @@ public interface OutputView { void printAllVoucher(List vouchers); + void printAllUser(List users); + void printError(String message); } From 12b2500a87233c686eb56dd0b23e35f7e3d406cd Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:36:45 +0900 Subject: [PATCH 34/62] =?UTF-8?q?refactor:=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EA=B0=80=20=EC=98=AC=EB=B0=94=EB=A5=B4?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EC=9D=84=20=EC=8B=9C=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EB=9E=A8=20=EC=A2=85=EB=A3=8C=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prgms/voucherProgram/VoucherProgram.java | 24 ++++++++++++++++--- .../voucher/FileVoucherRepository.java | 5 ++-- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java index 048fd5f9d8..830888fed8 100644 --- a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -3,6 +3,8 @@ import org.prgms.voucherProgram.entity.MenuType; import org.prgms.voucherProgram.entity.voucher.Voucher; import org.prgms.voucherProgram.entity.voucher.VoucherType; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; import org.prgms.voucherProgram.service.UserService; import org.prgms.voucherProgram.service.VoucherService; import org.prgms.voucherProgram.view.Console; @@ -34,7 +36,7 @@ public void run() { isNotEndProgram = false; break; case LIST: - outputView.printAllVoucher(voucherService.findAllVoucher()); + printVouchers(); break; case CREATE: VoucherType voucherType = inputVoucherCommand(); @@ -42,17 +44,33 @@ public void run() { outputView.printVoucher(voucher); break; case BLACKLIST: - outputView.printAllUser(userService.findBlackList()); + printBlackList(); } } } + private void printBlackList() { + try { + outputView.printAllUser(userService.findBlackList()); + } catch (IllegalArgumentException e) { + outputView.printError(e.getMessage()); + } + } + + private void printVouchers() { + try { + outputView.printAllVoucher(voucherService.findAllVoucher()); + } catch (IllegalArgumentException e) { + outputView.printError(e.getMessage()); + } + } + private Voucher createVoucher(VoucherType voucherType) { while (true) { try { long discountValue = inputView.inputDiscountValue(voucherType); return voucherService.create(voucherType, discountValue); - } catch (Exception e) { + } catch (WrongDiscountPercentException | WrongDiscountAmountException e) { outputView.printError(e.getMessage()); } } diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index c76279e041..b36088194c 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -3,7 +3,6 @@ import java.io.EOFException; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; @@ -21,7 +20,7 @@ public class FileVoucherRepository implements VoucherRepository { public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; public static final String FILE_NAME = FILE_LOCATION + "/voucherData.txt"; - private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 파일이 아닙니다."; + private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 voucher 파일이 아닙니다."; static { File file = new File(FILE_LOCATION); @@ -56,7 +55,7 @@ public List findAll() { Voucher voucher = (Voucher)objectInputStream.readObject(); vouchers.add(voucher); } - } catch (EOFException | FileNotFoundException e) { + } catch (EOFException e) { return vouchers; } catch (IOException | ClassNotFoundException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); From 4a343f9034040b5b0f85114ab8f5641a2b28f1e7 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:38:31 +0900 Subject: [PATCH 35/62] =?UTF-8?q?style:=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/prgms/voucherProgram/VoucherProgram.java | 4 ++-- src/main/java/org/prgms/voucherProgram/view/Console.java | 4 ++-- src/main/java/org/prgms/voucherProgram/view/OutputView.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java index 830888fed8..13a7dd3fa3 100644 --- a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -51,7 +51,7 @@ public void run() { private void printBlackList() { try { - outputView.printAllUser(userService.findBlackList()); + outputView.printUsers(userService.findBlackList()); } catch (IllegalArgumentException e) { outputView.printError(e.getMessage()); } @@ -59,7 +59,7 @@ private void printBlackList() { private void printVouchers() { try { - outputView.printAllVoucher(voucherService.findAllVoucher()); + outputView.printVouchers(voucherService.findAllVoucher()); } catch (IllegalArgumentException e) { outputView.printError(e.getMessage()); } diff --git a/src/main/java/org/prgms/voucherProgram/view/Console.java b/src/main/java/org/prgms/voucherProgram/view/Console.java index e2de41ca80..ef0217476f 100644 --- a/src/main/java/org/prgms/voucherProgram/view/Console.java +++ b/src/main/java/org/prgms/voucherProgram/view/Console.java @@ -60,7 +60,7 @@ public void printVoucher(Voucher voucher) { } @Override - public void printAllVoucher(List vouchers) { + public void printVouchers(List vouchers) { if (vouchers.isEmpty()) { System.out.printf("\n%s%n\n", EMPTY_VOUCHERS); return; @@ -74,7 +74,7 @@ public void printAllVoucher(List vouchers) { } @Override - public void printAllUser(List users) { + public void printUsers(List users) { if (users.isEmpty()) { System.out.printf("\n%s%n\n", EMPTY_USERS); return; diff --git a/src/main/java/org/prgms/voucherProgram/view/OutputView.java b/src/main/java/org/prgms/voucherProgram/view/OutputView.java index 5b35327414..5386a9a8b9 100644 --- a/src/main/java/org/prgms/voucherProgram/view/OutputView.java +++ b/src/main/java/org/prgms/voucherProgram/view/OutputView.java @@ -9,9 +9,9 @@ public interface OutputView { void printVoucher(Voucher voucher); - void printAllVoucher(List vouchers); + void printVouchers(List vouchers); - void printAllUser(List users); + void printUsers(List users); void printError(String message); } From 083c323bb90004488e06fb511845e8cb6d48f12e Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 00:58:40 +0900 Subject: [PATCH 36/62] =?UTF-8?q?style:=20=EC=BD=94=EB=93=9C=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=B0=8F=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringVoucherApplication.java | 1 - .../prgms/voucherProgram/VoucherProgram.java | 38 +++++++++---------- .../entity/voucher/FixedAmountVoucher.java | 2 +- .../voucher/PercentDiscountVoucher.java | 4 +- .../prgms/voucherProgram/view/Console.java | 1 + 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java b/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java index 344214fc8e..a9de7a5bc7 100644 --- a/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java +++ b/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java @@ -6,7 +6,6 @@ @SpringBootApplication public class SpringVoucherApplication { - public static void main(String[] args) { ApplicationContext applicationContext = new AnnotationConfigApplicationContext(SpringVoucherApplication.class); applicationContext.getBean(VoucherProgram.class).run(); diff --git a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java index 13a7dd3fa3..23421ddd74 100644 --- a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -49,11 +49,13 @@ public void run() { } } - private void printBlackList() { - try { - outputView.printUsers(userService.findBlackList()); - } catch (IllegalArgumentException e) { - outputView.printError(e.getMessage()); + private MenuType inputMenu() { + while (true) { + try { + return MenuType.of(inputView.inputMenu()); + } catch (Exception e) { + outputView.printError(e.getMessage()); + } } } @@ -65,17 +67,6 @@ private void printVouchers() { } } - private Voucher createVoucher(VoucherType voucherType) { - while (true) { - try { - long discountValue = inputView.inputDiscountValue(voucherType); - return voucherService.create(voucherType, discountValue); - } catch (WrongDiscountPercentException | WrongDiscountAmountException e) { - outputView.printError(e.getMessage()); - } - } - } - private VoucherType inputVoucherCommand() { while (true) { try { @@ -86,13 +77,22 @@ private VoucherType inputVoucherCommand() { } } - private MenuType inputMenu() { + private Voucher createVoucher(VoucherType voucherType) { while (true) { try { - return MenuType.of(inputView.inputMenu()); - } catch (Exception e) { + long discountValue = inputView.inputDiscountValue(voucherType); + return voucherService.create(voucherType, discountValue); + } catch (WrongDiscountPercentException | WrongDiscountAmountException e) { outputView.printError(e.getMessage()); } } } + + private void printBlackList() { + try { + outputView.printUsers(userService.findBlackList()); + } catch (IllegalArgumentException e) { + outputView.printError(e.getMessage()); + } + } } diff --git a/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java index 590af6ec09..5b7e0dc97f 100644 --- a/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java @@ -5,7 +5,7 @@ import org.prgms.voucherProgram.exception.WrongDiscountAmountException; public class FixedAmountVoucher implements Voucher { - public static final int MIN_AMOUNT = 1; + private static final int MIN_AMOUNT = 1; private final UUID voucherId; private final long discountAmount; diff --git a/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java index 07dbc5225f..0075b2b799 100644 --- a/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java @@ -5,8 +5,8 @@ import org.prgms.voucherProgram.exception.WrongDiscountPercentException; public class PercentDiscountVoucher implements Voucher { - public static final long MIN_PERCENT = 1; - public static final long MAX_PERCENT = 100; + private static final long MIN_PERCENT = 1; + private static final long MAX_PERCENT = 100; private final UUID voucherId; private final long discountPercent; diff --git a/src/main/java/org/prgms/voucherProgram/view/Console.java b/src/main/java/org/prgms/voucherProgram/view/Console.java index ef0217476f..431ffef361 100644 --- a/src/main/java/org/prgms/voucherProgram/view/Console.java +++ b/src/main/java/org/prgms/voucherProgram/view/Console.java @@ -18,6 +18,7 @@ public class Console implements InputView, OutputView { private static final String EMPTY_VOUCHERS = "Empty Vouchers"; private static final String EMPTY_USERS = "Empty Users"; private static final String ERROR_INPUT_NUMBER_TYPE = "[ERROR] 정수만 입력가능합니다."; + private final Scanner scanner = new Scanner(System.in); @Override From 387144ad8ede28f7e36e3fee514dc8c1bc0a4df3 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 01:06:45 +0900 Subject: [PATCH 37/62] =?UTF-8?q?feat:=20yaml=20properties=20=EB=B0=8F=20p?= =?UTF-8?q?rofile=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucherProgram/SpringVoucherApplication.java | 4 ++-- .../repository/voucher/FileVoucherRepository.java | 7 ++++--- .../repository/voucher/MemoryVoucherRepository.java | 2 ++ src/main/resources/application.properties | 1 - src/main/resources/application.yaml | 3 +++ 5 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yaml diff --git a/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java b/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java index a9de7a5bc7..e2fe0e9fa5 100644 --- a/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java +++ b/src/main/java/org/prgms/voucherProgram/SpringVoucherApplication.java @@ -1,13 +1,13 @@ package org.prgms.voucherProgram; +import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; @SpringBootApplication public class SpringVoucherApplication { public static void main(String[] args) { - ApplicationContext applicationContext = new AnnotationConfigApplicationContext(SpringVoucherApplication.class); + ApplicationContext applicationContext = SpringApplication.run(SpringVoucherApplication.class, args); applicationContext.getBean(VoucherProgram.class).run(); } } diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index b36088194c..0d61ba73eb 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -3,6 +3,7 @@ import java.io.EOFException; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; @@ -11,11 +12,11 @@ import java.util.List; import org.prgms.voucherProgram.entity.voucher.Voucher; -import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; @Repository -@Primary +@Profile("local") public class FileVoucherRepository implements VoucherRepository { public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; @@ -55,7 +56,7 @@ public List findAll() { Voucher voucher = (Voucher)objectInputStream.readObject(); vouchers.add(voucher); } - } catch (EOFException e) { + } catch (EOFException | FileNotFoundException e) { return vouchers; } catch (IOException | ClassNotFoundException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java index 38cfe78e37..8b34c583fd 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java @@ -7,9 +7,11 @@ import java.util.concurrent.ConcurrentHashMap; import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; @Repository +@Profile("dev") public class MemoryVoucherRepository implements VoucherRepository { private final Map storage = new ConcurrentHashMap<>(); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 8b13789179..0000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000000..d74c444c1c --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,3 @@ +spring: + profiles: + active: local From 8b4001fbe035849e39fa103e0e488d6762646c1c Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 03:09:32 +0900 Subject: [PATCH 38/62] =?UTF-8?q?fix:=20UserRepository=20=EC=A3=BC?= =?UTF-8?q?=EC=9E=85=EB=B0=A9=EC=8B=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucherProgram/service/UserService.java | 9 ++++----- .../prgms/voucherProgram/service/UserServiceTest.java | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/service/UserService.java b/src/main/java/org/prgms/voucherProgram/service/UserService.java index 2682e835f1..fc68728556 100644 --- a/src/main/java/org/prgms/voucherProgram/service/UserService.java +++ b/src/main/java/org/prgms/voucherProgram/service/UserService.java @@ -3,19 +3,18 @@ import java.util.List; import org.prgms.voucherProgram.entity.user.User; -import org.prgms.voucherProgram.repository.user.FileUserRepository; import org.prgms.voucherProgram.repository.user.UserRepository; import org.springframework.stereotype.Service; @Service public class UserService { - private final UserRepository fileUserRepository; + private final UserRepository userRepository; - public UserService(FileUserRepository fileUserRepository) { - this.fileUserRepository = fileUserRepository; + public UserService(UserRepository userRepository) { + this.userRepository = userRepository; } public List findBlackList() { - return fileUserRepository.findAll(); + return userRepository.findAll(); } } diff --git a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java index 1948da2e69..e3ad8ffbb3 100644 --- a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java +++ b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java @@ -12,19 +12,19 @@ import org.prgms.voucherProgram.repository.user.UserRepository; class UserServiceTest { - UserRepository userRepository = new UserRepository() { + UserService userService = new UserService(new UserRepository() { @Override public List findAll() { return Arrays.asList(new User(UUID.randomUUID(), "jin"), new User(UUID.randomUUID(), "hwan"), new User(UUID.randomUUID(), "pobi")); } - }; + }); @DisplayName("모든 유저를 반환한다.") @Test void findAll_ReturnAllVoucher() { - assertThat(userRepository.findAll()).hasSize(3) + assertThat(userService.findBlackList()).hasSize(3) .extracting("name").contains("hwan", "jin", "pobi"); } } From b177ab8fa6e936477ff1945dae2383e120ce2b23 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 03:20:07 +0900 Subject: [PATCH 39/62] =?UTF-8?q?refactor:=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/user/FileUserRepository.java | 24 ++++++++++--------- .../voucher/FileVoucherRepository.java | 9 +------ .../file}/customer_blacklist.csv | 0 3 files changed, 14 insertions(+), 19 deletions(-) rename src/main/{java/org/prgms/voucherProgram/repository/filedata => resources/file}/customer_blacklist.csv (100%) diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index f70b6dc199..b195bb6006 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -12,28 +12,30 @@ @Repository public class FileUserRepository implements UserRepository { - public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; - public static final String FILE_NAME = FILE_LOCATION + "/customer_blacklist.csv"; + private static final String FILE_NAME = "src/main/resources/file/customer_blacklist.csv"; private static final String DELIMITER = ","; private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 유저 파일이 아닙니다."; private static final int USER_ID_INDEX = 0; - private static final int USER_NAEM_INDEX = 1; + private static final int USER_NAME_INDEX = 1; public List findAll() { List users = new ArrayList<>(); try (BufferedReader bufferedReader = new BufferedReader(new FileReader(FILE_NAME))) { - String line; - - while ((line = bufferedReader.readLine()) != null) { - String[] splitLine = line.split(DELIMITER); - UUID userId = UUID.fromString(splitLine[USER_ID_INDEX].trim()); - String userName = splitLine[USER_NAEM_INDEX].trim(); - users.add(new User(userId, userName)); - } + addUsers(users, bufferedReader); } catch (IOException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); } return users; } + + private void addUsers(List users, BufferedReader bufferedReader) throws IOException { + String line; + while ((line = bufferedReader.readLine()) != null) { + String[] splitLine = line.split(DELIMITER); + UUID userId = UUID.fromString(splitLine[USER_ID_INDEX].trim()); + String userName = splitLine[USER_NAME_INDEX].trim(); + users.add(new User(userId, userName)); + } + } } diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index 0d61ba73eb..1e3952f1a3 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -1,7 +1,6 @@ package org.prgms.voucherProgram.repository.voucher; import java.io.EOFException; -import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -19,15 +18,9 @@ @Profile("local") public class FileVoucherRepository implements VoucherRepository { - public static final String FILE_LOCATION = "./src/main/java/org/prgms/voucherProgram/repository/filedata"; - public static final String FILE_NAME = FILE_LOCATION + "/voucherData.txt"; + public static final String FILE_NAME = "src/main/resources/file/voucherData.txt"; private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 voucher 파일이 아닙니다."; - static { - File file = new File(FILE_LOCATION); - file.mkdirs(); - } - @Override public Voucher save(Voucher voucher) { saveVoucherAtFile(voucher); diff --git a/src/main/java/org/prgms/voucherProgram/repository/filedata/customer_blacklist.csv b/src/main/resources/file/customer_blacklist.csv similarity index 100% rename from src/main/java/org/prgms/voucherProgram/repository/filedata/customer_blacklist.csv rename to src/main/resources/file/customer_blacklist.csv From 80a5955224191a265a0582f5517531b19e119ed6 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 03:26:18 +0900 Subject: [PATCH 40/62] =?UTF-8?q?docs:=20docs/README.md=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/README.md b/docs/README.md index 59f861fc4b..2927cd4bc2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -7,9 +7,8 @@ - [x] Maven / Gradle 로 프로젝트를 실제로 구성하고 이때 Spring Boot CLI를 개발PC에 설치해서 명령어들을 사용해보고 프로젝트를 만든다. 그리고 IDE (IntelliJ)에서 실행시켜 본다. -- [ ] 바우처 관리 Command-line Application을 만들어본다. +- [x] 바우처 관리 Command-line Application을 만들어본다. - - 참고: [https://dzone.com/articles/interactive-console-applications-in-java](https://dzone.com/articles/interactive-console-applications-in-java) - [x] 스프링부트 애플리케이션으로 만든다. (Web기능이 없이만듭니다. 즉, 서버가 띄지 않고 커맨드라인 애플리케이션으로 동작해야한다.) - [x] 프로그램이 시작하면 다음과 같이 지원가능한 명령어를 알려준다. @@ -32,11 +31,11 @@ (심화) 파일을 통한 데이터관리 기능과 고객 블랙 리스트 명단 관리기능 -- [ ] 메모리 관리가 아닌 파일로 관리가 되는 Repository를 한번 만들어보세요. +- [x] 메모리 관리가 아닌 파일로 관리가 되는 Repository를 한번 만들어보세요. - 기존 메모리 레포지토리는 지우지 말고 개발 프로파일에서만 동작하게 해보세요. -- [ ] 고객 블랙 리스트 명단을 작성한다. +- [x] 고객 블랙 리스트 명단을 작성한다. - customer_blacklist.csv 파일을 만들고 스프링 애플리케이션에서 해당 파일을 읽을 수 있고 블랙 리스트조회 할 수있다 (추가할 필요는 없어요. 블랙리스트는 파일로만 관리된다고 가정합니다.) -- [ ] YAML 프라퍼티를 만들고 어떤 설정을 만들수 있을지 고민해본다. +- [x] YAML 프라퍼티를 만들고 어떤 설정을 만들수 있을지 고민해본다. ### 구현해야 할 기능 목록 From 7dd78a2b4428016c7d2d852f3594ba1c5c33ec13 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 16:11:42 +0900 Subject: [PATCH 41/62] =?UTF-8?q?feat:=20logger=20=EA=B8=B0=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++- .../prgms/voucherProgram/VoucherProgram.java | 30 +++++++++++-------- .../repository/user/FileUserRepository.java | 7 ++++- .../repository/user/UserRepository.java | 2 +- .../voucher/FileVoucherRepository.java | 16 +++++----- .../voucher/MemoryVoucherRepository.java | 5 ++++ .../voucherProgram/service/UserService.java | 7 ++++- .../service/VoucherService.java | 8 ++++- .../prgms/voucherProgram/view/Console.java | 6 +++- .../user/FileUserRepositoryTest.java | 2 +- .../service/UserServiceTest.java | 13 ++------ 11 files changed, 66 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index e1c1ca85a9..c654d6f2c7 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - 4.0.0 @@ -27,6 +27,12 @@ spring-boot-starter-test test + + + org.springframework.boot + spring-boot-configuration-processor + true + diff --git a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java index 23421ddd74..dbaf0dc7a7 100644 --- a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -3,17 +3,19 @@ import org.prgms.voucherProgram.entity.MenuType; import org.prgms.voucherProgram.entity.voucher.Voucher; import org.prgms.voucherProgram.entity.voucher.VoucherType; -import org.prgms.voucherProgram.exception.WrongDiscountAmountException; -import org.prgms.voucherProgram.exception.WrongDiscountPercentException; import org.prgms.voucherProgram.service.UserService; import org.prgms.voucherProgram.service.VoucherService; import org.prgms.voucherProgram.view.Console; import org.prgms.voucherProgram.view.InputView; import org.prgms.voucherProgram.view.OutputView; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component public class VoucherProgram { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final VoucherService voucherService; private final UserService userService; private final InputView inputView; @@ -31,20 +33,17 @@ public void run() { while (isNotEndProgram) { MenuType menuType = inputMenu(); + logger.info("{} menu select", menuType); switch (menuType) { - case EXIT: - isNotEndProgram = false; - break; - case LIST: - printVouchers(); - break; - case CREATE: + case EXIT -> isNotEndProgram = false; + case LIST -> printVouchers(); + case CREATE -> { VoucherType voucherType = inputVoucherCommand(); + logger.info("{} select", voucherType); Voucher voucher = createVoucher(voucherType); outputView.printVoucher(voucher); - break; - case BLACKLIST: - printBlackList(); + } + case BLACKLIST -> printBlackList(); } } } @@ -54,6 +53,7 @@ private MenuType inputMenu() { try { return MenuType.of(inputView.inputMenu()); } catch (Exception e) { + logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } @@ -63,6 +63,7 @@ private void printVouchers() { try { outputView.printVouchers(voucherService.findAllVoucher()); } catch (IllegalArgumentException e) { + logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } @@ -72,6 +73,7 @@ private VoucherType inputVoucherCommand() { try { return VoucherType.findByCommand(inputView.inputVoucherCommand()); } catch (Exception e) { + logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } @@ -82,7 +84,8 @@ private Voucher createVoucher(VoucherType voucherType) { try { long discountValue = inputView.inputDiscountValue(voucherType); return voucherService.create(voucherType, discountValue); - } catch (WrongDiscountPercentException | WrongDiscountAmountException e) { + } catch (Exception e) { + logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } @@ -92,6 +95,7 @@ private void printBlackList() { try { outputView.printUsers(userService.findBlackList()); } catch (IllegalArgumentException e) { + logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index b195bb6006..b05a8db53f 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -8,6 +8,8 @@ import java.util.UUID; import org.prgms.voucherProgram.entity.user.User; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Repository; @Repository @@ -18,7 +20,9 @@ public class FileUserRepository implements UserRepository { private static final int USER_ID_INDEX = 0; private static final int USER_NAME_INDEX = 1; - public List findAll() { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + public List findBlackUsers() { List users = new ArrayList<>(); try (BufferedReader bufferedReader = new BufferedReader(new FileReader(FILE_NAME))) { @@ -26,6 +30,7 @@ public List findAll() { } catch (IOException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); } + logger.info("BlackUsers read at File => {}", users); return users; } diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java index 67cfda2d50..f563abe4f0 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/UserRepository.java @@ -5,5 +5,5 @@ import org.prgms.voucherProgram.entity.user.User; public interface UserRepository { - List findAll(); + List findBlackUsers(); } diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index 1e3952f1a3..ffb85d60da 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -11,27 +11,28 @@ import java.util.List; import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; @Repository @Profile("local") public class FileVoucherRepository implements VoucherRepository { - public static final String FILE_NAME = "src/main/resources/file/voucherData.txt"; private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 voucher 파일이 아닙니다."; + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Override public Voucher save(Voucher voucher) { saveVoucherAtFile(voucher); + logger.info("Voucher save at file => {}", voucher); return voucher; } private void saveVoucherAtFile(Voucher voucher) { - try ( - ObjectOutputStream objectOutputStream = new ObjectOutputStream( - new FileOutputStream(FILE_NAME, true)) - ) { + try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(FILE_NAME, true))) { objectOutputStream.writeObject(voucher); } catch (IOException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); @@ -41,15 +42,14 @@ private void saveVoucherAtFile(Voucher voucher) { @Override public List findAll() { List vouchers = new ArrayList<>(); - try ( - FileInputStream fileInputStream = new FileInputStream(FILE_NAME) - ) { + try (FileInputStream fileInputStream = new FileInputStream(FILE_NAME)) { while (true) { ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream); Voucher voucher = (Voucher)objectInputStream.readObject(); vouchers.add(voucher); } } catch (EOFException | FileNotFoundException e) { + logger.info("Voucher read at file => {}", vouchers); return vouchers; } catch (IOException | ClassNotFoundException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java index 8b34c583fd..ed8bfa3ae3 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java @@ -7,6 +7,8 @@ import java.util.concurrent.ConcurrentHashMap; import org.prgms.voucherProgram.entity.voucher.Voucher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; @@ -14,16 +16,19 @@ @Profile("dev") public class MemoryVoucherRepository implements VoucherRepository { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Map storage = new ConcurrentHashMap<>(); @Override public Voucher save(Voucher voucher) { storage.put(voucher.getVoucherId(), voucher); + logger.info("Voucher save at memory => {}", voucher); return voucher; } @Override public List findAll() { + logger.info("Voucher read at memory => {}", storage.values()); return new ArrayList<>(storage.values()); } } diff --git a/src/main/java/org/prgms/voucherProgram/service/UserService.java b/src/main/java/org/prgms/voucherProgram/service/UserService.java index fc68728556..7db4951a49 100644 --- a/src/main/java/org/prgms/voucherProgram/service/UserService.java +++ b/src/main/java/org/prgms/voucherProgram/service/UserService.java @@ -4,17 +4,22 @@ import org.prgms.voucherProgram.entity.user.User; import org.prgms.voucherProgram.repository.user.UserRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service public class UserService { private final UserRepository userRepository; + private final Logger logger = LoggerFactory.getLogger(this.getClass()); public UserService(UserRepository userRepository) { this.userRepository = userRepository; } public List findBlackList() { - return userRepository.findAll(); + List blackUsers = userRepository.findBlackUsers(); + logger.info("BlackUsers find at repository => {}", blackUsers); + return blackUsers; } } diff --git a/src/main/java/org/prgms/voucherProgram/service/VoucherService.java b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java index 0d23cc6754..3698b95a5e 100644 --- a/src/main/java/org/prgms/voucherProgram/service/VoucherService.java +++ b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java @@ -10,11 +10,14 @@ import org.prgms.voucherProgram.exception.WrongDiscountAmountException; import org.prgms.voucherProgram.exception.WrongDiscountPercentException; import org.prgms.voucherProgram.repository.voucher.VoucherRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service public class VoucherService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final VoucherRepository repository; public VoucherService(VoucherRepository repository) { @@ -25,6 +28,7 @@ public Voucher create(VoucherType voucherType, long value) throws WrongDiscountAmountException, WrongDiscountPercentException { Voucher voucher = getVoucher(voucherType, value); + logger.info("Voucher create => {}", voucher); return repository.save(voucher); } @@ -39,6 +43,8 @@ private Voucher getVoucher(VoucherType voucherType, long value) throws } public List findAllVoucher() { - return repository.findAll(); + List vouchers = repository.findAll(); + logger.info("Vouchers find at Repository => {}", vouchers); + return vouchers; } } diff --git a/src/main/java/org/prgms/voucherProgram/view/Console.java b/src/main/java/org/prgms/voucherProgram/view/Console.java index 431ffef361..0c0d6a36e8 100644 --- a/src/main/java/org/prgms/voucherProgram/view/Console.java +++ b/src/main/java/org/prgms/voucherProgram/view/Console.java @@ -6,6 +6,8 @@ import org.prgms.voucherProgram.entity.user.User; import org.prgms.voucherProgram.entity.voucher.Voucher; import org.prgms.voucherProgram.entity.voucher.VoucherType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component @@ -18,7 +20,8 @@ public class Console implements InputView, OutputView { private static final String EMPTY_VOUCHERS = "Empty Vouchers"; private static final String EMPTY_USERS = "Empty Users"; private static final String ERROR_INPUT_NUMBER_TYPE = "[ERROR] 정수만 입력가능합니다."; - + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Scanner scanner = new Scanner(System.in); @Override @@ -51,6 +54,7 @@ private Long convertToLong(String input) { try { return Long.parseLong(input); } catch (NumberFormatException e) { + logger.error(e.getMessage()); throw new IllegalArgumentException(ERROR_INPUT_NUMBER_TYPE); } } diff --git a/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java index 8208b139a4..de3858988b 100644 --- a/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java +++ b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java @@ -11,7 +11,7 @@ class FileUserRepositoryTest { @DisplayName("파일에 저장되어 있는 모든 User를 List형으로 반환한다.") @Test void findAll_ReturnAllUser() { - Assertions.assertThat(fileUserRepository.findAll()).hasSize(3) + Assertions.assertThat(fileUserRepository.findBlackUsers()).hasSize(3) .extracting("name").contains("hwan", "jin", "pobi"); } } diff --git a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java index e3ad8ffbb3..a1cadb4480 100644 --- a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java +++ b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java @@ -3,23 +3,16 @@ import static org.assertj.core.api.Assertions.*; import java.util.Arrays; -import java.util.List; import java.util.UUID; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.prgms.voucherProgram.entity.user.User; -import org.prgms.voucherProgram.repository.user.UserRepository; class UserServiceTest { - UserService userService = new UserService(new UserRepository() { - @Override - public List findAll() { - return Arrays.asList(new User(UUID.randomUUID(), "jin"), - new User(UUID.randomUUID(), "hwan"), - new User(UUID.randomUUID(), "pobi")); - } - }); + UserService userService = new UserService(() -> Arrays.asList(new User(UUID.randomUUID(), "jin"), + new User(UUID.randomUUID(), "hwan"), + new User(UUID.randomUUID(), "pobi"))); @DisplayName("모든 유저를 반환한다.") @Test From f189fa22866287395eebd58e61b93ddc34f12139 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 16:49:11 +0900 Subject: [PATCH 42/62] =?UTF-8?q?feat:=20logback=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prgms/voucherProgram/view/Console.java | 1 - src/main/resources/logback-spring.xml | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/logback-spring.xml diff --git a/src/main/java/org/prgms/voucherProgram/view/Console.java b/src/main/java/org/prgms/voucherProgram/view/Console.java index 0c0d6a36e8..59fed85c07 100644 --- a/src/main/java/org/prgms/voucherProgram/view/Console.java +++ b/src/main/java/org/prgms/voucherProgram/view/Console.java @@ -54,7 +54,6 @@ private Long convertToLong(String input) { try { return Long.parseLong(input); } catch (NumberFormatException e) { - logger.error(e.getMessage()); throw new IllegalArgumentException(ERROR_INPUT_NUMBER_TYPE); } } diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..b2400e3236 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,35 @@ + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ERROR + ACCEPT + DENY + + + logs/voucherError-%d{yyyy-MM-dd}.log + + + ${FILE_LOG_PATTERN} + + + + + + + + + From 3d2286a70e8c7384cecb40a77f8f289d769b98de Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 17:05:38 +0900 Subject: [PATCH 43/62] =?UTF-8?q?fix:=20=ED=8C=8C=EC=9D=BC=20=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=EA=B0=80=20=EC=98=AC=EB=B0=94=EB=A5=B4=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=84=20=EC=8B=9C=20=ED=94=84=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=A8=20=EC=A2=85=EB=A3=8C=ED=95=98=EC=A7=80=20=EB=AA=BB?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/prgms/voucherProgram/VoucherProgram.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java index dbaf0dc7a7..262d9538e1 100644 --- a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -3,6 +3,8 @@ import org.prgms.voucherProgram.entity.MenuType; import org.prgms.voucherProgram.entity.voucher.Voucher; import org.prgms.voucherProgram.entity.voucher.VoucherType; +import org.prgms.voucherProgram.exception.WrongDiscountAmountException; +import org.prgms.voucherProgram.exception.WrongDiscountPercentException; import org.prgms.voucherProgram.service.UserService; import org.prgms.voucherProgram.service.VoucherService; import org.prgms.voucherProgram.view.Console; @@ -65,6 +67,7 @@ private void printVouchers() { } catch (IllegalArgumentException e) { logger.error(e.getMessage()); outputView.printError(e.getMessage()); + System.exit(0); } } @@ -84,7 +87,11 @@ private Voucher createVoucher(VoucherType voucherType) { try { long discountValue = inputView.inputDiscountValue(voucherType); return voucherService.create(voucherType, discountValue); - } catch (Exception e) { + } catch (IllegalArgumentException e) { + logger.error(e.getMessage()); + outputView.printError(e.getMessage()); + System.exit(0); + } catch (WrongDiscountPercentException | WrongDiscountAmountException e) { logger.error(e.getMessage()); outputView.printError(e.getMessage()); } @@ -97,6 +104,7 @@ private void printBlackList() { } catch (IllegalArgumentException e) { logger.error(e.getMessage()); outputView.printError(e.getMessage()); + System.exit(0); } } } From 28e2ce6e27f644a2c9b4aa213c471f8757d0806b Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 20:00:37 +0900 Subject: [PATCH 44/62] =?UTF-8?q?refactor:=20=EB=B8=94=EB=9E=99=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20resource?= =?UTF-8?q?=EB=A1=9C=20=EC=A3=BC=EC=9E=85=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/AppConfiguration.java | 19 +++++++++++++++++++ .../repository/user/FileUserRepository.java | 13 ++++++++++--- src/main/resources/application.yaml | 4 ++++ .../user/FileUserRepositoryTest.java | 6 ++++-- 4 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java diff --git a/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java b/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java new file mode 100644 index 0000000000..ac2e87f18a --- /dev/null +++ b/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java @@ -0,0 +1,19 @@ +package org.prgms.voucherProgram.configuration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.Resource; + +@Configuration +public class AppConfiguration { + + @Value("${file.path.blacklist}") + private String blacklistFilePath; + + @Bean + Resource blacklistResource() { + return new ClassPathResource(blacklistFilePath); + } +} diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index b05a8db53f..f0193a0706 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -1,8 +1,8 @@ package org.prgms.voucherProgram.repository.user; import java.io.BufferedReader; -import java.io.FileReader; import java.io.IOException; +import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -10,23 +10,30 @@ import org.prgms.voucherProgram.entity.user.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.core.io.Resource; import org.springframework.stereotype.Repository; @Repository public class FileUserRepository implements UserRepository { - private static final String FILE_NAME = "src/main/resources/file/customer_blacklist.csv"; private static final String DELIMITER = ","; private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 유저 파일이 아닙니다."; private static final int USER_ID_INDEX = 0; private static final int USER_NAME_INDEX = 1; private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final Resource userResource; + + public FileUserRepository(Resource userResource) { + this.userResource = userResource; + } public List findBlackUsers() { List users = new ArrayList<>(); - try (BufferedReader bufferedReader = new BufferedReader(new FileReader(FILE_NAME))) { + try { + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(userResource.getInputStream())); addUsers(users, bufferedReader); + bufferedReader.close(); } catch (IOException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index d74c444c1c..c3ee909c86 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,3 +1,7 @@ spring: profiles: active: local + +file: + path: + blacklist: file/customer_blacklist.csv diff --git a/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java index de3858988b..01f80c3160 100644 --- a/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java +++ b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java @@ -3,14 +3,16 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.core.io.ClassPathResource; class FileUserRepositoryTest { - FileUserRepository fileUserRepository = new FileUserRepository(); + FileUserRepository fileUserRepository = new FileUserRepository( + new ClassPathResource("file/customer_blacklist.csv")); @DisplayName("파일에 저장되어 있는 모든 User를 List형으로 반환한다.") @Test - void findAll_ReturnAllUser() { + void findBlackUsers_ReturnBlackUsers() { Assertions.assertThat(fileUserRepository.findBlackUsers()).hasSize(3) .extracting("name").contains("hwan", "jin", "pobi"); } From b3249c2b1e1db626bcdc2b9d544f53595b42b764 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 20:04:29 +0900 Subject: [PATCH 45/62] =?UTF-8?q?refactor:=20try=20with=20resources?= =?UTF-8?q?=EB=A1=9C=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 --- .../voucherProgram/repository/user/FileUserRepository.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index f0193a0706..27a57a8270 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -29,11 +29,8 @@ public FileUserRepository(Resource userResource) { public List findBlackUsers() { List users = new ArrayList<>(); - - try { - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(userResource.getInputStream())); + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(userResource.getInputStream()))) { addUsers(users, bufferedReader); - bufferedReader.close(); } catch (IOException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); } From e64c01c314f50640af46b80ad6f1ae5b80a5e813 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 21:16:40 +0900 Subject: [PATCH 46/62] =?UTF-8?q?style:=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucherProgram/entity/voucher/FixedAmountVoucher.java | 6 +++++- .../entity/voucher/PercentDiscountVoucher.java | 6 +++++- .../java/org/prgms/voucherProgram/service/UserService.java | 2 +- .../org/prgms/voucherProgram/service/VoucherService.java | 6 +++--- src/main/java/org/prgms/voucherProgram/view/Console.java | 3 --- .../org/prgms/voucherProgram/service/UserServiceTest.java | 2 +- .../prgms/voucherProgram/service/VoucherServiceTest.java | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java index 5b7e0dc97f..c87b78f5e4 100644 --- a/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/FixedAmountVoucher.java @@ -17,11 +17,15 @@ public FixedAmountVoucher(UUID voucherId, long discountAmount) throws WrongDisco } private void validateDiscountAmount(long discountAmount) throws WrongDiscountAmountException { - if (discountAmount < MIN_AMOUNT) { + if (isUnderMinAmount(discountAmount)) { throw new WrongDiscountAmountException(); } } + private boolean isUnderMinAmount(long discountAmount) { + return discountAmount < MIN_AMOUNT; + } + @Override public long discount(long beforeDiscount) { return beforeDiscount - discountAmount; diff --git a/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java b/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java index 0075b2b799..c4bfbd3894 100644 --- a/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java +++ b/src/main/java/org/prgms/voucherProgram/entity/voucher/PercentDiscountVoucher.java @@ -18,11 +18,15 @@ public PercentDiscountVoucher(UUID voucherId, long discountPercent) throws Wrong } private void validateDiscountPercent(long discountPercent) throws WrongDiscountPercentException { - if (MAX_PERCENT < discountPercent || discountPercent < MIN_PERCENT) { + if (isWrongPercent(discountPercent)) { throw new WrongDiscountPercentException(); } } + private boolean isWrongPercent(long discountPercent) { + return MAX_PERCENT < discountPercent || discountPercent < MIN_PERCENT; + } + @Override public long discount(long beforeDiscount) { return (long)(beforeDiscount * (1 - (discountPercent / 100.0))); diff --git a/src/main/java/org/prgms/voucherProgram/service/UserService.java b/src/main/java/org/prgms/voucherProgram/service/UserService.java index 7db4951a49..9cfef67998 100644 --- a/src/main/java/org/prgms/voucherProgram/service/UserService.java +++ b/src/main/java/org/prgms/voucherProgram/service/UserService.java @@ -19,7 +19,7 @@ public UserService(UserRepository userRepository) { public List findBlackList() { List blackUsers = userRepository.findBlackUsers(); - logger.info("BlackUsers find at repository => {}", blackUsers); + logger.info("BlackUsers find at repository => {}", blackUsers.size()); return blackUsers; } } diff --git a/src/main/java/org/prgms/voucherProgram/service/VoucherService.java b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java index 3698b95a5e..24fef13fce 100644 --- a/src/main/java/org/prgms/voucherProgram/service/VoucherService.java +++ b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java @@ -27,12 +27,12 @@ public VoucherService(VoucherRepository repository) { public Voucher create(VoucherType voucherType, long value) throws WrongDiscountAmountException, WrongDiscountPercentException { - Voucher voucher = getVoucher(voucherType, value); + Voucher voucher = createVoucher(voucherType, value); logger.info("Voucher create => {}", voucher); return repository.save(voucher); } - private Voucher getVoucher(VoucherType voucherType, long value) throws + private Voucher createVoucher(VoucherType voucherType, long value) throws WrongDiscountAmountException, WrongDiscountPercentException { if (voucherType == VoucherType.FIXED_AMOUNT) { @@ -44,7 +44,7 @@ private Voucher getVoucher(VoucherType voucherType, long value) throws public List findAllVoucher() { List vouchers = repository.findAll(); - logger.info("Vouchers find at Repository => {}", vouchers); + logger.info("Vouchers find at Repository => {}", vouchers.size()); return vouchers; } } diff --git a/src/main/java/org/prgms/voucherProgram/view/Console.java b/src/main/java/org/prgms/voucherProgram/view/Console.java index 59fed85c07..40cc6167cb 100644 --- a/src/main/java/org/prgms/voucherProgram/view/Console.java +++ b/src/main/java/org/prgms/voucherProgram/view/Console.java @@ -6,8 +6,6 @@ import org.prgms.voucherProgram.entity.user.User; import org.prgms.voucherProgram.entity.voucher.Voucher; import org.prgms.voucherProgram.entity.voucher.VoucherType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component @@ -21,7 +19,6 @@ public class Console implements InputView, OutputView { private static final String EMPTY_USERS = "Empty Users"; private static final String ERROR_INPUT_NUMBER_TYPE = "[ERROR] 정수만 입력가능합니다."; - private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Scanner scanner = new Scanner(System.in); @Override diff --git a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java index a1cadb4480..92ff8ed22b 100644 --- a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java +++ b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java @@ -16,7 +16,7 @@ class UserServiceTest { @DisplayName("모든 유저를 반환한다.") @Test - void findAll_ReturnAllVoucher() { + void findBlackList_ReturnBlackUsers() { assertThat(userService.findBlackList()).hasSize(3) .extracting("name").contains("hwan", "jin", "pobi"); } diff --git a/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java index 598c8d4bba..2e942fb4b9 100644 --- a/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java +++ b/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java @@ -60,7 +60,7 @@ void create_PercentDiscountType_ReturnPercentDiscountVoucher() throws @DisplayName("모든 바우처를 반환한다.") @Test - void findAll_ReturnAllVoucher() { + void findAllVoucher_ReturnAllVoucher() { List vouchers = voucherService.findAllVoucher(); assertThat(vouchers).hasSize(2); From aa53602ae1ebf12bd010a0621e57234cd80a5df0 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 21:18:22 +0900 Subject: [PATCH 47/62] =?UTF-8?q?docs:=20docs/README.md=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index 2927cd4bc2..ab19f454d6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -25,9 +25,9 @@ - list 커맨드를 통해 만들어진 바우처를 조회할 수 있다. - 바우처 정보를 매모리에 관리한다. 어플리케이션이 종료가 되어 데이터가 모두 사라져도 괜찮습니다. (나중에 영속성을 가지도록 변경할거에요 걱정마세요!) -- [ ] 적절한 로그를 기록하고 `logback` 설정을해서 에러는 파일로 기록된다. +- [x] 적절한 로그를 기록하고 `logback` 설정을해서 에러는 파일로 기록된다. -- [ ] 실행가능한 `jar` 파일을 생성한다. +- [x] 실행가능한 `jar` 파일을 생성한다. (심화) 파일을 통한 데이터관리 기능과 고객 블랙 리스트 명단 관리기능 @@ -53,7 +53,14 @@ - [x] 출력 - [x] 바우처 조회 + - [x] 블랙 리스트 조회 - [x] 바우처 - - [x] 원하는 바우처로 생성 - - [x] 바우처 정보 저장 + - [x] 메모리, 파일 + - [x] 원하는 바우처로 생성 + - [x] 바우처 정보 저장 + - [x] 저장한 바우처들 반환 + +- [x] 블랙리스트 + - [x] 파일 + - [x] 저장한 블랙리스트 반환 From 18f22815f05107aec701033f526c47e6bad48684 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 21:46:58 +0900 Subject: [PATCH 48/62] =?UTF-8?q?style:=20=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucherProgram/repository/user/FileUserRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index 27a57a8270..62aa012eab 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -30,7 +30,7 @@ public FileUserRepository(Resource userResource) { public List findBlackUsers() { List users = new ArrayList<>(); try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(userResource.getInputStream()))) { - addUsers(users, bufferedReader); + addBlackUsers(users, bufferedReader); } catch (IOException e) { throw new IllegalArgumentException(ERROR_WRONG_FILE); } @@ -38,7 +38,7 @@ public List findBlackUsers() { return users; } - private void addUsers(List users, BufferedReader bufferedReader) throws IOException { + private void addBlackUsers(List users, BufferedReader bufferedReader) throws IOException { String line; while ((line = bufferedReader.readLine()) != null) { String[] splitLine = line.split(DELIMITER); From 19732fefb24e2cffa7c301b62c4a2ca5ee1565b0 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 22:06:25 +0900 Subject: [PATCH 49/62] =?UTF-8?q?refactor:=20resource=EB=A5=BC=20applicati?= =?UTF-8?q?onContext=EA=B0=80=20=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucherProgram/configuration/AppConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java b/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java index ac2e87f18a..5a11a1591d 100644 --- a/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java +++ b/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java @@ -1,9 +1,9 @@ package org.prgms.voucherProgram.configuration; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @Configuration @@ -13,7 +13,7 @@ public class AppConfiguration { private String blacklistFilePath; @Bean - Resource blacklistResource() { - return new ClassPathResource(blacklistFilePath); + Resource blacklistResource(ApplicationContext applicationContext) { + return applicationContext.getResource(blacklistFilePath); } } From 399d6aaf618034ca52593da5867f3eac5612a95f Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Sun, 10 Apr 2022 22:24:57 +0900 Subject: [PATCH 50/62] =?UTF-8?q?fix:=20voucher=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/voucher/FileVoucherRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index ffb85d60da..4259738103 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -19,7 +19,7 @@ @Repository @Profile("local") public class FileVoucherRepository implements VoucherRepository { - public static final String FILE_NAME = "src/main/resources/file/voucherData.txt"; + public static final String FILE_NAME = "./voucherData.txt"; private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 voucher 파일이 아닙니다."; private final Logger logger = LoggerFactory.getLogger(this.getClass()); From 70d5d56a02089e10488eccb09040ced4f11823ad Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Mon, 11 Apr 2022 22:51:40 +0900 Subject: [PATCH 51/62] =?UTF-8?q?refactor:=20log=20=EC=BD=98=EC=86=94?= =?UTF-8?q?=EC=97=90=20=EC=95=88=20=EC=B0=8D=ED=9E=88=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback-spring.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index b2400e3236..ad7fc4d273 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -27,8 +27,7 @@ - - + From ca2b2312f9287696fbb2ead1bb53c7b94c8572db Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Mon, 11 Apr 2022 23:04:18 +0900 Subject: [PATCH 52/62] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20log=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=97=90=EC=84=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=EB=A5=BC=20=EB=AA=BB=20=EA=B0=80=EC=A0=B8=EC=98=AC=20=EC=8B=9C?= =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/prgms/voucherProgram/VoucherProgram.java | 12 ------------ .../repository/user/FileUserRepository.java | 2 +- .../repository/voucher/FileVoucherRepository.java | 4 ++-- .../repository/voucher/MemoryVoucherRepository.java | 5 ----- .../prgms/voucherProgram/service/UserService.java | 7 +------ .../prgms/voucherProgram/service/VoucherService.java | 8 +------- 6 files changed, 5 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java index 262d9538e1..4fd424e962 100644 --- a/src/main/java/org/prgms/voucherProgram/VoucherProgram.java +++ b/src/main/java/org/prgms/voucherProgram/VoucherProgram.java @@ -10,14 +10,10 @@ import org.prgms.voucherProgram.view.Console; import org.prgms.voucherProgram.view.InputView; import org.prgms.voucherProgram.view.OutputView; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component public class VoucherProgram { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final VoucherService voucherService; private final UserService userService; private final InputView inputView; @@ -35,13 +31,11 @@ public void run() { while (isNotEndProgram) { MenuType menuType = inputMenu(); - logger.info("{} menu select", menuType); switch (menuType) { case EXIT -> isNotEndProgram = false; case LIST -> printVouchers(); case CREATE -> { VoucherType voucherType = inputVoucherCommand(); - logger.info("{} select", voucherType); Voucher voucher = createVoucher(voucherType); outputView.printVoucher(voucher); } @@ -55,7 +49,6 @@ private MenuType inputMenu() { try { return MenuType.of(inputView.inputMenu()); } catch (Exception e) { - logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } @@ -65,7 +58,6 @@ private void printVouchers() { try { outputView.printVouchers(voucherService.findAllVoucher()); } catch (IllegalArgumentException e) { - logger.error(e.getMessage()); outputView.printError(e.getMessage()); System.exit(0); } @@ -76,7 +68,6 @@ private VoucherType inputVoucherCommand() { try { return VoucherType.findByCommand(inputView.inputVoucherCommand()); } catch (Exception e) { - logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } @@ -88,11 +79,9 @@ private Voucher createVoucher(VoucherType voucherType) { long discountValue = inputView.inputDiscountValue(voucherType); return voucherService.create(voucherType, discountValue); } catch (IllegalArgumentException e) { - logger.error(e.getMessage()); outputView.printError(e.getMessage()); System.exit(0); } catch (WrongDiscountPercentException | WrongDiscountAmountException e) { - logger.error(e.getMessage()); outputView.printError(e.getMessage()); } } @@ -102,7 +91,6 @@ private void printBlackList() { try { outputView.printUsers(userService.findBlackList()); } catch (IllegalArgumentException e) { - logger.error(e.getMessage()); outputView.printError(e.getMessage()); System.exit(0); } diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index 62aa012eab..b9bd90bc99 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -32,9 +32,9 @@ public List findBlackUsers() { try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(userResource.getInputStream()))) { addBlackUsers(users, bufferedReader); } catch (IOException e) { + logger.error(e.getMessage()); throw new IllegalArgumentException(ERROR_WRONG_FILE); } - logger.info("BlackUsers read at File => {}", users); return users; } diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index 4259738103..01b86df266 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -27,7 +27,6 @@ public class FileVoucherRepository implements VoucherRepository { @Override public Voucher save(Voucher voucher) { saveVoucherAtFile(voucher); - logger.info("Voucher save at file => {}", voucher); return voucher; } @@ -35,6 +34,7 @@ private void saveVoucherAtFile(Voucher voucher) { try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(FILE_NAME, true))) { objectOutputStream.writeObject(voucher); } catch (IOException e) { + logger.error(e.getMessage()); throw new IllegalArgumentException(ERROR_WRONG_FILE); } } @@ -49,9 +49,9 @@ public List findAll() { vouchers.add(voucher); } } catch (EOFException | FileNotFoundException e) { - logger.info("Voucher read at file => {}", vouchers); return vouchers; } catch (IOException | ClassNotFoundException e) { + logger.error(e.getMessage()); throw new IllegalArgumentException(ERROR_WRONG_FILE); } } diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java index ed8bfa3ae3..8b34c583fd 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/MemoryVoucherRepository.java @@ -7,8 +7,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.prgms.voucherProgram.entity.voucher.Voucher; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; @@ -16,19 +14,16 @@ @Profile("dev") public class MemoryVoucherRepository implements VoucherRepository { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Map storage = new ConcurrentHashMap<>(); @Override public Voucher save(Voucher voucher) { storage.put(voucher.getVoucherId(), voucher); - logger.info("Voucher save at memory => {}", voucher); return voucher; } @Override public List findAll() { - logger.info("Voucher read at memory => {}", storage.values()); return new ArrayList<>(storage.values()); } } diff --git a/src/main/java/org/prgms/voucherProgram/service/UserService.java b/src/main/java/org/prgms/voucherProgram/service/UserService.java index 9cfef67998..000ef3e7ae 100644 --- a/src/main/java/org/prgms/voucherProgram/service/UserService.java +++ b/src/main/java/org/prgms/voucherProgram/service/UserService.java @@ -4,22 +4,17 @@ import org.prgms.voucherProgram.entity.user.User; import org.prgms.voucherProgram.repository.user.UserRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service public class UserService { private final UserRepository userRepository; - private final Logger logger = LoggerFactory.getLogger(this.getClass()); public UserService(UserRepository userRepository) { this.userRepository = userRepository; } public List findBlackList() { - List blackUsers = userRepository.findBlackUsers(); - logger.info("BlackUsers find at repository => {}", blackUsers.size()); - return blackUsers; + return userRepository.findBlackUsers(); } } diff --git a/src/main/java/org/prgms/voucherProgram/service/VoucherService.java b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java index 24fef13fce..0cc49202b4 100644 --- a/src/main/java/org/prgms/voucherProgram/service/VoucherService.java +++ b/src/main/java/org/prgms/voucherProgram/service/VoucherService.java @@ -10,14 +10,11 @@ import org.prgms.voucherProgram.exception.WrongDiscountAmountException; import org.prgms.voucherProgram.exception.WrongDiscountPercentException; import org.prgms.voucherProgram.repository.voucher.VoucherRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @Service public class VoucherService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final VoucherRepository repository; public VoucherService(VoucherRepository repository) { @@ -28,7 +25,6 @@ public Voucher create(VoucherType voucherType, long value) throws WrongDiscountAmountException, WrongDiscountPercentException { Voucher voucher = createVoucher(voucherType, value); - logger.info("Voucher create => {}", voucher); return repository.save(voucher); } @@ -43,8 +39,6 @@ private Voucher createVoucher(VoucherType voucherType, long value) throws } public List findAllVoucher() { - List vouchers = repository.findAll(); - logger.info("Vouchers find at Repository => {}", vouchers.size()); - return vouchers; + return repository.findAll(); } } From 8efe433c19adf3dd4187552d77a2dc8b763296cb Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Mon, 11 Apr 2022 23:05:06 +0900 Subject: [PATCH 53/62] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/voucher/FileVoucherRepository.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index 01b86df266..3a6bdc3785 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -26,17 +26,13 @@ public class FileVoucherRepository implements VoucherRepository { @Override public Voucher save(Voucher voucher) { - saveVoucherAtFile(voucher); - return voucher; - } - - private void saveVoucherAtFile(Voucher voucher) { try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(FILE_NAME, true))) { objectOutputStream.writeObject(voucher); } catch (IOException e) { logger.error(e.getMessage()); throw new IllegalArgumentException(ERROR_WRONG_FILE); } + return voucher; } @Override From 89372025c8d122dc5c101c341c7f86967dfd4188 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 00:51:44 +0900 Subject: [PATCH 54/62] =?UTF-8?q?refactor:=20=EB=B8=94=EB=9E=99=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9D=B8=EC=8A=A4=ED=84=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EA=B0=80=EC=A0=B8?= =?UTF-8?q?=EC=98=A4=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/user/FileUserRepository.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index b9bd90bc99..92536ba2d0 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -19,23 +19,23 @@ public class FileUserRepository implements UserRepository { private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 유저 파일이 아닙니다."; private static final int USER_ID_INDEX = 0; private static final int USER_NAME_INDEX = 1; + private static final List blackUsers = new ArrayList<>(); private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final Resource userResource; public FileUserRepository(Resource userResource) { this.userResource = userResource; + readBlackUsers(); } - public List findBlackUsers() { - List users = new ArrayList<>(); + private void readBlackUsers() { try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(userResource.getInputStream()))) { - addBlackUsers(users, bufferedReader); + addBlackUsers(blackUsers, bufferedReader); } catch (IOException e) { logger.error(e.getMessage()); throw new IllegalArgumentException(ERROR_WRONG_FILE); } - return users; } private void addBlackUsers(List users, BufferedReader bufferedReader) throws IOException { @@ -47,4 +47,8 @@ private void addBlackUsers(List users, BufferedReader bufferedReader) thro users.add(new User(userId, userName)); } } + + public List findBlackUsers() { + return blackUsers; + } } From 75959a50661c074735b593d10065566851d88ea7 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 01:17:39 +0900 Subject: [PATCH 55/62] =?UTF-8?q?refactor:=20@Value=EB=A1=9C=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=9C=84=EC=B9=98=20=EC=A3=BC=EC=9E=85=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/AppConfiguration.java | 19 ------------------- .../repository/user/FileUserRepository.java | 14 ++++++++------ 2 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java diff --git a/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java b/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java deleted file mode 100644 index 5a11a1591d..0000000000 --- a/src/main/java/org/prgms/voucherProgram/configuration/AppConfiguration.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.prgms.voucherProgram.configuration; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.Resource; - -@Configuration -public class AppConfiguration { - - @Value("${file.path.blacklist}") - private String blacklistFilePath; - - @Bean - Resource blacklistResource(ApplicationContext applicationContext) { - return applicationContext.getResource(blacklistFilePath); - } -} diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index 92536ba2d0..790fd7de22 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -10,7 +10,8 @@ import org.prgms.voucherProgram.entity.user.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.core.io.Resource; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.ClassPathResource; import org.springframework.stereotype.Repository; @Repository @@ -22,18 +23,19 @@ public class FileUserRepository implements UserRepository { private static final List blackUsers = new ArrayList<>(); private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private final Resource userResource; + private final String userFilePath; - public FileUserRepository(Resource userResource) { - this.userResource = userResource; + public FileUserRepository(@Value("${file.path.blacklist}") String userFilePath) { + this.userFilePath = userFilePath; readBlackUsers(); } private void readBlackUsers() { - try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(userResource.getInputStream()))) { + try (BufferedReader bufferedReader = new BufferedReader( + new InputStreamReader(new ClassPathResource(userFilePath).getInputStream()))) { addBlackUsers(blackUsers, bufferedReader); } catch (IOException e) { - logger.error(e.getMessage()); + logger.error("Fail to find a blacklist file"); throw new IllegalArgumentException(ERROR_WRONG_FILE); } } From 3c0abd8a4e2f3bcee3cf855913fd29a229308fa8 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 01:17:57 +0900 Subject: [PATCH 56/62] =?UTF-8?q?refactor:=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/voucher/FileVoucherRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index 3a6bdc3785..af9a17de0c 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -29,7 +29,7 @@ public Voucher save(Voucher voucher) { try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(FILE_NAME, true))) { objectOutputStream.writeObject(voucher); } catch (IOException e) { - logger.error(e.getMessage()); + logger.error("Fail to find a voucher file"); throw new IllegalArgumentException(ERROR_WRONG_FILE); } return voucher; @@ -47,7 +47,7 @@ public List findAll() { } catch (EOFException | FileNotFoundException e) { return vouchers; } catch (IOException | ClassNotFoundException e) { - logger.error(e.getMessage()); + logger.error("Fail to find a voucher file"); throw new IllegalArgumentException(ERROR_WRONG_FILE); } } From 96ca2a3b11676ae1035a756934795596ae2a62cf Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 01:19:50 +0900 Subject: [PATCH 57/62] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/FileUserRepositoryTest.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java index 01f80c3160..7a827f4f53 100644 --- a/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java +++ b/src/test/java/org/prgms/voucherProgram/repository/user/FileUserRepositoryTest.java @@ -1,19 +1,25 @@ package org.prgms.voucherProgram.repository.user; -import org.assertj.core.api.Assertions; +import static org.assertj.core.api.Assertions.*; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springframework.core.io.ClassPathResource; class FileUserRepositoryTest { - FileUserRepository fileUserRepository = new FileUserRepository( - new ClassPathResource("file/customer_blacklist.csv")); - - @DisplayName("파일에 저장되어 있는 모든 User를 List형으로 반환한다.") + @DisplayName("파일에 저장되어 있는 모든 blackUser를 List형으로 반환한다.") @Test void findBlackUsers_ReturnBlackUsers() { - Assertions.assertThat(fileUserRepository.findBlackUsers()).hasSize(3) + FileUserRepository fileUserRepository = new FileUserRepository("file/customer_blacklist.csv"); + assertThat(fileUserRepository.findBlackUsers()).hasSize(3) .extracting("name").contains("hwan", "jin", "pobi"); } + + @DisplayName("잘못된 파일일 경우 예외를 발생한다.") + @Test + void findBlackUsers_WrongFile_ThrowException() { + assertThatThrownBy(() -> new FileUserRepository("file/customer_black.csv")) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("[ERROR] 올바른 유저 파일이 아닙니다."); + } } From 5ed7953ef89ec39edbdc83d408879209f4091beb Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 10:37:16 +0900 Subject: [PATCH 58/62] =?UTF-8?q?refactor:=20Mockito=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/UserServiceTest.java | 26 ++++++++-- .../service/VoucherServiceTest.java | 51 +++++++++++-------- 2 files changed, 53 insertions(+), 24 deletions(-) diff --git a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java index 92ff8ed22b..0e402a7e47 100644 --- a/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java +++ b/src/test/java/org/prgms/voucherProgram/service/UserServiceTest.java @@ -1,23 +1,41 @@ package org.prgms.voucherProgram.service; import static org.assertj.core.api.Assertions.*; +import static org.mockito.BDDMockito.*; import java.util.Arrays; +import java.util.List; import java.util.UUID; 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.prgms.voucherProgram.entity.user.User; +import org.prgms.voucherProgram.repository.user.UserRepository; +@ExtendWith(MockitoExtension.class) class UserServiceTest { - UserService userService = new UserService(() -> Arrays.asList(new User(UUID.randomUUID(), "jin"), - new User(UUID.randomUUID(), "hwan"), - new User(UUID.randomUUID(), "pobi"))); - @DisplayName("모든 유저를 반환한다.") + @Mock + private UserRepository userRepository; + + @InjectMocks + private UserService userService; + + @DisplayName("모든 블랙리스트를 반환한다.") @Test void findBlackList_ReturnBlackUsers() { + List mockBlackUsers = Arrays.asList(new User(UUID.randomUUID(), "jin"), + new User(UUID.randomUUID(), "hwan"), + new User(UUID.randomUUID(), "pobi")); + + given(userRepository.findBlackUsers()).willReturn(mockBlackUsers); + assertThat(userService.findBlackList()).hasSize(3) .extracting("name").contains("hwan", "jin", "pobi"); + then(userRepository).should(times(1)).findBlackUsers(); } } diff --git a/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java b/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java index 2e942fb4b9..0a9b4b4925 100644 --- a/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java +++ b/src/test/java/org/prgms/voucherProgram/service/VoucherServiceTest.java @@ -1,6 +1,7 @@ package org.prgms.voucherProgram.service; import static org.assertj.core.api.Assertions.*; +import static org.mockito.BDDMockito.*; import java.util.Arrays; import java.util.List; @@ -8,6 +9,10 @@ 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.prgms.voucherProgram.entity.voucher.FixedAmountVoucher; import org.prgms.voucherProgram.entity.voucher.PercentDiscountVoucher; import org.prgms.voucherProgram.entity.voucher.Voucher; @@ -16,24 +21,14 @@ import org.prgms.voucherProgram.exception.WrongDiscountPercentException; import org.prgms.voucherProgram.repository.voucher.VoucherRepository; +@ExtendWith(MockitoExtension.class) class VoucherServiceTest { - VoucherService voucherService = new VoucherService(new VoucherRepository() { - @Override - public Voucher save(Voucher voucher) { - return voucher; - } - - @Override - public List findAll() { - try { - return Arrays.asList(new FixedAmountVoucher(UUID.randomUUID(), 10L), - new PercentDiscountVoucher(UUID.randomUUID(), 20L)); - } catch (Exception ignored) { - } - return null; - } - }); + @Mock + VoucherRepository voucherRepository; + + @InjectMocks + VoucherService voucherService; @DisplayName("FixedAmountVoucerType을 주면 FixedAmountVoucher를 반환한다.") @Test @@ -41,10 +36,15 @@ void create_FixedAmountVoucherType_ReturnFixedAmountVoucher() throws WrongDiscountPercentException, WrongDiscountAmountException { + Voucher mockVoucher = new FixedAmountVoucher(UUID.randomUUID(), 10L); + given(voucherRepository.save(any(FixedAmountVoucher.class))).willReturn(mockVoucher); + Voucher voucher = voucherService.create(VoucherType.FIXED_AMOUNT, 10L); assertThat(voucher).isInstanceOf(FixedAmountVoucher.class); - assertThat(voucher.discount(100L)).isEqualTo(90L); + assertThat(voucher).extracting("discountAmount") + .isEqualTo(10L); + then(voucherRepository).should(times(1)).save(any(Voucher.class)); } @DisplayName("PercentDiscountVoucerType을 주면 PercentDiscountVoucher를 반환한다.") @@ -52,17 +52,28 @@ void create_FixedAmountVoucherType_ReturnFixedAmountVoucher() throws void create_PercentDiscountType_ReturnPercentDiscountVoucher() throws WrongDiscountPercentException, WrongDiscountAmountException { + Voucher mockVoucher = new PercentDiscountVoucher(UUID.randomUUID(), 10L); + given(voucherRepository.save(any(PercentDiscountVoucher.class))).willReturn(mockVoucher); + Voucher voucher = voucherService.create(VoucherType.PERCENT_DISCOUNT, 10L); assertThat(voucher).isInstanceOf(PercentDiscountVoucher.class); - assertThat(voucher.discount(1000L)).isEqualTo(900L); + assertThat(voucher).extracting("discountPercent") + .isEqualTo(10L); + then(voucherRepository).should(times(1)).save(any(Voucher.class)); } @DisplayName("모든 바우처를 반환한다.") @Test - void findAllVoucher_ReturnAllVoucher() { + void findAllVoucher_ReturnAllVoucher() throws WrongDiscountAmountException, WrongDiscountPercentException { + List mockVouchers = Arrays.asList(new FixedAmountVoucher(UUID.randomUUID(), 10L), + new PercentDiscountVoucher(UUID.randomUUID(), 20L)); + given(voucherRepository.findAll()).willReturn(mockVouchers); + List vouchers = voucherService.findAllVoucher(); - assertThat(vouchers).hasSize(2); + assertThat(vouchers).hasSize(2) + .isEqualTo(mockVouchers); + then(voucherRepository).should(times(1)).findAll(); } } From 4538552770bd201464571a15d4b5cc95b90f13bf Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 10:50:40 +0900 Subject: [PATCH 59/62] =?UTF-8?q?refactor:=20=EC=BA=90=EC=8B=B1=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/user/FileUserRepository.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index 790fd7de22..ea705b8c95 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -5,7 +5,9 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import org.prgms.voucherProgram.entity.user.User; import org.slf4j.Logger; @@ -20,10 +22,11 @@ public class FileUserRepository implements UserRepository { private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 유저 파일이 아닙니다."; private static final int USER_ID_INDEX = 0; private static final int USER_NAME_INDEX = 1; - private static final List blackUsers = new ArrayList<>(); private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final String userFilePath; + private final Map storage = new ConcurrentHashMap<>(); public FileUserRepository(@Value("${file.path.blacklist}") String userFilePath) { this.userFilePath = userFilePath; @@ -33,24 +36,24 @@ public FileUserRepository(@Value("${file.path.blacklist}") String userFilePath) private void readBlackUsers() { try (BufferedReader bufferedReader = new BufferedReader( new InputStreamReader(new ClassPathResource(userFilePath).getInputStream()))) { - addBlackUsers(blackUsers, bufferedReader); + addBlackUsers(storage, bufferedReader); } catch (IOException e) { logger.error("Fail to find a blacklist file"); throw new IllegalArgumentException(ERROR_WRONG_FILE); } } - private void addBlackUsers(List users, BufferedReader bufferedReader) throws IOException { + private void addBlackUsers(Map storage, BufferedReader bufferedReader) throws IOException { String line; while ((line = bufferedReader.readLine()) != null) { String[] splitLine = line.split(DELIMITER); UUID userId = UUID.fromString(splitLine[USER_ID_INDEX].trim()); String userName = splitLine[USER_NAME_INDEX].trim(); - users.add(new User(userId, userName)); + storage.put(userId, new User(userId, userName)); } } public List findBlackUsers() { - return blackUsers; + return new ArrayList<>(storage.values()); } } From c4d01c1b747fdfebf6060e2524fb2a89687a302b Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 13:44:15 +0900 Subject: [PATCH 60/62] =?UTF-8?q?refactor:=20@Value=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=20=EB=B0=8F=20=ED=8C=8C=EC=9D=BC=20=EB=AA=BB=EC=B0=BE=EC=9D=84?= =?UTF-8?q?=20=EC=8B=9C=20=EC=98=88=EC=99=B8=20=EB=B0=9C=EC=83=9D=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/voucher/FileVoucherRepository.java | 15 ++++++++++----- src/main/resources/application.yaml | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java index af9a17de0c..4a4b948a71 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepository.java @@ -2,7 +2,6 @@ import java.io.EOFException; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; @@ -13,20 +12,26 @@ import org.prgms.voucherProgram.entity.voucher.Voucher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; @Repository @Profile("local") public class FileVoucherRepository implements VoucherRepository { - public static final String FILE_NAME = "./voucherData.txt"; private static final String ERROR_WRONG_FILE = "[ERROR] 올바른 voucher 파일이 아닙니다."; private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final String voucherFilePath; + + public FileVoucherRepository(@Value("${file.path.voucher}") String voucherFilePath) { + this.voucherFilePath = voucherFilePath; + } @Override public Voucher save(Voucher voucher) { - try (ObjectOutputStream objectOutputStream = new ObjectOutputStream(new FileOutputStream(FILE_NAME, true))) { + try (ObjectOutputStream objectOutputStream = new ObjectOutputStream( + new FileOutputStream(voucherFilePath, true))) { objectOutputStream.writeObject(voucher); } catch (IOException e) { logger.error("Fail to find a voucher file"); @@ -38,13 +43,13 @@ public Voucher save(Voucher voucher) { @Override public List findAll() { List vouchers = new ArrayList<>(); - try (FileInputStream fileInputStream = new FileInputStream(FILE_NAME)) { + try (FileInputStream fileInputStream = new FileInputStream(voucherFilePath)) { while (true) { ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream); Voucher voucher = (Voucher)objectInputStream.readObject(); vouchers.add(voucher); } - } catch (EOFException | FileNotFoundException e) { + } catch (EOFException e) { return vouchers; } catch (IOException | ClassNotFoundException e) { logger.error("Fail to find a voucher file"); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index c3ee909c86..a583990910 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -5,3 +5,4 @@ spring: file: path: blacklist: file/customer_blacklist.csv + voucher: ./voucherData.txt From 4755bab80dd94586e521f1099058b85ae38627c0 Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 13:44:29 +0900 Subject: [PATCH 61/62] =?UTF-8?q?refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/FileVoucherRepositoryTest.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepositoryTest.java b/src/test/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepositoryTest.java index 4aaf40ddef..f7774630be 100644 --- a/src/test/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepositoryTest.java +++ b/src/test/java/org/prgms/voucherProgram/repository/voucher/FileVoucherRepositoryTest.java @@ -16,11 +16,11 @@ class FileVoucherRepositoryTest { - VoucherRepository voucherRepository = new FileVoucherRepository(); + VoucherRepository voucherRepository; @AfterEach void tearDown() { - File file = new File(FileVoucherRepository.FILE_NAME); + File file = new File("./voucherData.txt"); file.delete(); } @@ -28,6 +28,7 @@ void tearDown() { @Test void save_Voucher_File() throws WrongDiscountAmountException { // given + voucherRepository = new FileVoucherRepository("./voucherData.txt"); Voucher voucher = new FixedAmountVoucher(UUID.randomUUID(), 10L); // when Voucher saveVoucher = voucherRepository.save(voucher); @@ -42,6 +43,7 @@ void save_Voucher_File() throws WrongDiscountAmountException { @Test void findAll_ReturnAllVoucher() throws WrongDiscountAmountException, WrongDiscountPercentException { // given + voucherRepository = new FileVoucherRepository("./voucherData.txt"); Voucher voucherOne = new FixedAmountVoucher(UUID.randomUUID(), 20L); Voucher voucherTwo = new PercentDiscountVoucher(UUID.randomUUID(), 20L); // when @@ -51,4 +53,22 @@ void findAll_ReturnAllVoucher() throws WrongDiscountAmountException, WrongDiscou assertThat(voucherRepository.findAll()).hasSize(2) .extracting("voucherId").contains(voucherOne.getVoucherId(), voucherTwo.getVoucherId()); } + + @DisplayName("Voucher를 저장할 시 잘못된 파일경로일 경우 예외를 발생한다.") + @Test + void saveVoucher_WrongFilePath_ThrowException() { + voucherRepository = new FileVoucherRepository("./"); + assertThatThrownBy(() -> voucherRepository.save(new FixedAmountVoucher(UUID.randomUUID(), 10L))) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("[ERROR] 올바른 voucher 파일이 아닙니다."); + } + + @DisplayName("Voucher를 찾을 시 잘못된 파일경로일 경우 예외를 발생한다.") + @Test + void findAllVoucher_WrongFilePath_ThrowException() { + voucherRepository = new FileVoucherRepository("./"); + assertThatThrownBy(() -> voucherRepository.findAll()) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("[ERROR] 올바른 voucher 파일이 아닙니다."); + } } From f3cec862e210aeb886da79354b03c93efd91b0bf Mon Sep 17 00:00:00 2001 From: yuminhwan Date: Tue, 12 Apr 2022 13:44:44 +0900 Subject: [PATCH 62/62] =?UTF-8?q?style:=20=EC=96=B4=EB=85=B8=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prgms/voucherProgram/repository/user/FileUserRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java index ea705b8c95..392cbe0510 100644 --- a/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java +++ b/src/main/java/org/prgms/voucherProgram/repository/user/FileUserRepository.java @@ -53,6 +53,7 @@ private void addBlackUsers(Map storage, BufferedReader bufferedReade } } + @Override public List findBlackUsers() { return new ArrayList<>(storage.values()); }