From 19999151def6afbfde852ec615b62ce469143611 Mon Sep 17 00:00:00 2001 From: Mahan Date: Fri, 7 Nov 2025 01:12:26 -0800 Subject: [PATCH 1/2] fix: just remove empty line :) --- backend/src/main/java/com/callmehaan/Main.java | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/src/main/java/com/callmehaan/Main.java b/backend/src/main/java/com/callmehaan/Main.java index daf58c1..6a3575c 100644 --- a/backend/src/main/java/com/callmehaan/Main.java +++ b/backend/src/main/java/com/callmehaan/Main.java @@ -31,7 +31,6 @@ CommandLineRunner runner(CustomerRepository customerRepository) { firstName.toLowerCase() + "." + lastName.toLowerCase() + "@onyx.com", random.nextInt(16, 99) ); - customerRepository.save(customer); }; } From 2ab838a2e78cade0eabe07cd863ec0f62829144c Mon Sep 17 00:00:00 2001 From: Mahan Date: Sun, 9 Nov 2025 12:18:24 -0800 Subject: [PATCH 2/2] feat: Add gender feature + fix tests --- .github/workflows/backend-cd.yml | 48 +++ .gitignore | 3 +- backend/mvnw | 295 ++++++++++++++++++ backend/mvnw.cmd | 189 +++++++++++ backend/pom.xml | 10 +- .../src/main/java/com/callmehaan/Main.java | 7 +- .../com/callmehaan/config/WebMvcConfig.java | 25 ++ .../com/callmehaan/customer/Customer.java | 26 +- .../CustomerJDBCDataAccessService.java | 11 +- .../CustomerListDataAccessService.java | 8 +- .../customer/CustomerRegistrationRequest.java | 3 +- .../customer/CustomerRowMapper.java | 3 +- .../callmehaan/customer/CustomerService.java | 3 +- .../java/com/callmehaan/customer/Gender.java | 5 + backend/src/main/resources/application.yml | 6 +- .../V3__Add_Gender_Enum_To_Customer.sql | 2 + .../CustomerJDBCDataAccessServiceTest.java | 28 +- .../CustomerJPADataAccessServiceTest.java | 8 +- .../customer/CustomerRepositoryTest.java | 8 +- .../customer/CustomerRowMapperTest.java | 5 +- .../customer/CustomerServiceTest.java | 24 +- 21 files changed, 653 insertions(+), 64 deletions(-) create mode 100644 .github/workflows/backend-cd.yml create mode 100755 backend/mvnw create mode 100644 backend/mvnw.cmd create mode 100644 backend/src/main/java/com/callmehaan/config/WebMvcConfig.java create mode 100644 backend/src/main/java/com/callmehaan/customer/Gender.java create mode 100644 backend/src/main/resources/db/migration/V3__Add_Gender_Enum_To_Customer.sql diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml new file mode 100644 index 0000000..214ed85 --- /dev/null +++ b/.github/workflows/backend-cd.yml @@ -0,0 +1,48 @@ +name: CD - Deploy Backend + +on: + workflow_dispatch: + push: + branches: + - main + paths: + - backend/** +jobs: + deploy: + runs-on: ubuntu-latest + services: + postgres: + image: postgres:latest + env: + POSTGRES_USER: callmehaan + POSTGRES_PASSWORD: callmehaan + POSTGRES_DB: customer + ports: + - 5332:5432 + options: + --health-cmd pg_ready + --health-interval 10s + --health-timeout 5s + --health-retries 5s + + defaults: + run: + working-directory: ./backend + + steps: + - uses: actions/checkout@v5 + - uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: '21' + cache: 'maven' + - name: Login to docker hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + - name: Set build number + id: build-number + run: echo "BUILD_NUMBER=$(date '+%d.%m.%Y.%H.%M.%S')" >> $GITHUB_OUTPUT + - name: Build package push with maven + run: mvn -ntp -B verify -Ddocker.image.tag=${{steps.build-number.outputs.BUILD_NUMBER}} jib:build \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7dd44db..0fe1927 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store node_modules -.idea \ No newline at end of file +.idea +target \ No newline at end of file diff --git a/backend/mvnw b/backend/mvnw new file mode 100755 index 0000000..bd8896b --- /dev/null +++ b/backend/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/backend/mvnw.cmd b/backend/mvnw.cmd new file mode 100644 index 0000000..92450f9 --- /dev/null +++ b/backend/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/backend/pom.xml b/backend/pom.xml index 8213d68..d8d1c9f 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -14,15 +14,13 @@ org.callmehaan onyx-api 1.0-SNAPSHOT - - callmehaan - https://callmehaan.io - 17 17 - + callmehaan + onyx-api + 1.2 @@ -137,7 +135,7 @@ - docker.io/${organization.name}/${project.artifactId}:${project.version} + docker.io/${docker.username}/${docker.image.name}:${docker.image.tag} latest diff --git a/backend/src/main/java/com/callmehaan/Main.java b/backend/src/main/java/com/callmehaan/Main.java index 6a3575c..bbe0442 100644 --- a/backend/src/main/java/com/callmehaan/Main.java +++ b/backend/src/main/java/com/callmehaan/Main.java @@ -2,6 +2,7 @@ import com.callmehaan.customer.Customer; import com.callmehaan.customer.CustomerRepository; +import com.callmehaan.customer.Gender; import com.github.javafaker.Faker; import com.github.javafaker.Name; import org.springframework.boot.CommandLineRunner; @@ -29,9 +30,9 @@ CommandLineRunner runner(CustomerRepository customerRepository) { Customer customer = new Customer( firstName + " " + lastName, firstName.toLowerCase() + "." + lastName.toLowerCase() + "@onyx.com", - random.nextInt(16, 99) - ); - customerRepository.save(customer); + random.nextInt(16, 99), + Gender.MALE); + // customerRepository.save(customer); }; } diff --git a/backend/src/main/java/com/callmehaan/config/WebMvcConfig.java b/backend/src/main/java/com/callmehaan/config/WebMvcConfig.java new file mode 100644 index 0000000..e950752 --- /dev/null +++ b/backend/src/main/java/com/callmehaan/config/WebMvcConfig.java @@ -0,0 +1,25 @@ +package com.callmehaan.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + @Value("#{'${cors.allowed-origins}'.split(',')}") + private List allowedOrigins; + + @Value("#{'${cors.allowed-methods}'.split(',')}") + private List allowedMethods; + + @Override + public void addCorsMappings(CorsRegistry registry) { + CorsRegistration corsRegistration = registry.addMapping("/api/**"); + this.allowedOrigins.forEach(corsRegistration::allowedOrigins); + this.allowedMethods.forEach(corsRegistration::allowedMethods); + } +} diff --git a/backend/src/main/java/com/callmehaan/customer/Customer.java b/backend/src/main/java/com/callmehaan/customer/Customer.java index b454162..f04e696 100644 --- a/backend/src/main/java/com/callmehaan/customer/Customer.java +++ b/backend/src/main/java/com/callmehaan/customer/Customer.java @@ -40,20 +40,28 @@ public class Customer { ) private Integer age; + @Column( + nullable = false + ) + @Enumerated(EnumType.STRING) + private Gender gender; + public Customer() { } - public Customer(Integer id, String name, String email, Integer age) { + public Customer(Integer id, String name, String email, Integer age, Gender gender) { this.id = id; this.name = name; this.email = email; this.age = age; + this.gender = gender; } - public Customer(String name, String email, Integer age) { + public Customer(String name, String email, Integer age, Gender gender) { this.name = name; this.email = email; this.age = age; + this.gender = gender; } public Integer getId() { @@ -88,17 +96,24 @@ public void setAge(Integer age) { this.age = age; } + public Gender getGender() { + return gender; + } + + public void setGender(Gender gender) { + this.gender = gender; + } + @Override public boolean equals(Object o) { - if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Customer customer = (Customer) o; - return Objects.equals(id, customer.id) && Objects.equals(name, customer.name) && Objects.equals(email, customer.email) && Objects.equals(age, customer.age); + return Objects.equals(id, customer.id) && Objects.equals(name, customer.name) && Objects.equals(email, customer.email) && Objects.equals(age, customer.age) && gender == customer.gender; } @Override public int hashCode() { - return Objects.hash(id, name, email, age); + return Objects.hash(id, name, email, age, gender); } @Override @@ -108,6 +123,7 @@ public String toString() { ", name='" + name + '\'' + ", email='" + email + '\'' + ", age=" + age + + ", gender=" + gender + '}'; } } diff --git a/backend/src/main/java/com/callmehaan/customer/CustomerJDBCDataAccessService.java b/backend/src/main/java/com/callmehaan/customer/CustomerJDBCDataAccessService.java index f8a91cf..f674317 100644 --- a/backend/src/main/java/com/callmehaan/customer/CustomerJDBCDataAccessService.java +++ b/backend/src/main/java/com/callmehaan/customer/CustomerJDBCDataAccessService.java @@ -18,7 +18,7 @@ public CustomerJDBCDataAccessService(JdbcTemplate jdbcTemplate, CustomerRowMappe @Override public List selectAllCustomers() { var sql = """ - SELECT id, name, email, age FROM customer + SELECT id, name, email, age, gender FROM customer """; return this.jdbcTemplate.query(sql, this.customerRowMapper); @@ -27,7 +27,7 @@ public List selectAllCustomers() { @Override public Optional selectCustomerById(Integer id) { var sql = """ - SELECT id, name, email, age FROM customer WHERE id = ? + SELECT id, name, email, age, gender FROM customer WHERE id = ? """; return this.jdbcTemplate.query(sql, customerRowMapper, id) .stream() @@ -37,14 +37,15 @@ public Optional selectCustomerById(Integer id) { @Override public void insertCustomer(Customer customer) { var sql = """ - INSERT INTO customer(name, email, age) - VALUES (?, ?, ?) + INSERT INTO customer(name, email, age, gender) + VALUES (?, ?, ?, ?) """; int updatedRecords = this.jdbcTemplate.update( sql, customer.getName(), customer.getEmail(), - customer.getAge() + customer.getAge(), + customer.getGender().name() ); System.out.printf("jdbcTemplate.update = %d%n", updatedRecords); diff --git a/backend/src/main/java/com/callmehaan/customer/CustomerListDataAccessService.java b/backend/src/main/java/com/callmehaan/customer/CustomerListDataAccessService.java index 232d65c..fc565ba 100644 --- a/backend/src/main/java/com/callmehaan/customer/CustomerListDataAccessService.java +++ b/backend/src/main/java/com/callmehaan/customer/CustomerListDataAccessService.java @@ -19,16 +19,16 @@ public class CustomerListDataAccessService implements CustomerDao { 1, "Alex", "alex@gmail.com", - 21 - ); + 21, + Gender.MALE); customers.add(alex); Customer jamila = new Customer( 2, "Jamila", "jamila@gmail.com", - 19 - ); + 19, + Gender.MALE); customers.add(jamila); } diff --git a/backend/src/main/java/com/callmehaan/customer/CustomerRegistrationRequest.java b/backend/src/main/java/com/callmehaan/customer/CustomerRegistrationRequest.java index 61fcb62..1745598 100644 --- a/backend/src/main/java/com/callmehaan/customer/CustomerRegistrationRequest.java +++ b/backend/src/main/java/com/callmehaan/customer/CustomerRegistrationRequest.java @@ -3,6 +3,7 @@ public record CustomerRegistrationRequest( String name, String email, - Integer age + Integer age, + Gender gender ) { } diff --git a/backend/src/main/java/com/callmehaan/customer/CustomerRowMapper.java b/backend/src/main/java/com/callmehaan/customer/CustomerRowMapper.java index dede5f9..11363b0 100644 --- a/backend/src/main/java/com/callmehaan/customer/CustomerRowMapper.java +++ b/backend/src/main/java/com/callmehaan/customer/CustomerRowMapper.java @@ -14,7 +14,8 @@ public Customer mapRow(ResultSet rs, int rowNum) throws SQLException { rs.getInt("id"), rs.getString("name"), rs.getString("email"), - rs.getInt("age") + rs.getInt("age"), + Gender.valueOf(rs.getString("gender")) ); } } diff --git a/backend/src/main/java/com/callmehaan/customer/CustomerService.java b/backend/src/main/java/com/callmehaan/customer/CustomerService.java index fbda3bb..d1134f9 100644 --- a/backend/src/main/java/com/callmehaan/customer/CustomerService.java +++ b/backend/src/main/java/com/callmehaan/customer/CustomerService.java @@ -41,7 +41,8 @@ public void addCustomer(CustomerRegistrationRequest customerRegistrationRequest) Customer customer = new Customer( customerRegistrationRequest.name(), customerRegistrationRequest.email(), - customerRegistrationRequest.age() + customerRegistrationRequest.age(), + customerRegistrationRequest.gender() ); customerDao.insertCustomer(customer); diff --git a/backend/src/main/java/com/callmehaan/customer/Gender.java b/backend/src/main/java/com/callmehaan/customer/Gender.java new file mode 100644 index 0000000..e3dadcc --- /dev/null +++ b/backend/src/main/java/com/callmehaan/customer/Gender.java @@ -0,0 +1,5 @@ +package com.callmehaan.customer; + +public enum Gender { + MALE, FEMALE +} diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml index 74b4bba..43abc5c 100644 --- a/backend/src/main/resources/application.yml +++ b/backend/src/main/resources/application.yml @@ -16,4 +16,8 @@ spring: format_sql: true show-sql: true main: - web-application-type: servlet \ No newline at end of file + web-application-type: servlet + +cors: + allowed-origins: "*" + allowed-methods: "*" \ No newline at end of file diff --git a/backend/src/main/resources/db/migration/V3__Add_Gender_Enum_To_Customer.sql b/backend/src/main/resources/db/migration/V3__Add_Gender_Enum_To_Customer.sql new file mode 100644 index 0000000..040a7f4 --- /dev/null +++ b/backend/src/main/resources/db/migration/V3__Add_Gender_Enum_To_Customer.sql @@ -0,0 +1,2 @@ +ALTER TABLE customer +ADD COLUMN gender TEXT NOT NULL; \ No newline at end of file diff --git a/backend/src/test/java/com/callmehaan/customer/CustomerJDBCDataAccessServiceTest.java b/backend/src/test/java/com/callmehaan/customer/CustomerJDBCDataAccessServiceTest.java index 64ebb87..2728a0b 100644 --- a/backend/src/test/java/com/callmehaan/customer/CustomerJDBCDataAccessServiceTest.java +++ b/backend/src/test/java/com/callmehaan/customer/CustomerJDBCDataAccessServiceTest.java @@ -26,8 +26,8 @@ void selectAllCustomers() { Customer customer = new Customer( FAKER.name().fullName(), FAKER.internet().emailAddress() + UUID.randomUUID(), - 20 - ); + 20, + Gender.MALE); underTest.insertCustomer(customer); List actualCustomers = underTest.selectAllCustomers(); @@ -41,8 +41,8 @@ void selectCustomerById() { Customer customer = new Customer( FAKER.name().fullName(), email, - 20 - ); + 20, + Gender.MALE); underTest.insertCustomer(customer); int customerId = underTest.selectAllCustomers() .stream() @@ -73,8 +73,8 @@ void insertCustomer() { Customer customer = new Customer( FAKER.name().fullName(), FAKER.internet().emailAddress() + UUID.randomUUID(), - 20 - ); + 20, + Gender.MALE); underTest.insertCustomer(customer); } @@ -85,8 +85,8 @@ void existsPersonWithEmail() { Customer customer = new Customer( FAKER.name().fullName(), email, - 20 - ); + 20, + Gender.MALE); underTest.insertCustomer(customer); boolean actual = underTest.existsPersonWithEmail(email); @@ -109,8 +109,8 @@ void existsPersonWithId() { Customer customer = new Customer( FAKER.name().fullName(), email, - 20 - ); + 20, + Gender.MALE); underTest.insertCustomer(customer); int id = underTest.selectAllCustomers() @@ -140,8 +140,8 @@ void deleteCustomerById() { Customer customer = new Customer( FAKER.name().fullName(), email, - 20 - ); + 20, + Gender.MALE); underTest.insertCustomer(customer); int id = underTest.selectAllCustomers() @@ -163,8 +163,8 @@ void updateCustomer() { Customer customer = new Customer( FAKER.name().fullName(), email, - 20 - ); + 20, + Gender.MALE); underTest.insertCustomer(customer); int id = underTest.selectAllCustomers() diff --git a/backend/src/test/java/com/callmehaan/customer/CustomerJPADataAccessServiceTest.java b/backend/src/test/java/com/callmehaan/customer/CustomerJPADataAccessServiceTest.java index dca4e9f..175b62c 100644 --- a/backend/src/test/java/com/callmehaan/customer/CustomerJPADataAccessServiceTest.java +++ b/backend/src/test/java/com/callmehaan/customer/CustomerJPADataAccessServiceTest.java @@ -45,8 +45,8 @@ void insertCustomer() { Customer customer = new Customer( "Mahan", "mahan@example.com", - 22 - ); + 22, + Gender.MALE); underTest.insertCustomer(customer); @@ -85,8 +85,8 @@ void updateCustomer() { Customer customer = new Customer( "Mahan", "mahan@example.com", - 22 - ); + 22, + Gender.MALE); underTest.insertCustomer(customer); diff --git a/backend/src/test/java/com/callmehaan/customer/CustomerRepositoryTest.java b/backend/src/test/java/com/callmehaan/customer/CustomerRepositoryTest.java index f4f03d8..f3ec4ce 100644 --- a/backend/src/test/java/com/callmehaan/customer/CustomerRepositoryTest.java +++ b/backend/src/test/java/com/callmehaan/customer/CustomerRepositoryTest.java @@ -33,8 +33,8 @@ void existsCustomerByEmail() { Customer customer = new Customer( FAKER.name().fullName(), email, - 20 - ); + 20, + Gender.MALE); underTest.save(customer); boolean actual = underTest.existsCustomerByEmail(email); @@ -57,8 +57,8 @@ void existsCustomerById() { Customer customer = new Customer( FAKER.name().fullName(), email, - 20 - ); + 20, + Gender.MALE); underTest.save(customer); int customerId = underTest.findAll() .stream() diff --git a/backend/src/test/java/com/callmehaan/customer/CustomerRowMapperTest.java b/backend/src/test/java/com/callmehaan/customer/CustomerRowMapperTest.java index 418fb23..7d4b79f 100644 --- a/backend/src/test/java/com/callmehaan/customer/CustomerRowMapperTest.java +++ b/backend/src/test/java/com/callmehaan/customer/CustomerRowMapperTest.java @@ -19,12 +19,13 @@ void mapRow() throws SQLException { when(resultSet.getInt("age")).thenReturn(22); when(resultSet.getString("name")).thenReturn("mahan"); when(resultSet.getString("email")).thenReturn("mahan@gmail.com"); + when(resultSet.getString("gender")).thenReturn("MALE"); Customer actual = customerRowMapper.mapRow(resultSet, 1); Customer expected = new Customer( - 1, "mahan", "mahan@gmail.com", 22 - ); + 1, "mahan", "mahan@gmail.com", 22, + Gender.MALE); assertThat(actual).isEqualTo(expected); } diff --git a/backend/src/test/java/com/callmehaan/customer/CustomerServiceTest.java b/backend/src/test/java/com/callmehaan/customer/CustomerServiceTest.java index 0f37587..3cff81a 100644 --- a/backend/src/test/java/com/callmehaan/customer/CustomerServiceTest.java +++ b/backend/src/test/java/com/callmehaan/customer/CustomerServiceTest.java @@ -40,8 +40,8 @@ void getAllCustomers() { void canGetCustomer() { int id = 10; Customer customer = new Customer( - id, "mahan", "mahan@gmail.com", 22 - ); + id, "mahan", "mahan@gmail.com", 22, + Gender.MALE); Mockito.when(customerDao.selectCustomerById(id)).thenReturn(Optional.of(customer)); @@ -70,7 +70,7 @@ void addCustomer() { when(customerDao.existsPersonWithEmail(email)).thenReturn(false); CustomerRegistrationRequest request = new CustomerRegistrationRequest( - "Mahan", email, 22 + "Mahan", email, 22, Gender.MALE ); underTest.addCustomer(request); @@ -93,7 +93,7 @@ void willThrowErrorWhenEmailExistsWhileAddingACustomer() { when(customerDao.existsPersonWithEmail(email)).thenReturn(true); CustomerRegistrationRequest request = new CustomerRegistrationRequest( - "Mahan", email, 22 + "Mahan", email, 22, Gender.MALE ); assertThatThrownBy(() -> underTest.addCustomer(request)) .isInstanceOf(DuplicateResourceException.class) @@ -130,8 +130,8 @@ void willThrowErrorWhenIdNotExistsWhileDeletingCustomerById() { void canUpdateAllCustomersProperties() { int id = 10; Customer customer = new Customer( - id, "mahan", "mahan@gmail.com", 22 - ); + id, "mahan", "mahan@gmail.com", 22, + Gender.MALE); when(customerDao.selectCustomerById(id)).thenReturn(Optional.of(customer)); @@ -157,8 +157,8 @@ void canUpdateAllCustomersProperties() { void canUpdateOnlyCustomersName() { //? We should do it for email and age only too :) int id = 10; Customer customer = new Customer( - id, "mahan", "mahan@gmail.com", 22 - ); + id, "mahan", "mahan@gmail.com", 22, + Gender.MALE); when(customerDao.selectCustomerById(id)).thenReturn(Optional.of(customer)); @@ -181,8 +181,8 @@ void canUpdateOnlyCustomersName() { //? We should do it for email and age only t void willThrowErrorWhenTryingToUpdateCustomerEmailWhenAlreadyTaken() { //? We should do it for email and age only too :) int id = 10; Customer customer = new Customer( - id, "mahan", "mahan@gmail.com", 22 - ); + id, "mahan", "mahan@gmail.com", 22, + Gender.MALE); when(customerDao.selectCustomerById(id)).thenReturn(Optional.of(customer)); @@ -204,8 +204,8 @@ void willThrowErrorWhenTryingToUpdateCustomerEmailWhenAlreadyTaken() { //? We sh void willThrowErrorWhenUpdateCustomerHasNoChanges() { int id = 10; Customer customer = new Customer( - id, "mahan", "mahan@gmail.com", 22 - ); + id, "mahan", "mahan@gmail.com", 22, + Gender.MALE); when(customerDao.selectCustomerById(id)).thenReturn(Optional.of(customer));