From 29ad3f5307c2720373c389eb4a4cf6c9f173fd55 Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Thu, 15 Aug 2024 18:25:03 +0100 Subject: [PATCH 1/8] commiting asiignments --- .gitignore | 3 - .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 +++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 69 +++++ .../RestApiExerciseApplication.java | 13 + .../cbfacademy/restapiexercise/ious/IOU.java | 66 +++++ .../restapiexercise/ious/IOUController.java | 68 +++++ .../restapiexercise/ious/IOURepository.java | 18 ++ .../restapiexercise/ious/IOUService.java | 43 +++ src/main/resources/application.properties | 5 + src/main/resources/local.properties | 3 + src/test/ious/IOUControllerTest.java | 271 ++++++++++++++++++ .../RestApiExerciseApplicationTests.java | 13 + 14 files changed, 996 insertions(+), 3 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/cbfacademy/restapiexercise/RestApiExerciseApplication.java create mode 100644 src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java create mode 100644 src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java create mode 100644 src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java create mode 100644 src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/local.properties create mode 100644 src/test/ious/IOUControllerTest.java create mode 100644 src/test/java/com/cbfacademy/restapiexercise/RestApiExerciseApplicationTests.java diff --git a/.gitignore b/.gitignore index 6560500..549e00a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,3 @@ build/ ### VS Code ### .vscode/ - -### Local Configuration ### -local.properties \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..8f96f52 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..d7c358e --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..6f779cf --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..4d731f4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.2 + + + com.cbfacademy + restapiexercise + 0.0.1-SNAPSHOT + REST API Exercise + RESTful API exercise using Spring Boot + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.mysql + mysql-connector-j + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/cbfacademy/restapiexercise/RestApiExerciseApplication.java b/src/main/java/com/cbfacademy/restapiexercise/RestApiExerciseApplication.java new file mode 100644 index 0000000..1f1189e --- /dev/null +++ b/src/main/java/com/cbfacademy/restapiexercise/RestApiExerciseApplication.java @@ -0,0 +1,13 @@ +package com.cbfacademy.restapiexercise; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class RestApiExerciseApplication { + + public static void main(String[] args) { + SpringApplication.run(RestApiExerciseApplication.class, args); + } + +} diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java new file mode 100644 index 0000000..3dfff6d --- /dev/null +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java @@ -0,0 +1,66 @@ +package com.cbfacademy.restapiexercise.ious; + +import java.math.BigDecimal; +import java.time.Instant; +import java.util.UUID; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Entity +@Table(name = "ious") +public class IOU { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + private String borrower; + private String lender; + private BigDecimal amount; + private Instant dateTime; + + public IOU(String borrower, String lender, BigDecimal amount, Instant dateTime) { + this.borrower = borrower; + this.lender = lender; + this.amount = amount; + this.dateTime = dateTime; + } + + public UUID getId() { + return this.id; + } + + public String getBorrower() { + return this.borrower; + } + + public void setBorrower(String borrower) { + this.borrower = borrower; + } + + public String getLender() { + return this.lender; + } + + public void setLender(String lender) { + this.lender = lender; + } + + public BigDecimal getAmount() { + return this.amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public Instant getDateTime() { + return this.dateTime; + } + + public void setDateTime(Instant dateTime) { + this.dateTime = dateTime; +} +} \ No newline at end of file diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java new file mode 100644 index 0000000..d799458 --- /dev/null +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java @@ -0,0 +1,68 @@ +package com.cbfacademy.restapiexercise.ious; + +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.annotation.Id; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping ("/api/ious") +public class IOUController{ + + + private IOUService iouService; + + public IOUController(IOUService iouService) { + this.iouService = iouService; + } + + + +@GetMapping(produces = "application/json") +public List getAllIOUs(String borrower) { + return iouService.getAllIOUs(); + } + +@GetMapping("/{id}") +public ResponseEntity getIOUById(@PathVariable Long id){ + Optional iou = iouService.getIOUById(id); + return iou.map(ResponseEntity::ok) + .orElseGet(() -> ResponseEntity.notFound().build()); +} + + + +@PostMapping (produces = "application/json") +public IOU createIOU (@RequestBody IOU iou) { + return iouService.createIOU(iou); +} + +@PutMapping("/{id}") +public ResponseEntity updateIOU(@PathVariable Long id, @RequestBody IOU iou) { + Optional updatedIOU = iouService.updateIOU(id, iou); + return updatedIOU.map(ResponseEntity::ok) + .orElseGet(() -> ResponseEntity.notFound().build()); +} + + +@DeleteMapping("/{id}") +public ResponseEntity deleteIOU(@PathVariable Long id) { + iouService.deleteIOU(id); + return ResponseEntity.noContent().build(); +} + + +} + + + diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java new file mode 100644 index 0000000..fef8d66 --- /dev/null +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java @@ -0,0 +1,18 @@ +package com.cbfacademy.restapiexercise.ious; + +import java.util.List; +import java.util.UUID; + +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.ListCrudRepository; + +public interface IOURepository extends ListCrudRepository { + List findByBorrower (String borrower); + + @Query(value = "SELECT * FROM IOU i WHERE i.amount > (SELECT AVG(amount) FROM IOU)", + nativeQuery = true) + List findHighValueIOUs(); + + + +} diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java new file mode 100644 index 0000000..9bc5a90 --- /dev/null +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java @@ -0,0 +1,43 @@ +package com.cbfacademy.restapiexercise.ious; + +import java.util.List; +import java.util.NoSuchElementException; +import java.util.UUID; + +import org.springframework.dao.OptimisticLockingFailureException; +import org.springframework.stereotype.Service; + +@Service + +public class IOUService { + private IOURepository iouRepository; + public IOUService(IOURepository iouRepository){ + this.iouRepository=iouRepository; + } + + public List getAllIOUs(){ + return this.iouRepository.findAll(); + } +public IOU getIOU(UUID id) throws NoSuchElementException{ + return this.iouRepository.findById(id).orElseThrow(); +} + +public IOU createIOU(IOU iou) throws IllegalArgumentException, + OptimisticLockingFailureException { + return this.iouRepository.save(iou); + } + public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { + IOU existingIOU = iouRepository.findById(id) + .orElseThrow(); + return iouRepository.save(existingIOU); + +} +public void deleteIOU(UUID id){ + this.iouRepository.deleteById(id); + +} + public List getIOUsByBorrower(String borrower){ + return iouRepository.findByBorrower(borrower); +} + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..aaf21f2 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.application.name=REST API Exercise +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=true +spring.config.import=optional:./local.properties \ No newline at end of file diff --git a/src/main/resources/local.properties b/src/main/resources/local.properties new file mode 100644 index 0000000..79996a6 --- /dev/null +++ b/src/main/resources/local.properties @@ -0,0 +1,3 @@ +spring.datasource.url=jdbc:mysql://localhost:3306/restapiexercise +spring.datasource.username=root +spring.datasource.password=Dakah123 \ No newline at end of file diff --git a/src/test/ious/IOUControllerTest.java b/src/test/ious/IOUControllerTest.java new file mode 100644 index 0000000..1f244ee --- /dev/null +++ b/src/test/ious/IOUControllerTest.java @@ -0,0 +1,271 @@ +package com.cbfacademy.restapiexercise.ious; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.context.annotation.Description; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.RequestEntity; +import org.springframework.http.ResponseEntity; +import org.springframework.web.util.UriComponentsBuilder; + +import com.cbfacademy.restapiexercise.RestApiExerciseApplication; + +import java.math.BigDecimal; +import java.net.URI; +import java.net.URISyntaxException; +import java.time.Duration; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Random; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +@SpringBootTest(classes = RestApiExerciseApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public class IOUControllerTest { + + @LocalServerPort + private int port; + + private URI baseURI; + + @Autowired + private TestRestTemplate restTemplate; + + private List defaultIOUs = new ArrayList<>() { + { + add(new IOU("John", "Alice", new BigDecimal("100.00"), getInstant(24))); + add(new IOU("Bob", "Eve", new BigDecimal("50.00"), getInstant(48))); + add(new IOU("Charlie", "Grace", new BigDecimal("200.00"), getInstant(72))); + } + }; + + @MockBean + private IOUService iouService; + + @BeforeEach + void setUp() throws RuntimeException { + this.baseURI = UriComponentsBuilder.newInstance() + .scheme("http") + .host("localhost") + .port(port) + .path("api/ious") + .build() + .toUri(); + + when(iouService.getAllIOUs()).thenReturn(defaultIOUs); + } + + @Test + @Description("POST /api/ious creates new IOU") + void createIOU() { + // Arrange + IOU iou = createNewIOU(); + + when(iouService.createIOU(any(IOU.class))).thenAnswer(invocation -> invocation.getArgument(0)); + + // Act + ResponseEntity response = restTemplate.postForEntity(baseURI.toString(), iou, IOU.class); + + // Assert + assertEquals(HttpStatus.CREATED, response.getStatusCode()); + assertNotNull(response.getBody()); + assertNotNull(response.getBody().getId()); + verify(iouService).createIOU(any(IOU.class)); + } + + @Test + @Description("GET /api/ious returns all IOUs") + void getAllIOUs() throws URISyntaxException { + // Act + ResponseEntity> response = restTemplate.exchange(baseURI, HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }); + List responseIOUs = response.getBody(); + + // Assert + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertNotNull(responseIOUs); + assertEquals(defaultIOUs.size(), responseIOUs.size()); + verify(iouService).getAllIOUs(); + } + + @Test + @Description("GET /api/ious/{id} returns matching IOU") + void getIOUById() { + // Arrange + IOU iou = selectRandomIOU(); + URI endpoint = getEndpoint(iou); + + when(iouService.getIOU(any(UUID.class))).thenReturn(iou); + + // Act + ResponseEntity response = restTemplate.getForEntity(endpoint, IOU.class); + + // Assert + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertNotNull(response.getBody()); + assertEquals(iou.getId(), response.getBody().getId()); + verify(iouService).getIOU(iou.getId()); + } + + @Test + @Description("GET /api/ious/{id} returns 404 for invalid IOU") + void getInvalidIOU() { + // Arrange + IOU iou = createNewIOU(); + URI endpoint = getEndpoint(iou); + + when(iouService.getIOU(any(UUID.class))).thenThrow(NoSuchElementException.class); + + // Act + ResponseEntity response = restTemplate.getForEntity(endpoint, IOU.class); + + // Assert + assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); + verify(iouService).getIOU(iou.getId()); + } + + @Test + @Description("PUT /api/ious/{id} updates matching IOU") + void updateIOU() { + // Arrange + IOU iou = selectRandomIOU(); + URI endpoint = getEndpoint(iou); + + when(iouService.getIOU(any(UUID.class))).thenReturn(iou); + when(iouService.updateIOU(any(UUID.class), any(IOU.class))).thenReturn(iou); + + // Act + iou.setLender("UpdatedLender"); + restTemplate.put(endpoint, iou); + + ResponseEntity response = restTemplate.getForEntity(endpoint, IOU.class); + IOU updatedIOU = response.getBody(); + + // Assert + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertEquals(iou.getId(), updatedIOU.getId()); + assertEquals("UpdatedLender", updatedIOU.getLender()); + verify(iouService).getIOU(iou.getId()); + verify(iouService).updateIOU(any(UUID.class), any(IOU.class)); + } + + @Test + @Description("PUT /api/ious/{id} returns 404 for invalid IOU") + void updateInvalidIOU() { + // Arrange + IOU iou = createNewIOU(); + URI endpoint = getEndpoint(iou); + + when(iouService.updateIOU(any(UUID.class), any(IOU.class))) + .thenThrow(new NoSuchElementException("IOU not found")); + + // Act + RequestEntity request = RequestEntity.put(endpoint).accept(MediaType.APPLICATION_JSON).body(iou); + ResponseEntity response = restTemplate.exchange(request, IOU.class); + + // Assert + assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); + verify(iouService).updateIOU(any(UUID.class), any(IOU.class)); + } + + @Test + @Description("DELETE /api/ious/{id} deletes matching IOU") + void deleteIOU() { + // Arrange + IOU iou = selectRandomIOU(); + URI endpoint = getEndpoint(iou); + + when(iouService.getIOU(any(UUID.class))).thenReturn(iou); + + ResponseEntity foundResponse = restTemplate.getForEntity(endpoint, IOU.class); + + doAnswer(invocation -> { + return null; + }).when(iouService).deleteIOU(any(UUID.class)); + when(iouService.getIOU(any(UUID.class))).thenThrow(NoSuchElementException.class); + + // Act + RequestEntity request = RequestEntity.delete(endpoint).accept(MediaType.APPLICATION_JSON).build(); + ResponseEntity deletionResponse = restTemplate.exchange(request, Object.class); + ResponseEntity deletedResponse = restTemplate.getForEntity(endpoint, IOU.class); + + // Assert + assertEquals(HttpStatus.OK, foundResponse.getStatusCode()); + assertTrue(deletionResponse.getStatusCode() == HttpStatus.OK + || deletionResponse.getStatusCode() == HttpStatus.NO_CONTENT); + assertEquals(HttpStatus.NOT_FOUND, deletedResponse.getStatusCode()); + verify(iouService).deleteIOU(iou.getId()); + } + + @Test + @Description("DELETE /api/ious/{id} returns 404 for invalid IOU") + void deleteInvalidIOU() { + // Arrange + IOU iou = createNewIOU(); + URI endpoint = getEndpoint(iou); + + doThrow(new NoSuchElementException("IOU not found")).when(iouService).deleteIOU(any(UUID.class)); + + // Act + RequestEntity request = RequestEntity.delete(endpoint).accept(MediaType.APPLICATION_JSON).build(); + ResponseEntity response = restTemplate.exchange(request, IOU.class); + + // Assert + assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode()); + verify(iouService).deleteIOU(iou.getId()); + } + + private IOU selectRandomIOU() { + int randomIndex = new Random().nextInt(defaultIOUs.size()); + + return defaultIOUs.get(randomIndex); + } + + private IOU createNewIOU() { + return new IOU("John", "Alice", new BigDecimal("100.00"), getInstant(0)); + } + + private URI getEndpoint(IOU iou) { + return appendPath(baseURI, iou.getId().toString()); + } + + private Instant getInstant(int hoursToSubtract) { + // Get the current date and time in the system's default time zone + ZoneId systemTimeZone = ZoneId.systemDefault(); + ZonedDateTime currentDateTime = ZonedDateTime.now(systemTimeZone); + + // Subtract the specified number of hours using Duration + Duration duration = Duration.ofHours(hoursToSubtract); + ZonedDateTime resultDateTime = currentDateTime.minus(duration); + + // Convert to Instant + Instant instant = resultDateTime.toInstant(); + + return instant; + } + + private URI appendPath(URI uri, String path) { + return UriComponentsBuilder.fromUri(uri).pathSegment(path).build().encode().toUri(); + } +} diff --git a/src/test/java/com/cbfacademy/restapiexercise/RestApiExerciseApplicationTests.java b/src/test/java/com/cbfacademy/restapiexercise/RestApiExerciseApplicationTests.java new file mode 100644 index 0000000..24c54c6 --- /dev/null +++ b/src/test/java/com/cbfacademy/restapiexercise/RestApiExerciseApplicationTests.java @@ -0,0 +1,13 @@ +package com.cbfacademy.restapiexercise; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class RestApiExerciseApplicationTests { + + @Test + void contextLoads() { + } + +} From b098b0a02f174d9d28d0aa9abb6d8d4154976788 Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Sun, 18 Aug 2024 23:31:25 +0100 Subject: [PATCH 2/8] working on exercises --- .../cbfacademy/restapiexercise/ious/IOU.java | 4 ++ .../restapiexercise/ious/IOUController.java | 12 ++--- .../restapiexercise/ious/IOURepository.java | 10 ++-- .../restapiexercise/ious/IOUService.java | 54 +++++++++---------- src/main/resources/application.properties | 2 +- 5 files changed, 37 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java index 3dfff6d..2c87fd2 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOU.java @@ -27,6 +27,10 @@ public IOU(String borrower, String lender, BigDecimal amount, Instant dateTime) this.amount = amount; this.dateTime = dateTime; } + //this is a default constructor with all parameters + public IOU (){ + this(null, null, BigDecimal.ZERO,Instant.now()); + } public UUID getId() { return this.id; diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java index d799458..826ccb5 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java @@ -35,13 +35,10 @@ public List getAllIOUs(String borrower) { @GetMapping("/{id}") public ResponseEntity getIOUById(@PathVariable Long id){ - Optional iou = iouService.getIOUById(id); - return iou.map(ResponseEntity::ok) - .orElseGet(() -> ResponseEntity.notFound().build()); + Optional iou = iouService.getIOU(UUID id); + return iou.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); } - - @PostMapping (produces = "application/json") public IOU createIOU (@RequestBody IOU iou) { return iouService.createIOU(iou); @@ -62,7 +59,4 @@ public ResponseEntity deleteIOU(@PathVariable Long id) { } -} - - - +} \ No newline at end of file diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java index fef8d66..86e055b 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java @@ -1,17 +1,15 @@ package com.cbfacademy.restapiexercise.ious; -import java.util.List; import java.util.UUID; -import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.ListCrudRepository; public interface IOURepository extends ListCrudRepository { - List findByBorrower (String borrower); + //List findByBorrower (String borrower); - @Query(value = "SELECT * FROM IOU i WHERE i.amount > (SELECT AVG(amount) FROM IOU)", - nativeQuery = true) - List findHighValueIOUs(); + // @Query(value = "SELECT * FROM IOU i WHERE i.amount > (SELECT AVG(amount) FROM IOU)", + //nativeQuery = true) + //List findHighValueIOUs(); diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java index 9bc5a90..370f901 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java @@ -8,36 +8,32 @@ import org.springframework.stereotype.Service; @Service - public class IOUService { - private IOURepository iouRepository; - public IOUService(IOURepository iouRepository){ - this.iouRepository=iouRepository; - } - - public List getAllIOUs(){ - return this.iouRepository.findAll(); - } -public IOU getIOU(UUID id) throws NoSuchElementException{ + + private IOURepository iouRepository; + + public IOUService(IOURepository iouRepository) { + this.iouRepository = iouRepository; + } + + public List getAllIOUs() { + return this.iouRepository.findAll(); + } + + public IOU getIOU(UUID id) throws NoSuchElementException { return this.iouRepository.findById(id).orElseThrow(); -} + } -public IOU createIOU(IOU iou) throws IllegalArgumentException, - OptimisticLockingFailureException { + public IOU createIOU(IOU iou) throws IllegalArgumentException, OptimisticLockingFailureException { return this.iouRepository.save(iou); - } - public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { - IOU existingIOU = iouRepository.findById(id) - .orElseThrow(); - return iouRepository.save(existingIOU); - -} -public void deleteIOU(UUID id){ - this.iouRepository.deleteById(id); - -} - public List getIOUsByBorrower(String borrower){ - return iouRepository.findByBorrower(borrower); -} - -} + } + + // public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { + // return this.iouRepository. + // } + + public void deleteIOU(UUID id) { + this.iouRepository.delete(getIOU(id)); + } + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index aaf21f2..d2c705a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=REST API Exercise spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.jpa.hibernate.ddl-auto=create +spring.jpa.hibernate.ddl-auto=update spring.jpa.open-in-view=true spring.config.import=optional:./local.properties \ No newline at end of file From f0698f687700ee614694c85c48424be06c2dbc17 Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Sun, 18 Aug 2024 23:33:55 +0100 Subject: [PATCH 3/8] changes to IOUService --- .../java/com/cbfacademy/restapiexercise/ious/IOUService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java index 370f901..06e3e25 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java @@ -10,7 +10,7 @@ @Service public class IOUService { - private IOURepository iouRepository; + private final IOURepository iouRepository; public IOUService(IOURepository iouRepository) { this.iouRepository = iouRepository; From 7aab3001eb8c290ddc10ebc27bc1dd4ea4f33d5a Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Mon, 19 Aug 2024 00:03:55 +0100 Subject: [PATCH 4/8] made changes on getmapping, .. removed updateIOU method (to be reviewed). --- .../restapiexercise/ious/IOUController.java | 21 ++++++++----------- .../restapiexercise/ious/IOUService.java | 6 +++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java index 826ccb5..009e6cf 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java @@ -1,16 +1,13 @@ package com.cbfacademy.restapiexercise.ious; import java.util.List; -import java.util.Optional; +import java.util.UUID; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.annotation.Id; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -20,7 +17,7 @@ public class IOUController{ - private IOUService iouService; + private final IOUService iouService; public IOUController(IOUService iouService) { this.iouService = iouService; @@ -29,14 +26,14 @@ public IOUController(IOUService iouService) { @GetMapping(produces = "application/json") -public List getAllIOUs(String borrower) { +public List getAllIOUs() { return iouService.getAllIOUs(); } @GetMapping("/{id}") -public ResponseEntity getIOUById(@PathVariable Long id){ - Optional iou = iouService.getIOU(UUID id); - return iou.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build()); +public ResponseEntity getIOUById(@PathVariable UUID id){ + IOU iou = iouService.getIOU(id); + return ResponseEntity.notFound().build(); } @PostMapping (produces = "application/json") @@ -44,16 +41,16 @@ public IOU createIOU (@RequestBody IOU iou) { return iouService.createIOU(iou); } -@PutMapping("/{id}") +/*@PutMapping("/{id}") public ResponseEntity updateIOU(@PathVariable Long id, @RequestBody IOU iou) { Optional updatedIOU = iouService.updateIOU(id, iou); return updatedIOU.map(ResponseEntity::ok) .orElseGet(() -> ResponseEntity.notFound().build()); -} +}*/ @DeleteMapping("/{id}") -public ResponseEntity deleteIOU(@PathVariable Long id) { +public ResponseEntity deleteIOU(@PathVariable UUID id) { iouService.deleteIOU(id); return ResponseEntity.noContent().build(); } diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java index 06e3e25..e4a6389 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java @@ -28,9 +28,9 @@ public IOU createIOU(IOU iou) throws IllegalArgumentException, OptimisticLocking return this.iouRepository.save(iou); } - // public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { - // return this.iouRepository. - // } + // public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { + //return this.iouRepository. + //} public void deleteIOU(UUID id) { this.iouRepository.delete(getIOU(id)); From 4e3a0154e5cb39e410e4bc81c943c7e670a011d4 Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Mon, 19 Aug 2024 16:32:20 +0100 Subject: [PATCH 5/8] fixing controller layer --- .../cbfacademy/restapiexercise/ious/IOUController.java | 8 +++++--- .../com/cbfacademy/restapiexercise/ious/IOUService.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java index 009e6cf..dcc0d99 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -41,12 +42,13 @@ public IOU createIOU (@RequestBody IOU iou) { return iouService.createIOU(iou); } -/*@PutMapping("/{id}") -public ResponseEntity updateIOU(@PathVariable Long id, @RequestBody IOU iou) { +@PutMapping("/{id}") +public ResponseEntity updateIOU(@PathVariable UUID id, @RequestBody IOU iou) { Optional updatedIOU = iouService.updateIOU(id, iou); return updatedIOU.map(ResponseEntity::ok) .orElseGet(() -> ResponseEntity.notFound().build()); -}*/ +} +//UUID id, IOU updatedIOU @DeleteMapping("/{id}") diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java index e4a6389..3e0eff8 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java @@ -28,9 +28,11 @@ public IOU createIOU(IOU iou) throws IllegalArgumentException, OptimisticLocking return this.iouRepository.save(iou); } - // public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { - //return this.iouRepository. - //} + public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { + IOU existingIOU = this.iouRepository.findById(id) + .orElseThrow(() -> new NoSuchElementException("No IOU found with id: " + id)); + return this.iouRepository.save(existingIOU); + } public void deleteIOU(UUID id) { this.iouRepository.delete(getIOU(id)); From 815fbb6a9532401aff19588990b80a8b6477c67f Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Tue, 20 Aug 2024 13:01:09 +0100 Subject: [PATCH 6/8] changed getmapping(ID) --- .../java/com/cbfacademy/restapiexercise/ious/IOUController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java index dcc0d99..bd6991b 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java @@ -34,7 +34,7 @@ public List getAllIOUs() { @GetMapping("/{id}") public ResponseEntity getIOUById(@PathVariable UUID id){ IOU iou = iouService.getIOU(id); - return ResponseEntity.notFound().build(); + return ResponseEntity.ok(iou); } @PostMapping (produces = "application/json") From 690737c7a9f97badc4c59c7f1d8b038595025960 Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Tue, 20 Aug 2024 13:25:08 +0100 Subject: [PATCH 7/8] fixed put mapping --- .../restapiexercise/ious/IOUController.java | 16 +++++++++------- .../restapiexercise/ious/IOUService.java | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java index bd6991b..23d5edb 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java @@ -1,6 +1,7 @@ package com.cbfacademy.restapiexercise.ious; import java.util.List; +import java.util.NoSuchElementException; import java.util.UUID; import org.springframework.http.ResponseEntity; @@ -42,14 +43,15 @@ public IOU createIOU (@RequestBody IOU iou) { return iouService.createIOU(iou); } -@PutMapping("/{id}") -public ResponseEntity updateIOU(@PathVariable UUID id, @RequestBody IOU iou) { - Optional updatedIOU = iouService.updateIOU(id, iou); - return updatedIOU.map(ResponseEntity::ok) - .orElseGet(() -> ResponseEntity.notFound().build()); +@PutMapping(value="/{id}", produces = "application/json") + public ResponseEntity updateIou(@PathVariable UUID id, @RequestBody IOU iou) { + try{ + IOU updatedIou =iouService.updateIOU(id,iou); + return ResponseEntity.ok(updatedIou); //return 200 ok with iou + }catch (NoSuchElementException e) { + return ResponseEntity.notFound().build(); + } } -//UUID id, IOU updatedIOU - @DeleteMapping("/{id}") public ResponseEntity deleteIOU(@PathVariable UUID id) { diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java index 3e0eff8..92b629a 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java @@ -28,11 +28,18 @@ public IOU createIOU(IOU iou) throws IllegalArgumentException, OptimisticLocking return this.iouRepository.save(iou); } - public IOU updateIOU(UUID id, IOU updatedIOU) throws NoSuchElementException { - IOU existingIOU = this.iouRepository.findById(id) - .orElseThrow(() -> new NoSuchElementException("No IOU found with id: " + id)); - return this.iouRepository.save(existingIOU); - } + public IOU updateIOU(UUID id, IOU updatedIOU) { + IOU existingIOU = getIOU(id); { + // Update the existing IOU with values from the updatedIOU + existingIOU.setAmount(updatedIOU.getAmount()); + existingIOU.setBorrower(updatedIOU.getBorrower()); + existingIOU.setLender(updatedIOU.getLender()); + existingIOU.setDateTime(updatedIOU.getDateTime()); + // Save the updated IOU back to the database + return iouRepository.save(existingIOU); + }}; + + public void deleteIOU(UUID id) { this.iouRepository.delete(getIOU(id)); From 56fd22e53dcb7fee0cbe5bae69a3271359522b37 Mon Sep 17 00:00:00 2001 From: Funmilayo Kolawole Date: Tue, 20 Aug 2024 17:10:11 +0100 Subject: [PATCH 8/8] Add feature to retrieve IOUs by borrower --- .../restapiexercise/ious/IOUController.java | 13 +++++++++++-- .../restapiexercise/ious/IOURepository.java | 3 ++- .../cbfacademy/restapiexercise/ious/IOUService.java | 6 ++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java index 23d5edb..1a80288 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -28,9 +29,17 @@ public IOUController(IOUService iouService) { @GetMapping(produces = "application/json") -public List getAllIOUs() { - return iouService.getAllIOUs(); +public List getAllIOUs(@RequestParam(required = false) String borrower) { + System.out.println("Received borrower parameter: " + borrower); + //if borrower is provided, and the vaule provided is meaningful + if (borrower !=null && !borrower.isEmpty()){ + return iouService.getIOUsByBorrower(borrower); +} + else{ + return iouService.getAllIOUs(); //return All IOUs + } } + @GetMapping("/{id}") public ResponseEntity getIOUById(@PathVariable UUID id){ diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java index 86e055b..a216f68 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOURepository.java @@ -1,11 +1,12 @@ package com.cbfacademy.restapiexercise.ious; +import java.util.List; import java.util.UUID; import org.springframework.data.repository.ListCrudRepository; public interface IOURepository extends ListCrudRepository { - //List findByBorrower (String borrower); + List findByBorrower (String borrower); // @Query(value = "SELECT * FROM IOU i WHERE i.amount > (SELECT AVG(amount) FROM IOU)", //nativeQuery = true) diff --git a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java index 92b629a..ae13ce8 100644 --- a/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java +++ b/src/main/java/com/cbfacademy/restapiexercise/ious/IOUService.java @@ -11,6 +11,7 @@ public class IOUService { private final IOURepository iouRepository; + public IOUService(IOURepository iouRepository) { this.iouRepository = iouRepository; @@ -44,5 +45,10 @@ public IOU updateIOU(UUID id, IOU updatedIOU) { public void deleteIOU(UUID id) { this.iouRepository.delete(getIOU(id)); } +public List getIOUsByBorrower(String borrower){ + return this.iouRepository.findByBorrower(borrower); + +} + } \ No newline at end of file