diff --git a/README.md b/README.md index 8d3540a..04af85c 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,9 @@ To manage the microservices of the application, you need to first launch the mod Then launch the module api_gateway and the module mediator. You can have access to the Dashboard of the eureka_server at http://localhost:8761. You will see all the microservices. +### For the endpoints documentation +You can access the documentation of each endpoints after launching at this address : http:///swagger-ui/index.html#. This page also allow you to try the different endpoints of the concerned service. + # terminal diff --git a/Server/.jpb/jpb-settings.xml b/Server/.jpb/jpb-settings.xml index 7aded39..4da588d 100644 --- a/Server/.jpb/jpb-settings.xml +++ b/Server/.jpb/jpb-settings.xml @@ -1,20 +1,13 @@ - + - + - - - - - - - - + \ No newline at end of file diff --git a/Server/bank/database/src/test/java/com/cashmanager/server/database/DatabaseApplicationTests.java b/Server/bank/database/src/test/java/com/cashmanager/server/database/DatabaseApplicationTests.java index 9d72773..e718bcf 100644 --- a/Server/bank/database/src/test/java/com/cashmanager/server/database/DatabaseApplicationTests.java +++ b/Server/bank/database/src/test/java/com/cashmanager/server/database/DatabaseApplicationTests.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest() +@SpringBootTest class DatabaseApplicationTests { @Test diff --git a/Server/common/src/main/java/com/cashmanager/server/common/dto/ProductDto.java b/Server/common/src/main/java/com/cashmanager/server/common/dto/ProductDto.java index c8446f3..42a22aa 100644 --- a/Server/common/src/main/java/com/cashmanager/server/common/dto/ProductDto.java +++ b/Server/common/src/main/java/com/cashmanager/server/common/dto/ProductDto.java @@ -10,4 +10,16 @@ public class ProductDto { private UUID id; private String name; private BigDecimal price; + private int stock; + + public ProductDto(UUID id, String name, BigDecimal price, int stock) { + this.id = id; + this.name = name; + this.price = price; + this.stock = stock; + } + + public ProductDto() { + + } } diff --git a/Server/init-shop-db.sh b/Server/init-shop-db.sh index ba1e30b..818f768 100644 --- a/Server/init-shop-db.sh +++ b/Server/init-shop-db.sh @@ -5,4 +5,5 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E CREATE USER "$SHOP_USER" WITH PASSWORD '$SHOP_PASSWORD'; CREATE DATABASE "$SHOP_DB"; GRANT ALL PRIVILEGES ON DATABASE "$SHOP_DB" TO "$SHOP_USER"; + ALTER DATABASE "$SHOP_DB" OWNER TO "$SHOP_USER"; EOSQL diff --git a/Server/shop/pom.xml b/Server/shop/pom.xml index 3503046..bec09d5 100644 --- a/Server/shop/pom.xml +++ b/Server/shop/pom.xml @@ -10,74 +10,25 @@ shop 0.0.1-SNAPSHOT - product - product + shop + shop 17 + pom - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - org.flywaydb - flyway-core - + + shop_database + product + + - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.springframework.boot - spring-boot-docker-compose - runtime - true - - - org.postgresql - postgresql - runtime - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test + com.cashmanager.server + common + 0.0.1-SNAPSHOT + compile - - - - - org.springframework.boot - spring-boot-maven-plugin - - - paketobuildpacks/builder-jammy-base:latest - - - - org.projectlombok - lombok - - - - - - - diff --git a/Server/shop/product/.gitignore b/Server/shop/product/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/Server/shop/product/.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/Server/shop/product/.mvn/wrapper/maven-wrapper.jar b/Server/shop/product/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..cb28b0e Binary files /dev/null and b/Server/shop/product/.mvn/wrapper/maven-wrapper.jar differ diff --git a/Server/shop/product/.mvn/wrapper/maven-wrapper.properties b/Server/shop/product/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5f0536e --- /dev/null +++ b/Server/shop/product/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-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/Server/shop/product/mvnw b/Server/shop/product/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/Server/shop/product/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/Server/shop/product/mvnw.cmd b/Server/shop/product/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/Server/shop/product/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/Server/shop/product/pom.xml b/Server/shop/product/pom.xml new file mode 100644 index 0000000..19e1a3f --- /dev/null +++ b/Server/shop/product/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.cashmanager.server + shop + 0.0.1-SNAPSHOT + + + product + 0.0.1-SNAPSHOT + product + product + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.2.0 + + + com.cashmanager.server + shop_database + 0.0.1-SNAPSHOT + compile + + + org.mapstruct + mapstruct + 1.5.5.Final + + + com.h2database + h2 + test + + + junit + junit + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + 17 + + + org.projectlombok + lombok + 1.18.30 + + + org.mapstruct + mapstruct-processor + 1.5.5.Final + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + + + + + diff --git a/Server/shop/product/src/main/java/com/cashmanager/server/product/ProductApplication.java b/Server/shop/product/src/main/java/com/cashmanager/server/product/ProductApplication.java new file mode 100644 index 0000000..419fc03 --- /dev/null +++ b/Server/shop/product/src/main/java/com/cashmanager/server/product/ProductApplication.java @@ -0,0 +1,17 @@ +package com.cashmanager.server.product; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +@SpringBootApplication +@EnableJpaRepositories(basePackages = "com.cashmanager.server") +@EntityScan("com.cashmanager.server.shop_database.entities") +public class ProductApplication { + + public static void main(String[] args) { + SpringApplication.run(ProductApplication.class, args); + } + +} diff --git a/Server/shop/product/src/main/java/com/cashmanager/server/product/controllers/ProductController.java b/Server/shop/product/src/main/java/com/cashmanager/server/product/controllers/ProductController.java new file mode 100644 index 0000000..d4e33e6 --- /dev/null +++ b/Server/shop/product/src/main/java/com/cashmanager/server/product/controllers/ProductController.java @@ -0,0 +1,51 @@ +package com.cashmanager.server.product.controllers; + +import com.cashmanager.server.common.dto.ProductDto; +import com.cashmanager.server.product.exceptions.ProductException; +import com.cashmanager.server.product.services.interfaces.IProductService; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/shop/products") +@Tag(name = "API Products") +public class ProductController { + + private final IProductService productService; + + public ProductController(IProductService productService) { + this.productService = productService; + } + + + @GetMapping("") + @Operation(summary = "Get all the products available in the database", description = "Returns a list of products") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "204", description = "No product in the database"), + @ApiResponse(responseCode = "503", description = "Error accessing the database, please retry later") + }) + public ResponseEntity> getProducts(){ + List productDtos ; + try { + productDtos = productService.getAllProducts(); + if(productDtos.isEmpty()){ + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + else{ + return new ResponseEntity<>(productDtos, HttpStatus.OK); + } + } catch (ProductException e) { + return new ResponseEntity<>(HttpStatus.SERVICE_UNAVAILABLE); + } + } +} diff --git a/Server/shop/product/src/main/java/com/cashmanager/server/product/exceptions/ProductException.java b/Server/shop/product/src/main/java/com/cashmanager/server/product/exceptions/ProductException.java new file mode 100644 index 0000000..f199361 --- /dev/null +++ b/Server/shop/product/src/main/java/com/cashmanager/server/product/exceptions/ProductException.java @@ -0,0 +1,14 @@ +package com.cashmanager.server.product.exceptions; + +/** + * Class that will be thrown when an error occur while communicated with the database + */ +public class ProductException extends Exception{ + public ProductException() { + super(); + } + + public ProductException(String message) { + super(message); + } +} diff --git a/Server/shop/product/src/main/java/com/cashmanager/server/product/services/ProductService.java b/Server/shop/product/src/main/java/com/cashmanager/server/product/services/ProductService.java new file mode 100644 index 0000000..b9878b3 --- /dev/null +++ b/Server/shop/product/src/main/java/com/cashmanager/server/product/services/ProductService.java @@ -0,0 +1,55 @@ +package com.cashmanager.server.product.services; + +import com.cashmanager.server.common.dto.ProductDto; +import com.cashmanager.server.product.exceptions.ProductException; +import com.cashmanager.server.product.services.interfaces.IProductService; +import com.cashmanager.server.product.services.mappers.ProductMapper; + +import com.cashmanager.server.shop_database.entities.Product; +import com.cashmanager.server.shop_database.repositories.ProductRepository; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +@Service +public class ProductService implements IProductService { + private final ProductRepository productRepository; + + public ProductService(ProductRepository productRepository) { + this.productRepository = productRepository; + } + + @Override + public List getAllProducts() throws ProductException { + try{ + List products = productRepository.findAll(); + List productDtos = new ArrayList<>(); + if(products.isEmpty()){ + return productDtos; + } + else{ + products.forEach(product -> { + ProductDto productDto = ProductMapper.INSTANCE.productToProductDto(product); + productDtos.add(productDto); + }); + return productDtos; + } + }catch (Exception e){ + throw new ProductException(e.getMessage()); + } + + } + + @Override + public Optional getProductById(UUID productId) { + return Optional.empty(); + } + + @Override + public Optional updateProduct(UUID productId, ProductDto product) { + return Optional.empty(); + } +} diff --git a/Server/shop/product/src/main/java/com/cashmanager/server/product/services/interfaces/IProductService.java b/Server/shop/product/src/main/java/com/cashmanager/server/product/services/interfaces/IProductService.java new file mode 100644 index 0000000..664cfca --- /dev/null +++ b/Server/shop/product/src/main/java/com/cashmanager/server/product/services/interfaces/IProductService.java @@ -0,0 +1,21 @@ +package com.cashmanager.server.product.services.interfaces; + +import com.cashmanager.server.common.dto.ProductDto; +import com.cashmanager.server.product.exceptions.ProductException; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public interface IProductService { + + /** + * Function that recuperate the products available in the database, via the ProductRepository + * @return List of ProductDto + * @throws ProductException if there is an error when communicating with the database + */ + List getAllProducts() throws ProductException; + Optional getProductById(UUID productId); + Optional updateProduct(UUID productId, ProductDto product); + +} diff --git a/Server/shop/product/src/main/java/com/cashmanager/server/product/services/mappers/ProductMapper.java b/Server/shop/product/src/main/java/com/cashmanager/server/product/services/mappers/ProductMapper.java new file mode 100644 index 0000000..7aad577 --- /dev/null +++ b/Server/shop/product/src/main/java/com/cashmanager/server/product/services/mappers/ProductMapper.java @@ -0,0 +1,26 @@ +package com.cashmanager.server.product.services.mappers; + +import com.cashmanager.server.common.dto.ProductDto; +import com.cashmanager.server.shop_database.entities.Product; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +@Mapper +public interface ProductMapper { + + ProductMapper INSTANCE = Mappers.getMapper(ProductMapper.class); + + /** + * Function that convert the entity Product to the ProductDto + * @param product : the product that will be converted + * @return productDto that result from the conversion + */ + ProductDto productToProductDto(Product product); + + /** + * Function that convert the dto ProductDto to the entity Product + * @param productDto : the dto that will be converted + * @return product that result from the conversion + */ + Product productDtoToProduct(ProductDto productDto); +} diff --git a/Server/shop/product/src/main/resources/application.properties b/Server/shop/product/src/main/resources/application.properties new file mode 100644 index 0000000..36c1390 --- /dev/null +++ b/Server/shop/product/src/main/resources/application.properties @@ -0,0 +1,8 @@ +spring.application.name=PRODUCT-SERVICE +server.port=8082 +spring.datasource.url=jdbc:postgresql://localhost:5432/shop_db +spring.datasource.username=shop_user +spring.datasource.password=shop_password + + + diff --git a/Server/shop/product/src/test/java/com/cashmanager/server/product/ProductApplicationTests.java b/Server/shop/product/src/test/java/com/cashmanager/server/product/ProductApplicationTests.java new file mode 100644 index 0000000..4e3a411 --- /dev/null +++ b/Server/shop/product/src/test/java/com/cashmanager/server/product/ProductApplicationTests.java @@ -0,0 +1,15 @@ +package com.cashmanager.server.product; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Profile; + +@SpringBootTest +@Profile("test") +class ProductApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/Server/shop/product/src/test/java/com/cashmanager/server/product/ProductControllerTest.java b/Server/shop/product/src/test/java/com/cashmanager/server/product/ProductControllerTest.java new file mode 100644 index 0000000..e47bd1f --- /dev/null +++ b/Server/shop/product/src/test/java/com/cashmanager/server/product/ProductControllerTest.java @@ -0,0 +1,28 @@ +package com.cashmanager.server.product; + +import com.cashmanager.server.common.dto.ProductDto; +import com.cashmanager.server.product.services.interfaces.IProductService; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Profile; + + +import java.util.List; +import static org.springframework.test.util.AssertionErrors.assertNotNull; + +@SpringBootTest +@Profile("test") +public class ProductControllerTest { + + @MockBean + private IProductService productService; + + @Test + public void testGetProducts() throws Exception { + //get the products + List products = productService.getAllProducts(); + //assert that the list is not null + assertNotNull("This list should not be null",products); + } +} diff --git a/Server/shop/product/src/test/resources/application.properties b/Server/shop/product/src/test/resources/application.properties new file mode 100644 index 0000000..651e64d --- /dev/null +++ b/Server/shop/product/src/test/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +spring.datasource.username=shop_user +spring.datasource.password=shop_password +spring.profiles.active=test \ No newline at end of file diff --git a/Server/shop/shop_database/.gitignore b/Server/shop/shop_database/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/Server/shop/shop_database/.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/Server/shop/shop_database/.mvn/wrapper/maven-wrapper.jar b/Server/shop/shop_database/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..cb28b0e Binary files /dev/null and b/Server/shop/shop_database/.mvn/wrapper/maven-wrapper.jar differ diff --git a/Server/shop/shop_database/.mvn/wrapper/maven-wrapper.properties b/Server/shop/shop_database/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5f0536e --- /dev/null +++ b/Server/shop/shop_database/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-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/Server/shop/compose.yaml b/Server/shop/shop_database/compose.yaml similarity index 61% rename from Server/shop/compose.yaml rename to Server/shop/shop_database/compose.yaml index c8f45d2..679d912 100644 --- a/Server/shop/compose.yaml +++ b/Server/shop/shop_database/compose.yaml @@ -3,9 +3,9 @@ services: image: 'postgres:16.1-alpine' volumes: - 'db:/var/lib/postgres/data' - - '../init-shop-db.sh:/docker-entrypoint-initdb.d/init-shop-db.sh' + - '../../init-shop-db.sh:/docker-entrypoint-initdb.d/init-shop-db.sh' env_file: - - ../.env.local + - ../../.env.local ports: - '5432:5432' volumes: diff --git a/Server/shop/shop_database/mvnw b/Server/shop/shop_database/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/Server/shop/shop_database/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/Server/shop/shop_database/mvnw.cmd b/Server/shop/shop_database/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/Server/shop/shop_database/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/Server/shop/shop_database/pom.xml b/Server/shop/shop_database/pom.xml new file mode 100644 index 0000000..236a384 --- /dev/null +++ b/Server/shop/shop_database/pom.xml @@ -0,0 +1,102 @@ + + + 4.0.0 + + com.cashmanager.server + shop + 0.0.1-SNAPSHOT + + + shop_database + 0.0.1-SNAPSHOT + shop_database + shop_database + + 17 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.flywaydb + flyway-core + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-docker-compose + runtime + true + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + com.h2database + h2 + test + + + junit + junit + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + false + + + + + + paketobuildpacks/builder-jammy-base:latest + + + + org.projectlombok + lombok + + + + + + + + diff --git a/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/ShopDatabaseApplication.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/ShopDatabaseApplication.java new file mode 100644 index 0000000..9578d7d --- /dev/null +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/ShopDatabaseApplication.java @@ -0,0 +1,14 @@ +package com.cashmanager.server.shop_database; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Profile; + +@SpringBootApplication +public class ShopDatabaseApplication { + + public static void main(String[] args) { + SpringApplication.run(ShopDatabaseApplication.class, args); + } + +} diff --git a/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/FlywayConfiguration.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/FlywayConfiguration.java new file mode 100644 index 0000000..f22bd7d --- /dev/null +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/FlywayConfiguration.java @@ -0,0 +1,23 @@ +package com.cashmanager.server.shop_database.config; + + +import jakarta.annotation.PostConstruct; +import org.flywaydb.core.Flyway; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; + +@Profile("dev") +@Configuration +public class FlywayConfiguration { + + + @PostConstruct + public void migrateFlyway(){ + Flyway flyway = Flyway.configure() + .dataSource("jdbc:postgresql://localhost:5432/shop_db","shop_user","shop_password") + .load(); + + flyway.migrate(); + + } +} diff --git a/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/FlywayStartUpStrategy.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/FlywayStartUpStrategy.java new file mode 100644 index 0000000..5ce346f --- /dev/null +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/FlywayStartUpStrategy.java @@ -0,0 +1,18 @@ +package com.cashmanager.server.shop_database.config; + +import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; + +@Profile("dev") + +@Configuration +public class FlywayStartUpStrategy { + @Bean + public FlywayMigrationStrategy flywayMigrationStrategy() { + return flyway -> { + // do nothing + }; + } +} diff --git a/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/ProductDatasourceConfiguration.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/ProductDatasourceConfiguration.java new file mode 100644 index 0000000..07c0b47 --- /dev/null +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/config/ProductDatasourceConfiguration.java @@ -0,0 +1,56 @@ +package com.cashmanager.server.shop_database.config; + +import jakarta.persistence.EntityManagerFactory; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import org.springframework.context.annotation.Profile; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import javax.sql.DataSource; + +@Profile("dev") + +@Configuration +@EnableTransactionManagement +@EnableJpaRepositories(entityManagerFactoryRef = "productEntityManagerFactory", + transactionManagerRef = "productTransactionManager", + basePackages = {"com.cashmanager.server.shop_database.repositories"}) +public class ProductDatasourceConfiguration { + + @Primary + @Bean(name="productProperties") + @ConfigurationProperties("spring.datasource.product") + public DataSourceProperties dataSourceProperties(){ + return new DataSourceProperties(); + } + + @Primary + @Bean(name="productDataSource") + public DataSource dataSource(@Qualifier("productProperties") DataSourceProperties properties){ + return properties.initializeDataSourceBuilder().build(); + } + + @Primary + @Bean(name = "productEntityManagerFactory") + public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean (EntityManagerFactoryBuilder builder, @Qualifier("productDataSource") DataSource dataSource){ + return builder.dataSource(dataSource) + .packages("com.cashmanager.server.shop_database.entities") + .persistenceUnit("products").build(); + } + + @Primary + @Bean(name="productTransactionManager") + @ConfigurationProperties("spring.jpa") + public PlatformTransactionManager transactionManager(@Qualifier("productEntityManagerFactory")EntityManagerFactory entityManagerFactory){ + return new JpaTransactionManager(entityManagerFactory); + } +} diff --git a/Server/shop/src/main/java/com/cashmanager/server/shop/Order.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/Order.java similarity index 96% rename from Server/shop/src/main/java/com/cashmanager/server/shop/Order.java rename to Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/Order.java index 3dcdf36..a71b139 100644 --- a/Server/shop/src/main/java/com/cashmanager/server/shop/Order.java +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/Order.java @@ -1,4 +1,4 @@ -package com.cashmanager.server.shop; +package com.cashmanager.server.shop_database.entities; import jakarta.persistence.*; import lombok.*; diff --git a/Server/shop/src/main/java/com/cashmanager/server/shop/OrderedOrder.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/OrderedOrder.java similarity index 96% rename from Server/shop/src/main/java/com/cashmanager/server/shop/OrderedOrder.java rename to Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/OrderedOrder.java index e05a5b5..7b43984 100644 --- a/Server/shop/src/main/java/com/cashmanager/server/shop/OrderedOrder.java +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/OrderedOrder.java @@ -1,4 +1,4 @@ -package com.cashmanager.server.shop; +package com.cashmanager.server.shop_database.entities; import jakarta.persistence.*; import lombok.*; diff --git a/Server/shop/src/main/java/com/cashmanager/server/shop/Product.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/Product.java similarity index 77% rename from Server/shop/src/main/java/com/cashmanager/server/shop/Product.java rename to Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/Product.java index 17b9477..2199386 100644 --- a/Server/shop/src/main/java/com/cashmanager/server/shop/Product.java +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/entities/Product.java @@ -1,10 +1,12 @@ -package com.cashmanager.server.shop; +package com.cashmanager.server.shop_database.entities; import jakarta.persistence.*; import lombok.*; import org.hibernate.proxy.HibernateProxy; +import java.math.BigDecimal; +import java.util.HashSet; import java.util.Objects; import java.util.Set; import java.util.UUID; @@ -25,8 +27,8 @@ public class Product { @Column( nullable = false) private String name; @Column( nullable = false) - private Integer price; - @Column( nullable = false) + private BigDecimal price; + @Column(name = "product_url", nullable = false) private String productUrl; @Column( nullable = false) private Integer stock; @@ -35,6 +37,15 @@ public class Product { @ToString.Exclude private Set orderedOrders; + + public Product(String name, BigDecimal price, String productUrl, Integer stock) { + this.name = name; + this.price = price; + this.stock = stock; + this.productUrl = productUrl; + this.orderedOrders = new HashSet<>(); + } + @Override public final boolean equals(Object o) { if (this == o) return true; diff --git a/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/repositories/ProductRepository.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/repositories/ProductRepository.java new file mode 100644 index 0000000..8d50d4c --- /dev/null +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/repositories/ProductRepository.java @@ -0,0 +1,9 @@ +package com.cashmanager.server.shop_database.repositories; + +import com.cashmanager.server.shop_database.entities.Product; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.UUID; + +public interface ProductRepository extends JpaRepository { +} diff --git a/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/seeders/ProductSeeder.java b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/seeders/ProductSeeder.java new file mode 100644 index 0000000..4ad0f89 --- /dev/null +++ b/Server/shop/shop_database/src/main/java/com/cashmanager/server/shop_database/seeders/ProductSeeder.java @@ -0,0 +1,36 @@ +package com.cashmanager.server.shop_database.seeders; + + +import com.cashmanager.server.shop_database.entities.Product; +import com.cashmanager.server.shop_database.repositories.ProductRepository; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +import java.math.BigDecimal; + +@Component +public class ProductSeeder implements CommandLineRunner { + ProductRepository productRepository; + + public ProductSeeder(ProductRepository productRepository) { + this.productRepository = productRepository; + } + + @Override + public void run(String... args) throws Exception { + loadProductData(); + } + + private void loadProductData() { + if(productRepository.count() == 0){ + Product product1 = new Product("tomate",BigDecimal.valueOf(2.0) ,"example.com",100); + Product product2 = new Product("salade",BigDecimal.valueOf(2.0) ,"example.com",50); + Product product3 = new Product("oignon",BigDecimal.valueOf(2.0) ,"example.com",70); + Product product4 = new Product("poivrons",BigDecimal.valueOf(2.0) ,"example.com",200); + productRepository.save(product1); + productRepository.save(product2); + productRepository.save(product3); + productRepository.save(product4); + } + } +} diff --git a/Server/shop/shop_database/src/main/resources/application.properties b/Server/shop/shop_database/src/main/resources/application.properties new file mode 100644 index 0000000..3089f59 --- /dev/null +++ b/Server/shop/shop_database/src/main/resources/application.properties @@ -0,0 +1,12 @@ +# WARNING!!! Currently this launching shop will create tables in bank database +spring.application.name=SHOP-DATABASE-SERVICE +spring.profiles.active=dev +server.port=8081 +# postgresql database url for unit tests +spring.datasource.product.url=jdbc:postgresql://localhost:5432/shop_db +# postgresql database username +spring.datasource.product.username=shop_user +# postgresql database password +spring.datasource.product.password=shop_password +spring.jpa.properties.hibernate.show_sql=true + diff --git a/Server/shop/src/main/resources/db/migration/V1__create_products.sql b/Server/shop/shop_database/src/main/resources/db/migration/V1__create_products.sql similarity index 100% rename from Server/shop/src/main/resources/db/migration/V1__create_products.sql rename to Server/shop/shop_database/src/main/resources/db/migration/V1__create_products.sql diff --git a/Server/shop/src/main/resources/db/migration/V2__create_orders.sql b/Server/shop/shop_database/src/main/resources/db/migration/V2__create_orders.sql similarity index 100% rename from Server/shop/src/main/resources/db/migration/V2__create_orders.sql rename to Server/shop/shop_database/src/main/resources/db/migration/V2__create_orders.sql diff --git a/Server/shop/src/main/resources/db/migration/V3__ordered_orders.sql b/Server/shop/shop_database/src/main/resources/db/migration/V3__ordered_orders.sql similarity index 100% rename from Server/shop/src/main/resources/db/migration/V3__ordered_orders.sql rename to Server/shop/shop_database/src/main/resources/db/migration/V3__ordered_orders.sql diff --git a/Server/shop/shop_database/src/main/resources/db/migration/V4__update_column_price.sql b/Server/shop/shop_database/src/main/resources/db/migration/V4__update_column_price.sql new file mode 100644 index 0000000..a1771f4 --- /dev/null +++ b/Server/shop/shop_database/src/main/resources/db/migration/V4__update_column_price.sql @@ -0,0 +1,6 @@ +ALTER TABLE products +DROP +COLUMN price; + +ALTER TABLE products + ADD price DECIMAL NOT NULL; \ No newline at end of file diff --git a/Server/shop/shop_database/src/test/java/com/cashmanager/server/shop_database/ProductRepositoryTest.java b/Server/shop/shop_database/src/test/java/com/cashmanager/server/shop_database/ProductRepositoryTest.java new file mode 100644 index 0000000..e37a337 --- /dev/null +++ b/Server/shop/shop_database/src/test/java/com/cashmanager/server/shop_database/ProductRepositoryTest.java @@ -0,0 +1,33 @@ +package com.cashmanager.server.shop_database; + +import com.cashmanager.server.shop_database.entities.Product; +import com.cashmanager.server.shop_database.repositories.ProductRepository; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.context.annotation.Profile; +import org.springframework.test.context.jdbc.Sql; + +import java.util.List; + +import static org.springframework.test.util.AssertionErrors.assertFalse; + +@SpringBootTest +@Profile("test") +public class ProductRepositoryTest { + + @Autowired + private ProductRepository productRepository; + + @Test + @Sql({"/db/test.sql"}) + public void getProducts(){ + //get the products in the database + List products = productRepository.findAll(); + //assert that the data is recuperated + assertFalse("This list should not be empty", products.isEmpty()); + + + } +} diff --git a/Server/shop/shop_database/src/test/java/com/cashmanager/server/shop_database/ShopDatabaseApplicationTests.java b/Server/shop/shop_database/src/test/java/com/cashmanager/server/shop_database/ShopDatabaseApplicationTests.java new file mode 100644 index 0000000..27f53ae --- /dev/null +++ b/Server/shop/shop_database/src/test/java/com/cashmanager/server/shop_database/ShopDatabaseApplicationTests.java @@ -0,0 +1,15 @@ +package com.cashmanager.server.shop_database; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Profile; + +@SpringBootTest +@Profile("test") +class ShopDatabaseApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/Server/shop/shop_database/src/test/resources/application.properties b/Server/shop/shop_database/src/test/resources/application.properties new file mode 100644 index 0000000..f5533d6 --- /dev/null +++ b/Server/shop/shop_database/src/test/resources/application.properties @@ -0,0 +1,7 @@ +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +spring.datasource.username=shop_user +spring.datasource.password=shop_password +spring.jpa.properties.hibernate.show_sql=true +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.profiles.active=test diff --git a/Server/shop/shop_database/src/test/resources/db/test.sql b/Server/shop/shop_database/src/test/resources/db/test.sql new file mode 100644 index 0000000..69f331f --- /dev/null +++ b/Server/shop/shop_database/src/test/resources/db/test.sql @@ -0,0 +1 @@ +INSERT INTO products (id,name,price,product_url,stock) VALUES ('ff13f62b-87bc-4a9e-825e-f5bbc99f5f95','product01',3.0,'test.com',100); \ No newline at end of file diff --git a/Server/shop/src/main/java/com/cashmanager/server/shop/ShopApplication.java b/Server/shop/src/main/java/com/cashmanager/server/shop/ShopApplication.java deleted file mode 100644 index 5d7ba37..0000000 --- a/Server/shop/src/main/java/com/cashmanager/server/shop/ShopApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.cashmanager.server.shop; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - - -@SpringBootApplication -public class ShopApplication { - - public static void main(String[] args) { - SpringApplication.run(ShopApplication.class, args); - } - -} diff --git a/Server/shop/src/main/resources/application.properties b/Server/shop/src/main/resources/application.properties deleted file mode 100644 index dff100c..0000000 --- a/Server/shop/src/main/resources/application.properties +++ /dev/null @@ -1,10 +0,0 @@ -# WOARNING!!! Currently this launching shop will create tables in bank database -# postgresql database url for unit tests -spring.datasource.url=jdbc:postgresql://localhost:5432/shop_db -# postgresql database username -spring.datasource.username=shop_user -# postgresql database password -spring.datasource.password=shop_password -#Configuration for the eureka-server -#spring.application.name=SHOP-SERVICE -#eureka.client.service-url.defaultZone=http://localhost:8761/eureka/ diff --git a/Server/shop/src/test/java/com/cashmanager/server/shop/ShopApplicationTests.java b/Server/shop/src/test/java/com/cashmanager/server/shop/ShopApplicationTests.java deleted file mode 100644 index 7cfa46f..0000000 --- a/Server/shop/src/test/java/com/cashmanager/server/shop/ShopApplicationTests.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cashmanager.server.shop; - -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class ShopApplicationTests { - -// @Test -// void contextLoads() { -// } - -}