From dee1ccf7e9cebf87d944de94d5f6aafdca7e2523 Mon Sep 17 00:00:00 2001 From: SW-H Date: Wed, 26 Jul 2023 00:54:05 +0900 Subject: [PATCH 01/10] =?UTF-8?q?init=20:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 164 ++++++++++ .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 308 ++++++++++++++++++ mvnw.cmd | 205 ++++++++++++ pom.xml | 63 ++++ .../SpringbootJpaApplication.java | 13 + .../config/DataSourceConfig.java | 63 ++++ src/main/resources/application.yaml | 14 + 8 files changed, 832 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/devcourse/springbootjpa/SpringbootJpaApplication.java create mode 100644 src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java create mode 100644 src/main/resources/application.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..5bf0ad8db --- /dev/null +++ b/.gitignore @@ -0,0 +1,164 @@ +# Created by https://www.toptal.com/developers/gitignore/api/maven,intellij,java +# Edit at https://www.toptal.com/developers/gitignore?templates=maven,intellij,java + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +# Eclipse m2e generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# End of https://www.toptal.com/developers/gitignore/api/maven,intellij,java + +.idea/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..462686e25 --- /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.9.3/apache-maven-3.9.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/mvnw b/mvnw new file mode 100755 index 000000000..66df28542 --- /dev/null +++ b/mvnw @@ -0,0 +1,308 @@ +#!/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# 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 + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -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 "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); 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 2>/dev/null; \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 + +# 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/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# 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. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +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 "$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 + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 000000000..95ba6f54a --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,205 @@ +@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 Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@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 WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_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 WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_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('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@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 000000000..ce4329fdc --- /dev/null +++ b/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.1.2 + + + com.devcourse + springboot-jpa + 0.0.1-SNAPSHOT + springboot-jpa + springboot-jpa + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/com/devcourse/springbootjpa/SpringbootJpaApplication.java b/src/main/java/com/devcourse/springbootjpa/SpringbootJpaApplication.java new file mode 100644 index 000000000..c0995e309 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/SpringbootJpaApplication.java @@ -0,0 +1,13 @@ +package com.devcourse.springbootjpa; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringbootJpaApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringbootJpaApplication.class, args); + } + +} diff --git a/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java b/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java new file mode 100644 index 000000000..1f24e707f --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java @@ -0,0 +1,63 @@ +package com.devcourse.springbootjpa.config; + +import java.util.Properties; + +import javax.sql.DataSource; + +import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.JpaVendorAdapter; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; + +@Configuration +public class DataSourceConfig { + // @Bean + // public DataSource dataSource() { + // DriverManagerDataSource dataSource = new DriverManagerDataSource(); + // dataSource.setDriverClassName("org.h2.Driver"); + // dataSource.setUrl("jdbc:h2:~/test"); + // dataSource.setUsername("sa"); + // dataSource.setPassword(""); + // + // return dataSource; + // } + // + // @Bean + // public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { + // AbstractJpaVendorAdapter adapter = new HibernateJpaVendorAdapter(); + // adapter.setShowSql(jpaProperties.isShowSql()); + // adapter.setDatabasePlatform(jpaProperties.getDatabasePlatform()); + // adapter.setGenerateDdl(jpaProperties.isGenerateDdl()); + // return adapter; + // } + // + // @Bean + // public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter, + // JpaProperties jpaProperties) { + // LocalContainerEntityManagerFactoryBean em + // = new LocalContainerEntityManagerFactoryBean(); + // em.setDataSource(dataSource); + // em.setPackagesToScan("com.devcourse.springbootjpa.domain"); + // em.setJpaVendorAdapter(jpaVendorAdapter); + // + // Properties properties = new Properties(); + // properties.putAll(jpaProperties.getProperties()); + // em.setJpaProperties(properties); + // + // return em; + // } + // + // @Bean + // public PlatformTransactionManager transactionManager(LocalContainerEntityManagerFactoryBean entityManagerFactory) { + // JpaTransactionManager transactionManager = new JpaTransactionManager(); + // transactionManager.setEntityManagerFactory(entityManagerFactory.getObject()); + // + // return transactionManager; + // } +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 000000000..216aaf9db --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,14 @@ +spring: + h2: + console: + enabled: true + jpa: + generate-ddl: true + hibernate: + ddl-auto: create-drop + database: H2 + show-sql: true + open-in-view: false + properties: + hibernate: + query.in_clause_parameter_padding: true From 28d1c691fc267ee01ff84dc89335896743f54f3f Mon Sep 17 00:00:00 2001 From: SW-H Date: Wed, 26 Jul 2023 17:23:42 +0900 Subject: [PATCH 02/10] =?UTF-8?q?feat=20:=20CRUD=20=EA=B5=AC=ED=98=84,=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 + .../springbootjpa/CustomerRepository.java | 8 + .../springbootjpa/domain/Customer.java | 78 +++++++++ .../exception/InvalidCustomerException.java | 10 ++ .../springbootjpa/CustomerRepositoryTest.java | 157 ++++++++++++++++++ .../devcourse/springbootjpa/CustomerTest.java | 50 ++++++ 6 files changed, 312 insertions(+) create mode 100644 src/main/java/com/devcourse/springbootjpa/CustomerRepository.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/Customer.java create mode 100644 src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java create mode 100644 src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java create mode 100644 src/test/java/com/devcourse/springbootjpa/CustomerTest.java diff --git a/pom.xml b/pom.xml index ce4329fdc..eb8eb2fde 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,15 @@ org.springframework.boot spring-boot-starter-web + + javax.validation + validation-api + 2.0.1.Final + + + org.springframework.boot + spring-boot-starter-validation + com.h2database diff --git a/src/main/java/com/devcourse/springbootjpa/CustomerRepository.java b/src/main/java/com/devcourse/springbootjpa/CustomerRepository.java new file mode 100644 index 000000000..3f40e7ea0 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/CustomerRepository.java @@ -0,0 +1,8 @@ +package com.devcourse.springbootjpa; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.devcourse.springbootjpa.domain.Customer; + +public interface CustomerRepository extends JpaRepository { +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/Customer.java b/src/main/java/com/devcourse/springbootjpa/domain/Customer.java new file mode 100644 index 000000000..517ec8f53 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/Customer.java @@ -0,0 +1,78 @@ +package com.devcourse.springbootjpa.domain; + +import java.util.Objects; + +import com.devcourse.springbootjpa.exception.InvalidCustomerException; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.Builder; +import lombok.Getter; + +@Entity +@Table(name = "customers") +@Getter +public class Customer { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + private String firstName; + + private String lastName; + + protected Customer() { + } + + @Builder + public Customer(long id, String firstName, String lastName) { + validateName(firstName, lastName); + this.id = id; + this.firstName = firstName; + this.lastName = lastName; + } + + public Customer(String firstName, String lastName) { + this.firstName = firstName; + this.lastName = lastName; + } + + void validateName(String firstName, String lastName) { + if (firstName == null || firstName.isEmpty() || firstName.isBlank() || firstName.length() > 10) { + throw new InvalidCustomerException("이름을 1~10자 사이로 입력해주세요"); + } + if (lastName == null || lastName.isEmpty() || lastName.isBlank() || lastName.length() > 5) { + throw new InvalidCustomerException("성을 1~5자 사이로 입력해주세요"); + } + } + + public void changeFirstName(String firstName) { + this.firstName = firstName; + } + + public void changeLastName(String lastName) { + this.lastName = lastName; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Customer customer = (Customer)o; + return (id == customer.id) && + (Objects.equals(firstName, customer.firstName)) && + (Objects.equals(lastName, customer.lastName)); + } + + @Override + public int hashCode() { + return Objects.hash(id, firstName, lastName); + } +} diff --git a/src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java b/src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java new file mode 100644 index 000000000..9a7750d5f --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java @@ -0,0 +1,10 @@ +package com.devcourse.springbootjpa.exception; + +public class InvalidCustomerException extends RuntimeException{ + public InvalidCustomerException(String message) { + super(message); + } + + public InvalidCustomerException() { + } +} diff --git a/src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java b/src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java new file mode 100644 index 000000000..dcddcc287 --- /dev/null +++ b/src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java @@ -0,0 +1,157 @@ +package com.devcourse.springbootjpa; + +import static org.assertj.core.api.AssertionsForClassTypes.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; + +import java.util.Optional; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +import com.devcourse.springbootjpa.domain.Customer; + +@DataJpaTest +class CustomerRepositoryTest { + + @Autowired + private CustomerRepository customerRepository; + + @Nested + @DisplayName("고객 등록(생성)에 대한 테스트") + class create_test { + + @Nested + @DisplayName("유효한 데이터가 입력된 경우") + class valid_data { + + @Test + @DisplayName("정상적으로 등록되며 요청한 데이터와 반환된 데이터가 동일하다") + void save() { + //Given + Customer customer = new Customer("승원", "한"); + // When + Customer savedCustomer = customerRepository.save(customer); + + // Then + assertThat(customer, equalTo(savedCustomer)); + } + } + } + + @Nested + @DisplayName("고객 조회에 대한 테스트") + class read_test { + + @Nested + @DisplayName("존재하는 고객에 대해 식별자(id)로 검색하는 경우") + class existing_customer { + + @Test + @DisplayName("정상적으로 데이터를 읽어 그 데이터를 반환한다 ") + void save() { + //Given + Customer customer = new Customer("승원", "한"); + customerRepository.save(customer); + long testId = customer.getId(); + + // When + Customer result = customerRepository.findById(testId).get(); + + // Then + assertThat(result, is(equalTo(customer))); + } + } + + @Nested + @DisplayName("존재하지 않는 고객에 대해 식별자(id)로 검색하는 경우") + class non_existing_customer { + + @Test + @DisplayName("Optional.empty를 반환한다") + void save() { + //Given + // When + Optional readCustomer = customerRepository.findById(-1L); + + // Then + assertThat(readCustomer, is(equalTo(Optional.empty()))); + } + } + } + + @Nested + @DisplayName("수정에 대한 테스트") + class update_test { + @Nested + @DisplayName("수정에 성공한 경우") + class updated { + + @Test + @DisplayName("데이터에 수정 내역이 반영되어 있다") + void save() { + //Given + Customer customer = new Customer("승원", "한"); + customerRepository.save(customer); + long id = customer.getId(); + + // When + customer.changeFirstName("길동"); + customer.changeLastName("홍"); + + // Then + Customer updated = customerRepository.findById(id).get(); + assertThat(updated, is(new Customer(id, "길동", "홍"))); + } + } + } + + @Nested + @DisplayName("삭제에 대한 테스트") + class delete_test { + @Nested + @DisplayName("존재하는 고객에 대해 삭제하는 경우") + class existing_customer { + + @Test + @DisplayName("삭제가 데이터에 반영되어 해당 정보를 조회할 수 없다") + void save() { + //Given + Customer customer = new Customer("승원", "한"); + customerRepository.save(customer); + long id = customer.getId(); + + // When + customerRepository.deleteById(id); + + // Then + Optional result = customerRepository.findById(id); + assertThat(result, is(equalTo(Optional.empty()))); + } + } + + @Nested + @DisplayName("존재하지 않는 고객에 대해 삭제하는 경우") + class non_existing_customer { + + @Test + @DisplayName("아무런 예외가 발생하지 않는다") + void save() { + //Given + long testId = -1L; + + // When + customerRepository.deleteById(testId); + + // Then + Throwable exception = catchThrowable(() -> customerRepository.findById(testId)); + Assertions.assertThat(exception).isNull(); + } + } + } + +} diff --git a/src/test/java/com/devcourse/springbootjpa/CustomerTest.java b/src/test/java/com/devcourse/springbootjpa/CustomerTest.java new file mode 100644 index 000000000..ad1e24531 --- /dev/null +++ b/src/test/java/com/devcourse/springbootjpa/CustomerTest.java @@ -0,0 +1,50 @@ +package com.devcourse.springbootjpa; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +import com.devcourse.springbootjpa.domain.Customer; +import com.devcourse.springbootjpa.exception.InvalidCustomerException; + +class CustomerTest { + @Nested + @DisplayName("이름이") + class FirstName { + @DisplayName("11자 이상 : InvalidCustomerException 발생") + @Test + void is_too_long() { + assertThrows(InvalidCustomerException.class, + () -> new Customer(1L, "가나다라마바사아자차카", "한")); + } + + @Test + @DisplayName("공백인 경우 : InvalidCustomerException 발생") + void is_blank() { + assertThrows(InvalidCustomerException.class, + () -> new Customer(1L, " ", "한")); + } + } + + @Nested + @DisplayName("성이") + class LastName { + @DisplayName("6자 이상 : InvalidCustomerException 발생") + @Test + void is_too_long() { + assertThrows(InvalidCustomerException.class, + () -> new Customer(1L, "승원", "가나다라마바") + ); + } + + @Test + @DisplayName("공백인 경우 : InvalidCustomerException 발생") + void is_blank() { + assertThrows(InvalidCustomerException.class, + () -> new Customer(1L, "승원", " ") + ); + } + } +} From ac591eb0ada818bf2fd80dd72d3ebefb46b00de4 Mon Sep 17 00:00:00 2001 From: SW-H Date: Wed, 26 Jul 2023 17:37:02 +0900 Subject: [PATCH 03/10] =?UTF-8?q?feat=20:=20CRUD=20=EA=B5=AC=ED=98=84,=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/DataSourceConfig.java | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java b/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java index 1f24e707f..a4eb71ce8 100644 --- a/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java +++ b/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java @@ -17,47 +17,47 @@ @Configuration public class DataSourceConfig { - // @Bean - // public DataSource dataSource() { - // DriverManagerDataSource dataSource = new DriverManagerDataSource(); - // dataSource.setDriverClassName("org.h2.Driver"); - // dataSource.setUrl("jdbc:h2:~/test"); - // dataSource.setUsername("sa"); - // dataSource.setPassword(""); - // - // return dataSource; - // } - // - // @Bean - // public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { - // AbstractJpaVendorAdapter adapter = new HibernateJpaVendorAdapter(); - // adapter.setShowSql(jpaProperties.isShowSql()); - // adapter.setDatabasePlatform(jpaProperties.getDatabasePlatform()); - // adapter.setGenerateDdl(jpaProperties.isGenerateDdl()); - // return adapter; - // } - // - // @Bean - // public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter, - // JpaProperties jpaProperties) { - // LocalContainerEntityManagerFactoryBean em - // = new LocalContainerEntityManagerFactoryBean(); - // em.setDataSource(dataSource); - // em.setPackagesToScan("com.devcourse.springbootjpa.domain"); - // em.setJpaVendorAdapter(jpaVendorAdapter); - // - // Properties properties = new Properties(); - // properties.putAll(jpaProperties.getProperties()); - // em.setJpaProperties(properties); - // - // return em; - // } - // - // @Bean - // public PlatformTransactionManager transactionManager(LocalContainerEntityManagerFactoryBean entityManagerFactory) { - // JpaTransactionManager transactionManager = new JpaTransactionManager(); - // transactionManager.setEntityManagerFactory(entityManagerFactory.getObject()); - // - // return transactionManager; - // } + @Bean + public DataSource dataSource() { + DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName("org.h2.Driver"); + dataSource.setUrl("jdbc:h2:~/test"); + dataSource.setUsername("sa"); + dataSource.setPassword(""); + + return dataSource; + } + + @Bean + public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { + AbstractJpaVendorAdapter adapter = new HibernateJpaVendorAdapter(); + adapter.setShowSql(jpaProperties.isShowSql()); + adapter.setDatabasePlatform(jpaProperties.getDatabasePlatform()); + adapter.setGenerateDdl(jpaProperties.isGenerateDdl()); + return adapter; + } + + @Bean + public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter, + JpaProperties jpaProperties) { + LocalContainerEntityManagerFactoryBean em + = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(dataSource); + em.setPackagesToScan("com.devcourse.springbootjpa.domain"); + em.setJpaVendorAdapter(jpaVendorAdapter); + + Properties properties = new Properties(); + properties.putAll(jpaProperties.getProperties()); + em.setJpaProperties(properties); + + return em; + } + + @Bean + public PlatformTransactionManager transactionManager(LocalContainerEntityManagerFactoryBean entityManagerFactory) { + JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(entityManagerFactory.getObject()); + + return transactionManager; + } } From c8d36461b6f075c33f554f56ef65db1a38b500ff Mon Sep 17 00:00:00 2001 From: Seungwon Han <49016275+SW-H@users.noreply.github.com> Date: Wed, 26 Jul 2023 18:01:16 +0900 Subject: [PATCH 04/10] =?UTF-8?q?refactor=20:=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/DataSourceConfig.java | 63 ------------------- 1 file changed, 63 deletions(-) delete mode 100644 src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java diff --git a/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java b/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java deleted file mode 100644 index a4eb71ce8..000000000 --- a/src/main/java/com/devcourse/springbootjpa/config/DataSourceConfig.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.devcourse.springbootjpa.config; - -import java.util.Properties; - -import javax.sql.DataSource; - -import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.jdbc.datasource.DriverManagerDataSource; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.JpaVendorAdapter; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; -import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.transaction.PlatformTransactionManager; - -@Configuration -public class DataSourceConfig { - @Bean - public DataSource dataSource() { - DriverManagerDataSource dataSource = new DriverManagerDataSource(); - dataSource.setDriverClassName("org.h2.Driver"); - dataSource.setUrl("jdbc:h2:~/test"); - dataSource.setUsername("sa"); - dataSource.setPassword(""); - - return dataSource; - } - - @Bean - public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { - AbstractJpaVendorAdapter adapter = new HibernateJpaVendorAdapter(); - adapter.setShowSql(jpaProperties.isShowSql()); - adapter.setDatabasePlatform(jpaProperties.getDatabasePlatform()); - adapter.setGenerateDdl(jpaProperties.isGenerateDdl()); - return adapter; - } - - @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter, - JpaProperties jpaProperties) { - LocalContainerEntityManagerFactoryBean em - = new LocalContainerEntityManagerFactoryBean(); - em.setDataSource(dataSource); - em.setPackagesToScan("com.devcourse.springbootjpa.domain"); - em.setJpaVendorAdapter(jpaVendorAdapter); - - Properties properties = new Properties(); - properties.putAll(jpaProperties.getProperties()); - em.setJpaProperties(properties); - - return em; - } - - @Bean - public PlatformTransactionManager transactionManager(LocalContainerEntityManagerFactoryBean entityManagerFactory) { - JpaTransactionManager transactionManager = new JpaTransactionManager(); - transactionManager.setEntityManagerFactory(entityManagerFactory.getObject()); - - return transactionManager; - } -} From 0b2becaf74808ea852d524f5dfb7b733bedc537f Mon Sep 17 00:00:00 2001 From: SW-H Date: Wed, 26 Jul 2023 18:08:51 +0900 Subject: [PATCH 05/10] =?UTF-8?q?docs=20:=20=EC=84=A4=EC=A0=95=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5bf0ad8db..56b8cf553 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,4 @@ buildNumber.properties # End of https://www.toptal.com/developers/gitignore/api/maven,intellij,java .idea/ +**/config/ From 795d8e646127bc13736b67d6cc8cffac84cf31b1 Mon Sep 17 00:00:00 2001 From: SW-H Date: Wed, 26 Jul 2023 23:43:37 +0900 Subject: [PATCH 06/10] =?UTF-8?q?feat=20:=20customer=20=EC=97=94=ED=84=B0?= =?UTF-8?q?=ED=8B=B0=EB=A5=BC=20=EC=9D=B4=EC=9A=A9=ED=95=B4=20=EC=83=9D?= =?UTF-8?q?=EB=AA=85=EC=A3=BC=EA=B8=B0=20=EC=8B=A4=EC=8A=B5(=EC=98=81?= =?UTF-8?q?=EC=86=8D=EC=84=B1=20=EC=BB=A8=ED=85=8D=EC=8A=A4=ED=8A=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springbootjpa/PersistenceContextTest.java | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java diff --git a/src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java b/src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java new file mode 100644 index 000000000..e54925388 --- /dev/null +++ b/src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java @@ -0,0 +1,114 @@ +package com.devcourse.springbootjpa; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.devcourse.springbootjpa.domain.Customer; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@SpringBootTest +class PersistenceContextTest { + @Autowired + CustomerRepository repository; + + @Autowired + EntityManagerFactory emf; + + @BeforeEach + void setUp() { + repository.deleteAll(); + } + + @Test + void 저장() { + EntityManager entityManager = emf.createEntityManager(); + EntityTransaction transaction = entityManager.getTransaction(); + + transaction.begin(); + + Customer customer = new Customer("Seungwon", "Han"); + + entityManager.persist(customer); + transaction.commit(); + } + + @Test + void 조회_DB조회() { + EntityManager entityManager = emf.createEntityManager(); + EntityTransaction transaction = entityManager.getTransaction(); + + transaction.begin(); + + Customer customer = new Customer("Seungwon", "Han"); + + entityManager.persist(customer); + transaction.commit(); + long id = customer.getId(); + + entityManager.detach(customer); + + Customer selected = entityManager.find(Customer.class, id); + log.info("{} {}", selected.getFirstName(), selected.getLastName()); + } + + @Test + void 조회_1차캐시_조회() { + EntityManager entityManager = emf.createEntityManager(); + EntityTransaction transaction = entityManager.getTransaction(); + + transaction.begin(); + + Customer customer = new Customer("Seungwon", "Han"); + + entityManager.persist(customer); + transaction.commit(); + long id = customer.getId(); + + Customer selected = entityManager.find(Customer.class, id); + log.info("{} {}", selected.getFirstName(), selected.getLastName()); + } + @Test + void 수정() { + EntityManager entityManager = emf.createEntityManager(); + EntityTransaction transaction = entityManager.getTransaction(); + + transaction.begin(); + + Customer customer = new Customer("Seungwon", "Han"); + + entityManager.persist(customer); + transaction.commit(); + + transaction.begin(); + customer.changeFirstName("Gildong"); + customer.changeLastName("Hong"); + + transaction.commit(); + } + + @Test + void 삭제() { + EntityManager entityManager = emf.createEntityManager(); + EntityTransaction transaction = entityManager.getTransaction(); + + transaction.begin(); + + Customer customer = new Customer("Seungwon", "Han"); + + entityManager.persist(customer); + transaction.commit(); + + transaction.begin(); + + entityManager.remove(customer); + + transaction.commit(); + } +} From 959fe4bc05860ac1d9b70b584efc89f8a6344c11 Mon Sep 17 00:00:00 2001 From: SW-H Date: Wed, 26 Jul 2023 23:49:23 +0900 Subject: [PATCH 07/10] =?UTF-8?q?feat=20:=20ddl=20option=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/devcourse/springbootjpa/domain/Customer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/devcourse/springbootjpa/domain/Customer.java b/src/main/java/com/devcourse/springbootjpa/domain/Customer.java index 517ec8f53..b92678893 100644 --- a/src/main/java/com/devcourse/springbootjpa/domain/Customer.java +++ b/src/main/java/com/devcourse/springbootjpa/domain/Customer.java @@ -4,6 +4,7 @@ import com.devcourse.springbootjpa.exception.InvalidCustomerException; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -17,11 +18,13 @@ @Getter public class Customer { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.AUTO) private long id; + @Column(length = 20, nullable=false) private String firstName; + @Column(length = 10, nullable=false) private String lastName; protected Customer() { @@ -75,4 +78,5 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(id, firstName, lastName); } + } From 611bd26fe2c08fd963dbe3d51bd2d216a540cd37 Mon Sep 17 00:00:00 2001 From: SW-H Date: Wed, 26 Jul 2023 23:49:58 +0900 Subject: [PATCH 08/10] =?UTF-8?q?feat=20:=20dialect/ddl=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 216aaf9db..a8a7f784e 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -4,11 +4,12 @@ spring: enabled: true jpa: generate-ddl: true - hibernate: - ddl-auto: create-drop database: H2 show-sql: true open-in-view: false properties: hibernate: + dialect: org.hibernate.dialect.H2Dialect query.in_clause_parameter_padding: true + hbm2ddl: + auto: create-drop From 445a6e755907515b6e5d35f0c3ce636cfecd2b41 Mon Sep 17 00:00:00 2001 From: SW-H Date: Fri, 28 Jul 2023 23:56:35 +0900 Subject: [PATCH 09/10] =?UTF-8?q?feat=20:=20=EC=97=94=ED=8B=B0=ED=8B=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80(item,=20order,=20orderItem),=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80,=20jpa=20repository=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springbootjpa/CustomerRepository.java | 8 - .../springbootjpa/domain/Customer.java | 82 --------- .../springbootjpa/domain/order/Item.java | 53 ++++++ .../springbootjpa/domain/order/Member.java | 51 ++++++ .../springbootjpa/domain/order/Order.java | 72 ++++++++ .../springbootjpa/domain/order/OrderItem.java | 54 ++++++ .../domain/order/OrderStatus.java | 5 + .../domain/repository/ItemRepository.java | 8 + .../domain/repository/MemberRepository.java | 8 + .../repository/OrderItemRepository.java | 8 + .../domain/repository/OrderRepository.java | 8 + .../exception/InvalidCustomerException.java | 2 +- .../exception/InvalidQuantityException.java | 10 ++ .../springbootjpa/CustomerRepositoryTest.java | 157 ------------------ .../devcourse/springbootjpa/CustomerTest.java | 50 ------ .../com/devcourse/springbootjpa/ItemTest.java | 25 +++ .../springbootjpa/OrderPersistenceTest.java | 81 +++++++++ .../devcourse/springbootjpa/OrderTest.java | 110 ++++++++++++ .../springbootjpa/PersistenceContextTest.java | 114 ------------- 19 files changed, 494 insertions(+), 412 deletions(-) delete mode 100644 src/main/java/com/devcourse/springbootjpa/CustomerRepository.java delete mode 100644 src/main/java/com/devcourse/springbootjpa/domain/Customer.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/order/Item.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/order/Member.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/order/Order.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/order/OrderStatus.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/repository/ItemRepository.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/repository/MemberRepository.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/repository/OrderItemRepository.java create mode 100644 src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java create mode 100644 src/main/java/com/devcourse/springbootjpa/exception/InvalidQuantityException.java delete mode 100644 src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java delete mode 100644 src/test/java/com/devcourse/springbootjpa/CustomerTest.java create mode 100644 src/test/java/com/devcourse/springbootjpa/ItemTest.java create mode 100644 src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java create mode 100644 src/test/java/com/devcourse/springbootjpa/OrderTest.java delete mode 100644 src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java diff --git a/src/main/java/com/devcourse/springbootjpa/CustomerRepository.java b/src/main/java/com/devcourse/springbootjpa/CustomerRepository.java deleted file mode 100644 index 3f40e7ea0..000000000 --- a/src/main/java/com/devcourse/springbootjpa/CustomerRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.devcourse.springbootjpa; - -import org.springframework.data.jpa.repository.JpaRepository; - -import com.devcourse.springbootjpa.domain.Customer; - -public interface CustomerRepository extends JpaRepository { -} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/Customer.java b/src/main/java/com/devcourse/springbootjpa/domain/Customer.java deleted file mode 100644 index b92678893..000000000 --- a/src/main/java/com/devcourse/springbootjpa/domain/Customer.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.devcourse.springbootjpa.domain; - -import java.util.Objects; - -import com.devcourse.springbootjpa.exception.InvalidCustomerException; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import lombok.Builder; -import lombok.Getter; - -@Entity -@Table(name = "customers") -@Getter -public class Customer { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private long id; - - @Column(length = 20, nullable=false) - private String firstName; - - @Column(length = 10, nullable=false) - private String lastName; - - protected Customer() { - } - - @Builder - public Customer(long id, String firstName, String lastName) { - validateName(firstName, lastName); - this.id = id; - this.firstName = firstName; - this.lastName = lastName; - } - - public Customer(String firstName, String lastName) { - this.firstName = firstName; - this.lastName = lastName; - } - - void validateName(String firstName, String lastName) { - if (firstName == null || firstName.isEmpty() || firstName.isBlank() || firstName.length() > 10) { - throw new InvalidCustomerException("이름을 1~10자 사이로 입력해주세요"); - } - if (lastName == null || lastName.isEmpty() || lastName.isBlank() || lastName.length() > 5) { - throw new InvalidCustomerException("성을 1~5자 사이로 입력해주세요"); - } - } - - public void changeFirstName(String firstName) { - this.firstName = firstName; - } - - public void changeLastName(String lastName) { - this.lastName = lastName; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - Customer customer = (Customer)o; - return (id == customer.id) && - (Objects.equals(firstName, customer.firstName)) && - (Objects.equals(lastName, customer.lastName)); - } - - @Override - public int hashCode() { - return Objects.hash(id, firstName, lastName); - } - -} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/Item.java b/src/main/java/com/devcourse/springbootjpa/domain/order/Item.java new file mode 100644 index 000000000..189282d33 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/Item.java @@ -0,0 +1,53 @@ +package com.devcourse.springbootjpa.domain.order; + +import java.util.List; + +import com.devcourse.springbootjpa.exception.InvalidQuantityException; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Entity +@Table(name = "item") +@Builder +@Getter +@AllArgsConstructor +public class Item { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + + private int price; + + private int stockQuantity; + + @OneToMany(mappedBy = "item") + private List orderItems; + + protected Item() { + } + + public Item(int price, int stockQuantity) { + this.price = price; + this.stockQuantity = stockQuantity; + } + + public void addOrderItem(OrderItem orderItem) { + reduceQuantity(orderItem.getQuantity()); + orderItem.setItem(this); + } + + public void reduceQuantity(int quantity) { + if (stockQuantity < quantity) { + throw new InvalidQuantityException("재고 수량이 부족합니다"); + } + stockQuantity -= quantity; + } +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/Member.java b/src/main/java/com/devcourse/springbootjpa/domain/order/Member.java new file mode 100644 index 000000000..c5bd5cc5a --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/Member.java @@ -0,0 +1,51 @@ +package com.devcourse.springbootjpa.domain.order; + +import java.util.ArrayList; +import java.util.List; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Entity +@Table(name = "member") +@Getter +@Builder +@AllArgsConstructor +public class Member { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + + @Column(name = "name", nullable = false, length = 30) + private String name; + + @Column(name = "nick_name", nullable = false, length = 30, unique = true) + private String nickname; + + @Column(name = "age", nullable = false) + private int age; + + @Column(name = "address", nullable = false) + private String address; + + @Column(name = "description", nullable = false) + private String description; + + @OneToMany(mappedBy = "member") + private List orders = new ArrayList<>(); + + protected Member() { + } + + public void addOrder(Order order) { + order.setMember(this); + } +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/Order.java b/src/main/java/com/devcourse/springbootjpa/domain/order/Order.java new file mode 100644 index 000000000..0d74651e1 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/Order.java @@ -0,0 +1,72 @@ +package com.devcourse.springbootjpa.domain.order; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Entity +@Table(name = "orders") +@Getter +@AllArgsConstructor +@Builder +public class Order { + @Id + @Column(name = "id") + private String uuid; + + @Column(name = "memo") + private String memo; + + @Enumerated(value = EnumType.STRING) + private OrderStatus orderStatus; + + @Column(name = "order_datetime", columnDefinition = "TIMESTAMP") + private LocalDateTime orderDateTime; + + @Column(name = "member_id", insertable = false, updatable = false) + private long memberID; + + @ManyToOne + @JoinColumn(name = "member_id", referencedColumnName = "id") + private Member member; + + @OneToMany(mappedBy = "order") + private List orderItems; + + protected Order() { + } + + public void setMember(Member member) { + if (Objects.nonNull(this.member)) { + this.member.getOrders().remove(this); + } + + this.member = member; + member.getOrders().add(this); + } + + public void addOrderItem(OrderItem orderItem) { + orderItems.add(orderItem); + } + + public void changeOrderStatus(OrderStatus orderStatus) { + this.orderStatus = orderStatus; + } + + public void changeMemo(String memo) { + this.memo = memo; + } +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java b/src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java new file mode 100644 index 000000000..76e164d81 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java @@ -0,0 +1,54 @@ +package com.devcourse.springbootjpa.domain.order; + +import java.util.Objects; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Entity +@Table(name = "order_item") +@Getter +@AllArgsConstructor +@Builder +public class OrderItem { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + + private int price; + + private int quantity; + + @ManyToOne + private Order order; + + @ManyToOne + private Item item; + + protected OrderItem() { + } + + public void setOrder(Order order) { + if (Objects.nonNull(this.order)) { + this.order.getOrderItems().remove(this); + } + + this.order = order; + order.getOrderItems().add(this); + } + + public void setItem(Item item) { + if (Objects.nonNull(this.item)) { + this.item.getOrderItems().remove(this); + } + item.addOrderItem(this); + this.item = item; + } +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/OrderStatus.java b/src/main/java/com/devcourse/springbootjpa/domain/order/OrderStatus.java new file mode 100644 index 000000000..1dedfc023 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/OrderStatus.java @@ -0,0 +1,5 @@ +package com.devcourse.springbootjpa.domain.order; + +public enum OrderStatus { + OPENED, CANCELED +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/repository/ItemRepository.java b/src/main/java/com/devcourse/springbootjpa/domain/repository/ItemRepository.java new file mode 100644 index 000000000..c41691470 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/repository/ItemRepository.java @@ -0,0 +1,8 @@ +package com.devcourse.springbootjpa.domain.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.devcourse.springbootjpa.domain.order.Item; + +public interface ItemRepository extends JpaRepository { +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/repository/MemberRepository.java b/src/main/java/com/devcourse/springbootjpa/domain/repository/MemberRepository.java new file mode 100644 index 000000000..8a91db8b1 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/repository/MemberRepository.java @@ -0,0 +1,8 @@ +package com.devcourse.springbootjpa.domain.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.devcourse.springbootjpa.domain.order.Member; + +public interface MemberRepository extends JpaRepository { +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderItemRepository.java b/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderItemRepository.java new file mode 100644 index 000000000..581052481 --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderItemRepository.java @@ -0,0 +1,8 @@ +package com.devcourse.springbootjpa.domain.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.devcourse.springbootjpa.domain.order.OrderItem; + +public interface OrderItemRepository extends JpaRepository { +} diff --git a/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java b/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java new file mode 100644 index 000000000..9168e284f --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java @@ -0,0 +1,8 @@ +package com.devcourse.springbootjpa.domain.repository; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.devcourse.springbootjpa.domain.order.Order; + +public interface OrderRepository extends JpaRepository { +} diff --git a/src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java b/src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java index 9a7750d5f..979cde0c0 100644 --- a/src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java +++ b/src/main/java/com/devcourse/springbootjpa/exception/InvalidCustomerException.java @@ -1,6 +1,6 @@ package com.devcourse.springbootjpa.exception; -public class InvalidCustomerException extends RuntimeException{ +public class InvalidCustomerException extends RuntimeException { public InvalidCustomerException(String message) { super(message); } diff --git a/src/main/java/com/devcourse/springbootjpa/exception/InvalidQuantityException.java b/src/main/java/com/devcourse/springbootjpa/exception/InvalidQuantityException.java new file mode 100644 index 000000000..3afcc5d9b --- /dev/null +++ b/src/main/java/com/devcourse/springbootjpa/exception/InvalidQuantityException.java @@ -0,0 +1,10 @@ +package com.devcourse.springbootjpa.exception; + +public class InvalidQuantityException extends RuntimeException { + public InvalidQuantityException() { + } + + public InvalidQuantityException(String message) { + super(message); + } +} diff --git a/src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java b/src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java deleted file mode 100644 index dcddcc287..000000000 --- a/src/test/java/com/devcourse/springbootjpa/CustomerRepositoryTest.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.devcourse.springbootjpa; - -import static org.assertj.core.api.AssertionsForClassTypes.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; - -import java.util.Optional; - -import org.assertj.core.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; - -import com.devcourse.springbootjpa.domain.Customer; - -@DataJpaTest -class CustomerRepositoryTest { - - @Autowired - private CustomerRepository customerRepository; - - @Nested - @DisplayName("고객 등록(생성)에 대한 테스트") - class create_test { - - @Nested - @DisplayName("유효한 데이터가 입력된 경우") - class valid_data { - - @Test - @DisplayName("정상적으로 등록되며 요청한 데이터와 반환된 데이터가 동일하다") - void save() { - //Given - Customer customer = new Customer("승원", "한"); - // When - Customer savedCustomer = customerRepository.save(customer); - - // Then - assertThat(customer, equalTo(savedCustomer)); - } - } - } - - @Nested - @DisplayName("고객 조회에 대한 테스트") - class read_test { - - @Nested - @DisplayName("존재하는 고객에 대해 식별자(id)로 검색하는 경우") - class existing_customer { - - @Test - @DisplayName("정상적으로 데이터를 읽어 그 데이터를 반환한다 ") - void save() { - //Given - Customer customer = new Customer("승원", "한"); - customerRepository.save(customer); - long testId = customer.getId(); - - // When - Customer result = customerRepository.findById(testId).get(); - - // Then - assertThat(result, is(equalTo(customer))); - } - } - - @Nested - @DisplayName("존재하지 않는 고객에 대해 식별자(id)로 검색하는 경우") - class non_existing_customer { - - @Test - @DisplayName("Optional.empty를 반환한다") - void save() { - //Given - // When - Optional readCustomer = customerRepository.findById(-1L); - - // Then - assertThat(readCustomer, is(equalTo(Optional.empty()))); - } - } - } - - @Nested - @DisplayName("수정에 대한 테스트") - class update_test { - @Nested - @DisplayName("수정에 성공한 경우") - class updated { - - @Test - @DisplayName("데이터에 수정 내역이 반영되어 있다") - void save() { - //Given - Customer customer = new Customer("승원", "한"); - customerRepository.save(customer); - long id = customer.getId(); - - // When - customer.changeFirstName("길동"); - customer.changeLastName("홍"); - - // Then - Customer updated = customerRepository.findById(id).get(); - assertThat(updated, is(new Customer(id, "길동", "홍"))); - } - } - } - - @Nested - @DisplayName("삭제에 대한 테스트") - class delete_test { - @Nested - @DisplayName("존재하는 고객에 대해 삭제하는 경우") - class existing_customer { - - @Test - @DisplayName("삭제가 데이터에 반영되어 해당 정보를 조회할 수 없다") - void save() { - //Given - Customer customer = new Customer("승원", "한"); - customerRepository.save(customer); - long id = customer.getId(); - - // When - customerRepository.deleteById(id); - - // Then - Optional result = customerRepository.findById(id); - assertThat(result, is(equalTo(Optional.empty()))); - } - } - - @Nested - @DisplayName("존재하지 않는 고객에 대해 삭제하는 경우") - class non_existing_customer { - - @Test - @DisplayName("아무런 예외가 발생하지 않는다") - void save() { - //Given - long testId = -1L; - - // When - customerRepository.deleteById(testId); - - // Then - Throwable exception = catchThrowable(() -> customerRepository.findById(testId)); - Assertions.assertThat(exception).isNull(); - } - } - } - -} diff --git a/src/test/java/com/devcourse/springbootjpa/CustomerTest.java b/src/test/java/com/devcourse/springbootjpa/CustomerTest.java deleted file mode 100644 index ad1e24531..000000000 --- a/src/test/java/com/devcourse/springbootjpa/CustomerTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.devcourse.springbootjpa; - -import static org.junit.jupiter.api.Assertions.*; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; - -import com.devcourse.springbootjpa.domain.Customer; -import com.devcourse.springbootjpa.exception.InvalidCustomerException; - -class CustomerTest { - @Nested - @DisplayName("이름이") - class FirstName { - @DisplayName("11자 이상 : InvalidCustomerException 발생") - @Test - void is_too_long() { - assertThrows(InvalidCustomerException.class, - () -> new Customer(1L, "가나다라마바사아자차카", "한")); - } - - @Test - @DisplayName("공백인 경우 : InvalidCustomerException 발생") - void is_blank() { - assertThrows(InvalidCustomerException.class, - () -> new Customer(1L, " ", "한")); - } - } - - @Nested - @DisplayName("성이") - class LastName { - @DisplayName("6자 이상 : InvalidCustomerException 발생") - @Test - void is_too_long() { - assertThrows(InvalidCustomerException.class, - () -> new Customer(1L, "승원", "가나다라마바") - ); - } - - @Test - @DisplayName("공백인 경우 : InvalidCustomerException 발생") - void is_blank() { - assertThrows(InvalidCustomerException.class, - () -> new Customer(1L, "승원", " ") - ); - } - } -} diff --git a/src/test/java/com/devcourse/springbootjpa/ItemTest.java b/src/test/java/com/devcourse/springbootjpa/ItemTest.java new file mode 100644 index 000000000..68e7a683a --- /dev/null +++ b/src/test/java/com/devcourse/springbootjpa/ItemTest.java @@ -0,0 +1,25 @@ +package com.devcourse.springbootjpa; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import com.devcourse.springbootjpa.domain.order.Item; +import com.devcourse.springbootjpa.exception.InvalidQuantityException; + +class ItemTest { + @Test + @DisplayName("재고보다 더 많은 수량을 주문하면 InvalidQuantityException이 발생한다") + void addItemTest() { + // given + Item item = new Item(10000, 10); + // when + // then + assertThrows( + InvalidQuantityException.class, + () -> item.reduceQuantity(11) + ); + + } +} diff --git a/src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java b/src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java new file mode 100644 index 000000000..c1c83bbc8 --- /dev/null +++ b/src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java @@ -0,0 +1,81 @@ +package com.devcourse.springbootjpa; + +import static com.devcourse.springbootjpa.domain.order.OrderStatus.*; + +import java.time.LocalDateTime; +import java.util.UUID; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +import com.devcourse.springbootjpa.domain.order.Member; +import com.devcourse.springbootjpa.domain.order.Order; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@DataJpaTest +class OrderPersistenceTest { + + @Autowired + EntityManagerFactory emf; + + @Test + void member_insert() { + Member member = Member.builder() + .name("seungwon") + .address("서울시 동작구") + .nickname("sw") + .description("백둥이") + .age(26) + .build(); + + EntityManager entityManager = emf.createEntityManager(); + EntityTransaction transaction = entityManager.getTransaction(); + transaction.begin(); + + entityManager.persist(member); + + transaction.commit(); + } + + @Test + void 연관관계_테스트() { + EntityManager entityManager = emf.createEntityManager(); + EntityTransaction transaction = entityManager.getTransaction(); + + transaction.begin(); + + Member member = Member.builder() + .name("seungwon") + .address("서울시 동작구") + .nickname("baekdung") + .description("백둥이") + .age(26) + .build(); + + entityManager.persist(member); + + Order order = Order.builder() + .uuid(UUID.randomUUID().toString()) + .orderStatus(OPENED) + .orderDateTime(LocalDateTime.now()) + .memo("부재시 연락주세요") + .member(member) + .build(); + + entityManager.persist(order); + + transaction.commit(); + + entityManager.clear(); + Order entity = entityManager.find(Order.class, order.getUuid()); + + log.info("{}", entity.getMember().getNickname()); + log.info("{}", entity.getMember().getOrders().size()); + } +} diff --git a/src/test/java/com/devcourse/springbootjpa/OrderTest.java b/src/test/java/com/devcourse/springbootjpa/OrderTest.java new file mode 100644 index 000000000..d2a25f48b --- /dev/null +++ b/src/test/java/com/devcourse/springbootjpa/OrderTest.java @@ -0,0 +1,110 @@ +package com.devcourse.springbootjpa; + +import static org.hamcrest.MatcherAssert.*; +import static org.hamcrest.Matchers.*; + +import java.util.List; +import java.util.UUID; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +import com.devcourse.springbootjpa.domain.order.Item; +import com.devcourse.springbootjpa.domain.order.Member; +import com.devcourse.springbootjpa.domain.order.Order; +import com.devcourse.springbootjpa.domain.order.OrderItem; +import com.devcourse.springbootjpa.domain.order.OrderStatus; +import com.devcourse.springbootjpa.domain.repository.ItemRepository; +import com.devcourse.springbootjpa.domain.repository.MemberRepository; +import com.devcourse.springbootjpa.domain.repository.OrderItemRepository; +import com.devcourse.springbootjpa.domain.repository.OrderRepository; + +@DataJpaTest +class OrderTest { + @Autowired + OrderRepository orderRepository; + + @Autowired + MemberRepository memberRepository; + + @Autowired + OrderItemRepository orderItemRepository; + + @Autowired + ItemRepository itemRepository; + Member member; + Item item; + OrderItem orderItem; + Order order; + + @BeforeEach + void setup() { + member = Member.builder() + .name("seungwon") + .nickname("baekdung") + .age(26) + .address("Gangnam, Seoul") + .description("vip") + .build(); + memberRepository.save(member); + + item = Item.builder() + .price(999_000) + .stockQuantity(100) + .build(); + itemRepository.save(item); + orderItem = OrderItem.builder() + .price(999_000) + .quantity(10) + .item(item) + .build(); + orderItemRepository.save(orderItem); + order = Order.builder() + .uuid(UUID.randomUUID().toString()) + .memo("부재시 문앞에 놔주세요") + .orderStatus(OrderStatus.OPENED) + .member(member) + .orderItems(List.of(orderItem)) + .build(); + } + + @Test + @DisplayName("주문 생성이 가능하다") + void CreateTest() { + // given + // when + Order saved = orderRepository.save(order); + // then + assertThat(saved.getOrderItems().get(0), is(equalTo(orderItem))); + assertThat(saved.getMember(), is(equalTo(member))); + } + + @Test + @DisplayName("주문 아이디로 검색이 가능하다") + void SearchTest() { + // given + Order saved = orderRepository.save(order); + String id = saved.getUuid(); + // when + Order found = orderRepository.findById(id).get(); + // then + assertThat(found, is(equalTo(saved))); + } + + @Test + @DisplayName("주문을 취소시 상태가 변경된다") + void deleteTest() { + // given + Order saved = orderRepository.save(order); + String id = saved.getUuid(); + // when + Order found = orderRepository.findById(id).get(); + found.changeOrderStatus(OrderStatus.CANCELED); + // then + assertThat(found.getOrderStatus(), is(equalTo(OrderStatus.CANCELED))); + } + +} diff --git a/src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java b/src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java deleted file mode 100644 index e54925388..000000000 --- a/src/test/java/com/devcourse/springbootjpa/PersistenceContextTest.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.devcourse.springbootjpa; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import com.devcourse.springbootjpa.domain.Customer; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.EntityManagerFactory; -import jakarta.persistence.EntityTransaction; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@SpringBootTest -class PersistenceContextTest { - @Autowired - CustomerRepository repository; - - @Autowired - EntityManagerFactory emf; - - @BeforeEach - void setUp() { - repository.deleteAll(); - } - - @Test - void 저장() { - EntityManager entityManager = emf.createEntityManager(); - EntityTransaction transaction = entityManager.getTransaction(); - - transaction.begin(); - - Customer customer = new Customer("Seungwon", "Han"); - - entityManager.persist(customer); - transaction.commit(); - } - - @Test - void 조회_DB조회() { - EntityManager entityManager = emf.createEntityManager(); - EntityTransaction transaction = entityManager.getTransaction(); - - transaction.begin(); - - Customer customer = new Customer("Seungwon", "Han"); - - entityManager.persist(customer); - transaction.commit(); - long id = customer.getId(); - - entityManager.detach(customer); - - Customer selected = entityManager.find(Customer.class, id); - log.info("{} {}", selected.getFirstName(), selected.getLastName()); - } - - @Test - void 조회_1차캐시_조회() { - EntityManager entityManager = emf.createEntityManager(); - EntityTransaction transaction = entityManager.getTransaction(); - - transaction.begin(); - - Customer customer = new Customer("Seungwon", "Han"); - - entityManager.persist(customer); - transaction.commit(); - long id = customer.getId(); - - Customer selected = entityManager.find(Customer.class, id); - log.info("{} {}", selected.getFirstName(), selected.getLastName()); - } - @Test - void 수정() { - EntityManager entityManager = emf.createEntityManager(); - EntityTransaction transaction = entityManager.getTransaction(); - - transaction.begin(); - - Customer customer = new Customer("Seungwon", "Han"); - - entityManager.persist(customer); - transaction.commit(); - - transaction.begin(); - customer.changeFirstName("Gildong"); - customer.changeLastName("Hong"); - - transaction.commit(); - } - - @Test - void 삭제() { - EntityManager entityManager = emf.createEntityManager(); - EntityTransaction transaction = entityManager.getTransaction(); - - transaction.begin(); - - Customer customer = new Customer("Seungwon", "Han"); - - entityManager.persist(customer); - transaction.commit(); - - transaction.begin(); - - entityManager.remove(customer); - - transaction.commit(); - } -} From 5d22a0f8e31f7609e193b57704afab70a166d688 Mon Sep 17 00:00:00 2001 From: SW-H Date: Mon, 31 Jul 2023 00:50:34 +0900 Subject: [PATCH 10/10] =?UTF-8?q?feat=20:=20=EB=A1=AC=EB=B3=B5=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9/=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=88=98=EC=A0=95,=20j?= =?UTF-8?q?pa=20=EC=97=B0=EA=B4=80=EA=B4=80=EA=B3=84=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springbootjpa/domain/order/Item.java | 16 ++++--- .../springbootjpa/domain/order/Member.java | 38 +++++++--------- .../springbootjpa/domain/order/Order.java | 44 +++++++++---------- .../springbootjpa/domain/order/OrderItem.java | 18 +++++--- .../domain/repository/OrderRepository.java | 2 +- .../springbootjpa/OrderPersistenceTest.java | 6 +-- .../devcourse/springbootjpa/OrderTest.java | 6 +-- 7 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/Item.java b/src/main/java/com/devcourse/springbootjpa/domain/order/Item.java index 189282d33..f3b44bba6 100644 --- a/src/main/java/com/devcourse/springbootjpa/domain/order/Item.java +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/Item.java @@ -10,19 +10,19 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import lombok.AllArgsConstructor; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; @Entity @Table(name = "item") -@Builder @Getter -@AllArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Item { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) - private long id; + private Long id; private int price; @@ -31,12 +31,16 @@ public class Item { @OneToMany(mappedBy = "item") private List orderItems; - protected Item() { + public Item(int price, int stockQuantity) { + this.price = price; + this.stockQuantity = stockQuantity; } - public Item(int price, int stockQuantity) { + @Builder + public Item(int price, int stockQuantity, List orderItems) { this.price = price; this.stockQuantity = stockQuantity; + this.orderItems = orderItems; } public void addOrderItem(OrderItem orderItem) { diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/Member.java b/src/main/java/com/devcourse/springbootjpa/domain/order/Member.java index c5bd5cc5a..cc2416293 100644 --- a/src/main/java/com/devcourse/springbootjpa/domain/order/Member.java +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/Member.java @@ -1,51 +1,47 @@ package com.devcourse.springbootjpa.domain.order; -import java.util.ArrayList; -import java.util.List; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import lombok.AllArgsConstructor; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; @Entity @Table(name = "member") @Getter -@Builder -@AllArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) + public class Member { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) - private long id; + private Long id; - @Column(name = "name", nullable = false, length = 30) + @Column(nullable = false, length = 30) private String name; - @Column(name = "nick_name", nullable = false, length = 30, unique = true) + @Column(nullable = false, length = 30, unique = true) private String nickname; - @Column(name = "age", nullable = false) + @Column(nullable = false) private int age; - @Column(name = "address", nullable = false) + @Column(nullable = false) private String address; - @Column(name = "description", nullable = false) + @Column(nullable = false) private String description; - @OneToMany(mappedBy = "member") - private List orders = new ArrayList<>(); - - protected Member() { - } - - public void addOrder(Order order) { - order.setMember(this); + @Builder + public Member(String name, String nickname, int age, String address, String description) { + this.name = name; + this.nickname = nickname; + this.age = age; + this.address = address; + this.description = description; } } diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/Order.java b/src/main/java/com/devcourse/springbootjpa/domain/order/Order.java index 0d74651e1..27e195385 100644 --- a/src/main/java/com/devcourse/springbootjpa/domain/order/Order.java +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/Order.java @@ -1,65 +1,63 @@ package com.devcourse.springbootjpa.domain.order; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; -import java.util.Objects; +import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import lombok.AllArgsConstructor; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; @Entity @Table(name = "orders") @Getter -@AllArgsConstructor -@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Order { @Id - @Column(name = "id") - private String uuid; + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; - @Column(name = "memo") private String memo; @Enumerated(value = EnumType.STRING) private OrderStatus orderStatus; - @Column(name = "order_datetime", columnDefinition = "TIMESTAMP") + @Column(columnDefinition = "TIMESTAMP") private LocalDateTime orderDateTime; - @Column(name = "member_id", insertable = false, updatable = false) - private long memberID; - @ManyToOne - @JoinColumn(name = "member_id", referencedColumnName = "id") + @JoinColumn(referencedColumnName = "id") private Member member; - @OneToMany(mappedBy = "order") - private List orderItems; - - protected Order() { - } - - public void setMember(Member member) { - if (Objects.nonNull(this.member)) { - this.member.getOrders().remove(this); - } + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) + private List orderItems = new ArrayList<>(); + @Builder + public Order(String memo, OrderStatus orderStatus, LocalDateTime orderDateTime, Member member, + List orderItems) { + this.memo = memo; + this.orderStatus = orderStatus; + this.orderDateTime = orderDateTime; this.member = member; - member.getOrders().add(this); + this.orderItems = orderItems; } public void addOrderItem(OrderItem orderItem) { orderItems.add(orderItem); + orderItem.setOrder(this); } public void changeOrderStatus(OrderStatus orderStatus) { diff --git a/src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java b/src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java index 76e164d81..621c6b85b 100644 --- a/src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java +++ b/src/main/java/com/devcourse/springbootjpa/domain/order/OrderItem.java @@ -6,33 +6,41 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import lombok.AllArgsConstructor; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; @Entity @Table(name = "order_item") @Getter -@AllArgsConstructor -@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class OrderItem { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE) - private long id; + private Long id; private int price; private int quantity; @ManyToOne + @JoinColumn(referencedColumnName = "id") private Order order; @ManyToOne + @JoinColumn(referencedColumnName = "id") private Item item; - protected OrderItem() { + @Builder + public OrderItem(int price, int quantity, Order order, Item item) { + this.price = price; + this.quantity = quantity; + this.order = order; + this.item = item; } public void setOrder(Order order) { diff --git a/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java b/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java index 9168e284f..74e4f9b3e 100644 --- a/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java +++ b/src/main/java/com/devcourse/springbootjpa/domain/repository/OrderRepository.java @@ -4,5 +4,5 @@ import com.devcourse.springbootjpa.domain.order.Order; -public interface OrderRepository extends JpaRepository { +public interface OrderRepository extends JpaRepository { } diff --git a/src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java b/src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java index c1c83bbc8..8115a488e 100644 --- a/src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java +++ b/src/test/java/com/devcourse/springbootjpa/OrderPersistenceTest.java @@ -3,7 +3,6 @@ import static com.devcourse.springbootjpa.domain.order.OrderStatus.*; import java.time.LocalDateTime; -import java.util.UUID; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -61,21 +60,18 @@ void member_insert() { entityManager.persist(member); Order order = Order.builder() - .uuid(UUID.randomUUID().toString()) .orderStatus(OPENED) .orderDateTime(LocalDateTime.now()) .memo("부재시 연락주세요") .member(member) .build(); - entityManager.persist(order); transaction.commit(); entityManager.clear(); - Order entity = entityManager.find(Order.class, order.getUuid()); + Order entity = entityManager.find(Order.class, order.getId()); log.info("{}", entity.getMember().getNickname()); - log.info("{}", entity.getMember().getOrders().size()); } } diff --git a/src/test/java/com/devcourse/springbootjpa/OrderTest.java b/src/test/java/com/devcourse/springbootjpa/OrderTest.java index d2a25f48b..1bd9a827f 100644 --- a/src/test/java/com/devcourse/springbootjpa/OrderTest.java +++ b/src/test/java/com/devcourse/springbootjpa/OrderTest.java @@ -4,7 +4,6 @@ import static org.hamcrest.Matchers.*; import java.util.List; -import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -63,7 +62,6 @@ void setup() { .build(); orderItemRepository.save(orderItem); order = Order.builder() - .uuid(UUID.randomUUID().toString()) .memo("부재시 문앞에 놔주세요") .orderStatus(OrderStatus.OPENED) .member(member) @@ -87,7 +85,7 @@ void CreateTest() { void SearchTest() { // given Order saved = orderRepository.save(order); - String id = saved.getUuid(); + Long id = saved.getId(); // when Order found = orderRepository.findById(id).get(); // then @@ -99,7 +97,7 @@ void SearchTest() { void deleteTest() { // given Order saved = orderRepository.save(order); - String id = saved.getUuid(); + Long id = saved.getId(); // when Order found = orderRepository.findById(id).get(); found.changeOrderStatus(OrderStatus.CANCELED);