From 3c7318e4385f444d6f7b277d5f58fd9ba8478da5 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Fri, 2 May 2025 22:15:23 +0300 Subject: [PATCH 01/40] added project base --- .gitattributes | 2 + .gitignore | 33 +++ .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 97 +++++++ .../com/podzilla/order/OrderApplication.java | 13 + src/main/resources/application.properties | 1 + .../podzilla/order/OrderApplicationTests.java | 13 + 9 files changed, 586 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/podzilla/order/OrderApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/podzilla/order/OrderApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /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.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# 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 +# +# http://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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/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 +# +# http://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.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@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 http://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.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..fd77e3d --- /dev/null +++ b/pom.xml @@ -0,0 +1,97 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.5 + + + com.podzilla + order + 0.0.1-SNAPSHOT + order + Order Micro Service + + + + + + + + + + + + + + + 23 + + + + org.springframework.boot + spring-boot-starter-data-jdbc + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/src/main/java/com/podzilla/order/OrderApplication.java b/src/main/java/com/podzilla/order/OrderApplication.java new file mode 100644 index 0000000..450cb00 --- /dev/null +++ b/src/main/java/com/podzilla/order/OrderApplication.java @@ -0,0 +1,13 @@ +package com.podzilla.order; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class OrderApplication { + + public static void main(String[] args) { + SpringApplication.run(OrderApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..bcd3ef5 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=order diff --git a/src/test/java/com/podzilla/order/OrderApplicationTests.java b/src/test/java/com/podzilla/order/OrderApplicationTests.java new file mode 100644 index 0000000..a1d6a75 --- /dev/null +++ b/src/test/java/com/podzilla/order/OrderApplicationTests.java @@ -0,0 +1,13 @@ +package com.podzilla.order; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class OrderApplicationTests { + + @Test + void contextLoads() { + } + +} From b0734f8482ccd54fb299f73df9f7058920a5624d Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Fri, 2 May 2025 22:20:07 +0300 Subject: [PATCH 02/40] added .github file --- .github/workflows/ci-cd.yml | 14 ++++++++++++++ .github/workflows/linter.yml | 12 ++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .github/workflows/ci-cd.yml create mode 100644 .github/workflows/linter.yml diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml new file mode 100644 index 0000000..ca05840 --- /dev/null +++ b/.github/workflows/ci-cd.yml @@ -0,0 +1,14 @@ +name: Use Template Java CI/CD + +on: + push: + branches: [ "main", "dev" ] + pull_request: + branches: [ "**" ] + +jobs: + call-ci: + uses: Podzilla/templates/.github/workflows/ci.yml@main + with: + branch: 'refs/heads/main' # <<< Passes the branch name dynamically + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml new file mode 100644 index 0000000..c9ed1da --- /dev/null +++ b/.github/workflows/linter.yml @@ -0,0 +1,12 @@ +name: Use Template Linter + +on: + pull_request: + branches: [ "**" ] + +jobs: + call-linter: + uses: Podzilla/templates/.github/workflows/super-linter.yml@main + with: + branch: 'dev' + secrets: inherit \ No newline at end of file From 280a921b04959e933698b1468e3c817d4a824bee Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Fri, 2 May 2025 22:23:26 +0300 Subject: [PATCH 03/40] fixed linter issue --- src/main/java/com/podzilla/order/OrderApplication.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/podzilla/order/OrderApplication.java b/src/main/java/com/podzilla/order/OrderApplication.java index 450cb00..dd4f9e7 100644 --- a/src/main/java/com/podzilla/order/OrderApplication.java +++ b/src/main/java/com/podzilla/order/OrderApplication.java @@ -6,8 +6,7 @@ @SpringBootApplication public class OrderApplication { - public static void main(String[] args) { + public static void main(final String[] args) { SpringApplication.run(OrderApplication.class, args); } - -} +} \ No newline at end of file From c059be8516b0a8624f956c50a06b62549e63bb08 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Fri, 2 May 2025 22:30:06 +0300 Subject: [PATCH 04/40] fixed linter issue --- src/main/java/com/podzilla/order/OrderApplication.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/podzilla/order/OrderApplication.java b/src/main/java/com/podzilla/order/OrderApplication.java index dd4f9e7..7492983 100644 --- a/src/main/java/com/podzilla/order/OrderApplication.java +++ b/src/main/java/com/podzilla/order/OrderApplication.java @@ -6,7 +6,7 @@ @SpringBootApplication public class OrderApplication { - public static void main(final String[] args) { - SpringApplication.run(OrderApplication.class, args); - } -} \ No newline at end of file + public static void main(final String[] args) { + SpringApplication.run(OrderApplication.class, args); + } +} From d27f2e1cc75c15afd30c22c1c7448b2cd2705492 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 3 May 2025 05:56:26 +0300 Subject: [PATCH 05/40] added order model, repository, service and controller --- .../order/controller/OrderController.java | 61 ++++++++++++++++++ .../java/com/podzilla/order/model/Order.java | 62 ++++++++++++++++++ .../com/podzilla/order/model/OrderItem.java | 30 +++++++++ .../com/podzilla/order/model/OrderStatus.java | 10 +++ .../order/repository/OrderRepository.java | 9 +++ .../podzilla/order/service/OrderService.java | 64 +++++++++++++++++++ 6 files changed, 236 insertions(+) create mode 100644 src/main/java/com/podzilla/order/controller/OrderController.java create mode 100644 src/main/java/com/podzilla/order/model/Order.java create mode 100644 src/main/java/com/podzilla/order/model/OrderItem.java create mode 100644 src/main/java/com/podzilla/order/model/OrderStatus.java create mode 100644 src/main/java/com/podzilla/order/repository/OrderRepository.java create mode 100644 src/main/java/com/podzilla/order/service/OrderService.java diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java new file mode 100644 index 0000000..cb3d05e --- /dev/null +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -0,0 +1,61 @@ +package com.podzilla.order.controller; + + +import com.podzilla.order.model.Order; +import com.podzilla.order.service.OrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.DeleteMapping; + +import java.util.List; + +@RestController +@RequestMapping("/orders") +public class OrderController { + + private final OrderService orderService; + + @Autowired + public OrderController(final OrderService orderService) { + this.orderService = orderService; + } + + @PostMapping + public ResponseEntity createOrder(@RequestBody final Order order) { + Order createdOrder = orderService.createOrder(order); + return ResponseEntity.ok(createdOrder); + } + + @GetMapping + public ResponseEntity> getAllOrders() { + List orders = orderService.getAllOrders(); + return ResponseEntity.ok(orders); + } + + @GetMapping("/{id}") + public ResponseEntity getOrderById(@PathVariable final long id) { + Order order = orderService.getOrderById(id) + .orElseThrow(() -> new RuntimeException("Order not found")); + return ResponseEntity.ok(order); + } + + @PutMapping("/{id}") + public ResponseEntity updateOrder(@PathVariable final long id, + @RequestBody final Order order) { + Order updatedOrder = orderService.updateOrder(id, order); + return ResponseEntity.ok(updatedOrder); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteOrder(@PathVariable final long id) { + orderService.deleteOrder(id); + return ResponseEntity.noContent().build(); + } +} diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java new file mode 100644 index 0000000..22402fb --- /dev/null +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -0,0 +1,62 @@ +package com.podzilla.order.model; + + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Enumerated; +import jakarta.persistence.EnumType; +import jakarta.persistence.OneToMany; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "orders") +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +public class Order { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + private long userId; + + private double totalAmount; + + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private OrderStatus status; + + @Column(nullable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; + + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) + private List orderItems = new ArrayList<>(); + + public Order(final long userId, final double totalAmount, + final OrderStatus status, List orderItems) { + this.userId = userId; + this.totalAmount = totalAmount; + this.status = status; + this.createdAt = LocalDateTime.now(); + this.updatedAt = LocalDateTime.now(); + this.orderItems = orderItems; + } + +} diff --git a/src/main/java/com/podzilla/order/model/OrderItem.java b/src/main/java/com/podzilla/order/model/OrderItem.java new file mode 100644 index 0000000..78846dd --- /dev/null +++ b/src/main/java/com/podzilla/order/model/OrderItem.java @@ -0,0 +1,30 @@ +package com.podzilla.order.model; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Table(name = "order_items") +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +public class OrderItem { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id; + + @Column(nullable = false) + private long productId; + + @Column(nullable = false) + private int quantity; + + @Column(nullable = false) + private double price; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "order_id", nullable = false) + private Order order; +} diff --git a/src/main/java/com/podzilla/order/model/OrderStatus.java b/src/main/java/com/podzilla/order/model/OrderStatus.java new file mode 100644 index 0000000..9dac508 --- /dev/null +++ b/src/main/java/com/podzilla/order/model/OrderStatus.java @@ -0,0 +1,10 @@ +package com.podzilla.order.model; + +public enum OrderStatus { + PENDING, + CONFIRMED, + SHIPPED, + DELIVERED, + CANCELLED +} + diff --git a/src/main/java/com/podzilla/order/repository/OrderRepository.java b/src/main/java/com/podzilla/order/repository/OrderRepository.java new file mode 100644 index 0000000..d9112fc --- /dev/null +++ b/src/main/java/com/podzilla/order/repository/OrderRepository.java @@ -0,0 +1,9 @@ +package com.podzilla.order.repository; + +import com.podzilla.order.model.Order; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface OrderRepository extends JpaRepository { +} diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java new file mode 100644 index 0000000..e1e27d8 --- /dev/null +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -0,0 +1,64 @@ +package com.podzilla.order.service; + +import com.podzilla.order.model.Order; +import com.podzilla.order.repository.OrderRepository; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +@Slf4j +@Service +public class OrderService { + private final OrderRepository orderRepository; + + @Autowired + public OrderService(final OrderRepository orderRepository) { + this.orderRepository = orderRepository; + } + + public Order createOrder(final Order order) { + log.info("Creating new order: {}", order); + order.setCreatedAt(LocalDateTime.now()); + order.setUpdatedAt(LocalDateTime.now()); + return orderRepository.save(order); + } + + public List getAllOrders() { + log.info("Fetching all orders"); + return orderRepository.findAll(); + } + + public Optional getOrderById(final long id) { + log.info("Fetching order with ID: {}", id); + return orderRepository.findById(id); + } + + public Order updateOrder(final long id, final Order updatedOrder) { + log.info("Updating order with ID: {}", id); + Optional existingOrder = orderRepository.findById(id); + if (existingOrder.isPresent()) { + Order order = existingOrder.get(); + BeanUtils.copyProperties(updatedOrder, order, "id"); + order.setUpdatedAt(LocalDateTime.now()); + log.info("Order with id: {} was found and updated", id); + return orderRepository.save(order); + } + log.warn("Order with id: {} was not found", id); + throw new RuntimeException("Order not found with id: " + id); + } + + public void deleteOrder(final long id) { + if (orderRepository.existsById(id)) { + log.warn("Deleting order with ID: {}", id); + orderRepository.deleteById(id); + } else { + log.warn("Order with ID: {} not found for deletion", id); + throw new RuntimeException("Order not found with id: " + id); + } + } +} From 05f9c90893f6e72c5dd342de525e2d45494f27c2 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 3 May 2025 06:01:42 +0300 Subject: [PATCH 06/40] fixed linter issues --- src/main/java/com/podzilla/order/model/Order.java | 5 +++-- .../java/com/podzilla/order/model/OrderItem.java | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index 22402fb..c28ff6e 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -46,11 +46,12 @@ public class Order { @Column(nullable = false) private LocalDateTime updatedAt; - @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = + true) private List orderItems = new ArrayList<>(); public Order(final long userId, final double totalAmount, - final OrderStatus status, List orderItems) { + final OrderStatus status, final List orderItems) { this.userId = userId; this.totalAmount = totalAmount; this.status = status; diff --git a/src/main/java/com/podzilla/order/model/OrderItem.java b/src/main/java/com/podzilla/order/model/OrderItem.java index 78846dd..0d7a03c 100644 --- a/src/main/java/com/podzilla/order/model/OrderItem.java +++ b/src/main/java/com/podzilla/order/model/OrderItem.java @@ -1,7 +1,18 @@ package com.podzilla.order.model; -import jakarta.persistence.*; -import lombok.*; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.FetchType; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; @Entity @Table(name = "order_items") From c26372dad41d283e0008b8ec4c97a90132ef679c Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sun, 4 May 2025 15:26:06 +0300 Subject: [PATCH 07/40] Add endpoints to get orders by user ID, cancel orders, and update order status --- .../order/controller/OrderController.java | 24 +++++++++++++ .../order/repository/OrderRepository.java | 3 ++ .../podzilla/order/service/OrderService.java | 34 +++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index cb3d05e..358802f 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -2,6 +2,7 @@ import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderStatus; import com.podzilla.order.service.OrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -58,4 +59,27 @@ public ResponseEntity deleteOrder(@PathVariable final long id) { orderService.deleteOrder(id); return ResponseEntity.noContent().build(); } + + @GetMapping("/user/{userId}") + public ResponseEntity getOrderByUserId + (@PathVariable final long userId) { + Order order = orderService.getOrderByUserId(userId) + .orElseThrow(() -> new RuntimeException("Order not found")); + return ResponseEntity.ok(order); + } + + @PutMapping("/cancel/{id}") + public ResponseEntity cancelOrder(@PathVariable final long id) { + Order order = orderService.cancelOrder(id); + return ResponseEntity.ok(order); + } + + // Endpoint to update order status + @PutMapping("/status/{id}") + public ResponseEntity updateOrderStatus(@PathVariable final long id, + @RequestBody final OrderStatus status) { + Order order = orderService.updateOrderStatus(id, status); + return ResponseEntity.ok(order); + } + } diff --git a/src/main/java/com/podzilla/order/repository/OrderRepository.java b/src/main/java/com/podzilla/order/repository/OrderRepository.java index d9112fc..fd8f9a2 100644 --- a/src/main/java/com/podzilla/order/repository/OrderRepository.java +++ b/src/main/java/com/podzilla/order/repository/OrderRepository.java @@ -4,6 +4,9 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository public interface OrderRepository extends JpaRepository { + Optional findByUserId(Long id); } diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index e1e27d8..296dad6 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -1,6 +1,7 @@ package com.podzilla.order.service; import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderStatus; import com.podzilla.order.repository.OrderRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -61,4 +62,37 @@ public void deleteOrder(final long id) { throw new RuntimeException("Order not found with id: " + id); } } + + public Optional getOrderByUserId(final long userId) { + log.info("Fetching order with user ID: {}", userId); + return orderRepository.findByUserId(userId); + } + + public Order cancelOrder(final long id) { + log.info("Cancelling order with ID: {}", id); + Optional existingOrder = orderRepository.findById(id); + if (existingOrder.isPresent()) { + Order order = existingOrder.get(); + order.setStatus(OrderStatus.CANCELLED); + order.setUpdatedAt(LocalDateTime.now()); + return orderRepository.save(order); + } else { + log.warn("Order with id: {} was not found", id); + throw new RuntimeException("Order not found with id: " + id); + } + } + + public Order updateOrderStatus(final long id, final OrderStatus status) { + log.info("Updating order status with ID: {}", id); + Optional existingOrder = orderRepository.findById(id); + if (existingOrder.isPresent()) { + Order order = existingOrder.get(); + order.setStatus(status); + order.setUpdatedAt(LocalDateTime.now()); + return orderRepository.save(order); + } else { + log.warn("Order with id: {} was not found", id); + throw new RuntimeException("Order not found with id: " + id); + } + } } From da784fcd387dee55990c24594d336527ba292248 Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sun, 4 May 2025 15:30:34 +0300 Subject: [PATCH 08/40] Fix linter issue --- .../java/com/podzilla/order/controller/OrderController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index 358802f..578436d 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -61,8 +61,8 @@ public ResponseEntity deleteOrder(@PathVariable final long id) { } @GetMapping("/user/{userId}") - public ResponseEntity getOrderByUserId - (@PathVariable final long userId) { + public ResponseEntity getOrderByUserId( + @PathVariable final long userId) { Order order = orderService.getOrderByUserId(userId) .orElseThrow(() -> new RuntimeException("Order not found")); return ResponseEntity.ok(order); From 5d203435b4d9f43ba663542566f053603e4cdc7f Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sun, 4 May 2025 17:34:58 +0300 Subject: [PATCH 09/40] Resolve Comments 1. Added Swagger and Logger Dependencies in pom.xml 2. Added Global Exception Handler to handle Exceptions in OrderService 3. Used Swagger and Logger for endpoints in OrderController --- pom.xml | 10 ++++ .../order/controller/OrderController.java | 41 +++++++++++++-- .../order/exception/NotFoundException.java | 7 +++ .../podzilla/order/service/OrderService.java | 50 ++++++++++++------- 4 files changed, 85 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/podzilla/order/exception/NotFoundException.java diff --git a/pom.xml b/pom.xml index fd77e3d..32ceacc 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,16 @@ org.springframework.boot spring-boot-starter-data-jdbc + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.8.5 + + + net.logstash.logback + logstash-logback-encoder + 7.4 + org.springframework.boot spring-boot-starter-data-jpa diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index 578436d..9156c30 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -14,8 +14,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.DeleteMapping; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.List; +import java.util.Optional; @RestController @RequestMapping("/orders") @@ -23,6 +29,9 @@ public class OrderController { private final OrderService orderService; + private static final Logger LOGGER = + LoggerFactory.getLogger(OrderController.class); + @Autowired public OrderController(final OrderService orderService) { this.orderService = orderService; @@ -61,25 +70,47 @@ public ResponseEntity deleteOrder(@PathVariable final long id) { } @GetMapping("/user/{userId}") - public ResponseEntity getOrderByUserId( + @Operation( + summary = "Get order by user ID", + description = "Fetches an order based on the provided user ID" + ) + @ApiResponse( + responseCode = "200", description = "Order found" + ) + public ResponseEntity> getOrderByUserId( @PathVariable final long userId) { - Order order = orderService.getOrderByUserId(userId) - .orElseThrow(() -> new RuntimeException("Order not found")); + Optional order = orderService.getOrderByUserId(userId); + LOGGER.info("Order found for user ID: {}", userId); return ResponseEntity.ok(order); } @PutMapping("/cancel/{id}") + @Operation( + summary = "Cancel order", + description = "Cancels an order based on the provided order ID" + ) + @ApiResponse( + responseCode = "200", description = "Order cancelled" + ) public ResponseEntity cancelOrder(@PathVariable final long id) { Order order = orderService.cancelOrder(id); + LOGGER.info("Order with ID: {} cancelled", id); return ResponseEntity.ok(order); } - // Endpoint to update order status @PutMapping("/status/{id}") + @Operation( + summary = "Update order status", + description = "Updates the status of an order based on " + + "the provided order ID" + ) + @ApiResponse( + responseCode = "200", description = "Order status updated" + ) public ResponseEntity updateOrderStatus(@PathVariable final long id, @RequestBody final OrderStatus status) { Order order = orderService.updateOrderStatus(id, status); + LOGGER.info("Order status updated for ID: {}", id); return ResponseEntity.ok(order); } - } diff --git a/src/main/java/com/podzilla/order/exception/NotFoundException.java b/src/main/java/com/podzilla/order/exception/NotFoundException.java new file mode 100644 index 0000000..322886c --- /dev/null +++ b/src/main/java/com/podzilla/order/exception/NotFoundException.java @@ -0,0 +1,7 @@ +package com.podzilla.order.exception; + +public class NotFoundException extends RuntimeException{ + public NotFoundException(final String message) { + super("Not Found: " + message); + } +} diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 296dad6..bd4a63d 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -1,5 +1,6 @@ package com.podzilla.order.service; +import com.podzilla.order.exception.NotFoundException; import com.podzilla.order.model.Order; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.repository.OrderRepository; @@ -7,11 +8,11 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.time.LocalDateTime; import java.util.List; import java.util.Optional; + @Slf4j @Service public class OrderService { @@ -65,34 +66,47 @@ public void deleteOrder(final long id) { public Optional getOrderByUserId(final long userId) { log.info("Fetching order with user ID: {}", userId); + + Optional order = orderRepository.findByUserId(userId); + + checkNotFoundException(order.orElse(null), + "Order not found with user ID: " + userId); + return orderRepository.findByUserId(userId); } public Order cancelOrder(final long id) { log.info("Cancelling order with ID: {}", id); + Optional existingOrder = orderRepository.findById(id); - if (existingOrder.isPresent()) { - Order order = existingOrder.get(); - order.setStatus(OrderStatus.CANCELLED); - order.setUpdatedAt(LocalDateTime.now()); - return orderRepository.save(order); - } else { - log.warn("Order with id: {} was not found", id); - throw new RuntimeException("Order not found with id: " + id); - } + + checkNotFoundException(existingOrder.orElse(null), + "Order not found with id: " + id); + + Order order = existingOrder.get(); + order.setStatus(OrderStatus.CANCELLED); + order.setUpdatedAt(LocalDateTime.now()); + return orderRepository.save(order); } public Order updateOrderStatus(final long id, final OrderStatus status) { log.info("Updating order status with ID: {}", id); + Optional existingOrder = orderRepository.findById(id); - if (existingOrder.isPresent()) { - Order order = existingOrder.get(); - order.setStatus(status); - order.setUpdatedAt(LocalDateTime.now()); - return orderRepository.save(order); - } else { - log.warn("Order with id: {} was not found", id); - throw new RuntimeException("Order not found with id: " + id); + + checkNotFoundException(existingOrder.orElse(null), + "Order not found with id: " + id); + + Order order = existingOrder.get(); + order.setStatus(status); + order.setUpdatedAt(LocalDateTime.now()); + return orderRepository.save(order); + } + + private void checkNotFoundException(final Object value, + final String message) { + if (value == null) { + throw new NotFoundException(message); } } } From 8cc4b16a6b0c4539a5706112aa00a495d300ac4e Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sun, 4 May 2025 17:39:20 +0300 Subject: [PATCH 10/40] Adjusted lint checks --- .../java/com/podzilla/order/controller/OrderController.java | 4 ++-- .../java/com/podzilla/order/exception/NotFoundException.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index 9156c30..9e19972 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -101,8 +101,8 @@ public ResponseEntity cancelOrder(@PathVariable final long id) { @PutMapping("/status/{id}") @Operation( summary = "Update order status", - description = "Updates the status of an order based on " + - "the provided order ID" + description = "Updates the status of an order based on " + + "the provided order ID" ) @ApiResponse( responseCode = "200", description = "Order status updated" diff --git a/src/main/java/com/podzilla/order/exception/NotFoundException.java b/src/main/java/com/podzilla/order/exception/NotFoundException.java index 322886c..7a2c0da 100644 --- a/src/main/java/com/podzilla/order/exception/NotFoundException.java +++ b/src/main/java/com/podzilla/order/exception/NotFoundException.java @@ -1,6 +1,6 @@ package com.podzilla.order.exception; -public class NotFoundException extends RuntimeException{ +public class NotFoundException extends RuntimeException { public NotFoundException(final String message) { super("Not Found: " + message); } From 7191cb3c67ee5a22ab51a06355f0d8900dbf0600 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Tue, 6 May 2025 23:07:08 +0300 Subject: [PATCH 11/40] added swagger and logger in the controller --- pom.xml | 5 +++ .../order/controller/OrderController.java | 36 +++++++++++++++++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fd77e3d..f342395 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,11 @@ org.springframework.boot spring-boot-starter-data-jdbc + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.8.5 + org.springframework.boot spring-boot-starter-data-jpa diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index cb3d05e..541aa56 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -1,10 +1,11 @@ package com.podzilla.order.controller; - import com.podzilla.order.model.Order; import com.podzilla.order.service.OrderService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -12,15 +13,20 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.DeleteMapping; - +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @RestController @RequestMapping("/orders") +@Tag(name = "Order API", description = "Order management operations") public class OrderController { private final OrderService orderService; + private static final Logger LOGGER = + LoggerFactory.getLogger(OrderController.class); @Autowired public OrderController(final OrderService orderService) { @@ -28,33 +34,57 @@ public OrderController(final OrderService orderService) { } @PostMapping + @Operation(summary = "Create a new order", + description = "Creates a new order and returns the created order") + @ApiResponse(responseCode = "200", description = "Order created " + + "successfully") public ResponseEntity createOrder(@RequestBody final Order order) { + LOGGER.info("Creating new order: {}", order); Order createdOrder = orderService.createOrder(order); return ResponseEntity.ok(createdOrder); } @GetMapping + @Operation(summary = "Get all orders", + description = "Returns a list of all orders") + @ApiResponse(responseCode = "200", description = "List of orders") public ResponseEntity> getAllOrders() { + LOGGER.info("Fetching all orders"); List orders = orderService.getAllOrders(); return ResponseEntity.ok(orders); } @GetMapping("/{id}") + @Operation(summary = "Get order by ID", + description = "Returns an order by its ID") + @ApiResponse(responseCode = "200", description = "Order found") public ResponseEntity getOrderById(@PathVariable final long id) { + LOGGER.info("Fetching order with ID: {}", id); Order order = orderService.getOrderById(id) .orElseThrow(() -> new RuntimeException("Order not found")); return ResponseEntity.ok(order); } @PutMapping("/{id}") + @Operation(summary = "Update an order", + description = "Updates an existing order and returns the updated " + + "order") + @ApiResponse(responseCode = "200", description = "Order updated " + + "successfully") public ResponseEntity updateOrder(@PathVariable final long id, @RequestBody final Order order) { + LOGGER.info("Updating order with ID: {}", id); Order updatedOrder = orderService.updateOrder(id, order); return ResponseEntity.ok(updatedOrder); } @DeleteMapping("/{id}") + @Operation(summary = "Delete an order", + description = "Deletes an order by its ID") + @ApiResponse(responseCode = "204", description = "Order deleted " + + "successfully") public ResponseEntity deleteOrder(@PathVariable final long id) { + LOGGER.info("Deleting order with ID: {}", id); orderService.deleteOrder(id); return ResponseEntity.noContent().build(); } From fd5c1e5ccc853d3f0d7080f072ca24bc2a754816 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Tue, 6 May 2025 23:12:46 +0300 Subject: [PATCH 12/40] fixed linter issues --- .../com/podzilla/order/controller/OrderController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index 541aa56..6170b14 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -36,8 +36,8 @@ public OrderController(final OrderService orderService) { @PostMapping @Operation(summary = "Create a new order", description = "Creates a new order and returns the created order") - @ApiResponse(responseCode = "200", description = "Order created " + - "successfully") + @ApiResponse(responseCode = "200", description = "Order created " + + "successfully") public ResponseEntity createOrder(@RequestBody final Order order) { LOGGER.info("Creating new order: {}", order); Order createdOrder = orderService.createOrder(order); @@ -69,8 +69,8 @@ public ResponseEntity getOrderById(@PathVariable final long id) { @Operation(summary = "Update an order", description = "Updates an existing order and returns the updated " + "order") - @ApiResponse(responseCode = "200", description = "Order updated " + - "successfully") + @ApiResponse(responseCode = "200", description = "Order updated " + + "successfully") public ResponseEntity updateOrder(@PathVariable final long id, @RequestBody final Order order) { LOGGER.info("Updating order with ID: {}", id); From a5423a9a0fb43bcc6c46549ef66cef05da5cecce Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Thu, 8 May 2025 18:14:55 +0300 Subject: [PATCH 13/40] Added Global Exception Handler and Endpoint to Check out an order --- pom.xml | 4 ++ .../order/controller/OrderController.java | 14 +++++ .../order/exception/ErrorResponse.java | 19 ++++++ .../exception/GlobalExceptionHandler.java | 62 +++++++++++++++++++ .../exception/InvalidActionException.java | 7 +++ .../order/exception/ValidationException.java | 7 +++ .../podzilla/order/service/OrderService.java | 37 ++++++++++- 7 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/podzilla/order/exception/ErrorResponse.java create mode 100644 src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/podzilla/order/exception/InvalidActionException.java create mode 100644 src/main/java/com/podzilla/order/exception/ValidationException.java diff --git a/pom.xml b/pom.xml index 32ceacc..116047e 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,10 @@ org.springframework.boot spring-boot-starter-data-jdbc + + org.springframework.boot + spring-boot-starter-security + org.springdoc springdoc-openapi-starter-webmvc-ui diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index 9e19972..569d876 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -113,4 +113,18 @@ public ResponseEntity updateOrderStatus(@PathVariable final long id, LOGGER.info("Order status updated for ID: {}", id); return ResponseEntity.ok(order); } + + @PostMapping("/checkout/{id}") + @Operation( + summary = "Checkout order", + description = "Checks out an order based on the provided order ID" + ) + @ApiResponse( + responseCode = "200", description = "Order checked out" + ) + public ResponseEntity checkoutOrder(@PathVariable final long id) { + Order order = orderService.checkoutOrder(id); + LOGGER.info("Order with ID: {} checked out", id); + return ResponseEntity.ok(order); + } } diff --git a/src/main/java/com/podzilla/order/exception/ErrorResponse.java b/src/main/java/com/podzilla/order/exception/ErrorResponse.java new file mode 100644 index 0000000..c752990 --- /dev/null +++ b/src/main/java/com/podzilla/order/exception/ErrorResponse.java @@ -0,0 +1,19 @@ +package com.podzilla.order.exception; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +import java.time.LocalDateTime; + +@Getter +public class ErrorResponse { + private final String message; + private final HttpStatus status; + private final LocalDateTime timestamp; + + public ErrorResponse(final String message, final HttpStatus status) { + this.message = message; + this.status = status; + this.timestamp = LocalDateTime.now(); + } +} diff --git a/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java b/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..0f19f36 --- /dev/null +++ b/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java @@ -0,0 +1,62 @@ +package com.podzilla.order.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.core.AuthenticationException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +@RestControllerAdvice +public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { + + + @ExceptionHandler(AccessDeniedException.class) + public ResponseEntity handleAccessDeniedException( + final AccessDeniedException exception) { + return ResponseEntity.status(HttpStatus.FORBIDDEN) + .body(new ErrorResponse(exception.getMessage(), + HttpStatus.FORBIDDEN)); + } + + @ExceptionHandler(AuthenticationException.class) + public ResponseEntity handleAuthenticationException( + final AuthenticationException exception) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .body(new ErrorResponse(exception.getMessage(), + HttpStatus.UNAUTHORIZED)); + } + + @ExceptionHandler(NotFoundException.class) + public ResponseEntity handleNotFoundException( + final NotFoundException exception) { + return ResponseEntity.status(HttpStatus.NOT_FOUND) + .body(new ErrorResponse(exception.getMessage(), + HttpStatus.NOT_FOUND)); + } + + @ExceptionHandler(ValidationException.class) + public ResponseEntity handleValidationException( + final ValidationException exception) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ErrorResponse(exception.getMessage(), + HttpStatus.BAD_REQUEST)); + } + + @ExceptionHandler(InvalidActionException.class) + public ResponseEntity handleInvalidActionException( + final InvalidActionException exception) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(new ErrorResponse(exception.getMessage(), + HttpStatus.BAD_REQUEST)); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleException( + final Exception exception) { + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse(exception.getMessage(), + HttpStatus.INTERNAL_SERVER_ERROR)); + } +} diff --git a/src/main/java/com/podzilla/order/exception/InvalidActionException.java b/src/main/java/com/podzilla/order/exception/InvalidActionException.java new file mode 100644 index 0000000..89ce1d5 --- /dev/null +++ b/src/main/java/com/podzilla/order/exception/InvalidActionException.java @@ -0,0 +1,7 @@ +package com.podzilla.order.exception; + +public class InvalidActionException extends RuntimeException { + public InvalidActionException(final String message) { + super("Invalid action: " + message); + } +} diff --git a/src/main/java/com/podzilla/order/exception/ValidationException.java b/src/main/java/com/podzilla/order/exception/ValidationException.java new file mode 100644 index 0000000..f23efb2 --- /dev/null +++ b/src/main/java/com/podzilla/order/exception/ValidationException.java @@ -0,0 +1,7 @@ +package com.podzilla.order.exception; + +public class ValidationException extends RuntimeException { + public ValidationException(final String message) { + super("Validation error: " + message); + } +} diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index bd4a63d..710020d 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -89,7 +89,8 @@ public Order cancelOrder(final long id) { return orderRepository.save(order); } - public Order updateOrderStatus(final long id, final OrderStatus status) { + public Order updateOrderStatus(final long id, + final OrderStatus status) { log.info("Updating order status with ID: {}", id); Optional existingOrder = orderRepository.findById(id); @@ -103,6 +104,40 @@ public Order updateOrderStatus(final long id, final OrderStatus status) { return orderRepository.save(order); } + public Order checkoutOrder(final long id) { + log.info("Checking out order with ID: {}", id); + + Optional existingOrder = orderRepository.findById(id); + checkNotFoundException(existingOrder.orElse(null), + "Order not found with id: " + id); + + Order order = existingOrder.get(); + + if (order.getStatus() != OrderStatus.PENDING) { + throw new IllegalStateException("Only pending orders " + + "can be checked out."); + } + + order.setStatus(OrderStatus.CONFIRMED); + order.setUpdatedAt(LocalDateTime.now()); + Order savedOrder = orderRepository.save(order); + + //ToDo: Uncomment and implement the message publisher +// OrderCheckedOutEvent event = new OrderCheckedOutEvent( +// savedOrder.getId(), +// savedOrder.getUserId(), +// savedOrder.getTotalAmount(), // if applicable +// savedOrder.getStatus().name(), +// savedOrder.getUpdatedAt().toString() +// ); +// +// messagePublisher.publishOrderCheckedOutEvent(event); +// +// log.info("Order with ID: {} has been checked out and event published", +// id); + return savedOrder; + } + private void checkNotFoundException(final Object value, final String message) { if (value == null) { From 71d8612da653119643d8e1394c9a1411b3a2ff6e Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sat, 10 May 2025 21:08:49 +0300 Subject: [PATCH 14/40] Create docker-compose.yml --- docker-compose.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c126715 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,44 @@ +services: + backend: + image: openjdk:25-ea-4-jdk-oraclelinux9 + container_name: order + ports: + - "8080:8080" + depends_on: + - order_db + environment: + - SPRING_DATASOURCE_URL=jdbc:postgresql://order_db:5432/orderDB + volumes: + - ./target:/app + - ./logs:/logs + command: [ "java", "-jar", "/app/order-0.0.1-SNAPSHOT.jar" ] + + order_db: + image: postgres:14.17 + container_name: order_db + environment: + POSTGRES_PASSWORD: 1234 + POSTGRES_USER: postgres + POSTGRES_DB: orderDB + ports: + - "5432:5432" + + loki: + image: grafana/loki:3.5.0 + container_name: loki + ports: + - "3100:3100" + command: -config.file=/etc/loki/local-config.yaml + + grafana: + image: grafana/grafana:10.4.1 + container_name: grafana + ports: + - "3000:3000" + depends_on: + - loki + environment: + - GF_SECURITY_ADMIN_USER=admin + - GF_SECURITY_ADMIN_PASSWORD=admin + volumes: + - grafana_data:/var/lib/grafana From ae077b0b88f71e49a0bf4f3d8c676e74c261c1fe Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sun, 11 May 2025 16:53:52 +0300 Subject: [PATCH 15/40] Add DockerFile --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c2a45ba --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:25-ea-4-jdk-oraclelinux9 + +WORKDIR /app + +COPY target/order-0.0.1-SNAPSHOT.jar /app/order-0.0.1-SNAPSHOT.jar + +ENTRYPOINT [ "java", "-jar", "/app/order-0.0.1-SNAPSHOT.jar" ] \ No newline at end of file From 5e4bb964606e82121ece166add8dbc2306b5563e Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Mon, 12 May 2025 20:42:35 +0300 Subject: [PATCH 16/40] Removed Checkout endpoint and Adjusted OrderStatus enum --- .../com/podzilla/order/model/OrderStatus.java | 6 ++-- .../podzilla/order/service/OrderService.java | 36 ++----------------- 2 files changed, 5 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/podzilla/order/model/OrderStatus.java b/src/main/java/com/podzilla/order/model/OrderStatus.java index 9dac508..07de71e 100644 --- a/src/main/java/com/podzilla/order/model/OrderStatus.java +++ b/src/main/java/com/podzilla/order/model/OrderStatus.java @@ -1,10 +1,10 @@ package com.podzilla.order.model; public enum OrderStatus { - PENDING, - CONFIRMED, + PLACED, + CANCELLED, SHIPPED, DELIVERED, - CANCELLED + FAILED } diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 710020d..c520689 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -75,6 +75,8 @@ public Optional getOrderByUserId(final long userId) { return orderRepository.findByUserId(userId); } + + public Order cancelOrder(final long id) { log.info("Cancelling order with ID: {}", id); @@ -104,40 +106,6 @@ public Order updateOrderStatus(final long id, return orderRepository.save(order); } - public Order checkoutOrder(final long id) { - log.info("Checking out order with ID: {}", id); - - Optional existingOrder = orderRepository.findById(id); - checkNotFoundException(existingOrder.orElse(null), - "Order not found with id: " + id); - - Order order = existingOrder.get(); - - if (order.getStatus() != OrderStatus.PENDING) { - throw new IllegalStateException("Only pending orders " - + "can be checked out."); - } - - order.setStatus(OrderStatus.CONFIRMED); - order.setUpdatedAt(LocalDateTime.now()); - Order savedOrder = orderRepository.save(order); - - //ToDo: Uncomment and implement the message publisher -// OrderCheckedOutEvent event = new OrderCheckedOutEvent( -// savedOrder.getId(), -// savedOrder.getUserId(), -// savedOrder.getTotalAmount(), // if applicable -// savedOrder.getStatus().name(), -// savedOrder.getUpdatedAt().toString() -// ); -// -// messagePublisher.publishOrderCheckedOutEvent(event); -// -// log.info("Order with ID: {} has been checked out and event published", -// id); - return savedOrder; - } - private void checkNotFoundException(final Object value, final String message) { if (value == null) { From 94a14a8e7d381129e439c2a251dcf999caf5cad3 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Mon, 12 May 2025 20:46:47 +0300 Subject: [PATCH 17/40] added order address --- .../com/podzilla/order/model/Address.java | 30 +++++++++++++++++++ .../java/com/podzilla/order/model/Order.java | 21 +++++-------- 2 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/podzilla/order/model/Address.java diff --git a/src/main/java/com/podzilla/order/model/Address.java b/src/main/java/com/podzilla/order/model/Address.java new file mode 100644 index 0000000..2e6739b --- /dev/null +++ b/src/main/java/com/podzilla/order/model/Address.java @@ -0,0 +1,30 @@ +package com.podzilla.order.model; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.UUID; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "addresses") +public class Address { + + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + private String street; + private String city; + private String state; + private String country; + private String postalCode; + + @ManyToOne + @JoinColumn(name = "order_id", nullable = false) + private Order order; +} diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index c28ff6e..8c5e4a0 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -1,16 +1,7 @@ package com.podzilla.order.model; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Column; -import jakarta.persistence.Enumerated; -import jakarta.persistence.EnumType; -import jakarta.persistence.OneToMany; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -19,6 +10,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.UUID; @Entity @Table(name = "orders") @@ -30,12 +22,15 @@ public class Order { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; + private UUID id; - private long userId; + private UUID userId; private double totalAmount; + @OneToOne(cascade = CascadeType.ALL) + private Address shippingAddress; + @Enumerated(EnumType.STRING) @Column(nullable = false) private OrderStatus status; @@ -50,7 +45,7 @@ public class Order { true) private List orderItems = new ArrayList<>(); - public Order(final long userId, final double totalAmount, + public Order(final UUID userId, final double totalAmount, final OrderStatus status, final List orderItems) { this.userId = userId; this.totalAmount = totalAmount; From afcea40101f5b9c3acf096cc29af047048fce660 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Mon, 12 May 2025 20:51:59 +0300 Subject: [PATCH 18/40] fixed linter issues --- src/main/java/com/podzilla/order/model/Address.java | 9 ++++++++- src/main/java/com/podzilla/order/model/Order.java | 12 +++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/podzilla/order/model/Address.java b/src/main/java/com/podzilla/order/model/Address.java index 2e6739b..acf13c3 100644 --- a/src/main/java/com/podzilla/order/model/Address.java +++ b/src/main/java/com/podzilla/order/model/Address.java @@ -1,6 +1,13 @@ package com.podzilla.order.model; -import jakarta.persistence.*; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index 8c5e4a0..fbc14ee 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -1,7 +1,17 @@ package com.podzilla.order.model; -import jakarta.persistence.*; +import jakarta.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Enumerated; +import jakarta.persistence.EnumType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.GenerationType; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; From e881d83dbdc6f42df4eeb8875f537ab4a48bb014 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Mon, 12 May 2025 21:06:21 +0300 Subject: [PATCH 19/40] fixed errors --- .../order/controller/OrderController.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index dff1524..b947a93 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -33,9 +33,6 @@ public class OrderController { private static final Logger LOGGER = LoggerFactory.getLogger(OrderController.class); - private static final Logger LOGGER = - LoggerFactory.getLogger(OrderController.class); - @Autowired public OrderController(final OrderService orderService) { this.orderService = orderService; @@ -141,18 +138,4 @@ public ResponseEntity updateOrderStatus(@PathVariable final long id, LOGGER.info("Order status updated for ID: {}", id); return ResponseEntity.ok(order); } - - @PostMapping("/checkout/{id}") - @Operation( - summary = "Checkout order", - description = "Checks out an order based on the provided order ID" - ) - @ApiResponse( - responseCode = "200", description = "Order checked out" - ) - public ResponseEntity checkoutOrder(@PathVariable final long id) { - Order order = orderService.checkoutOrder(id); - LOGGER.info("Order with ID: {} checked out", id); - return ResponseEntity.ok(order); - } } From c911c79c01866f68c69f0d2b94cef6a58818bb1b Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Mon, 12 May 2025 21:13:39 +0300 Subject: [PATCH 20/40] Chnage long -> UUID in OrderService --- .../order/repository/OrderRepository.java | 5 +++-- .../com/podzilla/order/service/OrderService.java | 15 +++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/podzilla/order/repository/OrderRepository.java b/src/main/java/com/podzilla/order/repository/OrderRepository.java index fd8f9a2..106d6d0 100644 --- a/src/main/java/com/podzilla/order/repository/OrderRepository.java +++ b/src/main/java/com/podzilla/order/repository/OrderRepository.java @@ -5,8 +5,9 @@ import org.springframework.stereotype.Repository; import java.util.Optional; +import java.util.UUID; @Repository -public interface OrderRepository extends JpaRepository { - Optional findByUserId(Long id); +public interface OrderRepository extends JpaRepository { + Optional findByUserId(UUID id); } diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index c520689..fab9aba 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -11,6 +11,7 @@ import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import java.util.UUID; @Slf4j @@ -35,12 +36,12 @@ public List getAllOrders() { return orderRepository.findAll(); } - public Optional getOrderById(final long id) { + public Optional getOrderById(final UUID id) { log.info("Fetching order with ID: {}", id); return orderRepository.findById(id); } - public Order updateOrder(final long id, final Order updatedOrder) { + public Order updateOrder(final UUID id, final Order updatedOrder) { log.info("Updating order with ID: {}", id); Optional existingOrder = orderRepository.findById(id); if (existingOrder.isPresent()) { @@ -54,7 +55,7 @@ public Order updateOrder(final long id, final Order updatedOrder) { throw new RuntimeException("Order not found with id: " + id); } - public void deleteOrder(final long id) { + public void deleteOrder(final UUID id) { if (orderRepository.existsById(id)) { log.warn("Deleting order with ID: {}", id); orderRepository.deleteById(id); @@ -64,7 +65,7 @@ public void deleteOrder(final long id) { } } - public Optional getOrderByUserId(final long userId) { + public Optional getOrderByUserId(final UUID userId) { log.info("Fetching order with user ID: {}", userId); Optional order = orderRepository.findByUserId(userId); @@ -75,9 +76,7 @@ public Optional getOrderByUserId(final long userId) { return orderRepository.findByUserId(userId); } - - - public Order cancelOrder(final long id) { + public Order cancelOrder(final UUID id) { log.info("Cancelling order with ID: {}", id); Optional existingOrder = orderRepository.findById(id); @@ -91,7 +90,7 @@ public Order cancelOrder(final long id) { return orderRepository.save(order); } - public Order updateOrderStatus(final long id, + public Order updateOrderStatus(final UUID id, final OrderStatus status) { log.info("Updating order status with ID: {}", id); From 667adea7dd29a3c651821ae3dd96c5b8fbc326a2 Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Mon, 12 May 2025 21:14:37 +0300 Subject: [PATCH 21/40] long -> UUID in OrderController --- .../podzilla/order/controller/OrderController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index b947a93..2e21d66 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.DeleteMapping; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; import org.slf4j.Logger; @@ -23,6 +22,7 @@ import java.util.List; import java.util.Optional; +import java.util.UUID; @RestController @RequestMapping("/orders") @@ -63,7 +63,7 @@ public ResponseEntity> getAllOrders() { @Operation(summary = "Get order by ID", description = "Returns an order by its ID") @ApiResponse(responseCode = "200", description = "Order found") - public ResponseEntity getOrderById(@PathVariable final long id) { + public ResponseEntity getOrderById(@PathVariable final UUID id) { LOGGER.info("Fetching order with ID: {}", id); Order order = orderService.getOrderById(id) .orElseThrow(() -> new RuntimeException("Order not found")); @@ -76,7 +76,7 @@ public ResponseEntity getOrderById(@PathVariable final long id) { + "order") @ApiResponse(responseCode = "200", description = "Order updated " + "successfully") - public ResponseEntity updateOrder(@PathVariable final long id, + public ResponseEntity updateOrder(@PathVariable final UUID id, @RequestBody final Order order) { LOGGER.info("Updating order with ID: {}", id); Order updatedOrder = orderService.updateOrder(id, order); @@ -88,7 +88,7 @@ public ResponseEntity updateOrder(@PathVariable final long id, description = "Deletes an order by its ID") @ApiResponse(responseCode = "204", description = "Order deleted " + "successfully") - public ResponseEntity deleteOrder(@PathVariable final long id) { + public ResponseEntity deleteOrder(@PathVariable final UUID id) { LOGGER.info("Deleting order with ID: {}", id); orderService.deleteOrder(id); return ResponseEntity.noContent().build(); @@ -103,7 +103,7 @@ public ResponseEntity deleteOrder(@PathVariable final long id) { responseCode = "200", description = "Order found" ) public ResponseEntity> getOrderByUserId( - @PathVariable final long userId) { + @PathVariable final UUID userId) { Optional order = orderService.getOrderByUserId(userId); LOGGER.info("Order found for user ID: {}", userId); return ResponseEntity.ok(order); @@ -117,7 +117,7 @@ public ResponseEntity> getOrderByUserId( @ApiResponse( responseCode = "200", description = "Order cancelled" ) - public ResponseEntity cancelOrder(@PathVariable final long id) { + public ResponseEntity cancelOrder(@PathVariable final UUID id) { Order order = orderService.cancelOrder(id); LOGGER.info("Order with ID: {} cancelled", id); return ResponseEntity.ok(order); @@ -132,7 +132,7 @@ public ResponseEntity cancelOrder(@PathVariable final long id) { @ApiResponse( responseCode = "200", description = "Order status updated" ) - public ResponseEntity updateOrderStatus(@PathVariable final long id, + public ResponseEntity updateOrderStatus(@PathVariable final UUID id, @RequestBody final OrderStatus status) { Order order = orderService.updateOrderStatus(id, status); LOGGER.info("Order status updated for ID: {}", id); From 5950a26d35c6a6acb9a463fd641ffcd370b6c493 Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Tue, 13 May 2025 16:41:21 +0300 Subject: [PATCH 22/40] Add stock reservation and order placed messaging via RabbitMQ - Added models for StockReservationRequest and StockReservationResponse - Added OrderPlaced event model for communicating with warehouse and ERP - Implemented RabbitMQ producer and consumer for messaging - Added RabbitMQ configuration and dependency setup --- docker-compose.yml | 11 +++ pom.xml | 5 ++ .../order/messaging/OrderConsumer.java | 39 +++++++++++ .../order/messaging/OrderProducer.java | 33 +++++++++ .../order/messaging/RabbitMQConfig.java | 68 +++++++++++++++++++ .../java/com/podzilla/order/model/Order.java | 5 +- .../com/podzilla/order/model/OrderItem.java | 4 +- .../com/podzilla/order/model/OrderPlaced.java | 28 ++++++++ .../com/podzilla/order/model/OrderStatus.java | 3 +- .../order/model/StockReservationRequest.java | 23 +++++++ .../order/model/StockReservationResponse.java | 13 ++++ .../podzilla/order/service/OrderService.java | 36 +++++++++- src/main/resources/application.yml | 8 +++ 13 files changed, 270 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/podzilla/order/messaging/OrderConsumer.java create mode 100644 src/main/java/com/podzilla/order/messaging/OrderProducer.java create mode 100644 src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java create mode 100644 src/main/java/com/podzilla/order/model/OrderPlaced.java create mode 100644 src/main/java/com/podzilla/order/model/StockReservationRequest.java create mode 100644 src/main/java/com/podzilla/order/model/StockReservationResponse.java create mode 100644 src/main/resources/application.yml diff --git a/docker-compose.yml b/docker-compose.yml index c126715..b437317 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,6 +22,17 @@ services: POSTGRES_DB: orderDB ports: - "5432:5432" + - + + rabbitmq: + image: rabbitmq:3-management + container_name: rabbitmq + ports: + - "15672:15672" + - "5672:5672" + environment: + RABBITMQ_DEFAULT_USER: user + RABBITMQ_DEFAULT_PASS: password loki: image: grafana/loki:3.5.0 diff --git a/pom.xml b/pom.xml index a7ebd93..91190ba 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,11 @@ org.springframework.boot spring-boot-starter-data-jdbc + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + 4.0.0 + org.springdoc springdoc-openapi-starter-webmvc-ui diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java new file mode 100644 index 0000000..4ef5fa4 --- /dev/null +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -0,0 +1,39 @@ +package com.podzilla.order.messaging; + +import com.podzilla.order.model.OrderStatus; +import com.podzilla.order.service.OrderService; +import com.podzilla.order.model.StockReservationResponse; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.stereotype.Component; + +import java.util.UUID; + +@Component +public class OrderConsumer { + + private final OrderService orderService; + + public OrderConsumer(final OrderService orderService) { + this.orderService = orderService; + } + + @RabbitListener(queues = RabbitMQConfig.STOCK_RESERVED_QUEUE) + public void handleStockReserved(final StockReservationResponse message) { + System.out.println("✅ Stock reserved for order: " + + message.getOrderId() + + ", product: " + message.getOrderId()); + + orderService.placeOrder(UUID.fromString(message.getOrderId())); + } + + @RabbitListener(queues = RabbitMQConfig.ORDER_FAILED_QUEUE) + public void handleOrderFulfillmentFailed( + final StockReservationResponse message) { + System.out.println("❌ Order fulfillment failed for order: " + + message.getOrderId() + + ", reason: " + message.getReason()); + + orderService.updateOrderStatus( + UUID.fromString(message.getOrderId()), OrderStatus.FAILED); + } +} diff --git a/src/main/java/com/podzilla/order/messaging/OrderProducer.java b/src/main/java/com/podzilla/order/messaging/OrderProducer.java new file mode 100644 index 0000000..61c738f --- /dev/null +++ b/src/main/java/com/podzilla/order/messaging/OrderProducer.java @@ -0,0 +1,33 @@ +package com.podzilla.order.messaging; + +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.stereotype.Component; + +@Component +public class OrderProducer { + + private final RabbitTemplate rabbitTemplate; + + public OrderProducer(final RabbitTemplate rabbitTemplate, + final RabbitMQConfig rabbitMQConfig) { + this.rabbitTemplate = rabbitTemplate; + } + + public void sendStockReservationRequest( + final Object stockReservationRequest) { + rabbitTemplate.convertAndSend( + RabbitMQConfig.EXCHANGE, + RabbitMQConfig.ORDER_ROUTING_KEY, + stockReservationRequest + ); + } + + public void sendOrderPlaced( + final Object orderPlaced) { + rabbitTemplate.convertAndSend( + RabbitMQConfig.EXCHANGE, + RabbitMQConfig.ORDER_PLACED_ROUTING_KEY, + orderPlaced + ); + } +} diff --git a/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java b/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java new file mode 100644 index 0000000..2d8892b --- /dev/null +++ b/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java @@ -0,0 +1,68 @@ +package com.podzilla.order.messaging; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.core.TopicExchange; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class RabbitMQConfig { + // Exchange + public static final String EXCHANGE = "shared_exchange"; + + // Outbound (sending to warehouse) + public static final String ORDER_ROUTING_KEY = + "order.stock_reservation_requested"; + + public static final String ORDER_PLACED_ROUTING_KEY = + "order.placed"; + + // Inbound (responses from warehouse) + public static final String STOCK_RESERVED_ROUTING_KEY = + "warehouse.stock_reserved"; + public static final String ORDER_FAILED_ROUTING_KEY = + "warehouse.order_fulfillment_failed"; + + // Queues this service will consume from (responses from warehouse) + public static final String STOCK_RESERVED_QUEUE = + "order.stock_reserved.queue"; + public static final String ORDER_FAILED_QUEUE = + "order.fulfillment_failed.queue"; + + @Bean + public Queue stockReservedQueue() { + return new Queue(STOCK_RESERVED_QUEUE); + } + + @Bean + public Queue orderFailedQueue() { + return new Queue(ORDER_FAILED_QUEUE); + } + + @Bean + public TopicExchange exchange() { + return new TopicExchange(EXCHANGE); + } + + @Bean + public Binding warehouseStockReservedBinding( + final Queue stockReservedQueue, + final TopicExchange exchange) { + return BindingBuilder + .bind(stockReservedQueue) + .to(exchange) + .with("warehouse.stock_reserved"); + } + + @Bean + public Binding warehouseFulfillmentFailedBinding( + final Queue orderFailedQueue, + final TopicExchange exchange) { + return BindingBuilder + .bind(orderFailedQueue) + .to(exchange) + .with("warehouse.order_fulfillment_failed"); + } +} diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index fbc14ee..65685ad 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -17,6 +17,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; +import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -36,7 +37,7 @@ public class Order { private UUID userId; - private double totalAmount; + private BigDecimal totalAmount; @OneToOne(cascade = CascadeType.ALL) private Address shippingAddress; @@ -55,7 +56,7 @@ public class Order { true) private List orderItems = new ArrayList<>(); - public Order(final UUID userId, final double totalAmount, + public Order(final UUID userId, final BigDecimal totalAmount, final OrderStatus status, final List orderItems) { this.userId = userId; this.totalAmount = totalAmount; diff --git a/src/main/java/com/podzilla/order/model/OrderItem.java b/src/main/java/com/podzilla/order/model/OrderItem.java index 0d7a03c..4615890 100644 --- a/src/main/java/com/podzilla/order/model/OrderItem.java +++ b/src/main/java/com/podzilla/order/model/OrderItem.java @@ -14,6 +14,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; +import java.math.BigDecimal; + @Entity @Table(name = "order_items") @NoArgsConstructor @@ -33,7 +35,7 @@ public class OrderItem { private int quantity; @Column(nullable = false) - private double price; + private BigDecimal pricePerUnit; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "order_id", nullable = false) diff --git a/src/main/java/com/podzilla/order/model/OrderPlaced.java b/src/main/java/com/podzilla/order/model/OrderPlaced.java new file mode 100644 index 0000000..bcace14 --- /dev/null +++ b/src/main/java/com/podzilla/order/model/OrderPlaced.java @@ -0,0 +1,28 @@ +package com.podzilla.order.model; + +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +@Entity +@Getter +@Setter +public class OrderPlaced implements Serializable { + private String orderId; + private String customerId; + private BigDecimal totalAmount; + private List items; + private Address deliveryAddress; + + public OrderPlaced(final Order order) { + this.orderId = order.getId().toString(); + this.customerId = order.getUserId().toString(); + this.totalAmount = order.getTotalAmount(); + this.items = order.getOrderItems(); + this.deliveryAddress = order.getShippingAddress(); + } +} diff --git a/src/main/java/com/podzilla/order/model/OrderStatus.java b/src/main/java/com/podzilla/order/model/OrderStatus.java index 07de71e..2b9c3d7 100644 --- a/src/main/java/com/podzilla/order/model/OrderStatus.java +++ b/src/main/java/com/podzilla/order/model/OrderStatus.java @@ -5,6 +5,7 @@ public enum OrderStatus { CANCELLED, SHIPPED, DELIVERED, - FAILED + FAILED, + PENDING } diff --git a/src/main/java/com/podzilla/order/model/StockReservationRequest.java b/src/main/java/com/podzilla/order/model/StockReservationRequest.java new file mode 100644 index 0000000..a240bf0 --- /dev/null +++ b/src/main/java/com/podzilla/order/model/StockReservationRequest.java @@ -0,0 +1,23 @@ +package com.podzilla.order.model; + +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.List; + +@Entity +@Getter +@Setter +public class StockReservationRequest implements Serializable { + private String orderId; + private List items; + + public StockReservationRequest( + final String orderId, + final List items) { + this.orderId = orderId; + this.items = items; + } +} diff --git a/src/main/java/com/podzilla/order/model/StockReservationResponse.java b/src/main/java/com/podzilla/order/model/StockReservationResponse.java new file mode 100644 index 0000000..d46ddd1 --- /dev/null +++ b/src/main/java/com/podzilla/order/model/StockReservationResponse.java @@ -0,0 +1,13 @@ +package com.podzilla.order.model; + +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +@Entity +@Getter +@Setter +public class StockReservationResponse { + private String orderId; + private String reason; +} diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index fab9aba..05ebcdd 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -2,6 +2,10 @@ import com.podzilla.order.exception.NotFoundException; import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderItem; +import com.podzilla.order.model.StockReservationRequest; +import com.podzilla.order.model.OrderPlaced; +import com.podzilla.order.messaging.OrderProducer; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.repository.OrderRepository; import lombok.extern.slf4j.Slf4j; @@ -18,17 +22,45 @@ @Service public class OrderService { private final OrderRepository orderRepository; + private final OrderProducer orderProducer; @Autowired - public OrderService(final OrderRepository orderRepository) { + public OrderService(final OrderRepository orderRepository, + final OrderProducer orderProducer) { this.orderRepository = orderRepository; + this.orderProducer = orderProducer; } public Order createOrder(final Order order) { log.info("Creating new order: {}", order); order.setCreatedAt(LocalDateTime.now()); order.setUpdatedAt(LocalDateTime.now()); - return orderRepository.save(order); + orderRepository.save(order); + + List orderItems = order.getOrderItems(); + + // Send request to stock service to reserve stock + StockReservationRequest stockReservationRequest = + new StockReservationRequest( + order.getId().toString(), + orderItems + ); + + orderProducer.sendStockReservationRequest(stockReservationRequest); + + return order; + } + + public Order placeOrder(final UUID orderId) { + log.info("Placing order with ID: {}", orderId); + Order order = updateOrderStatus(orderId, OrderStatus.PLACED); + + OrderPlaced stockReservedAnalytics = + new OrderPlaced(order); + + // Send order details to analytics service + orderProducer.sendOrderPlaced(stockReservedAnalytics); + return order; } public List getAllOrders() { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..0bc1010 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,8 @@ +spring: + application: + name: User + rabbitmq: + host: rabbitmq # container name + port: 5672 + username: user + password: password From 7d6888d946052c236c81b2339541da4464662210 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 14:35:17 +0300 Subject: [PATCH 23/40] modified order consumer and order producer --- pom.xml | 12 ++- .../com/podzilla/order/OrderApplication.java | 2 + .../order/messaging/OrderConsumer.java | 91 +++++++++++++++---- .../order/messaging/OrderProducer.java | 40 +++++--- .../java/com/podzilla/order/model/Order.java | 14 +-- .../com/podzilla/order/model/OrderPlaced.java | 56 ++++++------ .../{OrderItem.java => OrderProduct.java} | 21 ++--- .../com/podzilla/order/model/OrderStatus.java | 7 +- .../order/model/StockReservationRequest.java | 46 +++++----- .../order/model/StockReservationResponse.java | 26 +++--- .../podzilla/order/service/OrderService.java | 62 ++++++++----- .../podzilla/order/OrderApplicationTests.java | 26 +++--- 12 files changed, 249 insertions(+), 154 deletions(-) rename src/main/java/com/podzilla/order/model/{OrderItem.java => OrderProduct.java} (51%) diff --git a/pom.xml b/pom.xml index 91190ba..faaa236 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,12 @@ 23 + + + jitpack.io + https://jitpack.io + + org.springframework.boot @@ -87,8 +93,12 @@ spring-boot-starter-test test + + com.github.Podzilla + podzilla-utils-lib + v1.1.6 + - diff --git a/src/main/java/com/podzilla/order/OrderApplication.java b/src/main/java/com/podzilla/order/OrderApplication.java index 7492983..7d4ba92 100644 --- a/src/main/java/com/podzilla/order/OrderApplication.java +++ b/src/main/java/com/podzilla/order/OrderApplication.java @@ -2,8 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; @SpringBootApplication +@ComponentScan(basePackages = {"com.podzilla"}) public class OrderApplication { public static void main(final String[] args) { diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index 4ef5fa4..ed92388 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -1,14 +1,22 @@ package com.podzilla.order.messaging; +import com.podzilla.mq.EventsConstants; +import com.podzilla.mq.QueueResolver; +import com.podzilla.mq.events.*; +import com.podzilla.order.model.Address; +import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderProduct; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.service.OrderService; -import com.podzilla.order.model.StockReservationResponse; +import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.stereotype.Component; +import java.util.List; import java.util.UUID; @Component +@Slf4j public class OrderConsumer { private final OrderService orderService; @@ -17,23 +25,74 @@ public OrderConsumer(final OrderService orderService) { this.orderService = orderService; } - @RabbitListener(queues = RabbitMQConfig.STOCK_RESERVED_QUEUE) - public void handleStockReserved(final StockReservationResponse message) { - System.out.println("✅ Stock reserved for order: " - + message.getOrderId() - + ", product: " + message.getOrderId()); - - orderService.placeOrder(UUID.fromString(message.getOrderId())); + @RabbitListener(queues = EventsConstants.ORDER_INVENTORY_EVENT_QUEUE) + public void handleStockReserved(final BaseEvent payload) { + if(payload instanceof WarehouseStockReservedEvent warehouseStockReservedEvent) { + log.info("✅ Stock reserved for order: {}", warehouseStockReservedEvent.getOrderId()); + orderService.placeOrder(UUID.fromString(warehouseStockReservedEvent.getOrderId())); + } + if(payload instanceof WarehouseOrderFulfillmentFailedEvent warehouseOrderFulfillmentFailedEvent){ + log.info("❌ Order fulfillment failed for order: {}, reason: {}", + warehouseOrderFulfillmentFailedEvent.getOrderId(), + warehouseOrderFulfillmentFailedEvent.getReason()); + orderService.updateOrderStatus( + UUID.fromString(warehouseOrderFulfillmentFailedEvent.getOrderId()), OrderStatus.FAILED); + } } - @RabbitListener(queues = RabbitMQConfig.ORDER_FAILED_QUEUE) - public void handleOrderFulfillmentFailed( - final StockReservationResponse message) { - System.out.println("❌ Order fulfillment failed for order: " - + message.getOrderId() - + ", reason: " + message.getReason()); + @RabbitListener(queues = EventsConstants.ORDER_ORDER_EVENT_QUEUE) + public void trackOrder(final BaseEvent payload) { + if(payload instanceof OrderPackagedEvent orderPackagedEvent) { + log.info("✅ Order packaged for order: {}", + orderPackagedEvent.getOrderId()); + orderService.updateOrderStatus( + UUID.fromString(orderPackagedEvent.getOrderId()), + OrderStatus.PACKAGED); + } + if(payload instanceof OrderOutForDeliveryEvent orderOutForDeliveryEvent){ + log.info("✅ Order out for delivery for order: {}", + orderOutForDeliveryEvent.getOrderId()); + orderService.updateOrderStatus( + UUID.fromString(orderOutForDeliveryEvent.getOrderId()), + OrderStatus.SHIPPED); + } + if(payload instanceof OrderDeliveredEvent orderDeliveredEvent) { + log.info("✅ Order delivered for order: {}", + orderDeliveredEvent.getOrderId()); + orderService.updateOrderStatus( + UUID.fromString(orderDeliveredEvent.getOrderId()), + OrderStatus.DELIVERED); + } + if(payload instanceof CartCheckedoutEvent cartCheckedoutEvent) { + log.info("✅ Cart checked out for user with id: {}", + cartCheckedoutEvent.getCustomerId()); + Address address = new Address(); + address.setStreet(cartCheckedoutEvent.getDeliveryAddress().getStreet()); + address.setCity(cartCheckedoutEvent.getDeliveryAddress().getCity()); + address.setState(cartCheckedoutEvent.getDeliveryAddress().getState()); + address.setCountry(cartCheckedoutEvent.getDeliveryAddress().getCountry()); + address.setPostalCode(cartCheckedoutEvent.getDeliveryAddress().getPostalCode()); + List orderProducts = + cartCheckedoutEvent.getItems().stream() + .map(orderProduct -> { + OrderProduct product = new OrderProduct(); + product.setProductId(UUID.fromString(orderProduct.getProductId())); + product.setQuantity(orderProduct.getQuantity()); + product.setPricePerUnit(orderProduct.getPricePerUnit()); + return product; + }).toList(); + Order order = new Order(); + order.setUserId(UUID.fromString(cartCheckedoutEvent.getCustomerId())); + order.setTotalAmount(cartCheckedoutEvent.getTotalAmount()); + order.setStatus(OrderStatus.PENDING); + order.setShippingAddress(address); + order.setOrderProducts(orderProducts); + orderService.createOrder(order); + } + } - orderService.updateOrderStatus( - UUID.fromString(message.getOrderId()), OrderStatus.FAILED); + public static void main(String[] args) { + System.out.println( QueueResolver.getQueueForServiceEvent(EventsConstants.SERVICE_ORDER, + EventsConstants.ORDER_PLACED)); } } diff --git a/src/main/java/com/podzilla/order/messaging/OrderProducer.java b/src/main/java/com/podzilla/order/messaging/OrderProducer.java index 61c738f..82d7194 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderProducer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderProducer.java @@ -1,33 +1,45 @@ package com.podzilla.order.messaging; +import com.podzilla.mq.EventPublisher; +import com.podzilla.mq.EventsConstants; +import com.podzilla.mq.events.OrderCancelledEvent; +import com.podzilla.mq.events.OrderPlacedEvent; +import com.podzilla.mq.events.OrderStockReservationRequestedEvent; +import com.podzilla.mq.events.WarehouseStockReservedEvent; +import lombok.RequiredArgsConstructor; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Component; @Component +@RequiredArgsConstructor public class OrderProducer { - private final RabbitTemplate rabbitTemplate; - public OrderProducer(final RabbitTemplate rabbitTemplate, - final RabbitMQConfig rabbitMQConfig) { - this.rabbitTemplate = rabbitTemplate; - } + private final EventPublisher eventPublisher; + public void sendStockReservationRequest( - final Object stockReservationRequest) { - rabbitTemplate.convertAndSend( - RabbitMQConfig.EXCHANGE, - RabbitMQConfig.ORDER_ROUTING_KEY, - stockReservationRequest + final OrderStockReservationRequestedEvent orderStockReservationRequestedEvent) { + + eventPublisher.publishEvent( + EventsConstants.ORDER_STOCK_RESERVATION_REQUESTED, + orderStockReservationRequestedEvent ); } public void sendOrderPlaced( - final Object orderPlaced) { - rabbitTemplate.convertAndSend( - RabbitMQConfig.EXCHANGE, - RabbitMQConfig.ORDER_PLACED_ROUTING_KEY, + final OrderPlacedEvent orderPlaced) { + eventPublisher.publishEvent( + EventsConstants.ORDER_PLACED, orderPlaced ); } + + public void sendCancelOrder( + final OrderCancelledEvent orderCancelledEvent){ + eventPublisher.publishEvent( + EventsConstants.ORDER_CANCELLED, + orderCancelledEvent + ); + } } diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index 65685ad..6abd6bb 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -32,7 +32,7 @@ public class Order { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @GeneratedValue(strategy = GenerationType.UUID) private UUID id; private UUID userId; @@ -43,27 +43,27 @@ public class Order { private Address shippingAddress; @Enumerated(EnumType.STRING) - @Column(nullable = false) + @Column(nullable = true) private OrderStatus status; - @Column(nullable = false) + @Column(nullable = true) private LocalDateTime createdAt; - @Column(nullable = false) + @Column(nullable = true) private LocalDateTime updatedAt; @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) - private List orderItems = new ArrayList<>(); + private List orderProducts = new ArrayList<>(); public Order(final UUID userId, final BigDecimal totalAmount, - final OrderStatus status, final List orderItems) { + final OrderStatus status, final List orderProducts) { this.userId = userId; this.totalAmount = totalAmount; this.status = status; this.createdAt = LocalDateTime.now(); this.updatedAt = LocalDateTime.now(); - this.orderItems = orderItems; + this.orderProducts = orderProducts; } } diff --git a/src/main/java/com/podzilla/order/model/OrderPlaced.java b/src/main/java/com/podzilla/order/model/OrderPlaced.java index bcace14..5aa6d82 100644 --- a/src/main/java/com/podzilla/order/model/OrderPlaced.java +++ b/src/main/java/com/podzilla/order/model/OrderPlaced.java @@ -1,28 +1,28 @@ -package com.podzilla.order.model; - -import jakarta.persistence.Entity; -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.List; - -@Entity -@Getter -@Setter -public class OrderPlaced implements Serializable { - private String orderId; - private String customerId; - private BigDecimal totalAmount; - private List items; - private Address deliveryAddress; - - public OrderPlaced(final Order order) { - this.orderId = order.getId().toString(); - this.customerId = order.getUserId().toString(); - this.totalAmount = order.getTotalAmount(); - this.items = order.getOrderItems(); - this.deliveryAddress = order.getShippingAddress(); - } -} +//package com.podzilla.order.model; +// +//import jakarta.persistence.Entity; +//import lombok.Getter; +//import lombok.Setter; +// +//import java.io.Serializable; +//import java.math.BigDecimal; +//import java.util.List; +// +//@Entity +//@Getter +//@Setter +//public class OrderPlaced implements Serializable { +// private String orderId; +// private String customerId; +// private BigDecimal totalAmount; +// private List items; +// private Address deliveryAddress; +// +// public OrderPlaced(final Order order) { +// this.orderId = order.getId().toString(); +// this.customerId = order.getUserId().toString(); +// this.totalAmount = order.getTotalAmount(); +// this.items = order.getOrderProducts(); +// this.deliveryAddress = order.getShippingAddress(); +// } +//} diff --git a/src/main/java/com/podzilla/order/model/OrderItem.java b/src/main/java/com/podzilla/order/model/OrderProduct.java similarity index 51% rename from src/main/java/com/podzilla/order/model/OrderItem.java rename to src/main/java/com/podzilla/order/model/OrderProduct.java index 4615890..65dfe48 100644 --- a/src/main/java/com/podzilla/order/model/OrderItem.java +++ b/src/main/java/com/podzilla/order/model/OrderProduct.java @@ -1,35 +1,28 @@ package com.podzilla.order.model; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import jakarta.persistence.Column; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.FetchType; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import java.math.BigDecimal; +import java.util.UUID; @Entity -@Table(name = "order_items") +@Table(name = "order_products") @NoArgsConstructor @AllArgsConstructor @Getter @Setter -public class OrderItem { +public class OrderProduct { @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id; + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; @Column(nullable = false) - private long productId; + private UUID productId; @Column(nullable = false) private int quantity; diff --git a/src/main/java/com/podzilla/order/model/OrderStatus.java b/src/main/java/com/podzilla/order/model/OrderStatus.java index 2b9c3d7..54cb05f 100644 --- a/src/main/java/com/podzilla/order/model/OrderStatus.java +++ b/src/main/java/com/podzilla/order/model/OrderStatus.java @@ -1,11 +1,12 @@ package com.podzilla.order.model; public enum OrderStatus { + PENDING, + FAILED, PLACED, - CANCELLED, + PACKAGED, SHIPPED, DELIVERED, - FAILED, - PENDING + CANCELLED, } diff --git a/src/main/java/com/podzilla/order/model/StockReservationRequest.java b/src/main/java/com/podzilla/order/model/StockReservationRequest.java index a240bf0..7a8fcae 100644 --- a/src/main/java/com/podzilla/order/model/StockReservationRequest.java +++ b/src/main/java/com/podzilla/order/model/StockReservationRequest.java @@ -1,23 +1,23 @@ -package com.podzilla.order.model; - -import jakarta.persistence.Entity; -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; -import java.util.List; - -@Entity -@Getter -@Setter -public class StockReservationRequest implements Serializable { - private String orderId; - private List items; - - public StockReservationRequest( - final String orderId, - final List items) { - this.orderId = orderId; - this.items = items; - } -} +//package com.podzilla.order.model; +// +//import jakarta.persistence.Entity; +//import lombok.Getter; +//import lombok.Setter; +// +//import java.io.Serializable; +//import java.util.List; +// +//@Entity +//@Getter +//@Setter +//public class StockReservationRequest implements Serializable { +// private String orderId; +// private List items; +// +// public StockReservationRequest( +// final String orderId, +// final List items) { +// this.orderId = orderId; +// this.items = items; +// } +//} diff --git a/src/main/java/com/podzilla/order/model/StockReservationResponse.java b/src/main/java/com/podzilla/order/model/StockReservationResponse.java index d46ddd1..4703fb9 100644 --- a/src/main/java/com/podzilla/order/model/StockReservationResponse.java +++ b/src/main/java/com/podzilla/order/model/StockReservationResponse.java @@ -1,13 +1,13 @@ -package com.podzilla.order.model; - -import jakarta.persistence.Entity; -import lombok.Getter; -import lombok.Setter; - -@Entity -@Getter -@Setter -public class StockReservationResponse { - private String orderId; - private String reason; -} +//package com.podzilla.order.model; +// +//import jakarta.persistence.Entity; +//import lombok.Getter; +//import lombok.Setter; +// +//@Entity +//@Getter +//@Setter +//public class StockReservationResponse { +// private String orderId; +// private String reason; +//} diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 05ebcdd..c515a93 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -1,18 +1,19 @@ package com.podzilla.order.service; +import com.podzilla.mq.events.*; import com.podzilla.order.exception.NotFoundException; -import com.podzilla.order.model.Order; -import com.podzilla.order.model.OrderItem; -import com.podzilla.order.model.StockReservationRequest; -import com.podzilla.order.model.OrderPlaced; import com.podzilla.order.messaging.OrderProducer; +import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderProduct; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.repository.OrderRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -36,30 +37,26 @@ public Order createOrder(final Order order) { order.setCreatedAt(LocalDateTime.now()); order.setUpdatedAt(LocalDateTime.now()); orderRepository.save(order); - - List orderItems = order.getOrderItems(); - - // Send request to stock service to reserve stock - StockReservationRequest stockReservationRequest = - new StockReservationRequest( - order.getId().toString(), - orderItems - ); - + OrderStockReservationRequestedEvent stockReservationRequest = + OrderStockReservationRequestedEvent.builder() + .orderId(order.getId().toString()) + .items(getOrderItems(order)) + .build(); orderProducer.sendStockReservationRequest(stockReservationRequest); - return order; } public Order placeOrder(final UUID orderId) { log.info("Placing order with ID: {}", orderId); Order order = updateOrderStatus(orderId, OrderStatus.PLACED); - - OrderPlaced stockReservedAnalytics = - new OrderPlaced(order); - - // Send order details to analytics service - orderProducer.sendOrderPlaced(stockReservedAnalytics); + OrderPlacedEvent orderPlaced = + OrderPlacedEvent.builder() + .orderId(order.getId().toString()) + .customerId(order.getUserId().toString()) + .items(getOrderItems(order)) + .totalAmount(order.getTotalAmount()) + .build(); + orderProducer.sendOrderPlaced(orderPlaced); return order; } @@ -119,7 +116,15 @@ public Order cancelOrder(final UUID id) { Order order = existingOrder.get(); order.setStatus(OrderStatus.CANCELLED); order.setUpdatedAt(LocalDateTime.now()); - return orderRepository.save(order); + orderRepository.save(order); + OrderCancelledEvent orderCancelledEvent = + OrderCancelledEvent.builder() + .orderId(order.getId().toString()) + .customerId(order.getUserId().toString()) + .reason("Customer requested cancellation") + .build(); + orderProducer.sendCancelOrder(orderCancelledEvent); + return order; } public Order updateOrderStatus(final UUID id, @@ -143,4 +148,17 @@ private void checkNotFoundException(final Object value, throw new NotFoundException(message); } } + + private List getOrderItems(final Order order) { + List orderItems = new ArrayList<>(); + List orderProducts = order.getOrderProducts(); + for (OrderProduct product : orderProducts) { + OrderItem orderItem = new OrderItem(); + orderItem.setProductId(product.getId().toString()); + orderItem.setQuantity(product.getQuantity()); + orderItem.setPricePerUnit(product.getPricePerUnit()); + orderItems.add(orderItem); + } + return orderItems; + } } diff --git a/src/test/java/com/podzilla/order/OrderApplicationTests.java b/src/test/java/com/podzilla/order/OrderApplicationTests.java index a1d6a75..8556e0a 100644 --- a/src/test/java/com/podzilla/order/OrderApplicationTests.java +++ b/src/test/java/com/podzilla/order/OrderApplicationTests.java @@ -1,13 +1,13 @@ -package com.podzilla.order; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class OrderApplicationTests { - - @Test - void contextLoads() { - } - -} +//package com.podzilla.order; +// +//import org.junit.jupiter.api.Test; +//import org.springframework.boot.test.context.SpringBootTest; +// +//@SpringBootTest +//class OrderApplicationTests { +// +// @Test +// void contextLoads() { +// } +// +//} From 61eb999b7d531d2a2002be7c353cc627bdaa6e80 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 14:43:46 +0300 Subject: [PATCH 24/40] removed unused classes --- .../com/podzilla/order/model/OrderPlaced.java | 28 ------------------- .../order/model/StockReservationRequest.java | 23 --------------- .../order/model/StockReservationResponse.java | 13 --------- 3 files changed, 64 deletions(-) delete mode 100644 src/main/java/com/podzilla/order/model/OrderPlaced.java delete mode 100644 src/main/java/com/podzilla/order/model/StockReservationRequest.java delete mode 100644 src/main/java/com/podzilla/order/model/StockReservationResponse.java diff --git a/src/main/java/com/podzilla/order/model/OrderPlaced.java b/src/main/java/com/podzilla/order/model/OrderPlaced.java deleted file mode 100644 index 5aa6d82..0000000 --- a/src/main/java/com/podzilla/order/model/OrderPlaced.java +++ /dev/null @@ -1,28 +0,0 @@ -//package com.podzilla.order.model; -// -//import jakarta.persistence.Entity; -//import lombok.Getter; -//import lombok.Setter; -// -//import java.io.Serializable; -//import java.math.BigDecimal; -//import java.util.List; -// -//@Entity -//@Getter -//@Setter -//public class OrderPlaced implements Serializable { -// private String orderId; -// private String customerId; -// private BigDecimal totalAmount; -// private List items; -// private Address deliveryAddress; -// -// public OrderPlaced(final Order order) { -// this.orderId = order.getId().toString(); -// this.customerId = order.getUserId().toString(); -// this.totalAmount = order.getTotalAmount(); -// this.items = order.getOrderProducts(); -// this.deliveryAddress = order.getShippingAddress(); -// } -//} diff --git a/src/main/java/com/podzilla/order/model/StockReservationRequest.java b/src/main/java/com/podzilla/order/model/StockReservationRequest.java deleted file mode 100644 index 7a8fcae..0000000 --- a/src/main/java/com/podzilla/order/model/StockReservationRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -//package com.podzilla.order.model; -// -//import jakarta.persistence.Entity; -//import lombok.Getter; -//import lombok.Setter; -// -//import java.io.Serializable; -//import java.util.List; -// -//@Entity -//@Getter -//@Setter -//public class StockReservationRequest implements Serializable { -// private String orderId; -// private List items; -// -// public StockReservationRequest( -// final String orderId, -// final List items) { -// this.orderId = orderId; -// this.items = items; -// } -//} diff --git a/src/main/java/com/podzilla/order/model/StockReservationResponse.java b/src/main/java/com/podzilla/order/model/StockReservationResponse.java deleted file mode 100644 index 4703fb9..0000000 --- a/src/main/java/com/podzilla/order/model/StockReservationResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -//package com.podzilla.order.model; -// -//import jakarta.persistence.Entity; -//import lombok.Getter; -//import lombok.Setter; -// -//@Entity -//@Getter -//@Setter -//public class StockReservationResponse { -// private String orderId; -// private String reason; -//} From b7c78d08e91200b13c1fee1b1bda55544e4a0d9b Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 17:06:31 +0300 Subject: [PATCH 25/40] fixed linter issues --- .../order/controller/OrderController.java | 42 ++++- .../order/messaging/OrderConsumer.java | 166 ++++++++++++------ .../java/com/podzilla/order/model/Order.java | 11 +- .../podzilla/order/model/OrderLocation.java | 19 ++ .../com/podzilla/order/model/OrderStatus.java | 4 +- .../podzilla/order/service/OrderService.java | 15 +- 6 files changed, 193 insertions(+), 64 deletions(-) create mode 100644 src/main/java/com/podzilla/order/model/OrderLocation.java diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index 2e21d66..1c18bb6 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -1,6 +1,7 @@ package com.podzilla.order.controller; import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderLocation; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.service.OrderService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.RestController; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -38,6 +40,8 @@ public OrderController(final OrderService orderService) { this.orderService = orderService; } + + @PostMapping @Operation(summary = "Create a new order", description = "Creates a new order and returns the created order") @@ -49,6 +53,8 @@ public ResponseEntity createOrder(@RequestBody final Order order) { return ResponseEntity.ok(createdOrder); } + + @GetMapping @Operation(summary = "Get all orders", description = "Returns a list of all orders") @@ -59,6 +65,8 @@ public ResponseEntity> getAllOrders() { return ResponseEntity.ok(orders); } + + @GetMapping("/{id}") @Operation(summary = "Get order by ID", description = "Returns an order by its ID") @@ -70,7 +78,9 @@ public ResponseEntity getOrderById(@PathVariable final UUID id) { return ResponseEntity.ok(order); } - @PutMapping("/{id}") + + + @PatchMapping("/{id}") @Operation(summary = "Update an order", description = "Updates an existing order and returns the updated " + "order") @@ -83,6 +93,8 @@ public ResponseEntity updateOrder(@PathVariable final UUID id, return ResponseEntity.ok(updatedOrder); } + + @DeleteMapping("/{id}") @Operation(summary = "Delete an order", description = "Deletes an order by its ID") @@ -94,6 +106,8 @@ public ResponseEntity deleteOrder(@PathVariable final UUID id) { return ResponseEntity.noContent().build(); } + + @GetMapping("/user/{userId}") @Operation( summary = "Get order by user ID", @@ -109,6 +123,8 @@ public ResponseEntity> getOrderByUserId( return ResponseEntity.ok(order); } + + @PutMapping("/cancel/{id}") @Operation( summary = "Cancel order", @@ -117,12 +133,15 @@ public ResponseEntity> getOrderByUserId( @ApiResponse( responseCode = "200", description = "Order cancelled" ) - public ResponseEntity cancelOrder(@PathVariable final UUID id) { - Order order = orderService.cancelOrder(id); + public ResponseEntity cancelOrder(@PathVariable final UUID id, + @RequestBody final String reason) { + Order order = orderService.cancelOrder(id, reason); LOGGER.info("Order with ID: {} cancelled", id); return ResponseEntity.ok(order); } + + @PutMapping("/status/{id}") @Operation( summary = "Update order status", @@ -138,4 +157,21 @@ public ResponseEntity updateOrderStatus(@PathVariable final UUID id, LOGGER.info("Order status updated for ID: {}", id); return ResponseEntity.ok(order); } + + + + @GetMapping("/trackOrder/{id}") + @Operation( + summary = "Track order", + description = "Tracks the location of an order based on " + + "the provided order ID" + ) + @ApiResponse( + responseCode = "200", description = "Order location tracked" + ) + public ResponseEntity trackOrder(@PathVariable final UUID id) { + OrderLocation location = orderService.trackOrder(id); + LOGGER.info("Order location tracked for ID: {}", id); + return ResponseEntity.ok(location); + } } diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index ed92388..78579a9 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -27,72 +27,138 @@ public OrderConsumer(final OrderService orderService) { @RabbitListener(queues = EventsConstants.ORDER_INVENTORY_EVENT_QUEUE) public void handleStockReserved(final BaseEvent payload) { - if(payload instanceof WarehouseStockReservedEvent warehouseStockReservedEvent) { - log.info("✅ Stock reserved for order: {}", warehouseStockReservedEvent.getOrderId()); - orderService.placeOrder(UUID.fromString(warehouseStockReservedEvent.getOrderId())); + if(payload instanceof WarehouseStockReservedEvent + warehouseStockReservedEvent) { + handleWarehouseStockReservedEvent(warehouseStockReservedEvent); } - if(payload instanceof WarehouseOrderFulfillmentFailedEvent warehouseOrderFulfillmentFailedEvent){ - log.info("❌ Order fulfillment failed for order: {}, reason: {}", - warehouseOrderFulfillmentFailedEvent.getOrderId(), - warehouseOrderFulfillmentFailedEvent.getReason()); - orderService.updateOrderStatus( - UUID.fromString(warehouseOrderFulfillmentFailedEvent.getOrderId()), OrderStatus.FAILED); + if(payload instanceof WarehouseOrderFulfillmentFailedEvent + warehouseOrderFulfillmentFailedEvent){ + + handleWarehouseOrderFulfillmentFailedEvent( + warehouseOrderFulfillmentFailedEvent); } } @RabbitListener(queues = EventsConstants.ORDER_ORDER_EVENT_QUEUE) public void trackOrder(final BaseEvent payload) { if(payload instanceof OrderPackagedEvent orderPackagedEvent) { - log.info("✅ Order packaged for order: {}", - orderPackagedEvent.getOrderId()); - orderService.updateOrderStatus( - UUID.fromString(orderPackagedEvent.getOrderId()), - OrderStatus.PACKAGED); + handleOrderPackagedEvent(orderPackagedEvent); + } + if(payload instanceof OrderAssignedToCourierEvent + orderAssignedToCourierEvent) { + handleOrderAssignedToCourierEvent(orderAssignedToCourierEvent); } - if(payload instanceof OrderOutForDeliveryEvent orderOutForDeliveryEvent){ - log.info("✅ Order out for delivery for order: {}", - orderOutForDeliveryEvent.getOrderId()); - orderService.updateOrderStatus( - UUID.fromString(orderOutForDeliveryEvent.getOrderId()), - OrderStatus.SHIPPED); + if(payload instanceof OrderOutForDeliveryEvent + orderOutForDeliveryEvent){ + handleOrderOutForDeliveryEvent(orderOutForDeliveryEvent); } if(payload instanceof OrderDeliveredEvent orderDeliveredEvent) { - log.info("✅ Order delivered for order: {}", - orderDeliveredEvent.getOrderId()); - orderService.updateOrderStatus( - UUID.fromString(orderDeliveredEvent.getOrderId()), - OrderStatus.DELIVERED); + handleOrderDeliveredEvent(orderDeliveredEvent); } if(payload instanceof CartCheckedoutEvent cartCheckedoutEvent) { - log.info("✅ Cart checked out for user with id: {}", - cartCheckedoutEvent.getCustomerId()); - Address address = new Address(); - address.setStreet(cartCheckedoutEvent.getDeliveryAddress().getStreet()); - address.setCity(cartCheckedoutEvent.getDeliveryAddress().getCity()); - address.setState(cartCheckedoutEvent.getDeliveryAddress().getState()); - address.setCountry(cartCheckedoutEvent.getDeliveryAddress().getCountry()); - address.setPostalCode(cartCheckedoutEvent.getDeliveryAddress().getPostalCode()); - List orderProducts = - cartCheckedoutEvent.getItems().stream() - .map(orderProduct -> { - OrderProduct product = new OrderProduct(); - product.setProductId(UUID.fromString(orderProduct.getProductId())); - product.setQuantity(orderProduct.getQuantity()); - product.setPricePerUnit(orderProduct.getPricePerUnit()); - return product; - }).toList(); - Order order = new Order(); - order.setUserId(UUID.fromString(cartCheckedoutEvent.getCustomerId())); - order.setTotalAmount(cartCheckedoutEvent.getTotalAmount()); - order.setStatus(OrderStatus.PENDING); - order.setShippingAddress(address); - order.setOrderProducts(orderProducts); - orderService.createOrder(order); + handleCartCheckoutEvent(cartCheckedoutEvent); } } + private void handleWarehouseStockReservedEvent( + final WarehouseStockReservedEvent warehouseStockReservedEvent) { + + log.info("✅ Stock reserved for order: {}", + warehouseStockReservedEvent.getOrderId()); + orderService.placeOrder(UUID.fromString( + warehouseStockReservedEvent.getOrderId())); + } + + private void handleWarehouseOrderFulfillmentFailedEvent( + final WarehouseOrderFulfillmentFailedEvent + warehouseOrderFulfillmentFailedEvent) { + log.info("❌ Order fulfillment failed for order: {}, reason: {}", + warehouseOrderFulfillmentFailedEvent.getOrderId(), + warehouseOrderFulfillmentFailedEvent.getReason()); + orderService.cancelOrder( + UUID.fromString(warehouseOrderFulfillmentFailedEvent + .getOrderId()), + warehouseOrderFulfillmentFailedEvent.getReason()); + } + + private void handleCartCheckoutEvent( + final CartCheckedoutEvent cartCheckedoutEvent) { + log.info("✅ Cart checked out for user with id: {}", + cartCheckedoutEvent.getCustomerId()); + Address address = new Address(); + address.setStreet( + cartCheckedoutEvent.getDeliveryAddress().getStreet()); + address.setCity(cartCheckedoutEvent.getDeliveryAddress().getCity()); + address.setState(cartCheckedoutEvent.getDeliveryAddress().getState()); + address.setCountry( + cartCheckedoutEvent.getDeliveryAddress().getCountry()); + address.setPostalCode( + cartCheckedoutEvent.getDeliveryAddress().getPostalCode()); + List orderProducts = + cartCheckedoutEvent.getItems().stream() + .map(orderProduct -> { + OrderProduct product = new OrderProduct(); + product.setProductId( + UUID.fromString(orderProduct.getProductId())); + product.setQuantity(orderProduct.getQuantity()); + product.setPricePerUnit(orderProduct.getPricePerUnit()); + return product; + }).toList(); + Order order = new Order(); + order.setUserId(UUID.fromString(cartCheckedoutEvent.getCustomerId())); + order.setTotalAmount(cartCheckedoutEvent.getTotalAmount()); + order.setStatus(OrderStatus.PENDING); + order.setShippingAddress(address); + order.setOrderProducts(orderProducts); + orderService.createOrder(order); + } + + private void handleOrderAssignedToCourierEvent( + final OrderAssignedToCourierEvent orderAssignedToCourierEvent) { + log.info("✅ Order assigned to courier for order: {}", + orderAssignedToCourierEvent.getOrderId()); + orderService.updateOrder( + UUID.fromString(orderAssignedToCourierEvent.getOrderId()), + Order.builder() + .courierId(UUID.fromString( + orderAssignedToCourierEvent.getCourierId())) + .status(OrderStatus.ORDER_ASSIGNED_TO_COURIER) + .build()); + } + + private void handleOrderDeliveredEvent( + final OrderDeliveredEvent orderDeliveredEvent) { + log.info("✅ Order delivered for order: {}", + orderDeliveredEvent.getOrderId()); + orderService.updateOrderStatus( + UUID.fromString(orderDeliveredEvent.getOrderId()), + OrderStatus.DELIVERED); + } + + private void handleOrderOutForDeliveryEvent( + final OrderOutForDeliveryEvent orderOutForDeliveryEvent) { + log.info("✅ Order out for delivery for order: {}", + orderOutForDeliveryEvent.getOrderId()); + orderService.updateOrder( + UUID.fromString(orderOutForDeliveryEvent.getOrderId()), + Order.builder() + .courierId(UUID.fromString(orderOutForDeliveryEvent + .getCourierId())) + .status(OrderStatus.OUT_FOR_DELIVERY) + .build()); + } + + private void handleOrderPackagedEvent( + final OrderPackagedEvent orderPackagedEvent) { + log.info("✅ Order packaged for order: {}", + orderPackagedEvent.getOrderId()); + orderService.updateOrderStatus( + UUID.fromString(orderPackagedEvent.getOrderId()), + OrderStatus.PACKAGED); + } + public static void main(String[] args) { System.out.println( QueueResolver.getQueueForServiceEvent(EventsConstants.SERVICE_ORDER, - EventsConstants.ORDER_PLACED)); + EventsConstants.ORDER_ASSIGNED_TO_COURIER)); } } diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index 6abd6bb..43cf990 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -12,10 +12,7 @@ import jakarta.persistence.EnumType; import jakarta.persistence.CascadeType; import jakarta.persistence.GenerationType; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -29,6 +26,7 @@ @AllArgsConstructor @Getter @Setter +@Builder public class Order { @Id @@ -37,19 +35,18 @@ public class Order { private UUID userId; + private UUID courierId; + private BigDecimal totalAmount; @OneToOne(cascade = CascadeType.ALL) private Address shippingAddress; @Enumerated(EnumType.STRING) - @Column(nullable = true) private OrderStatus status; - @Column(nullable = true) private LocalDateTime createdAt; - @Column(nullable = true) private LocalDateTime updatedAt; @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = diff --git a/src/main/java/com/podzilla/order/model/OrderLocation.java b/src/main/java/com/podzilla/order/model/OrderLocation.java new file mode 100644 index 0000000..e6d2218 --- /dev/null +++ b/src/main/java/com/podzilla/order/model/OrderLocation.java @@ -0,0 +1,19 @@ +package com.podzilla.order.model; + +import jakarta.persistence.Entity; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.math.BigDecimal; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class OrderLocation { + + private BigDecimal latitude; + private BigDecimal longitude; +} diff --git a/src/main/java/com/podzilla/order/model/OrderStatus.java b/src/main/java/com/podzilla/order/model/OrderStatus.java index 54cb05f..5b56052 100644 --- a/src/main/java/com/podzilla/order/model/OrderStatus.java +++ b/src/main/java/com/podzilla/order/model/OrderStatus.java @@ -2,10 +2,10 @@ public enum OrderStatus { PENDING, - FAILED, PLACED, PACKAGED, - SHIPPED, + ORDER_ASSIGNED_TO_COURIER, + OUT_FOR_DELIVERY, DELIVERED, CANCELLED, } diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index c515a93..53afcea 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -4,6 +4,7 @@ import com.podzilla.order.exception.NotFoundException; import com.podzilla.order.messaging.OrderProducer; import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderLocation; import com.podzilla.order.model.OrderProduct; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.repository.OrderRepository; @@ -105,7 +106,7 @@ public Optional getOrderByUserId(final UUID userId) { return orderRepository.findByUserId(userId); } - public Order cancelOrder(final UUID id) { + public Order cancelOrder(final UUID id, final String reason) { log.info("Cancelling order with ID: {}", id); Optional existingOrder = orderRepository.findById(id); @@ -121,7 +122,7 @@ public Order cancelOrder(final UUID id) { OrderCancelledEvent.builder() .orderId(order.getId().toString()) .customerId(order.getUserId().toString()) - .reason("Customer requested cancellation") + .reason(reason) .build(); orderProducer.sendCancelOrder(orderCancelledEvent); return order; @@ -142,6 +143,14 @@ public Order updateOrderStatus(final UUID id, return orderRepository.save(order); } + public OrderLocation trackOrder(final UUID id) { + log.info("Tracking order with ID: {}", id); + Optional existingOrder = orderRepository.findById(id); + checkNotFoundException(existingOrder.orElse(null), + "Order not found with id: " + id); + + } + private void checkNotFoundException(final Object value, final String message) { if (value == null) { @@ -161,4 +170,6 @@ private List getOrderItems(final Order order) { } return orderItems; } + + } From d5ac88ef8289b2d877d88b0f151fcf774596e93b Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 17:42:49 +0300 Subject: [PATCH 26/40] added track order --- .../order/config/WebClientConfig.java | 14 +++++++++ .../com/podzilla/order/dtos/LocationDTO.java | 15 ++++++++++ .../podzilla/order/model/OrderLocation.java | 2 ++ .../podzilla/order/service/OrderService.java | 29 +++++++++++++++++-- 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/podzilla/order/config/WebClientConfig.java create mode 100644 src/main/java/com/podzilla/order/dtos/LocationDTO.java diff --git a/src/main/java/com/podzilla/order/config/WebClientConfig.java b/src/main/java/com/podzilla/order/config/WebClientConfig.java new file mode 100644 index 0000000..c0e81c6 --- /dev/null +++ b/src/main/java/com/podzilla/order/config/WebClientConfig.java @@ -0,0 +1,14 @@ +package com.podzilla.order.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.client.WebClient; + +@Configuration +public class WebClientConfig { + + @Bean + public WebClient webClient() { + return WebClient.builder().build(); + } +} diff --git a/src/main/java/com/podzilla/order/dtos/LocationDTO.java b/src/main/java/com/podzilla/order/dtos/LocationDTO.java new file mode 100644 index 0000000..e0fa719 --- /dev/null +++ b/src/main/java/com/podzilla/order/dtos/LocationDTO.java @@ -0,0 +1,15 @@ +package com.podzilla.order.dtos; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LocationDTO { + private BigDecimal first; // Latitude + private BigDecimal second; // Longitude +} diff --git a/src/main/java/com/podzilla/order/model/OrderLocation.java b/src/main/java/com/podzilla/order/model/OrderLocation.java index e6d2218..68f0451 100644 --- a/src/main/java/com/podzilla/order/model/OrderLocation.java +++ b/src/main/java/com/podzilla/order/model/OrderLocation.java @@ -5,6 +5,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.Data; import java.math.BigDecimal; @@ -12,6 +13,7 @@ @Setter @NoArgsConstructor @AllArgsConstructor +@Data public class OrderLocation { private BigDecimal latitude; diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 53afcea..f052831 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -1,6 +1,10 @@ package com.podzilla.order.service; -import com.podzilla.mq.events.*; +import com.podzilla.mq.events.OrderCancelledEvent; +import com.podzilla.mq.events.OrderItem; +import com.podzilla.mq.events.OrderPlacedEvent; +import com.podzilla.mq.events.OrderStockReservationRequestedEvent; +import com.podzilla.order.dtos.LocationDTO; import com.podzilla.order.exception.NotFoundException; import com.podzilla.order.messaging.OrderProducer; import com.podzilla.order.model.Order; @@ -12,6 +16,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; import java.time.LocalDateTime; import java.util.ArrayList; @@ -25,12 +30,15 @@ public class OrderService { private final OrderRepository orderRepository; private final OrderProducer orderProducer; + private final WebClient webClient; @Autowired public OrderService(final OrderRepository orderRepository, - final OrderProducer orderProducer) { + final OrderProducer orderProducer, + final WebClient webClient) { this.orderRepository = orderRepository; this.orderProducer = orderProducer; + this.webClient = webClient; } public Order createOrder(final Order order) { @@ -148,7 +156,22 @@ public OrderLocation trackOrder(final UUID id) { Optional existingOrder = orderRepository.findById(id); checkNotFoundException(existingOrder.orElse(null), "Order not found with id: " + id); - + + String url = "http://delivery-service/delivery-tasks/" + id + + "/location"; + + LocationDTO location = webClient + .get() + .uri(url) + .retrieve() + .bodyToMono(LocationDTO.class) + .block(); + + if (location == null || location.getFirst() == null || location.getSecond() == null) { + throw new RuntimeException("Failed to get location for order " + id); + } + + return new OrderLocation(location.getFirst(), location.getSecond()); } private void checkNotFoundException(final Object value, From db27a0b940a8c748ea6a0043ecd414873ce93047 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 17:53:14 +0300 Subject: [PATCH 27/40] modified get location url --- .../java/com/podzilla/order/service/OrderService.java | 10 +++++----- src/main/resources/application.properties | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index f052831..ed038e4 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; @@ -32,6 +33,9 @@ public class OrderService { private final OrderProducer orderProducer; private final WebClient webClient; + @Value("${api.gateway.url}") + private String apiGatewayUrl; + @Autowired public OrderService(final OrderRepository orderRepository, final OrderProducer orderProducer, @@ -156,10 +160,7 @@ public OrderLocation trackOrder(final UUID id) { Optional existingOrder = orderRepository.findById(id); checkNotFoundException(existingOrder.orElse(null), "Order not found with id: " + id); - - String url = "http://delivery-service/delivery-tasks/" + id - + "/location"; - + String url = apiGatewayUrl + "/delivery-tasks/" + id + "/location"; LocationDTO location = webClient .get() .uri(url) @@ -170,7 +171,6 @@ public OrderLocation trackOrder(final UUID id) { if (location == null || location.getFirst() == null || location.getSecond() == null) { throw new RuntimeException("Failed to get location for order " + id); } - return new OrderLocation(location.getFirst(), location.getSecond()); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bcd3ef5..6b013d9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,2 @@ spring.application.name=order +api.gateway.url=http://localhost:8080 \ No newline at end of file From 784d7d4b352a581070cd72aae7ba6fda46e7579b Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 18:05:38 +0300 Subject: [PATCH 28/40] fixed linter issue --- .../order/messaging/OrderConsumer.java | 33 ++++++++++--------- .../order/messaging/OrderProducer.java | 4 +-- .../java/com/podzilla/order/model/Order.java | 18 +++------- 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index 78579a9..653b82c 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -1,8 +1,14 @@ package com.podzilla.order.messaging; import com.podzilla.mq.EventsConstants; -import com.podzilla.mq.QueueResolver; -import com.podzilla.mq.events.*; +import com.podzilla.mq.events.BaseEvent; +import com.podzilla.mq.events.CartCheckedoutEvent; +import com.podzilla.mq.events.OrderAssignedToCourierEvent; +import com.podzilla.mq.events.OrderDeliveredEvent; +import com.podzilla.mq.events.OrderOutForDeliveryEvent; +import com.podzilla.mq.events.OrderPackagedEvent; +import com.podzilla.mq.events.WarehouseOrderFulfillmentFailedEvent; +import com.podzilla.mq.events.WarehouseStockReservedEvent; import com.podzilla.order.model.Address; import com.podzilla.order.model.Order; import com.podzilla.order.model.OrderProduct; @@ -27,12 +33,12 @@ public OrderConsumer(final OrderService orderService) { @RabbitListener(queues = EventsConstants.ORDER_INVENTORY_EVENT_QUEUE) public void handleStockReserved(final BaseEvent payload) { - if(payload instanceof WarehouseStockReservedEvent + if (payload instanceof WarehouseStockReservedEvent warehouseStockReservedEvent) { handleWarehouseStockReservedEvent(warehouseStockReservedEvent); } - if(payload instanceof WarehouseOrderFulfillmentFailedEvent - warehouseOrderFulfillmentFailedEvent){ + if (payload instanceof WarehouseOrderFulfillmentFailedEvent + warehouseOrderFulfillmentFailedEvent) { handleWarehouseOrderFulfillmentFailedEvent( warehouseOrderFulfillmentFailedEvent); @@ -41,21 +47,21 @@ public void handleStockReserved(final BaseEvent payload) { @RabbitListener(queues = EventsConstants.ORDER_ORDER_EVENT_QUEUE) public void trackOrder(final BaseEvent payload) { - if(payload instanceof OrderPackagedEvent orderPackagedEvent) { + if (payload instanceof OrderPackagedEvent orderPackagedEvent) { handleOrderPackagedEvent(orderPackagedEvent); } - if(payload instanceof OrderAssignedToCourierEvent + if (payload instanceof OrderAssignedToCourierEvent orderAssignedToCourierEvent) { handleOrderAssignedToCourierEvent(orderAssignedToCourierEvent); } - if(payload instanceof OrderOutForDeliveryEvent - orderOutForDeliveryEvent){ + if (payload instanceof OrderOutForDeliveryEvent + orderOutForDeliveryEvent) { handleOrderOutForDeliveryEvent(orderOutForDeliveryEvent); } - if(payload instanceof OrderDeliveredEvent orderDeliveredEvent) { + if (payload instanceof OrderDeliveredEvent orderDeliveredEvent) { handleOrderDeliveredEvent(orderDeliveredEvent); } - if(payload instanceof CartCheckedoutEvent cartCheckedoutEvent) { + if (payload instanceof CartCheckedoutEvent cartCheckedoutEvent) { handleCartCheckoutEvent(cartCheckedoutEvent); } } @@ -156,9 +162,4 @@ private void handleOrderPackagedEvent( UUID.fromString(orderPackagedEvent.getOrderId()), OrderStatus.PACKAGED); } - - public static void main(String[] args) { - System.out.println( QueueResolver.getQueueForServiceEvent(EventsConstants.SERVICE_ORDER, - EventsConstants.ORDER_ASSIGNED_TO_COURIER)); - } } diff --git a/src/main/java/com/podzilla/order/messaging/OrderProducer.java b/src/main/java/com/podzilla/order/messaging/OrderProducer.java index 82d7194..a34781d 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderProducer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderProducer.java @@ -5,9 +5,7 @@ import com.podzilla.mq.events.OrderCancelledEvent; import com.podzilla.mq.events.OrderPlacedEvent; import com.podzilla.mq.events.OrderStockReservationRequestedEvent; -import com.podzilla.mq.events.WarehouseStockReservedEvent; import lombok.RequiredArgsConstructor; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Component; @Component @@ -36,7 +34,7 @@ public void sendOrderPlaced( } public void sendCancelOrder( - final OrderCancelledEvent orderCancelledEvent){ + final OrderCancelledEvent orderCancelledEvent) { eventPublisher.publishEvent( EventsConstants.ORDER_CANCELLED, orderCancelledEvent diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index 43cf990..e35db9a 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -7,12 +7,15 @@ import jakarta.persistence.Id; import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import jakarta.persistence.Column; import jakarta.persistence.Enumerated; import jakarta.persistence.EnumType; import jakarta.persistence.CascadeType; import jakarta.persistence.GenerationType; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -52,15 +55,4 @@ public class Order { @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) private List orderProducts = new ArrayList<>(); - - public Order(final UUID userId, final BigDecimal totalAmount, - final OrderStatus status, final List orderProducts) { - this.userId = userId; - this.totalAmount = totalAmount; - this.status = status; - this.createdAt = LocalDateTime.now(); - this.updatedAt = LocalDateTime.now(); - this.orderProducts = orderProducts; - } - } From 76687d4639dc9f75d0c64efb524d0d0508822b9b Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 19:21:25 +0300 Subject: [PATCH 29/40] added confirmation type, fixed linter issue --- pom.xml | 2 +- .../com/podzilla/order/dtos/LocationDTO.java | 5 +- .../order/messaging/OrderConsumer.java | 46 +++++++------------ .../java/com/podzilla/order/model/Order.java | 13 +++++- .../podzilla/order/model/OrderLocation.java | 7 +-- .../podzilla/order/model/OrderProduct.java | 10 +++- .../podzilla/order/service/OrderService.java | 18 ++++++-- 7 files changed, 55 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index faaa236..8c928b6 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.github.Podzilla podzilla-utils-lib - v1.1.6 + v1.1.10 diff --git a/src/main/java/com/podzilla/order/dtos/LocationDTO.java b/src/main/java/com/podzilla/order/dtos/LocationDTO.java index e0fa719..bfa3dfb 100644 --- a/src/main/java/com/podzilla/order/dtos/LocationDTO.java +++ b/src/main/java/com/podzilla/order/dtos/LocationDTO.java @@ -4,12 +4,11 @@ import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; @Data @AllArgsConstructor @NoArgsConstructor public class LocationDTO { - private BigDecimal first; // Latitude - private BigDecimal second; // Longitude + private double first; // Latitude + private double second; // Longitude } diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index 653b82c..d42a46d 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -13,6 +13,7 @@ import com.podzilla.order.model.Order; import com.podzilla.order.model.OrderProduct; import com.podzilla.order.model.OrderStatus; + import com.podzilla.order.service.OrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.annotation.RabbitListener; @@ -71,8 +72,7 @@ private void handleWarehouseStockReservedEvent( log.info("✅ Stock reserved for order: {}", warehouseStockReservedEvent.getOrderId()); - orderService.placeOrder(UUID.fromString( - warehouseStockReservedEvent.getOrderId())); + orderService.placeOrder(UUID.fromString(warehouseStockReservedEvent.getOrderId())); } private void handleWarehouseOrderFulfillmentFailedEvent( @@ -82,8 +82,7 @@ private void handleWarehouseOrderFulfillmentFailedEvent( warehouseOrderFulfillmentFailedEvent.getOrderId(), warehouseOrderFulfillmentFailedEvent.getReason()); orderService.cancelOrder( - UUID.fromString(warehouseOrderFulfillmentFailedEvent - .getOrderId()), + UUID.fromString(warehouseOrderFulfillmentFailedEvent.getOrderId()), warehouseOrderFulfillmentFailedEvent.getReason()); } @@ -92,20 +91,15 @@ private void handleCartCheckoutEvent( log.info("✅ Cart checked out for user with id: {}", cartCheckedoutEvent.getCustomerId()); Address address = new Address(); - address.setStreet( - cartCheckedoutEvent.getDeliveryAddress().getStreet()); + address.setStreet(cartCheckedoutEvent.getDeliveryAddress().getStreet()); address.setCity(cartCheckedoutEvent.getDeliveryAddress().getCity()); address.setState(cartCheckedoutEvent.getDeliveryAddress().getState()); - address.setCountry( - cartCheckedoutEvent.getDeliveryAddress().getCountry()); - address.setPostalCode( - cartCheckedoutEvent.getDeliveryAddress().getPostalCode()); - List orderProducts = - cartCheckedoutEvent.getItems().stream() + address.setCountry(cartCheckedoutEvent.getDeliveryAddress().getCountry()); + address.setPostalCode(cartCheckedoutEvent.getDeliveryAddress().getPostalCode()); + List orderProducts = cartCheckedoutEvent.getItems().stream() .map(orderProduct -> { OrderProduct product = new OrderProduct(); - product.setProductId( - UUID.fromString(orderProduct.getProductId())); + product.setProductId(UUID.fromString(orderProduct.getProductId())); product.setQuantity(orderProduct.getQuantity()); product.setPricePerUnit(orderProduct.getPricePerUnit()); return product; @@ -116,18 +110,18 @@ private void handleCartCheckoutEvent( order.setStatus(OrderStatus.PENDING); order.setShippingAddress(address); order.setOrderProducts(orderProducts); + order.setConfirmationType(cartCheckedoutEvent.getConfirmationType()); + order.setSignature(cartCheckedoutEvent.getSignature()); orderService.createOrder(order); } - private void handleOrderAssignedToCourierEvent( - final OrderAssignedToCourierEvent orderAssignedToCourierEvent) { + private void handleOrderAssignedToCourierEvent(final OrderAssignedToCourierEvent orderAssignedToCourierEvent) { log.info("✅ Order assigned to courier for order: {}", orderAssignedToCourierEvent.getOrderId()); orderService.updateOrder( UUID.fromString(orderAssignedToCourierEvent.getOrderId()), Order.builder() - .courierId(UUID.fromString( - orderAssignedToCourierEvent.getCourierId())) + .courierId(UUID.fromString(orderAssignedToCourierEvent.getCourierId())) .status(OrderStatus.ORDER_ASSIGNED_TO_COURIER) .build()); } @@ -136,26 +130,20 @@ private void handleOrderDeliveredEvent( final OrderDeliveredEvent orderDeliveredEvent) { log.info("✅ Order delivered for order: {}", orderDeliveredEvent.getOrderId()); - orderService.updateOrderStatus( - UUID.fromString(orderDeliveredEvent.getOrderId()), - OrderStatus.DELIVERED); + orderService.updateOrderStatus(UUID.fromString(orderDeliveredEvent.getOrderId()), OrderStatus.DELIVERED); } - private void handleOrderOutForDeliveryEvent( - final OrderOutForDeliveryEvent orderOutForDeliveryEvent) { - log.info("✅ Order out for delivery for order: {}", - orderOutForDeliveryEvent.getOrderId()); + private void handleOrderOutForDeliveryEvent(final OrderOutForDeliveryEvent orderOutForDeliveryEvent) { + log.info("✅ Order out for delivery for order: {}", orderOutForDeliveryEvent.getOrderId()); orderService.updateOrder( UUID.fromString(orderOutForDeliveryEvent.getOrderId()), Order.builder() - .courierId(UUID.fromString(orderOutForDeliveryEvent - .getCourierId())) + .courierId(UUID.fromString(orderOutForDeliveryEvent.getCourierId())) .status(OrderStatus.OUT_FOR_DELIVERY) .build()); } - private void handleOrderPackagedEvent( - final OrderPackagedEvent orderPackagedEvent) { + private void handleOrderPackagedEvent(final OrderPackagedEvent orderPackagedEvent) { log.info("✅ Order packaged for order: {}", orderPackagedEvent.getOrderId()); orderService.updateOrderStatus( diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index e35db9a..11f857b 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -11,6 +11,7 @@ import jakarta.persistence.EnumType; import jakarta.persistence.CascadeType; import jakarta.persistence.GenerationType; +import com.podzilla.mq.events.ConfirmationType; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -52,7 +53,15 @@ public class Order { private LocalDateTime updatedAt; - @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = - true) + private ConfirmationType confirmationType; + + private String signature; + + private double orderLatitude; + + private double orderLongitude; + + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, + orphanRemoval = true) private List orderProducts = new ArrayList<>(); } diff --git a/src/main/java/com/podzilla/order/model/OrderLocation.java b/src/main/java/com/podzilla/order/model/OrderLocation.java index 68f0451..b4fe5cb 100644 --- a/src/main/java/com/podzilla/order/model/OrderLocation.java +++ b/src/main/java/com/podzilla/order/model/OrderLocation.java @@ -1,14 +1,11 @@ package com.podzilla.order.model; -import jakarta.persistence.Entity; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.Data; -import java.math.BigDecimal; - @Getter @Setter @NoArgsConstructor @@ -16,6 +13,6 @@ @Data public class OrderLocation { - private BigDecimal latitude; - private BigDecimal longitude; + private double latitude; + private double longitude; } diff --git a/src/main/java/com/podzilla/order/model/OrderProduct.java b/src/main/java/com/podzilla/order/model/OrderProduct.java index 65dfe48..dad2e31 100644 --- a/src/main/java/com/podzilla/order/model/OrderProduct.java +++ b/src/main/java/com/podzilla/order/model/OrderProduct.java @@ -1,6 +1,14 @@ package com.podzilla.order.model; -import jakarta.persistence.*; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 28605b1..ef33c35 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -4,14 +4,13 @@ import com.podzilla.mq.events.OrderItem; import com.podzilla.mq.events.OrderPlacedEvent; import com.podzilla.mq.events.OrderStockReservationRequestedEvent; +import com.podzilla.mq.events.DeliveryAddress; import com.podzilla.order.dtos.LocationDTO; import com.podzilla.order.exception.NotFoundException; import com.podzilla.order.messaging.OrderProducer; import com.podzilla.order.model.Order; import com.podzilla.order.model.OrderLocation; import com.podzilla.order.model.OrderProduct; -import com.podzilla.order.exception.NotFoundException; -import com.podzilla.order.model.Order; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.repository.OrderRepository; import lombok.extern.slf4j.Slf4j; @@ -23,8 +22,6 @@ import java.time.LocalDateTime; import java.util.ArrayList; -import org.springframework.stereotype.Service; -import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -66,12 +63,22 @@ public Order createOrder(final Order order) { public Order placeOrder(final UUID orderId) { log.info("Placing order with ID: {}", orderId); Order order = updateOrderStatus(orderId, OrderStatus.PLACED); + DeliveryAddress deliveryAddress = new DeliveryAddress( + order.getShippingAddress().getStreet(), + order.getShippingAddress().getCity(), + order.getShippingAddress().getState(), + order.getShippingAddress().getCountry(), + order.getShippingAddress().getPostalCode() + ); OrderPlacedEvent orderPlaced = OrderPlacedEvent.builder() .orderId(order.getId().toString()) .customerId(order.getUserId().toString()) .items(getOrderItems(order)) .totalAmount(order.getTotalAmount()) + .deliveryAddress(deliveryAddress) + .confirmationType(order.getConfirmationType()) + .signature(order.getSignature()) .build(); orderProducer.sendOrderPlaced(orderPlaced); return order; @@ -172,9 +179,10 @@ public OrderLocation trackOrder(final UUID id) { .bodyToMono(LocationDTO.class) .block(); - if (location == null || location.getFirst() == null || location.getSecond() == null) { + if (location == null) { throw new RuntimeException("Failed to get location for order " + id); } + log.info("Order location: {}", location); return new OrderLocation(location.getFirst(), location.getSecond()); } From 4ffb1951baee8fc93ec9761ce56a96885f8b7922 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 19:31:33 +0300 Subject: [PATCH 30/40] added order long - lat --- pom.xml | 2 +- src/main/java/com/podzilla/order/messaging/OrderConsumer.java | 2 ++ src/main/java/com/podzilla/order/service/OrderService.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c928b6..a4bf087 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.github.Podzilla podzilla-utils-lib - v1.1.10 + v1.1.11 diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index d42a46d..0ca0567 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -112,6 +112,8 @@ private void handleCartCheckoutEvent( order.setOrderProducts(orderProducts); order.setConfirmationType(cartCheckedoutEvent.getConfirmationType()); order.setSignature(cartCheckedoutEvent.getSignature()); + order.setOrderLatitude(cartCheckedoutEvent.getOrderLatitude()); + order.setOrderLongitude(cartCheckedoutEvent.getOrderLongitude()); orderService.createOrder(order); } diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index ef33c35..8bfd0a7 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -79,6 +79,8 @@ public Order placeOrder(final UUID orderId) { .deliveryAddress(deliveryAddress) .confirmationType(order.getConfirmationType()) .signature(order.getSignature()) + .orderLatitude(order.getOrderLatitude()) + .orderLongitude(order.getOrderLongitude()) .build(); orderProducer.sendOrderPlaced(orderPlaced); return order; From bbeff45d8ad218377a1bd247256f144d866c8bcd Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 19:37:42 +0300 Subject: [PATCH 31/40] fixed linter issue --- .../order/messaging/OrderConsumer.java | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index 0ca0567..9549673 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -34,13 +34,14 @@ public OrderConsumer(final OrderService orderService) { @RabbitListener(queues = EventsConstants.ORDER_INVENTORY_EVENT_QUEUE) public void handleStockReserved(final BaseEvent payload) { - if (payload instanceof WarehouseStockReservedEvent - warehouseStockReservedEvent) { + if (payload instanceof WarehouseStockReservedEvent) { + WarehouseStockReservedEvent warehouseStockReservedEvent = + (WarehouseStockReservedEvent) payload; handleWarehouseStockReservedEvent(warehouseStockReservedEvent); } - if (payload instanceof WarehouseOrderFulfillmentFailedEvent - warehouseOrderFulfillmentFailedEvent) { - + if (payload instanceof WarehouseOrderFulfillmentFailedEvent) { + WarehouseOrderFulfillmentFailedEvent warehouseOrderFulfillmentFailedEvent = + (WarehouseOrderFulfillmentFailedEvent) payload; handleWarehouseOrderFulfillmentFailedEvent( warehouseOrderFulfillmentFailedEvent); } @@ -48,21 +49,28 @@ public void handleStockReserved(final BaseEvent payload) { @RabbitListener(queues = EventsConstants.ORDER_ORDER_EVENT_QUEUE) public void trackOrder(final BaseEvent payload) { - if (payload instanceof OrderPackagedEvent orderPackagedEvent) { + if (payload instanceof OrderPackagedEvent) { + OrderPackagedEvent orderPackagedEvent = (OrderPackagedEvent) payload; handleOrderPackagedEvent(orderPackagedEvent); } - if (payload instanceof OrderAssignedToCourierEvent - orderAssignedToCourierEvent) { + if (payload instanceof OrderAssignedToCourierEvent) { + OrderAssignedToCourierEvent orderAssignedToCourierEvent = + (OrderAssignedToCourierEvent) payload; handleOrderAssignedToCourierEvent(orderAssignedToCourierEvent); } - if (payload instanceof OrderOutForDeliveryEvent - orderOutForDeliveryEvent) { + if (payload instanceof OrderOutForDeliveryEvent) { + OrderOutForDeliveryEvent orderOutForDeliveryEvent = + (OrderOutForDeliveryEvent) payload; handleOrderOutForDeliveryEvent(orderOutForDeliveryEvent); } - if (payload instanceof OrderDeliveredEvent orderDeliveredEvent) { + if (payload instanceof OrderDeliveredEvent) { + OrderDeliveredEvent orderDeliveredEvent = + (OrderDeliveredEvent) payload; handleOrderDeliveredEvent(orderDeliveredEvent); } - if (payload instanceof CartCheckedoutEvent cartCheckedoutEvent) { + if (payload instanceof CartCheckedoutEvent) { + CartCheckedoutEvent cartCheckedoutEvent = + (CartCheckedoutEvent) payload; handleCartCheckoutEvent(cartCheckedoutEvent); } } From b5740a3998e34576aaa783983d361725077e1150 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 22:20:11 +0300 Subject: [PATCH 32/40] fixed run errors --- docker-compose.yml | 25 ++----- pom.xml | 17 ++--- .../exception/GlobalExceptionHandler.java | 18 ----- .../order/messaging/RabbitMQConfig.java | 68 ------------------- src/main/resources/application.properties | 6 +- src/main/resources/application.yml | 4 +- 6 files changed, 17 insertions(+), 121 deletions(-) delete mode 100644 src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java diff --git a/docker-compose.yml b/docker-compose.yml index 1ff4abe..6579263 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,8 @@ services: - order_db environment: - SPRING_DATASOURCE_URL=jdbc:postgresql://order_db:5432/orderDB + - SPRING_DATASOURCE_USERNAME=postgres + - SPRING_DATASOURCE_PASSWORD=1234 volumes: - ./target:/app - ./logs:/logs @@ -30,25 +32,6 @@ services: - "15672:15672" - "5672:5672" environment: - RABBITMQ_DEFAULT_USER: user - RABBITMQ_DEFAULT_PASS: password + RABBITMQ_DEFAULT_USER: guest + RABBITMQ_DEFAULT_PASS: guest - loki: - image: grafana/loki:3.5.0 - container_name: loki - ports: - - "3100:3100" - command: -config.file=/etc/loki/local-config.yaml - - grafana: - image: grafana/grafana:10.4.1 - container_name: grafana - ports: - - "3000:3000" - depends_on: - - loki - environment: - - GF_SECURITY_ADMIN_USER=admin - - GF_SECURITY_ADMIN_PASSWORD=admin - volumes: - - grafana_data:/var/lib/grafana diff --git a/pom.xml b/pom.xml index a4bf087..c944f87 100644 --- a/pom.xml +++ b/pom.xml @@ -40,20 +40,15 @@ org.springframework.boot spring-boot-starter-data-jdbc - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - 4.0.0 - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.8.5 - org.springframework.boot - spring-boot-starter-security + spring-boot-starter-webflux + + + + + org.springdoc springdoc-openapi-starter-webmvc-ui diff --git a/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java b/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java index 0f19f36..2b8e2d7 100644 --- a/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java @@ -2,8 +2,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.AccessDeniedException; -import org.springframework.security.core.AuthenticationException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; @@ -12,22 +10,6 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { - @ExceptionHandler(AccessDeniedException.class) - public ResponseEntity handleAccessDeniedException( - final AccessDeniedException exception) { - return ResponseEntity.status(HttpStatus.FORBIDDEN) - .body(new ErrorResponse(exception.getMessage(), - HttpStatus.FORBIDDEN)); - } - - @ExceptionHandler(AuthenticationException.class) - public ResponseEntity handleAuthenticationException( - final AuthenticationException exception) { - return ResponseEntity.status(HttpStatus.UNAUTHORIZED) - .body(new ErrorResponse(exception.getMessage(), - HttpStatus.UNAUTHORIZED)); - } - @ExceptionHandler(NotFoundException.class) public ResponseEntity handleNotFoundException( final NotFoundException exception) { diff --git a/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java b/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java deleted file mode 100644 index 2d8892b..0000000 --- a/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.podzilla.order.messaging; - -import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.Queue; -import org.springframework.amqp.core.TopicExchange; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class RabbitMQConfig { - // Exchange - public static final String EXCHANGE = "shared_exchange"; - - // Outbound (sending to warehouse) - public static final String ORDER_ROUTING_KEY = - "order.stock_reservation_requested"; - - public static final String ORDER_PLACED_ROUTING_KEY = - "order.placed"; - - // Inbound (responses from warehouse) - public static final String STOCK_RESERVED_ROUTING_KEY = - "warehouse.stock_reserved"; - public static final String ORDER_FAILED_ROUTING_KEY = - "warehouse.order_fulfillment_failed"; - - // Queues this service will consume from (responses from warehouse) - public static final String STOCK_RESERVED_QUEUE = - "order.stock_reserved.queue"; - public static final String ORDER_FAILED_QUEUE = - "order.fulfillment_failed.queue"; - - @Bean - public Queue stockReservedQueue() { - return new Queue(STOCK_RESERVED_QUEUE); - } - - @Bean - public Queue orderFailedQueue() { - return new Queue(ORDER_FAILED_QUEUE); - } - - @Bean - public TopicExchange exchange() { - return new TopicExchange(EXCHANGE); - } - - @Bean - public Binding warehouseStockReservedBinding( - final Queue stockReservedQueue, - final TopicExchange exchange) { - return BindingBuilder - .bind(stockReservedQueue) - .to(exchange) - .with("warehouse.stock_reserved"); - } - - @Bean - public Binding warehouseFulfillmentFailedBinding( - final Queue orderFailedQueue, - final TopicExchange exchange) { - return BindingBuilder - .bind(orderFailedQueue) - .to(exchange) - .with("warehouse.order_fulfillment_failed"); - } -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6b013d9..cde2649 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,6 @@ spring.application.name=order -api.gateway.url=http://localhost:8080 \ No newline at end of file +api.gateway.url=http://localhost:8080 +spring.rabbitmq.host=rabbitmq +spring.rabbitmq.port=5672 +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0bc1010..7a033f0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,5 +4,5 @@ spring: rabbitmq: host: rabbitmq # container name port: 5672 - username: user - password: password + username: guest + password: guest \ No newline at end of file From 21594a8d61ca540e58ad1c27a2f552fe37458c60 Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sat, 17 May 2025 22:32:41 +0300 Subject: [PATCH 33/40] Added Builder design pattern --- .../order/messaging/OrderConsumer.java | 25 ++--- .../java/com/podzilla/order/model/Order.java | 101 +++++++++++++++++- 2 files changed, 112 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index 9549673..67289ef 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -112,16 +112,17 @@ private void handleCartCheckoutEvent( product.setPricePerUnit(orderProduct.getPricePerUnit()); return product; }).toList(); - Order order = new Order(); - order.setUserId(UUID.fromString(cartCheckedoutEvent.getCustomerId())); - order.setTotalAmount(cartCheckedoutEvent.getTotalAmount()); - order.setStatus(OrderStatus.PENDING); - order.setShippingAddress(address); - order.setOrderProducts(orderProducts); - order.setConfirmationType(cartCheckedoutEvent.getConfirmationType()); - order.setSignature(cartCheckedoutEvent.getSignature()); - order.setOrderLatitude(cartCheckedoutEvent.getOrderLatitude()); - order.setOrderLongitude(cartCheckedoutEvent.getOrderLongitude()); + Order order = new Order.Builder() + .userId(UUID.fromString(cartCheckedoutEvent.getCustomerId())) + .totalAmount(cartCheckedoutEvent.getTotalAmount()) + .status(OrderStatus.PENDING) + .shippingAddress(address) + .orderProducts(orderProducts) + .confirmationType(cartCheckedoutEvent.getConfirmationType()) + .signature(cartCheckedoutEvent.getSignature()) + .orderLatitude(cartCheckedoutEvent.getOrderLatitude()) + .orderLongitude(cartCheckedoutEvent.getOrderLongitude()) + .build(); orderService.createOrder(order); } @@ -130,7 +131,7 @@ private void handleOrderAssignedToCourierEvent(final OrderAssignedToCourierEvent orderAssignedToCourierEvent.getOrderId()); orderService.updateOrder( UUID.fromString(orderAssignedToCourierEvent.getOrderId()), - Order.builder() + new Order.Builder() .courierId(UUID.fromString(orderAssignedToCourierEvent.getCourierId())) .status(OrderStatus.ORDER_ASSIGNED_TO_COURIER) .build()); @@ -147,7 +148,7 @@ private void handleOrderOutForDeliveryEvent(final OrderOutForDeliveryEvent order log.info("✅ Order out for delivery for order: {}", orderOutForDeliveryEvent.getOrderId()); orderService.updateOrder( UUID.fromString(orderOutForDeliveryEvent.getOrderId()), - Order.builder() + new Order.Builder() .courierId(UUID.fromString(orderOutForDeliveryEvent.getCourierId())) .status(OrderStatus.OUT_FOR_DELIVERY) .build()); diff --git a/src/main/java/com/podzilla/order/model/Order.java b/src/main/java/com/podzilla/order/model/Order.java index 11f857b..902a1b4 100644 --- a/src/main/java/com/podzilla/order/model/Order.java +++ b/src/main/java/com/podzilla/order/model/Order.java @@ -13,7 +13,6 @@ import jakarta.persistence.GenerationType; import com.podzilla.mq.events.ConfirmationType; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -30,7 +29,6 @@ @AllArgsConstructor @Getter @Setter -@Builder public class Order { @Id @@ -64,4 +62,103 @@ public class Order { @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) private List orderProducts = new ArrayList<>(); + + public static class Builder { + private UUID id; + private UUID userId; + private UUID courierId; + private BigDecimal totalAmount; + private Address shippingAddress; + private OrderStatus status; + private LocalDateTime createdAt; + private LocalDateTime updatedAt; + private ConfirmationType confirmationType; + private String signature; + private double orderLatitude; + private double orderLongitude; + private List orderProducts = new ArrayList<>(); + + public Builder id(final UUID id) { + this.id = id; + return this; + } + + public Builder userId(final UUID userId) { + this.userId = userId; + return this; + } + + public Builder courierId(final UUID courierId) { + this.courierId = courierId; + return this; + } + + public Builder totalAmount(final BigDecimal totalAmount) { + this.totalAmount = totalAmount; + return this; + } + + public Builder shippingAddress(final Address shippingAddress) { + this.shippingAddress = shippingAddress; + return this; + } + + public Builder status(final OrderStatus status) { + this.status = status; + return this; + } + + public Builder createdAt(final LocalDateTime createdAt) { + this.createdAt = createdAt; + return this; + } + + public Builder updatedAt(final LocalDateTime updatedAt) { + this.updatedAt = updatedAt; + return this; + } + + public Builder confirmationType(final ConfirmationType confirmationType) { + this.confirmationType = confirmationType; + return this; + } + + public Builder signature(final String signature) { + this.signature = signature; + return this; + } + + public Builder orderLatitude(final double orderLatitude) { + this.orderLatitude = orderLatitude; + return this; + } + + public Builder orderLongitude(final double orderLongitude) { + this.orderLongitude = orderLongitude; + return this; + } + + public Builder orderProducts(final List orderProducts) { + this.orderProducts = orderProducts; + return this; + } + + public Order build() { + Order order = new Order(); + order.setId(id); + order.setUserId(userId); + order.setCourierId(courierId); + order.setTotalAmount(totalAmount); + order.setShippingAddress(shippingAddress); + order.setStatus(status); + order.setCreatedAt(createdAt); + order.setUpdatedAt(updatedAt); + order.setConfirmationType(confirmationType); + order.setSignature(signature); + order.setOrderLatitude(orderLatitude); + order.setOrderLongitude(orderLongitude); + order.setOrderProducts(orderProducts); + return order; + } + } } From 3653097cc8d264ec0b6ff19df8c372a9da60af89 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sat, 17 May 2025 22:45:01 +0300 Subject: [PATCH 34/40] deleted rabbitmq file --- .../order/messaging/RabbitMQConfig.java | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java diff --git a/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java b/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java deleted file mode 100644 index 2d8892b..0000000 --- a/src/main/java/com/podzilla/order/messaging/RabbitMQConfig.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.podzilla.order.messaging; - -import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.Queue; -import org.springframework.amqp.core.TopicExchange; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class RabbitMQConfig { - // Exchange - public static final String EXCHANGE = "shared_exchange"; - - // Outbound (sending to warehouse) - public static final String ORDER_ROUTING_KEY = - "order.stock_reservation_requested"; - - public static final String ORDER_PLACED_ROUTING_KEY = - "order.placed"; - - // Inbound (responses from warehouse) - public static final String STOCK_RESERVED_ROUTING_KEY = - "warehouse.stock_reserved"; - public static final String ORDER_FAILED_ROUTING_KEY = - "warehouse.order_fulfillment_failed"; - - // Queues this service will consume from (responses from warehouse) - public static final String STOCK_RESERVED_QUEUE = - "order.stock_reserved.queue"; - public static final String ORDER_FAILED_QUEUE = - "order.fulfillment_failed.queue"; - - @Bean - public Queue stockReservedQueue() { - return new Queue(STOCK_RESERVED_QUEUE); - } - - @Bean - public Queue orderFailedQueue() { - return new Queue(ORDER_FAILED_QUEUE); - } - - @Bean - public TopicExchange exchange() { - return new TopicExchange(EXCHANGE); - } - - @Bean - public Binding warehouseStockReservedBinding( - final Queue stockReservedQueue, - final TopicExchange exchange) { - return BindingBuilder - .bind(stockReservedQueue) - .to(exchange) - .with("warehouse.stock_reserved"); - } - - @Bean - public Binding warehouseFulfillmentFailedBinding( - final Queue orderFailedQueue, - final TopicExchange exchange) { - return BindingBuilder - .bind(orderFailedQueue) - .to(exchange) - .with("warehouse.order_fulfillment_failed"); - } -} From abe48da58a421a76de41ed69d864a4156c4cf409 Mon Sep 17 00:00:00 2001 From: Omar Aly Date: Sat, 17 May 2025 23:14:46 +0300 Subject: [PATCH 35/40] Added Strategy Design pattern for Order creation --- .../order/controller/OrderController.java | 2 - .../podzilla/order/service/OrderService.java | 24 ++++++--- .../statusstrategy/CreatedOrderStrategy.java | 50 +++++++++++++++++++ .../statusstrategy/OrderStatusStrategy.java | 7 +++ .../OrderStatusStrategyFactory.java | 30 +++++++++++ 5 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/podzilla/order/service/statusstrategy/CreatedOrderStrategy.java create mode 100644 src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategy.java create mode 100644 src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategyFactory.java diff --git a/src/main/java/com/podzilla/order/controller/OrderController.java b/src/main/java/com/podzilla/order/controller/OrderController.java index 1c18bb6..c0378a4 100644 --- a/src/main/java/com/podzilla/order/controller/OrderController.java +++ b/src/main/java/com/podzilla/order/controller/OrderController.java @@ -158,8 +158,6 @@ public ResponseEntity updateOrderStatus(@PathVariable final UUID id, return ResponseEntity.ok(order); } - - @GetMapping("/trackOrder/{id}") @Operation( summary = "Track order", diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 8bfd0a7..6444df1 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -3,7 +3,6 @@ import com.podzilla.mq.events.OrderCancelledEvent; import com.podzilla.mq.events.OrderItem; import com.podzilla.mq.events.OrderPlacedEvent; -import com.podzilla.mq.events.OrderStockReservationRequestedEvent; import com.podzilla.mq.events.DeliveryAddress; import com.podzilla.order.dtos.LocationDTO; import com.podzilla.order.exception.NotFoundException; @@ -19,6 +18,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; +import com.podzilla.order.service.statusstrategy.OrderStatusStrategy; +import com.podzilla.order.service.statusstrategy.OrderStatusStrategyFactory; import java.time.LocalDateTime; import java.util.ArrayList; @@ -33,6 +34,7 @@ public class OrderService { private final OrderRepository orderRepository; private final OrderProducer orderProducer; private final WebClient webClient; + private final OrderStatusStrategyFactory strategyFactory; @Value("${api.gateway.url}") private String apiGatewayUrl; @@ -40,10 +42,12 @@ public class OrderService { @Autowired public OrderService(final OrderRepository orderRepository, final OrderProducer orderProducer, - final WebClient webClient) { + final WebClient webClient, + final OrderStatusStrategyFactory strategyFactory) { this.orderRepository = orderRepository; this.orderProducer = orderProducer; this.webClient = webClient; + this.strategyFactory = strategyFactory; } public Order createOrder(final Order order) { @@ -51,12 +55,16 @@ public Order createOrder(final Order order) { order.setCreatedAt(LocalDateTime.now()); order.setUpdatedAt(LocalDateTime.now()); orderRepository.save(order); - OrderStockReservationRequestedEvent stockReservationRequest = - OrderStockReservationRequestedEvent.builder() - .orderId(order.getId().toString()) - .items(getOrderItems(order)) - .build(); - orderProducer.sendStockReservationRequest(stockReservationRequest); + + OrderStatusStrategy strategy = strategyFactory.getStrategy(OrderStatus.PENDING); + strategy.handle(order); + +// OrderStockReservationRequestedEvent stockReservationRequest = +// OrderStockReservationRequestedEvent.builder() +// .orderId(order.getId().toString()) +// .items(getOrderItems(order)) +// .build(); +// orderProducer.sendStockReservationRequest(stockReservationRequest); return order; } diff --git a/src/main/java/com/podzilla/order/service/statusstrategy/CreatedOrderStrategy.java b/src/main/java/com/podzilla/order/service/statusstrategy/CreatedOrderStrategy.java new file mode 100644 index 0000000..ee1e823 --- /dev/null +++ b/src/main/java/com/podzilla/order/service/statusstrategy/CreatedOrderStrategy.java @@ -0,0 +1,50 @@ +package com.podzilla.order.service.statusstrategy; + +import com.podzilla.mq.events.OrderItem; +import com.podzilla.mq.events.OrderStockReservationRequestedEvent; +import com.podzilla.order.model.Order; +import com.podzilla.order.model.OrderProduct; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import com.podzilla.order.messaging.OrderProducer; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class CreatedOrderStrategy implements OrderStatusStrategy { + + private final OrderProducer orderProducer; + + @Autowired + public CreatedOrderStrategy(final OrderProducer orderProducer) { + this.orderProducer = orderProducer; + } + + @Override + public void handle(final Order order) { + System.out.println("Handling CREATED status - notify user, reserve stock"); + + OrderStockReservationRequestedEvent stockReservationRequest = + OrderStockReservationRequestedEvent.builder() + .orderId(order.getId().toString()) + .items(getOrderItems(order)) + .build(); + + orderProducer.sendStockReservationRequest(stockReservationRequest); + } + + private List getOrderItems(final Order order) { + List orderItems = new ArrayList<>(); + List orderProducts = order.getOrderProducts(); + for (OrderProduct product : orderProducts) { + OrderItem orderItem = new OrderItem(); + orderItem.setProductId(product.getId().toString()); + orderItem.setQuantity(product.getQuantity()); + orderItem.setPricePerUnit(product.getPricePerUnit()); + orderItems.add(orderItem); + } + return orderItems; + } +} + diff --git a/src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategy.java b/src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategy.java new file mode 100644 index 0000000..52ee3ab --- /dev/null +++ b/src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategy.java @@ -0,0 +1,7 @@ +package com.podzilla.order.service.statusstrategy; + +import com.podzilla.order.model.Order; + +public interface OrderStatusStrategy { + void handle(Order order); +} diff --git a/src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategyFactory.java b/src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategyFactory.java new file mode 100644 index 0000000..39c1de8 --- /dev/null +++ b/src/main/java/com/podzilla/order/service/statusstrategy/OrderStatusStrategyFactory.java @@ -0,0 +1,30 @@ +package com.podzilla.order.service.statusstrategy; + +import com.podzilla.order.model.OrderStatus; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Component +public class OrderStatusStrategyFactory { + + private final Map strategyMap; + + @Autowired + public OrderStatusStrategyFactory(final List strategies) { + strategyMap = new HashMap<>(); + for (OrderStatusStrategy strategy : strategies) { + if (strategy instanceof CreatedOrderStrategy) { + strategyMap.put(OrderStatus.PENDING, strategy); + } + } + } + + public OrderStatusStrategy getStrategy(final OrderStatus status) { + return strategyMap.get(status); + } +} + From 27aa36cc2d5290c747ec7d21b1d2babe47e18635 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sun, 18 May 2025 18:48:00 +0300 Subject: [PATCH 36/40] modified order canceled event, and listened to order delivery failed event --- pom.xml | 2 +- .../order/messaging/OrderConsumer.java | 13 +++++- .../com/podzilla/order/model/OrderStatus.java | 4 +- .../podzilla/order/service/OrderService.java | 44 +++++++++++++------ 4 files changed, 46 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index c944f87..1040229 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ com.github.Podzilla podzilla-utils-lib - v1.1.11 + v1.1.12 diff --git a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java index 67289ef..13e8225 100644 --- a/src/main/java/com/podzilla/order/messaging/OrderConsumer.java +++ b/src/main/java/com/podzilla/order/messaging/OrderConsumer.java @@ -9,6 +9,7 @@ import com.podzilla.mq.events.OrderPackagedEvent; import com.podzilla.mq.events.WarehouseOrderFulfillmentFailedEvent; import com.podzilla.mq.events.WarehouseStockReservedEvent; +import com.podzilla.mq.events.OrderDeliveryFailedEvent; import com.podzilla.order.model.Address; import com.podzilla.order.model.Order; import com.podzilla.order.model.OrderProduct; @@ -73,6 +74,16 @@ public void trackOrder(final BaseEvent payload) { (CartCheckedoutEvent) payload; handleCartCheckoutEvent(cartCheckedoutEvent); } + if (payload instanceof OrderDeliveryFailedEvent) { + OrderDeliveryFailedEvent orderDeliveryFailedEvent = + (OrderDeliveryFailedEvent) payload; + log.info("❌ Order delivery failed for order: {}, reason: {}", + orderDeliveryFailedEvent.getOrderId(), + orderDeliveryFailedEvent.getReason()); + orderService.updateOrderStatus( + UUID.fromString(orderDeliveryFailedEvent.getOrderId()), + OrderStatus.DELIVERY_FAILED); + } } private void handleWarehouseStockReservedEvent( @@ -133,7 +144,7 @@ private void handleOrderAssignedToCourierEvent(final OrderAssignedToCourierEvent UUID.fromString(orderAssignedToCourierEvent.getOrderId()), new Order.Builder() .courierId(UUID.fromString(orderAssignedToCourierEvent.getCourierId())) - .status(OrderStatus.ORDER_ASSIGNED_TO_COURIER) + .status(OrderStatus.ASSIGNED_TO_COURIER) .build()); } diff --git a/src/main/java/com/podzilla/order/model/OrderStatus.java b/src/main/java/com/podzilla/order/model/OrderStatus.java index 5b56052..7a333c1 100644 --- a/src/main/java/com/podzilla/order/model/OrderStatus.java +++ b/src/main/java/com/podzilla/order/model/OrderStatus.java @@ -4,9 +4,11 @@ public enum OrderStatus { PENDING, PLACED, PACKAGED, - ORDER_ASSIGNED_TO_COURIER, + ASSIGNED_TO_COURIER, OUT_FOR_DELIVERY, DELIVERED, + FULFILLMENT_FAILED, + DELIVERY_FAILED, CANCELLED, } diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 6444df1..5f64e96 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -1,10 +1,11 @@ package com.podzilla.order.service; +import com.podzilla.mq.events.DeliveryAddress; import com.podzilla.mq.events.OrderCancelledEvent; import com.podzilla.mq.events.OrderItem; import com.podzilla.mq.events.OrderPlacedEvent; -import com.podzilla.mq.events.DeliveryAddress; import com.podzilla.order.dtos.LocationDTO; +import com.podzilla.order.exception.InvalidActionException; import com.podzilla.order.exception.NotFoundException; import com.podzilla.order.messaging.OrderProducer; import com.podzilla.order.model.Order; @@ -12,14 +13,14 @@ import com.podzilla.order.model.OrderProduct; import com.podzilla.order.model.OrderStatus; import com.podzilla.order.repository.OrderRepository; +import com.podzilla.order.service.statusstrategy.OrderStatusStrategy; +import com.podzilla.order.service.statusstrategy.OrderStatusStrategyFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; -import com.podzilla.order.service.statusstrategy.OrderStatusStrategy; -import com.podzilla.order.service.statusstrategy.OrderStatusStrategyFactory; import java.time.LocalDateTime; import java.util.ArrayList; @@ -148,17 +149,32 @@ public Order cancelOrder(final UUID id, final String reason) { "Order not found with id: " + id); Order order = existingOrder.get(); - order.setStatus(OrderStatus.CANCELLED); - order.setUpdatedAt(LocalDateTime.now()); - orderRepository.save(order); - OrderCancelledEvent orderCancelledEvent = - OrderCancelledEvent.builder() - .orderId(order.getId().toString()) - .customerId(order.getUserId().toString()) - .reason(reason) - .build(); - orderProducer.sendCancelOrder(orderCancelledEvent); - return order; + OrderStatus status = order.getStatus(); + if (status == OrderStatus.PENDING || status == OrderStatus.PACKAGED || status == OrderStatus.PLACED) { + order.setStatus(OrderStatus.CANCELLED); + order.setUpdatedAt(LocalDateTime.now()); + orderRepository.save(order); + List orderProducts = order.getOrderProducts(); + List orderItems = orderProducts.stream() + .map(orderProduct -> { + OrderItem orderItem = new OrderItem(); + orderItem.setProductId(orderProduct.getProductId().toString()); + orderItem.setQuantity(orderProduct.getQuantity()); + orderItem.setPricePerUnit(orderProduct.getPricePerUnit()); + return orderItem; + }).toList(); + OrderCancelledEvent orderCancelledEvent = + OrderCancelledEvent.builder() + .orderId(order.getId().toString()) + .customerId(order.getUserId().toString()) + .items(orderItems) + .reason(reason) + .build(); + orderProducer.sendCancelOrder(orderCancelledEvent); + return order; + } + log.warn("Order with id: {} cannot be cancelled", id); + throw new InvalidActionException("Order cannot be cancelled with id: " + id); } public Order updateOrderStatus(final UUID id, From a7f08bcad2a19ce59ea0c7c976da74badefececb Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sun, 18 May 2025 18:50:13 +0300 Subject: [PATCH 37/40] removed duplicated imports --- src/main/java/com/podzilla/order/service/OrderService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 82ce698..c96ca18 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -4,7 +4,6 @@ import com.podzilla.mq.events.OrderCancelledEvent; import com.podzilla.mq.events.OrderItem; import com.podzilla.mq.events.OrderPlacedEvent; -import com.podzilla.mq.events.DeliveryAddress; import com.podzilla.order.dtos.LocationDTO; import com.podzilla.order.exception.InvalidActionException; import com.podzilla.order.exception.NotFoundException; @@ -22,9 +21,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; -import com.podzilla.order.service.statusstrategy.OrderStatusStrategy; -import com.podzilla.order.service.statusstrategy.OrderStatusStrategyFactory; - import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; From 3d36c5a7d820dbab8c9a05546959d45b6e9e5a15 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sun, 18 May 2025 18:52:06 +0300 Subject: [PATCH 38/40] Update src/main/java/com/podzilla/order/service/OrderService.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../java/com/podzilla/order/service/OrderService.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index c96ca18..e5b8159 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -153,15 +153,7 @@ public Order cancelOrder(final UUID id, final String reason) { order.setStatus(OrderStatus.CANCELLED); order.setUpdatedAt(LocalDateTime.now()); orderRepository.save(order); - List orderProducts = order.getOrderProducts(); - List orderItems = orderProducts.stream() - .map(orderProduct -> { - OrderItem orderItem = new OrderItem(); - orderItem.setProductId(orderProduct.getProductId().toString()); - orderItem.setQuantity(orderProduct.getQuantity()); - orderItem.setPricePerUnit(orderProduct.getPricePerUnit()); - return orderItem; - }).toList(); + List orderItems = getOrderItems(order); OrderCancelledEvent orderCancelledEvent = OrderCancelledEvent.builder() .orderId(order.getId().toString()) From 31eed6ccd3b335b1a26ad22e4fcd4d22627b6c19 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sun, 18 May 2025 18:53:58 +0300 Subject: [PATCH 39/40] modified getOrderItems method --- .../podzilla/order/service/OrderService.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index e5b8159..349a7a4 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -153,12 +153,11 @@ public Order cancelOrder(final UUID id, final String reason) { order.setStatus(OrderStatus.CANCELLED); order.setUpdatedAt(LocalDateTime.now()); orderRepository.save(order); - List orderItems = getOrderItems(order); OrderCancelledEvent orderCancelledEvent = OrderCancelledEvent.builder() .orderId(order.getId().toString()) .customerId(order.getUserId().toString()) - .items(orderItems) + .items(getOrderItems(order)) .reason(reason) .build(); orderProducer.sendCancelOrder(orderCancelledEvent); @@ -211,17 +210,12 @@ private void checkNotFoundException(final Object value, } private List getOrderItems(final Order order) { - List orderItems = new ArrayList<>(); List orderProducts = order.getOrderProducts(); - for (OrderProduct product : orderProducts) { - OrderItem orderItem = new OrderItem(); - orderItem.setProductId(product.getId().toString()); - orderItem.setQuantity(product.getQuantity()); - orderItem.setPricePerUnit(product.getPricePerUnit()); - orderItems.add(orderItem); - } - return orderItems; + return orderProducts.stream() + .map(product -> new OrderItem( + product.getProductId().toString(), + product.getQuantity(), + product.getPricePerUnit())) + .toList(); } - - } From a1d7abe7d7869c61e9ad3e25673859888e3bbc44 Mon Sep 17 00:00:00 2001 From: MohammmedAhmed8 <94786411+MohammmedAhmed8@users.noreply.github.com> Date: Sun, 18 May 2025 18:56:27 +0300 Subject: [PATCH 40/40] fixed linter --- src/main/java/com/podzilla/order/service/OrderService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/podzilla/order/service/OrderService.java b/src/main/java/com/podzilla/order/service/OrderService.java index 349a7a4..76eb036 100644 --- a/src/main/java/com/podzilla/order/service/OrderService.java +++ b/src/main/java/com/podzilla/order/service/OrderService.java @@ -22,7 +22,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID;