diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..549e00a2a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..bf82ff01c Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..ca5ab4bab --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/mvnw b/mvnw new file mode 100644 index 000000000..8a8fb2282 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..501800a2d --- /dev/null +++ b/pom.xml @@ -0,0 +1,88 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.0.9 + + + com + jpa-weekly + 0.0.1-SNAPSHOT + jpa-weekly + jpa-weekly + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.security + spring-security-crypto + + + org.springframework.boot + spring-boot-starter-validation + + + com.h2database + h2 + runtime + + + org.mockito + mockito-inline + 5.1.1 + test + + + org.instancio + instancio-junit + 3.0.0 + test + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + test + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/com/jpaweekly/JpaWeekilyApplication.java b/src/main/java/com/jpaweekly/JpaWeekilyApplication.java new file mode 100644 index 000000000..bf413c9f2 --- /dev/null +++ b/src/main/java/com/jpaweekly/JpaWeekilyApplication.java @@ -0,0 +1,15 @@ +package com.jpaweekly; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class JpaWeekilyApplication { + + public static void main(String[] args) { + SpringApplication.run(JpaWeekilyApplication.class, args); + } + +} diff --git a/src/main/java/com/jpaweekly/common/BaseEntity.java b/src/main/java/com/jpaweekly/common/BaseEntity.java new file mode 100644 index 000000000..5f3e6614b --- /dev/null +++ b/src/main/java/com/jpaweekly/common/BaseEntity.java @@ -0,0 +1,24 @@ +package com.jpaweekly.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@Getter +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseEntity { + @Column(name = "created_at", nullable = false, updatable = false) + @CreatedDate + LocalDateTime createdAt; + + @Column(name = "updated_at", nullable = false) + @LastModifiedDate + LocalDateTime updatedAt; +} diff --git a/src/main/java/com/jpaweekly/config/Config.java b/src/main/java/com/jpaweekly/config/Config.java new file mode 100644 index 000000000..36589ac6d --- /dev/null +++ b/src/main/java/com/jpaweekly/config/Config.java @@ -0,0 +1,15 @@ +package com.jpaweekly.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +@Configuration +public class Config { + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/com/jpaweekly/domain/customer/Customer.java b/src/main/java/com/jpaweekly/domain/customer/Customer.java new file mode 100644 index 000000000..40a1211e6 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/Customer.java @@ -0,0 +1,35 @@ +package com.jpaweekly.domain.customer; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Table(name = "customers") +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Customer { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "first_name", nullable = false) + private String firstName; + + @Column(name = "last_name", nullable = false) + private String lastName; + + @Builder + private Customer(String firstName, String lastName) { + this.firstName = firstName; + this.lastName = lastName; + } + + public void update(String firstName, String lastName) { + this.firstName = firstName; + this.lastName = lastName; + } +} diff --git a/src/main/java/com/jpaweekly/domain/customer/CustomerConverter.java b/src/main/java/com/jpaweekly/domain/customer/CustomerConverter.java new file mode 100644 index 000000000..1063bbc40 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/CustomerConverter.java @@ -0,0 +1,21 @@ +package com.jpaweekly.domain.customer; + +import com.jpaweekly.domain.customer.dto.CustomerRequest; +import com.jpaweekly.domain.customer.dto.CustomerResponse; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class CustomerConverter { + + public static CustomerResponse convertEntityToResponse(Customer customer) { + return new CustomerResponse(customer.getId(), customer.getFirstName(), customer.getLastName()); + } + + public static Customer convertRequestToEntity(CustomerRequest request) { + return Customer.builder() + .firstName(request.firstName()) + .lastName(request.lastName()) + .build(); + } +} diff --git a/src/main/java/com/jpaweekly/domain/customer/application/CustomerService.java b/src/main/java/com/jpaweekly/domain/customer/application/CustomerService.java new file mode 100644 index 000000000..08ef77527 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/application/CustomerService.java @@ -0,0 +1,21 @@ +package com.jpaweekly.domain.customer.application; + +import com.jpaweekly.domain.customer.dto.CustomerRequest; +import com.jpaweekly.domain.customer.dto.CustomerResponse; +import com.jpaweekly.domain.customer.dto.CustomerUpdate; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface CustomerService { + + Long create(CustomerRequest request); + + CustomerResponse findCustomerById(Long id); + + Page findCustomersWithPaging(Pageable pageable); + + void update(Long id, CustomerUpdate request); + + void delete(Long id); + +} diff --git a/src/main/java/com/jpaweekly/domain/customer/application/CustomerServiceImpl.java b/src/main/java/com/jpaweekly/domain/customer/application/CustomerServiceImpl.java new file mode 100644 index 000000000..41f3bc142 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/application/CustomerServiceImpl.java @@ -0,0 +1,49 @@ +package com.jpaweekly.domain.customer.application; + +import com.jpaweekly.domain.customer.Customer; +import com.jpaweekly.domain.customer.CustomerConverter; +import com.jpaweekly.domain.customer.dto.CustomerRequest; +import com.jpaweekly.domain.customer.dto.CustomerResponse; +import com.jpaweekly.domain.customer.dto.CustomerUpdate; +import com.jpaweekly.domain.customer.infrastructrue.CustomerRepository; +import jakarta.persistence.EntityNotFoundException; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional(readOnly = true) +@Service +@RequiredArgsConstructor +public class CustomerServiceImpl implements CustomerService { + + private final CustomerRepository customerRepository; + + @Transactional + public Long create(CustomerRequest request) { + Customer customer = CustomerConverter.convertRequestToEntity(request); + return customerRepository.save(customer).getId(); + } + + public CustomerResponse findCustomerById(Long id) { + Customer customer = customerRepository.findById(id).orElseThrow(EntityNotFoundException::new); + return CustomerConverter.convertEntityToResponse(customer); + } + + public Page findCustomersWithPaging(Pageable pageable) { + return customerRepository.findAll(pageable) + .map(CustomerConverter::convertEntityToResponse); + } + + @Transactional + public void update(Long id, CustomerUpdate request) { + Customer customer = customerRepository.findById(id).orElseThrow(EntityNotFoundException::new); + customer.update(request.firstName(), request.lastName()); + } + + @Transactional + public void delete(Long id) { + customerRepository.deleteById(id); + } +} diff --git a/src/main/java/com/jpaweekly/domain/customer/dto/CustomerRequest.java b/src/main/java/com/jpaweekly/domain/customer/dto/CustomerRequest.java new file mode 100644 index 000000000..e07c0042c --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/dto/CustomerRequest.java @@ -0,0 +1,11 @@ +package com.jpaweekly.domain.customer.dto; + +import jakarta.validation.constraints.NotBlank; + +public record CustomerRequest ( + @NotBlank + String firstName, + @NotBlank + String lastName +){ +} diff --git a/src/main/java/com/jpaweekly/domain/customer/dto/CustomerResponse.java b/src/main/java/com/jpaweekly/domain/customer/dto/CustomerResponse.java new file mode 100644 index 000000000..9fb161cd0 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/dto/CustomerResponse.java @@ -0,0 +1,8 @@ +package com.jpaweekly.domain.customer.dto; + +public record CustomerResponse ( + Long id, + String firstName, + String lastName +){ +} diff --git a/src/main/java/com/jpaweekly/domain/customer/dto/CustomerUpdate.java b/src/main/java/com/jpaweekly/domain/customer/dto/CustomerUpdate.java new file mode 100644 index 000000000..e105b85b1 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/dto/CustomerUpdate.java @@ -0,0 +1,11 @@ +package com.jpaweekly.domain.customer.dto; + +import jakarta.validation.constraints.NotBlank; + +public record CustomerUpdate ( + @NotBlank + String firstName, + @NotBlank + String lastName +) { +} diff --git a/src/main/java/com/jpaweekly/domain/customer/infrastructrue/CustomerRepository.java b/src/main/java/com/jpaweekly/domain/customer/infrastructrue/CustomerRepository.java new file mode 100644 index 000000000..d5c536ff0 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/infrastructrue/CustomerRepository.java @@ -0,0 +1,8 @@ +package com.jpaweekly.domain.customer.infrastructrue; + +import com.jpaweekly.domain.customer.Customer; +import org.springframework.data.jpa.repository.JpaRepository; + + +public interface CustomerRepository extends JpaRepository { +} diff --git a/src/main/java/com/jpaweekly/domain/customer/presentation/CustomerApiController.java b/src/main/java/com/jpaweekly/domain/customer/presentation/CustomerApiController.java new file mode 100644 index 000000000..128842306 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/customer/presentation/CustomerApiController.java @@ -0,0 +1,41 @@ +package com.jpaweekly.domain.customer.presentation; + +import com.jpaweekly.domain.customer.application.CustomerService; +import com.jpaweekly.domain.customer.dto.CustomerRequest; +import com.jpaweekly.domain.customer.dto.CustomerResponse; +import com.jpaweekly.domain.customer.dto.CustomerUpdate; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/v1/customers") +@RequiredArgsConstructor +public class CustomerApiController { + + private final CustomerService customerService; + + @GetMapping + public ResponseEntity> customerPage(@PageableDefault() Pageable pageable) { + Page customers = customerService.findCustomersWithPaging(pageable); + return ResponseEntity.ok(customers); + } + + @PostMapping + public ResponseEntity customerCreate(@RequestBody @Valid CustomerRequest request) { + Long id = customerService.create(request); + return new ResponseEntity<>(id, HttpStatus.CREATED); + } + + @PatchMapping("/{id}") + public ResponseEntity customerUpdate(@PathVariable Long id, @RequestBody CustomerUpdate request) { + customerService.update(id, request); + return ResponseEntity.ok().build(); + } + +} diff --git a/src/main/java/com/jpaweekly/domain/order/Order.java b/src/main/java/com/jpaweekly/domain/order/Order.java new file mode 100644 index 000000000..972f5ba5f --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/Order.java @@ -0,0 +1,58 @@ +package com.jpaweekly.domain.order; + +import com.jpaweekly.common.BaseEntity; +import com.jpaweekly.domain.user.User; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.util.Assert; + +@Entity +@Table(name = "orders") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Order extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String address; + + @Enumerated(EnumType.STRING) + private OrderStatus orderStatus; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @Builder + private Order(String address, OrderStatus orderStatus, User user) { + Assert.notNull(user, "User must be provided"); + Assert.notNull(address, "Address must be provided"); + this.address = address; + this.orderStatus = orderStatus; + this.user = user; + } + + public void changeOrderStatusToDelivering() { + if (this.orderStatus == OrderStatus.READY_FOR_DELIVERY) { + this.orderStatus = OrderStatus.DELIVERING; + } else throw new RuntimeException("message"); + } + + public void changeOrderStatusToComplete() { + if (this.orderStatus == OrderStatus.DELIVERING) { + this.orderStatus = OrderStatus.COMPLETED; + } else throw new RuntimeException("message"); + } + + public void cancelOrder() { + if (this.orderStatus != OrderStatus.COMPLETED) { + this.orderStatus = OrderStatus.CANCELLED; + } else throw new RuntimeException("message"); + } + +} diff --git a/src/main/java/com/jpaweekly/domain/order/OrderProduct.java b/src/main/java/com/jpaweekly/domain/order/OrderProduct.java new file mode 100644 index 000000000..31892de8d --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/OrderProduct.java @@ -0,0 +1,39 @@ +package com.jpaweekly.domain.order; + +import com.jpaweekly.domain.product.Product; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Table(name = "order_product") +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class OrderProduct { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "order_id") + private Order order; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "product_id") + private Product product; + + private int quantity; + + private int totalPrice; + + @Builder + private OrderProduct(Order order, Product product, int quantity) { + this.order = order; + this.product = product; + this.quantity = quantity; + this.totalPrice = product.getPrice() * quantity; + } +} diff --git a/src/main/java/com/jpaweekly/domain/order/OrderStatus.java b/src/main/java/com/jpaweekly/domain/order/OrderStatus.java new file mode 100644 index 000000000..420658775 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/OrderStatus.java @@ -0,0 +1,8 @@ +package com.jpaweekly.domain.order; + +public enum OrderStatus { + READY_FOR_DELIVERY, + DELIVERING, + COMPLETED, + CANCELLED +} diff --git a/src/main/java/com/jpaweekly/domain/order/application/OrderService.java b/src/main/java/com/jpaweekly/domain/order/application/OrderService.java new file mode 100644 index 000000000..daf56b9ef --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/application/OrderService.java @@ -0,0 +1,27 @@ +package com.jpaweekly.domain.order.application; + +import com.jpaweekly.domain.order.dto.OrderCreateRequest; +import com.jpaweekly.domain.order.dto.OrderProductResponse; +import com.jpaweekly.domain.order.dto.OrderResponse; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface OrderService { + Long createOrder(Long id, OrderCreateRequest request); + + OrderResponse findOrderById(Long id); + + Page findOrders(Pageable pageable); + + Page findOrderProducts(Pageable pageable); + + Page findOrderProductsByOderId(Long orderId, Pageable pageable); + + void deliverOrder(Long id); + + void completeOrder(Long id); + + void deleteOrder(Long id); + + void cancelOrder(Long id); +} diff --git a/src/main/java/com/jpaweekly/domain/order/application/OrderServiceImpl.java b/src/main/java/com/jpaweekly/domain/order/application/OrderServiceImpl.java new file mode 100644 index 000000000..56cb7ea1d --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/application/OrderServiceImpl.java @@ -0,0 +1,97 @@ +package com.jpaweekly.domain.order.application; + +import com.jpaweekly.domain.order.Order; +import com.jpaweekly.domain.order.OrderProduct; +import com.jpaweekly.domain.order.dto.OrderCreateRequest; +import com.jpaweekly.domain.order.dto.OrderProductResponse; +import com.jpaweekly.domain.order.dto.OrderResponse; +import com.jpaweekly.domain.order.infrastructrue.OrderProductRepository; +import com.jpaweekly.domain.order.infrastructrue.OrderRepository; +import com.jpaweekly.domain.product.Product; +import com.jpaweekly.domain.product.infrastructrue.ProductRepository; +import com.jpaweekly.domain.user.User; +import com.jpaweekly.domain.user.infrastructrue.UserRepository; +import jakarta.persistence.EntityNotFoundException; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +@Transactional(readOnly = true) +@Service +@RequiredArgsConstructor +public class OrderServiceImpl implements OrderService { + + private final OrderRepository orderRepository; + private final UserRepository userRepository; + private final ProductRepository productRepository; + private final OrderProductRepository orderProductRepository; + + @Transactional + public Long createOrder(Long id, OrderCreateRequest request) { + User user = userRepository.findById(id).orElseThrow(EntityNotFoundException::new); + + Order order = request.toEntity(user); + Order savedOrder = orderRepository.save(order); + + List orderProducts = new ArrayList<>(); + request.orderProductCreateList().forEach(item -> { + Product product = productRepository.findById(item.productId()).orElseThrow(EntityNotFoundException::new); + OrderProduct orderProduct = OrderProduct.builder() + .order(savedOrder) + .product(product) + .quantity(item.quantity()) + .build(); + orderProducts.add(orderProduct); + }); + orderProductRepository.saveAll(orderProducts); + return savedOrder.getId(); + } + + public OrderResponse findOrderById(Long id) { + Order order = orderRepository.findById(id).orElseThrow(EntityNotFoundException::new); + return OrderResponse.from(order); + } + + public Page findOrders(Pageable pageable) { + return orderRepository.findAll(pageable) + .map(OrderResponse::from); + } + + public Page findOrderProducts(Pageable pageable) { + return orderProductRepository.findAll(pageable) + .map(OrderProductResponse::from); + } + + public Page findOrderProductsByOderId(Long orderId, Pageable pageable) { + return orderProductRepository.findByOrderId(orderId, pageable) + .map(OrderProductResponse::from); + } + + @Transactional + public void deliverOrder(Long id) { + Order order = orderRepository.findById(id).orElseThrow(EntityNotFoundException::new); + order.changeOrderStatusToDelivering(); + } + + @Transactional + public void completeOrder(Long id) { + Order order = orderRepository.findById(id).orElseThrow(EntityNotFoundException::new); + order.changeOrderStatusToComplete(); + } + + @Transactional + public void cancelOrder(Long id) { + Order order = orderRepository.findById(id).orElseThrow(EntityNotFoundException::new); + order.cancelOrder(); + } + + @Transactional + public void deleteOrder(Long id) { + orderRepository.deleteById(id); + } +} diff --git a/src/main/java/com/jpaweekly/domain/order/dto/OrderCreateRequest.java b/src/main/java/com/jpaweekly/domain/order/dto/OrderCreateRequest.java new file mode 100644 index 000000000..50a6a2d9f --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/dto/OrderCreateRequest.java @@ -0,0 +1,25 @@ +package com.jpaweekly.domain.order.dto; + +import com.jpaweekly.domain.order.Order; +import com.jpaweekly.domain.order.OrderStatus; +import com.jpaweekly.domain.user.User; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +import java.util.List; + + +public record OrderCreateRequest( + @NotBlank + String address, + @NotNull + List orderProductCreateList +) { + public Order toEntity(User user) { + return Order.builder() + .address(this.address) + .orderStatus(OrderStatus.READY_FOR_DELIVERY) + .user(user) + .build(); + } +} diff --git a/src/main/java/com/jpaweekly/domain/order/dto/OrderProductCreate.java b/src/main/java/com/jpaweekly/domain/order/dto/OrderProductCreate.java new file mode 100644 index 000000000..0d4704934 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/dto/OrderProductCreate.java @@ -0,0 +1,12 @@ +package com.jpaweekly.domain.order.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record OrderProductCreate( + @NotNull + Long productId, + @NotBlank + int quantity +) { +} diff --git a/src/main/java/com/jpaweekly/domain/order/dto/OrderProductResponse.java b/src/main/java/com/jpaweekly/domain/order/dto/OrderProductResponse.java new file mode 100644 index 000000000..5dda5ce05 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/dto/OrderProductResponse.java @@ -0,0 +1,17 @@ +package com.jpaweekly.domain.order.dto; + +import com.jpaweekly.domain.order.OrderProduct; + +public record OrderProductResponse ( + String productName, + int quantity, + int totalPrice +){ + public static OrderProductResponse from(OrderProduct orderProduct) { + return new OrderProductResponse( + orderProduct.getProduct().getProductName(), + orderProduct.getQuantity(), + orderProduct.getTotalPrice() + ); + } +} diff --git a/src/main/java/com/jpaweekly/domain/order/dto/OrderResponse.java b/src/main/java/com/jpaweekly/domain/order/dto/OrderResponse.java new file mode 100644 index 000000000..042761974 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/dto/OrderResponse.java @@ -0,0 +1,22 @@ +package com.jpaweekly.domain.order.dto; + +import com.jpaweekly.domain.order.Order; +import com.jpaweekly.domain.order.OrderStatus; + +import java.time.LocalDateTime; + +public record OrderResponse( + Long id, + String nickname, + String address, + OrderStatus orderStatus, + LocalDateTime createdAt +) { + public static OrderResponse from(Order order) { + return new OrderResponse(order.getId(), + order.getUser().getNickname(), + order.getAddress(), + order.getOrderStatus(), + order.getCreatedAt()); + } +} diff --git a/src/main/java/com/jpaweekly/domain/order/infrastructrue/CustomOrderProductRepository.java b/src/main/java/com/jpaweekly/domain/order/infrastructrue/CustomOrderProductRepository.java new file mode 100644 index 000000000..36f4685a2 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/infrastructrue/CustomOrderProductRepository.java @@ -0,0 +1,9 @@ +package com.jpaweekly.domain.order.infrastructrue; + +import com.jpaweekly.domain.order.OrderProduct; + +import java.util.List; + +public interface CustomOrderProductRepository { + void saveAll(List orderProducts); +} diff --git a/src/main/java/com/jpaweekly/domain/order/infrastructrue/CustomOrderProductRepositoryImpl.java b/src/main/java/com/jpaweekly/domain/order/infrastructrue/CustomOrderProductRepositoryImpl.java new file mode 100644 index 000000000..ac7734aad --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/infrastructrue/CustomOrderProductRepositoryImpl.java @@ -0,0 +1,37 @@ +package com.jpaweekly.domain.order.infrastructrue; + +import com.jpaweekly.domain.order.OrderProduct; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.jdbc.core.namedparam.SqlParameterSource; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Repository +@RequiredArgsConstructor +public class CustomOrderProductRepositoryImpl implements CustomOrderProductRepository{ + + private final NamedParameterJdbcTemplate jdbcTemplate; + + @Transactional + public void saveAll(List orderProducts) { + SqlParameterSource[] sqlParameterSources = new SqlParameterSource[orderProducts.size()]; + int idx = 0; + for (OrderProduct orderProduct : orderProducts) { + SqlParameterSource source = new MapSqlParameterSource() + .addValue("order_id", orderProduct.getOrder().getId()) + .addValue("product_id", orderProduct.getProduct().getId()) + .addValue("quantity", orderProduct.getQuantity()) + .addValue("totalPrice", orderProduct.getTotalPrice()); + sqlParameterSources[idx++] = source; + } + String sql = """ + insert into order_product (order_id, product_id, quantity, total_price) + values(:order_id, :product_id, :quantity, :totalPrice)"""; + jdbcTemplate.batchUpdate(sql, sqlParameterSources); + } + +} diff --git a/src/main/java/com/jpaweekly/domain/order/infrastructrue/OrderProductRepository.java b/src/main/java/com/jpaweekly/domain/order/infrastructrue/OrderProductRepository.java new file mode 100644 index 000000000..915c9459b --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/infrastructrue/OrderProductRepository.java @@ -0,0 +1,11 @@ +package com.jpaweekly.domain.order.infrastructrue; + +import com.jpaweekly.domain.order.OrderProduct; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface OrderProductRepository extends JpaRepository, CustomOrderProductRepository { + + Page findByOrderId(Long orderId, Pageable pageable); +} diff --git a/src/main/java/com/jpaweekly/domain/order/infrastructrue/OrderRepository.java b/src/main/java/com/jpaweekly/domain/order/infrastructrue/OrderRepository.java new file mode 100644 index 000000000..0727b0ab0 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/order/infrastructrue/OrderRepository.java @@ -0,0 +1,8 @@ +package com.jpaweekly.domain.order.infrastructrue; + +import com.jpaweekly.domain.order.Order; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface OrderRepository extends JpaRepository { + +} diff --git a/src/main/java/com/jpaweekly/domain/product/Product.java b/src/main/java/com/jpaweekly/domain/product/Product.java new file mode 100644 index 000000000..9a64f7624 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/product/Product.java @@ -0,0 +1,36 @@ +package com.jpaweekly.domain.product; + +import com.jpaweekly.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.util.StringUtils; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Product extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "product_name", nullable = false) + private String productName; + + @Column(name = "price", nullable = false) + private int price; + + @Builder + private Product(String productName, int price) { + this.productName = productName; + this.price = price; + } + + public void update(String ProductName, int price) { + this.productName = productName; + this.price = price; + } +} diff --git a/src/main/java/com/jpaweekly/domain/product/application/ProductService.java b/src/main/java/com/jpaweekly/domain/product/application/ProductService.java new file mode 100644 index 000000000..394f6489d --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/product/application/ProductService.java @@ -0,0 +1,21 @@ +package com.jpaweekly.domain.product.application; + +import com.jpaweekly.domain.product.dto.ProductCreateRequest; +import com.jpaweekly.domain.product.dto.ProductResponse; +import com.jpaweekly.domain.product.dto.ProductUpdateRequest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface ProductService { + Long createProduct(ProductCreateRequest request); + + ProductResponse findProductById(Long id); + + ProductResponse findProductByProductName(String productName); + + Page findProducts(Pageable pageable); + + void updateProduct(Long id, ProductUpdateRequest request); + + void deleteProduct(Long id); +} diff --git a/src/main/java/com/jpaweekly/domain/product/application/ProductServiceImpl.java b/src/main/java/com/jpaweekly/domain/product/application/ProductServiceImpl.java new file mode 100644 index 000000000..cad874ca3 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/product/application/ProductServiceImpl.java @@ -0,0 +1,55 @@ +package com.jpaweekly.domain.product.application; + + +import com.jpaweekly.domain.product.Product; +import com.jpaweekly.domain.product.dto.ProductCreateRequest; +import com.jpaweekly.domain.product.dto.ProductResponse; +import com.jpaweekly.domain.product.dto.ProductUpdateRequest; +import com.jpaweekly.domain.product.infrastructrue.ProductRepository; +import jakarta.persistence.EntityNotFoundException; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional(readOnly = true) +@Service +@RequiredArgsConstructor +public class ProductServiceImpl implements ProductService { + + private final ProductRepository productRepository; + + @Transactional + public Long createProduct(ProductCreateRequest request) { + Product product = request.toEntity(); + return productRepository.save(product).getId(); + } + + public ProductResponse findProductById(Long id) { + Product product = productRepository.findById(id).orElseThrow(EntityNotFoundException::new); + return ProductResponse.from(product); + } + + public ProductResponse findProductByProductName(String productName) { + Product product = productRepository.findByProductName(productName).orElseThrow(EntityNotFoundException::new); + return ProductResponse.from(product); + } + + public Page findProducts(Pageable pageable) { + return productRepository.findAll(pageable) + .map(ProductResponse::from); + } + + @Transactional + public void updateProduct(Long id, ProductUpdateRequest request) { + Product product = productRepository.findById(id).orElseThrow(EntityNotFoundException::new); + product.update(request.productName(), request.price()); + } + + @Transactional + public void deleteProduct(Long id) { + productRepository.deleteById(id); + } + +} diff --git a/src/main/java/com/jpaweekly/domain/product/dto/ProductCreateRequest.java b/src/main/java/com/jpaweekly/domain/product/dto/ProductCreateRequest.java new file mode 100644 index 000000000..d518c9f62 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/product/dto/ProductCreateRequest.java @@ -0,0 +1,19 @@ +package com.jpaweekly.domain.product.dto; + +import com.jpaweekly.domain.product.Product; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; + +public record ProductCreateRequest( + @NotBlank + String productName, + @Min(0) + int price +) { + public Product toEntity() { + return Product.builder() + .productName(this.productName) + .price(this.price) + .build(); + } +} diff --git a/src/main/java/com/jpaweekly/domain/product/dto/ProductResponse.java b/src/main/java/com/jpaweekly/domain/product/dto/ProductResponse.java new file mode 100644 index 000000000..a57637199 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/product/dto/ProductResponse.java @@ -0,0 +1,15 @@ +package com.jpaweekly.domain.product.dto; + +import com.jpaweekly.domain.product.Product; + +public record ProductResponse( + Long id, + String ProductName, + int price +) { + public static ProductResponse from(Product product) { + return new ProductResponse(product.getId(), + product.getProductName(), + product.getPrice()); + } +} diff --git a/src/main/java/com/jpaweekly/domain/product/dto/ProductUpdateRequest.java b/src/main/java/com/jpaweekly/domain/product/dto/ProductUpdateRequest.java new file mode 100644 index 000000000..d03d52b0d --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/product/dto/ProductUpdateRequest.java @@ -0,0 +1,19 @@ +package com.jpaweekly.domain.product.dto; + +import com.jpaweekly.domain.product.Product; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; + +public record ProductUpdateRequest( + @NotBlank + String productName, + @Min(0) + int price +){ + public Product toEntity() { + return Product.builder() + .productName(this.productName) + .price(this.price) + .build(); + } +} diff --git a/src/main/java/com/jpaweekly/domain/product/infrastructrue/ProductRepository.java b/src/main/java/com/jpaweekly/domain/product/infrastructrue/ProductRepository.java new file mode 100644 index 000000000..e7751f559 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/product/infrastructrue/ProductRepository.java @@ -0,0 +1,11 @@ +package com.jpaweekly.domain.product.infrastructrue; + +import com.jpaweekly.domain.product.Product; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface ProductRepository extends JpaRepository { + + Optional findByProductName(String productName); +} diff --git a/src/main/java/com/jpaweekly/domain/user/User.java b/src/main/java/com/jpaweekly/domain/user/User.java new file mode 100644 index 000000000..cb52c1f80 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/user/User.java @@ -0,0 +1,35 @@ +package com.jpaweekly.domain.user; + +import com.jpaweekly.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Table(name = "users") +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class User extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(unique = true, nullable = false) + private String loginId; + + @Column(nullable = false) + private String password; + + @Column(unique = true, nullable = false) + private String nickname; + + @Builder + private User(String loginId, String nickname, String password) { + this.loginId = loginId; + this.nickname = nickname; + this.password = password; + } +} diff --git a/src/main/java/com/jpaweekly/domain/user/application/UserService.java b/src/main/java/com/jpaweekly/domain/user/application/UserService.java new file mode 100644 index 000000000..ab4559600 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/user/application/UserService.java @@ -0,0 +1,7 @@ +package com.jpaweekly.domain.user.application; + +import com.jpaweekly.domain.user.dto.UserCreateRequest; + +public interface UserService { + Long createUser(UserCreateRequest request); +} diff --git a/src/main/java/com/jpaweekly/domain/user/application/UserServiceImpl.java b/src/main/java/com/jpaweekly/domain/user/application/UserServiceImpl.java new file mode 100644 index 000000000..784a70c6f --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/user/application/UserServiceImpl.java @@ -0,0 +1,31 @@ +package com.jpaweekly.domain.user.application; + +import com.jpaweekly.domain.user.User; +import com.jpaweekly.domain.user.dto.UserCreateRequest; +import com.jpaweekly.domain.user.infrastructrue.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Transactional(readOnly = true) +@Service +@RequiredArgsConstructor +public class UserServiceImpl implements UserService { + + private final UserRepository userRepository; + private final PasswordEncoder passwordEncoder; + + @Transactional + public Long createUser(UserCreateRequest request) { + String encodedPassword = passwordEncoder.encode(request.password()); + User user = User.builder() + .loginId(request.loginId()) + .password(encodedPassword) + .nickname(request.nickname()) + .build(); + userRepository.save(user); + return user.getId(); + } +} diff --git a/src/main/java/com/jpaweekly/domain/user/dto/UserCreateRequest.java b/src/main/java/com/jpaweekly/domain/user/dto/UserCreateRequest.java new file mode 100644 index 000000000..ae90bfd67 --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/user/dto/UserCreateRequest.java @@ -0,0 +1,13 @@ +package com.jpaweekly.domain.user.dto; + +import jakarta.validation.constraints.NotBlank; + +public record UserCreateRequest ( + @NotBlank + String loginId, + @NotBlank + String password, + @NotBlank + String nickname +){ +} diff --git a/src/main/java/com/jpaweekly/domain/user/dto/UserResponse.java b/src/main/java/com/jpaweekly/domain/user/dto/UserResponse.java new file mode 100644 index 000000000..67cf2fa7f --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/user/dto/UserResponse.java @@ -0,0 +1,21 @@ +package com.jpaweekly.domain.user.dto; + +import com.jpaweekly.domain.user.User; + +import java.time.LocalDateTime; + +public record UserResponse( + Long id, + String loginId, + String password, + String nickname, + LocalDateTime createdAt +) { + public static UserResponse from(User user) { + return new UserResponse(user.getId(), + user.getLoginId(), + user.getPassword(), + user.getNickname(), + user.getCreatedAt()); + } +} diff --git a/src/main/java/com/jpaweekly/domain/user/infrastructrue/UserRepository.java b/src/main/java/com/jpaweekly/domain/user/infrastructrue/UserRepository.java new file mode 100644 index 000000000..27f3ec7ee --- /dev/null +++ b/src/main/java/com/jpaweekly/domain/user/infrastructrue/UserRepository.java @@ -0,0 +1,11 @@ +package com.jpaweekly.domain.user.infrastructrue; + +import com.jpaweekly.domain.user.User; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface UserRepository extends JpaRepository { + + Optional findByNickname(String nickname); +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 000000000..d076b40c5 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + datasource: + url: jdbc:h2:~/weekly + username: sa + password: + + h2: + console: + enabled: true + path: /h2-console + + jpa: + open-in-view: false + hibernate: + ddl-auto: none + show_sql: true + properties: + hibernate: + format_sql: true diff --git a/src/test/java/com/jpaweekly/domain/customer/application/CustomerServiceImplTest.java b/src/test/java/com/jpaweekly/domain/customer/application/CustomerServiceImplTest.java new file mode 100644 index 000000000..d9c1b0af0 --- /dev/null +++ b/src/test/java/com/jpaweekly/domain/customer/application/CustomerServiceImplTest.java @@ -0,0 +1,135 @@ +package com.jpaweekly.domain.customer.application; + +import com.jpaweekly.domain.customer.Customer; +import com.jpaweekly.domain.customer.CustomerConverter; +import com.jpaweekly.domain.customer.dto.CustomerRequest; +import com.jpaweekly.domain.customer.dto.CustomerResponse; +import com.jpaweekly.domain.customer.dto.CustomerUpdate; +import com.jpaweekly.domain.customer.infrastructrue.CustomerRepository; +import org.instancio.Instancio; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; + +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mockStatic; + +@ExtendWith(MockitoExtension.class) +class CustomerServiceImplTest { + + private static MockedStatic customerConverter; + + @InjectMocks + private CustomerServiceImpl customerService; + + @Mock + private CustomerRepository customerRepository; + + @BeforeAll + public static void setUp() { + customerConverter = mockStatic(CustomerConverter.class); + } + + @AfterAll + public static void tearDown() { + customerConverter.close(); + } + + @Test + void createCustomerTest() { + //given + Customer customer = Instancio.create(Customer.class); + Long customerId = customer.getId(); + CustomerRequest request = Instancio.create(CustomerRequest.class); + + given(CustomerConverter.convertRequestToEntity(request)).willReturn(customer); + given(customerRepository.save(customer)).willReturn(customer); + + //when + Long id = customerService.create(request); + + //then + assertThat(customerId).isEqualTo(id); + } + + @Test + void findByIdTest() { + Customer customer = Instancio.create(Customer.class); + Long customerId = customer.getId(); + CustomerResponse response = Instancio.create(CustomerResponse.class); + + given(customerRepository.findById(customerId)).willReturn(Optional.of(customer)); + given(CustomerConverter.convertEntityToResponse(customer)).willReturn(response); + + //when + CustomerResponse storedCustomer = customerService.findCustomerById(customerId); + + //then + assertThat(response).isEqualTo(storedCustomer); + } + + @Test + void findAllTest() { + //given + int testSize = 55; + int page = 0; + int pageSize = 10; + + Page customers = new PageImpl<>(Instancio.ofList(Customer.class).size(testSize).create()); + Pageable pageable = PageRequest.of(page, pageSize); + + given(customerRepository.findAll(pageable)).willReturn(customers); + + //when + Page storedCustomers = customerService.findCustomersWithPaging(pageable); + + //then + assertThat(storedCustomers.getTotalElements()).isEqualTo(testSize); + } + + @Test + void updateTest() { + //given + Customer customer = Instancio.create(Customer.class); + Long customerId = customer.getId(); + CustomerUpdate request = Instancio.create(CustomerUpdate.class); + CustomerResponse response = new CustomerResponse(customerId, request.firstName(), request.lastName()); + + given(customerRepository.findById(customerId)).willReturn(Optional.of(customer)); + given(CustomerConverter.convertEntityToResponse(customer)).willReturn(response); + + //when + customerService.update(customerId, request); + + //then + assertThat(request.firstName()).isEqualTo(response.firstName()); + } + + @Test + void deleteTest() { + //given + Customer customer = Instancio.create(Customer.class); + Long customerId = customer.getId(); + + //when + doNothing().when(customerRepository).deleteById(customerId); + + //then + assertThatNoException().isThrownBy(() -> customerService.delete(customerId)); + } + +} diff --git a/src/test/java/com/jpaweekly/domain/customer/infrastructure/CustomerRepositoryTest.java b/src/test/java/com/jpaweekly/domain/customer/infrastructure/CustomerRepositoryTest.java new file mode 100644 index 000000000..a02e23fe4 --- /dev/null +++ b/src/test/java/com/jpaweekly/domain/customer/infrastructure/CustomerRepositoryTest.java @@ -0,0 +1,98 @@ +package com.jpaweekly.domain.customer.infrastructure; + +import com.jpaweekly.domain.customer.application.CustomerService; +import com.jpaweekly.domain.customer.application.CustomerServiceImpl; +import com.jpaweekly.domain.customer.dto.CustomerRequest; +import com.jpaweekly.domain.customer.dto.CustomerResponse; +import com.jpaweekly.domain.customer.dto.CustomerUpdate; +import jakarta.persistence.EntityNotFoundException; +import org.instancio.Instancio; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.context.annotation.Import; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +@DataJpaTest +@Import(CustomerServiceImpl.class) +class CustomerRepositoryTest { + + @Autowired + private CustomerService customerService; + + @Test + void createTest() { + //given + CustomerRequest request = Instancio.create(CustomerRequest.class); + + //when + Long id = customerService.create(request); + + //then + assertThat(id).isNotNull(); + } + + @Test + void findByIdTest() { + //given + CustomerRequest request = Instancio.create(CustomerRequest.class); + Long id = customerService.create(request); + + //when + CustomerResponse storedCustomer = customerService.findCustomerById(id); + + //then + assertThat(id).isEqualTo(storedCustomer.id()); + } + + @Test + void findAllTest() { + //given + int testSize = 33; + List requests = Instancio.ofList(CustomerRequest.class).size(testSize).create(); + requests.forEach(customerService::create); + + //when + Pageable pageable = PageRequest.of(0, 10); + Page response = customerService.findCustomersWithPaging(pageable); + + //then + assertThat(response.getTotalElements()).isEqualTo(testSize); + } + + @Test + void updateTest() { + //given + CustomerRequest request = Instancio.create(CustomerRequest.class); + Long id = customerService.create(request); + CustomerUpdate customerUpdate = Instancio.create(CustomerUpdate.class); + + //when + customerService.update(id, customerUpdate); + CustomerResponse updated = customerService.findCustomerById(id); + + //then + assertThat(customerUpdate.firstName()).isEqualTo(updated.firstName()); + } + + @Test + void deleteTest() { + CustomerRequest request = Instancio.create(CustomerRequest.class); + Long id = customerService.create(request); + + //when + customerService.delete(id); + + //then + assertThatThrownBy(() -> customerService.findCustomerById(id)) + .isInstanceOf(EntityNotFoundException.class); + } + +} diff --git a/src/test/java/com/jpaweekly/domain/order/application/OrderServiceImplTest.java b/src/test/java/com/jpaweekly/domain/order/application/OrderServiceImplTest.java new file mode 100644 index 000000000..0a55f98b7 --- /dev/null +++ b/src/test/java/com/jpaweekly/domain/order/application/OrderServiceImplTest.java @@ -0,0 +1,124 @@ +package com.jpaweekly.domain.order.application; + +import com.jpaweekly.domain.order.Order; +import com.jpaweekly.domain.order.OrderProduct; +import com.jpaweekly.domain.order.dto.OrderCreateRequest; +import com.jpaweekly.domain.order.dto.OrderProductCreate; +import com.jpaweekly.domain.order.infrastructrue.OrderProductRepository; +import com.jpaweekly.domain.order.infrastructrue.OrderRepository; +import com.jpaweekly.domain.product.Product; +import com.jpaweekly.domain.product.infrastructrue.ProductRepository; +import com.jpaweekly.domain.user.User; +import com.jpaweekly.domain.user.infrastructrue.UserRepository; +import org.instancio.Instancio; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.test.util.ReflectionTestUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.instancio.Assign.valueOf; +import static org.instancio.Select.field; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.doNothing; + +@ExtendWith(MockitoExtension.class) +class OrderServiceImplTest { + + @InjectMocks + private OrderServiceImpl orderService; + + @Mock + private OrderRepository orderRepository; + + @Mock + private UserRepository userRepository; + + @Mock + private ProductRepository productRepository; + + @Mock + private OrderProductRepository orderProductRepository; + + Long initialId = 1L; + + @Test + void orderCreateTest() { + //given + int productSize = 100; + int orderProductCreateSize = 10; + + List productList = getProductList(productSize); + List orderProductCreateList = getOrderProductList(orderProductCreateSize, productSize); + OrderCreateRequest request = getOrderCreateRequest(orderProductCreateList); + + User user = Instancio.create(User.class); + Long userId = user.getId(); + + Order order = request.toEntity(user); + ReflectionTestUtils.setField(order, "id", initialId); + + given(userRepository.findById(userId)).willReturn(Optional.of(user)); + given(orderRepository.save(any(Order.class))).willReturn(order); + for (int i = 0; i < orderProductCreateList.size(); i++) { + long productId = orderProductCreateList.get(i).productId(); + int productIdx = (int) productId - 1; + given(productRepository.findById(productId)).willReturn(Optional.ofNullable(productList.get(productIdx))); + } + doNothing().when(orderProductRepository).saveAll(anyList()); + + //when + Long orderId = orderService.createOrder(userId, request); + + //then + assertThat(order.getId()).isEqualTo(orderId); + } + + + private List getProductList(int size) { + return Instancio.ofList(Product.class) + .size(size) + .assign(valueOf(Product::getId).generate(gen -> gen.longSeq().start(initialId))) + .create(); + } + + private List getOrderProductList(int size, long productSize) { + return Instancio.ofList(OrderProductCreate.class) + .size(size) + .supply(field(OrderProductCreate::productId), random -> random.longRange(initialId, productSize)) + .create(); + } + + private OrderCreateRequest getOrderCreateRequest(List orderProductCreateList) { + return Instancio.of(OrderCreateRequest.class) + .set(field(OrderCreateRequest::orderProductCreateList), orderProductCreateList) + .create(); + } + + private List getOrderProductList( + List orderProductCreateList, + List productList, + Order order + ) { + List orderProductList = new ArrayList<>(); + for (int i = 0; i < orderProductCreateList.size(); i++) { + int productIdx = (int) (orderProductCreateList.get(i).productId() - 1); + OrderProduct orderProduct = Instancio.of(OrderProduct.class) + .set(field(OrderProduct::getOrder), order) + .set(field(OrderProduct::getProduct), productList.get(productIdx)) + .set(field(OrderProduct::getQuantity), orderProductCreateList.get(i).quantity()) + .create(); + orderProductList.add(orderProduct); + } + return orderProductList; + } + +} diff --git a/src/test/java/com/jpaweekly/domain/product/application/ProductServiceImplTest.java b/src/test/java/com/jpaweekly/domain/product/application/ProductServiceImplTest.java new file mode 100644 index 000000000..b11fd73c7 --- /dev/null +++ b/src/test/java/com/jpaweekly/domain/product/application/ProductServiceImplTest.java @@ -0,0 +1,25 @@ +package com.jpaweekly.domain.product.application; + +import com.jpaweekly.domain.product.dto.ProductCreateRequest; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest +class ProductServiceImplTest { + + @Autowired + private ProductService productService; + + @Test + void create_product_test() { + ProductCreateRequest request = new ProductCreateRequest("주먹밥", 100); + + Long productId = productService.createProduct(request); + + assertThat(productId).isNotNull(); + } + +} diff --git a/src/test/java/com/jpaweekly/domain/user/application/UserServiceImplTest.java b/src/test/java/com/jpaweekly/domain/user/application/UserServiceImplTest.java new file mode 100644 index 000000000..9ccaae150 --- /dev/null +++ b/src/test/java/com/jpaweekly/domain/user/application/UserServiceImplTest.java @@ -0,0 +1,26 @@ +package com.jpaweekly.domain.user.application; + +import com.jpaweekly.domain.user.dto.UserCreateRequest; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest +class UserServiceImplTest { + + @Autowired + private UserService userService; + + + @Test + void create_user_test() { + UserCreateRequest userCreateRequest = new UserCreateRequest("test", "123", "tester"); + + Long userId = userService.createUser(userCreateRequest); + + assertThat(userId).isNotNull(); + } + +} diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml new file mode 100644 index 000000000..00167f398 --- /dev/null +++ b/src/test/resources/application.yml @@ -0,0 +1,13 @@ +spring: + datasource: + url: jdbc:h2:mem:board + username: sa + password: + + jpa: + hibernate: + ddl-auto: create-drop + show_sql: true + properties: + hibernate: + format_sql: true