diff --git a/JavaBackEnd288/backend-programming/.DS_Store b/JavaBackEnd288/backend-programming/.DS_Store new file mode 100644 index 0000000..07e1407 Binary files /dev/null and b/JavaBackEnd288/backend-programming/.DS_Store differ diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch(1).zip b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch(1).zip new file mode 100644 index 0000000..9c9c595 Binary files /dev/null and b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch(1).zip differ diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.gitattributes b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.gitignore b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.gitignore new file mode 100644 index 0000000..667aaef --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.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/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.mvn/wrapper/maven-wrapper.properties b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..8dea6c2 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/README.md b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/README.md new file mode 100644 index 0000000..caa3a65 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/README.md @@ -0,0 +1,42 @@ +Task B. Create your subgroup and project by logging into GitLab using the web link provided and do the following: + + Connected my project to Gitlab + +Task C. Construct four new packages, one for each of the following: controllers, entities, dao, and services. The packages will need to be used for a checkout form and vacations packages list. + + Constructed four new packages controllers, entities, dao, and services. Created a package named config and copied RestDataConfig.java into it and corrected the import. + +Task D. Write code for the entities package that includes entity classes and the enum designed to match the UML diagram. + + Wrote Entities Classes Cart.java, CartItem.java, Country.java, Customer.java, Division.java, Excursion.java, and Vacation.java. Also made the Enum status. All are designed to match the UML diagram. + +Task E. Write code for the dao package that includes repository interfaces for the entities that extend JpaRepository, and add cross-origin support. + + Wrote CartItemRepository.java, CartRepository.java, CountryRepository.java, CustomerRepository.java, DivisionRepository.java, ExcursionRepository.java, and VacationRepository.java. These interfaces all extend JpaRepository and add cross-origin support. + +Task F. Write code for the services package that includes each of the following: + +• a purchase data class with a customer cart and a set of cart items + +• a purchase response data class that contains an order tracking number + +• a checkout service interface + +• a checkout service implementation class + + Wrote CheckoutService.java a checkout service interface, CheckoutServiceImpl.java a checkout service implementation class, Purchase.java a purchase data class with a customer cart and a set of cart items, and PurchaseResponse.java containing the order tracking number + +Task G. Write code to include validation to enforce the inputs needed by the Angular front-end. + + Added validation using nullable=false in Customer entity @Column annotations to prevent null fields. Added checks in CheckoutController and CheckoutServiceImpl to validate inputs and prevent invalid updates. Note: javax.validation not used due to pom.xml restrictions. + +Task H. Write code for the controllers package that includes a REST controller checkout controller class with a post mapping to place orders. + + REST controller checkout controller class with post mapping to place order in file CheckoutController.java. + +Task I. Add five sample customers to the application programmatically. + + Five Sample customers added to the java application, this information is only updated if the customer database has 1 or less members, meaning it will not run after the first run on a new database. + +Task J. Run your integrated application by adding a customer order for a vacation with two excursions using the unmodified Angular front-end. Provide + diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/mvnw b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/mvnw new file mode 100644 index 0000000..bd8896b --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/mvnw @@ -0,0 +1,295 @@ +#!/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.4 +# +# 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:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# 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 <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.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${scriptName#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 + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/mvnw.cmd b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/mvnw.cmd @@ -0,0 +1,189 @@ +<# : 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.4 +@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 -eq $False) { "/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_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::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 + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -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/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/pom.xml b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/pom.xml new file mode 100644 index 0000000..13baf7d --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/pom.xml @@ -0,0 +1,87 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.6 + + + com.example + demo + 0.0.1-SNAPSHOT + demo + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-data-rest + + + com.mysql + mysql-connector-j + runtime + + + org.projectlombok + lombok + 1.18.36 + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + 1.18.36 + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/DemoApplication.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/config/RestDataConfig.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/config/RestDataConfig.java new file mode 100644 index 0000000..b4bafe4 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/config/RestDataConfig.java @@ -0,0 +1,48 @@ +package com.example.demo.config; + +import com.example.demo.entities.*; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.rest.core.config.RepositoryRestConfiguration; +import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer; +import org.springframework.web.servlet.config.annotation.CorsRegistry; + +/** + *

RestDataConfig

+ * per course instructions include this code to configure the rest api end-points exposed for the project + * TODO restrict non-used rest api end points + *

+ * + * @author WGU Course Materials + * @version 0.1 + * @since 2023-02-27 + */ +@Configuration +public class RestDataConfig implements RepositoryRestConfigurer { + + /** + * This method exposes standard rest api end points for the following classes: + * Country + * Customer + * Division + * Excursion + * Vacation + *

+ * Set page configuration parameters + * + * @param config + * @param cors + */ + @Override + public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config, CorsRegistry cors) { + config.exposeIdsFor(Country.class); + config.exposeIdsFor(Customer.class); + config.exposeIdsFor(Division.class); + config.exposeIdsFor(Excursion.class); + config.exposeIdsFor(Vacation.class); + config.setDefaultPageSize(Integer.MAX_VALUE); + config.setMaxPageSize(Integer.MAX_VALUE); + + + } +} + diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/controllers/CheckoutController.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/controllers/CheckoutController.java new file mode 100644 index 0000000..79dc2ba --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/controllers/CheckoutController.java @@ -0,0 +1,26 @@ +package com.example.demo.controllers; + +import com.example.demo.services.CheckoutService; +import com.example.demo.services.Purchase; +import com.example.demo.services.PurchaseResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@CrossOrigin("http://localhost:4200") +@RestController +@RequestMapping("/api/checkout") +public class CheckoutController { + + private CheckoutService checkoutService; + + @Autowired + public CheckoutController(CheckoutService checkoutService){ + this.checkoutService = checkoutService; + } + + @PostMapping("/purchase") + public PurchaseResponse placeOrder(@RequestBody Purchase purchase){ + PurchaseResponse purchaseResponse = checkoutService.placeOrder(purchase); + return purchaseResponse; + } +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CartItemRepository.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CartItemRepository.java new file mode 100644 index 0000000..5b22011 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CartItemRepository.java @@ -0,0 +1,9 @@ +package com.example.demo.dao; + +import com.example.demo.entities.CartItem; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.web.bind.annotation.CrossOrigin; + +@CrossOrigin("http://localhost:4200") +public interface CartItemRepository extends JpaRepository { +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CartRepository.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CartRepository.java new file mode 100644 index 0000000..912a25f --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CartRepository.java @@ -0,0 +1,9 @@ +package com.example.demo.dao; + +import com.example.demo.entities.Cart; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.web.bind.annotation.CrossOrigin; + +@CrossOrigin("http://localhost:4200") +public interface CartRepository extends JpaRepository { +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CountryRepository.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CountryRepository.java new file mode 100644 index 0000000..37cda85 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CountryRepository.java @@ -0,0 +1,9 @@ +package com.example.demo.dao; + +import com.example.demo.entities.Country; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.web.bind.annotation.CrossOrigin; + +@CrossOrigin("http://localhost:4200") +public interface CountryRepository extends JpaRepository { +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CustomerRepository.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CustomerRepository.java new file mode 100644 index 0000000..71ed51c --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/CustomerRepository.java @@ -0,0 +1,9 @@ +package com.example.demo.dao; + +import com.example.demo.entities.Customer; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.web.bind.annotation.CrossOrigin; + +@CrossOrigin("http://localhost:4200") +public interface CustomerRepository extends JpaRepository { +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/DivisionRepository.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/DivisionRepository.java new file mode 100644 index 0000000..e8e0fdd --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/DivisionRepository.java @@ -0,0 +1,15 @@ +package com.example.demo.dao; + +import com.example.demo.entities.Country; +import com.example.demo.entities.Division; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; +import org.springframework.web.bind.annotation.CrossOrigin; + +import java.util.List; + +@CrossOrigin("http://localhost:4200") +@RepositoryRestResource(collectionResourceRel = "divisions", path = "divisions") +public interface DivisionRepository extends JpaRepository { + List findByCountry(Country country); +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/ExcursionRepository.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/ExcursionRepository.java new file mode 100644 index 0000000..ea9680f --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/ExcursionRepository.java @@ -0,0 +1,9 @@ +package com.example.demo.dao; + +import com.example.demo.entities.Excursion; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.web.bind.annotation.CrossOrigin; + +@CrossOrigin("http://localhost:4200") +public interface ExcursionRepository extends JpaRepository { +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/VacationRepository.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/VacationRepository.java new file mode 100644 index 0000000..db9f018 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/dao/VacationRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.dao; + +import com.example.demo.entities.Vacation; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.web.bind.annotation.CrossOrigin; + +@CrossOrigin("http://localhost:4200") +public interface VacationRepository extends JpaRepository { + +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Cart.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Cart.java new file mode 100644 index 0000000..fe7f260 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Cart.java @@ -0,0 +1,57 @@ +package com.example.demo.entities; + + +import jakarta.persistence.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Table(name = "carts") +@Data +public class Cart { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "cart_id") + private Long id; + + @Column(name = "order_tracking_number") + private String orderTrackingNumber; + + @Column(name = "package_price") + private BigDecimal packagePrice; + + @Column(name = "party_size") + private int partySize; + + @Enumerated(EnumType.STRING) + private StatusType status; + + @Column(name = "create_date") + private Date createDate; + + @Column(name = "last_update") + private Date lastUpdate; + + @ManyToOne + @JoinColumn(name = "customer_id") + private Customer customer; + + @OneToMany(mappedBy = "cart", cascade = CascadeType.ALL) + private Set cartItems; + + public void add(CartItem item) { + if (item != null) { + if (cartItems == null) { + cartItems = new HashSet<>(); + } + cartItems.add(item); + item.setCart(this); + } + } + +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/CartItem.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/CartItem.java new file mode 100644 index 0000000..e3c9240 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/CartItem.java @@ -0,0 +1,60 @@ +package com.example.demo.entities; + + + + + + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import java.util.Date; +import java.util.Set; + +@Entity +@Table(name="cart_items") +@Getter +@Setter +public class CartItem { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "cart_item_id") + private Long id; + + @ManyToMany + @JoinTable( + name = "excursion_cartitem", + joinColumns = @JoinColumn(name = "cart_item_id"), + inverseJoinColumns = @JoinColumn(name = "excursion_id") + ) + private Set excursions; + + // WARNING: Do not add cascade here as Excursion entities are existing reference data and should not be cascaded from CartItem. + + @ManyToOne + @JoinColumn(name = "cart_id") + private Cart cart; + + + @CreationTimestamp + @Column(name = "create_date") + private Date create_date; + + @UpdateTimestamp + @Column(name = "last_update") + private Date last_update; + + + @ManyToOne + @JoinColumn(name = "vacation_id") + private Vacation vacation; + + // WARNING: Do not add cascade here (e.g., CascadeType.ALL) as it will cause Vacation and Excursion entities to be duplicated during checkout. + // Vacation and Excursion are existing reference data and should not be cascaded from CartItem. + +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Country.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Country.java new file mode 100644 index 0000000..e8f6b1d --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Country.java @@ -0,0 +1,39 @@ +package com.example.demo.entities; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + + +import java.util.Date; +import java.util.Set; + +@Entity +@Table(name="countries") +@Getter +@Setter +public class Country { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "country_id") + private Long id; + + + @Column(name = "country") + private String country_name; + + @CreationTimestamp + @Column(name = "create_date") + private Date create_date; + + @UpdateTimestamp + @Column(name = "last_update") + private Date last_update; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "country", fetch = FetchType.EAGER) + private Set divisions; +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Customer.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Customer.java new file mode 100644 index 0000000..5b24857 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Customer.java @@ -0,0 +1,68 @@ +package com.example.demo.entities; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +@Entity +@Table(name="customers") +@Getter +@Setter +public class Customer { + + //for input validation I put nullable=false for requested form information + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "customer_id") + private Long id; + + @Column(name = "customer_first_name", nullable = false) + private String firstName; + + @Column(name = "customer_last_name", nullable = false) + private String lastName; + + @Column(name = "address", nullable = false) + private String address; + + @Column(name = "postal_code", nullable = false) + private String postal_code; + + @Column(name = "phone", nullable = false) + private String phone; + + @Column(name = "create_date") + @CreationTimestamp + private Date create_date; + + @Column(name = "last_update") + @UpdateTimestamp + private Date last_update; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name="division_id") + private Division division; + + @OneToMany(cascade = CascadeType.ALL, mappedBy = "customer") + private Set carts; + + + public void add(Cart cart) { + if (cart != null) { + if (carts == null) { + carts = new HashSet<>(); + } + carts.add(cart); + cart.setCustomer(this); + } + } + + +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Division.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Division.java new file mode 100644 index 0000000..d09b56b --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Division.java @@ -0,0 +1,47 @@ +package com.example.demo.entities; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import java.util.Date; +import java.util.Set; + +@Entity +@Table(name="divisions") +@Getter +@Setter +public class Division { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "division_id") + private Long id; + + @Column(name = "division") + private String division_name; + + @CreationTimestamp + @Column(name = "create_date") + private Date create_date; + + + @UpdateTimestamp + @Column(name = "last_update") + private Date last_update; + + + @OneToMany(mappedBy = "division", fetch = FetchType.LAZY) + private Set customers; + + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "country_id", nullable = false) + private Country country; + + + +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Excursion.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Excursion.java new file mode 100644 index 0000000..fa79c49 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Excursion.java @@ -0,0 +1,49 @@ +package com.example.demo.entities; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.Set; + +@Entity +@Table(name="excursions") +@Getter +@Setter +public class Excursion { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "excursion_id") + private Long id; + + + @Column(name = "excursion_title") + private String excursion_title; + + @Column(name = "excursion_price") + private BigDecimal excursion_price; + + @Column(name = "image_url") + private String image_URL; + + @CreationTimestamp + @Column(name = "create_date") + private Date create_date; + + @UpdateTimestamp + @Column(name = "last_update") + private Date last_update; + + @ManyToOne + @JoinColumn(name = "vacation_id") + private Vacation vacation; + + @ManyToMany(mappedBy = "excursions") + Set cart_items; +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/StatusType.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/StatusType.java new file mode 100644 index 0000000..cc1f629 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/StatusType.java @@ -0,0 +1,7 @@ +package com.example.demo.entities; + +public enum StatusType { + pending, + ordered, + canceled +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Vacation.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Vacation.java new file mode 100644 index 0000000..99baff3 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/entities/Vacation.java @@ -0,0 +1,51 @@ +package com.example.demo.entities; + + + + + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.Set; + +@Entity +@Table(name="vacations") +@Getter +@Setter +public class Vacation { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "vacation_id") + private Long id; + + @Column(name = "vacation_title") + private String vacation_title; + + @Column(name = "description") + private String description; + + @Column(name = "travel_fare_price") + private BigDecimal travel_price; + + @Column(name = "image_url") + private String image_URL; + + @CreationTimestamp + @Column(name = "create_date") + private Date create_date; + + @UpdateTimestamp + @Column(name = "last_update") + private Date last_update; + + @OneToMany(mappedBy = "vacation", cascade = CascadeType.ALL) + private Set excursions; +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/CheckoutService.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/CheckoutService.java new file mode 100644 index 0000000..6e30be1 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/CheckoutService.java @@ -0,0 +1,5 @@ +package com.example.demo.services; + +public interface CheckoutService { + PurchaseResponse placeOrder(Purchase purchase); +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/CheckoutServiceImpl.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/CheckoutServiceImpl.java new file mode 100644 index 0000000..14cb738 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/CheckoutServiceImpl.java @@ -0,0 +1,112 @@ +package com.example.demo.services; + +import com.example.demo.dao.CartRepository; +import com.example.demo.dao.CustomerRepository; +import com.example.demo.entities.Cart; +import com.example.demo.entities.CartItem; +import com.example.demo.entities.Customer; +import com.example.demo.entities.StatusType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.util.Set; +import java.util.UUID; + +@Service +public class CheckoutServiceImpl implements CheckoutService { + + private CustomerRepository customerRepository; + private CartRepository cartRepository; + + @Autowired + public CheckoutServiceImpl(CustomerRepository customerRepository, CartRepository cartRepository) { + this.customerRepository = customerRepository; + this.cartRepository = cartRepository; + } + + @Override +@Transactional +public PurchaseResponse placeOrder(Purchase purchase) { + + // Retrieve Cart info + Cart cart = purchase.getCart(); + + // Get Cart items from purchase + Set cartItems = purchase.getCartItems(); + + // Validate cart is not empty + if (cartItems == null || cartItems.isEmpty()) { + System.out.println("Cart is empty - return error"); + return new PurchaseResponse("ERROR: Cart is empty"); + } + + // DEBUG: Check party size BEFORE validation + System.out.println("Party size from cart BEFORE: " + cart.getPartySize()); + + // Validate and fix party size BEFORE using it + if (cart.getPartySize() <= 0) { + System.out.println("Invalid party size - setting to 1"); + cart.setPartySize(1); // Default to 1 if not provided + } + + // DEBUG: Check party size AFTER validation + System.out.println("Party size from cart AFTER: " + cart.getPartySize()); + + // Generate order tracking number + String orderTrackingNumber = generateOrderTrackingNumber(); + System.out.println("Init Generate tracking number " + orderTrackingNumber); + cart.setOrderTrackingNumber(orderTrackingNumber); + + // Set cart status to ordered + cart.setStatus(StatusType.ordered); + + // Populate cart with cartItems + cartItems.forEach(item -> cart.add(item)); + + // Let's Calculate total package price + BigDecimal totalPrice = BigDecimal.ZERO; + for (CartItem item : cartItems) { + // Let's add the vacation price + if (item.getVacation() != null && item.getVacation().getTravel_price() != null) { + System.out.println("Adding vacation price: " + item.getVacation().getTravel_price()); + totalPrice = totalPrice.add(item.getVacation().getTravel_price()); + } + + // Now let's add the excursions price + if (item.getExcursions() != null) { + for (var excursion : item.getExcursions()) { + if (excursion.getExcursion_price() != null) { + System.out.println("Adding excursion price: " + excursion.getExcursion_price()); + totalPrice = totalPrice.add(excursion.getExcursion_price()); + } + } + } + } + + System.out.println("Total price before party size multiply: " + totalPrice); + System.out.println("Party size: " + cart.getPartySize()); + + // Let's multiply by party size + totalPrice = totalPrice.multiply(BigDecimal.valueOf(Math.max(cart.getPartySize(), 1))); + + System.out.println("Final total price: " + totalPrice); + cart.setPackagePrice(totalPrice); + + // Populate cart with customer + Customer customer = purchase.getCustomer(); + customer.add(cart); + + // Save to database + customerRepository.save(customer); + + System.out.println("Returning tracking number " + orderTrackingNumber); + return new PurchaseResponse(orderTrackingNumber); +} + + private String generateOrderTrackingNumber() { + // Generate a random UUID as the order tracking number + return UUID.randomUUID().toString(); + } +} \ No newline at end of file diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/Purchase.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/Purchase.java new file mode 100644 index 0000000..d803963 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/Purchase.java @@ -0,0 +1,17 @@ +package com.example.demo.services; + +import com.example.demo.entities.Cart; +import com.example.demo.entities.CartItem; +import com.example.demo.entities.Customer; +import lombok.Getter; +import lombok.Setter; + +import java.util.Set; + +@Getter +@Setter +public class Purchase { + Cart cart; + Set cartItems; + Customer customer; +} diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/PurchaseResponse.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/PurchaseResponse.java new file mode 100644 index 0000000..ccbcec6 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/java/com/example/demo/services/PurchaseResponse.java @@ -0,0 +1,16 @@ +package com.example.demo.services; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +//@Setter +// +//@Getter + +@Data +@AllArgsConstructor +public class PurchaseResponse { + private String orderTrackingNumber; +} \ No newline at end of file diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/resources/application.properties b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/resources/application.properties new file mode 100644 index 0000000..4487904 --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/main/resources/application.properties @@ -0,0 +1,14 @@ +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/full-stack-ecommerce?useSSL=false&useUnicode=yes&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=UTC +spring.datasource.username=ecommerceapp +spring.datasource.password=ecommerceapp +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect + +spring.jpa.hibernate.ddl-auto=none + +spring.data.rest.base-path=/api + +# allow jackson parser to process comments in payload +spring.jackson.parser.allow-comments=true +# application logging level +logging.level.org.springframework=INFO diff --git a/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/test/java/com/example/demo/DemoApplicationTests.java b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/JavaBackEnd288/backend-programming/d288-back-end-programming-wokring_branch/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/JavaFrameWorks-D287/d287-java-frameworks b/JavaFrameWorks-D287/d287-java-frameworks new file mode 160000 index 0000000..685f77d --- /dev/null +++ b/JavaFrameWorks-D287/d287-java-frameworks @@ -0,0 +1 @@ +Subproject commit 685f77d40f5328f34ca46fad5060d32dbf0ff948