From 0b684ecba8af9c1a4819a526a478f8ce90a52e9e Mon Sep 17 00:00:00 2001 From: Nuray Taghiyeva Date: Fri, 6 Mar 2026 14:58:18 +0400 Subject: [PATCH 01/12] new file added --- .idea/.gitignore | 10 + .idea/compiler.xml | 18 ++ .idea/encodings.xml | 6 + .idea/homework-java-ironschool.iml | 9 + .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 14 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + ironschool/.gitattributes | 2 + ironschool/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + ironschool/mvnw | 295 ++++++++++++++++++ ironschool/mvnw.cmd | 189 +++++++++++ ironschool/pom.xml | 75 +++++ .../ironschool/IronschoolApplication.java | 13 + .../ironschool/ServletInitializer.java | 13 + .../src/main/resources/application.properties | 1 + .../IronschoolApplicationTests.java | 13 + 18 files changed, 728 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/homework-java-ironschool.iml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 ironschool/.gitattributes create mode 100644 ironschool/.gitignore create mode 100644 ironschool/.mvn/wrapper/maven-wrapper.properties create mode 100644 ironschool/mvnw create mode 100644 ironschool/mvnw.cmd create mode 100644 ironschool/pom.xml create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/IronschoolApplication.java create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/ServletInitializer.java create mode 100644 ironschool/src/main/resources/application.properties create mode 100644 ironschool/src/test/java/org/ironhack/collections/ironschool/IronschoolApplicationTests.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..ab1f4164 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Ignored default folder with query files +/queries/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..a5e723c8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..4a2ce313 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/homework-java-ironschool.iml b/.idea/homework-java-ironschool.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/.idea/homework-java-ironschool.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..712ab9d9 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..3fa8ebf4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..7d988043 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/ironschool/.gitattributes b/ironschool/.gitattributes new file mode 100644 index 00000000..3b41682a --- /dev/null +++ b/ironschool/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/ironschool/.gitignore b/ironschool/.gitignore new file mode 100644 index 00000000..667aaef0 --- /dev/null +++ b/ironschool/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/ironschool/.mvn/wrapper/maven-wrapper.properties b/ironschool/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..8dea6c22 --- /dev/null +++ b/ironschool/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/ironschool/mvnw b/ironschool/mvnw new file mode 100644 index 00000000..bd8896bf --- /dev/null +++ b/ironschool/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/ironschool/mvnw.cmd b/ironschool/mvnw.cmd new file mode 100644 index 00000000..92450f93 --- /dev/null +++ b/ironschool/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/ironschool/pom.xml b/ironschool/pom.xml new file mode 100644 index 00000000..afa17cb8 --- /dev/null +++ b/ironschool/pom.xml @@ -0,0 +1,75 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.0.3 + + + org.ironhack.collections + ironschool + 0.0.1-SNAPSHOT + war + ironschool + ironschool + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-webmvc + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + org.springframework.boot + spring-boot-starter-validation-test + test + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/IronschoolApplication.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/IronschoolApplication.java new file mode 100644 index 00000000..726d8aa2 --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/IronschoolApplication.java @@ -0,0 +1,13 @@ +package org.ironhack.collections.ironschool; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class IronschoolApplication { + + public static void main(String[] args) { + SpringApplication.run(IronschoolApplication.class, args); + } + +} diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/ServletInitializer.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/ServletInitializer.java new file mode 100644 index 00000000..3cb6f33a --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/ServletInitializer.java @@ -0,0 +1,13 @@ +package org.ironhack.collections.ironschool; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; + +public class ServletInitializer extends SpringBootServletInitializer { + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(IronschoolApplication.class); + } + +} diff --git a/ironschool/src/main/resources/application.properties b/ironschool/src/main/resources/application.properties new file mode 100644 index 00000000..64bb90af --- /dev/null +++ b/ironschool/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=ironschool diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/IronschoolApplicationTests.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/IronschoolApplicationTests.java new file mode 100644 index 00000000..207d1e10 --- /dev/null +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/IronschoolApplicationTests.java @@ -0,0 +1,13 @@ +package org.ironhack.collections.ironschool; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class IronschoolApplicationTests { + + @Test + void contextLoads() { + } + +} From 5785d7ba19b42543215c3589e618411eef89ef4f Mon Sep 17 00:00:00 2001 From: Nuray Taghiyeva Date: Fri, 6 Mar 2026 15:13:35 +0400 Subject: [PATCH 02/12] Add project file structure --- .../org/ironhack/collections/ironschool/Model/Course.java | 4 ++++ .../org/ironhack/collections/ironschool/Model/Student.java | 4 ++++ .../org/ironhack/collections/ironschool/Model/Teacher.java | 4 ++++ .../collections/ironschool/Service/SchoolService.java | 4 ++++ .../org/ironhack/collections/ironschool/Util/IdGenerator.java | 4 ++++ 5 files changed, 20 insertions(+) create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Util/IdGenerator.java diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java new file mode 100644 index 00000000..ed0812ad --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java @@ -0,0 +1,4 @@ +package org.ironhack.collections.ironschool.Model; + +public class Course { +} diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java new file mode 100644 index 00000000..0141ac0d --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java @@ -0,0 +1,4 @@ +package org.ironhack.collections.ironschool.Model; + +public class Student { +} diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java new file mode 100644 index 00000000..63ca741d --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java @@ -0,0 +1,4 @@ +package org.ironhack.collections.ironschool.Model; + +public class Teacher { +} diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java new file mode 100644 index 00000000..02fa24ad --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java @@ -0,0 +1,4 @@ +package org.ironhack.collections.ironschool.Service; + +public class SchoolService { +} diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Util/IdGenerator.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Util/IdGenerator.java new file mode 100644 index 00000000..6752546c --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Util/IdGenerator.java @@ -0,0 +1,4 @@ +package org.ironhack.collections.ironschool.Util; + +public class IdGenerator { +} From f8028b57fbfd093a832f3d9d83363ea87e27febb Mon Sep 17 00:00:00 2001 From: "Shebnem.M" Date: Fri, 6 Mar 2026 16:47:03 +0400 Subject: [PATCH 03/12] feat: implement Teacher class with auto-ID generator --- .../collections/ironschool/Model/Teacher.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java index 63ca741d..5b8777c2 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java @@ -1,4 +1,34 @@ package org.ironhack.collections.ironschool.Model; +import java.util.UUID; + public class Teacher { + private String teacherId; + private String name; + private double salary; + public Teacher(String name, double salary){ + this.teacherId= UUID.randomUUID().toString(); + this.name=name; + this.salary=salary; + } + + public String getName() { + return name; + } + + public double getSalary() { + return salary; + } + + public String getTeacherId() { + return teacherId; + } + + public void setName(String name) { + this.name = name; + } + + public void setSalary(double salary) { + this.salary = salary; + } } From e074c1ecd81baa63967a2625eb0385052916906b Mon Sep 17 00:00:00 2001 From: "Shebnem.M" Date: Fri, 6 Mar 2026 17:11:00 +0400 Subject: [PATCH 04/12] feat: implement Student class with auto-ID --- .../collections/ironschool/Model/Student.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java index 0141ac0d..65a37026 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java @@ -1,4 +1,51 @@ package org.ironhack.collections.ironschool.Model; public class Student { + private String studentId; + private String name; + private String address; + private String email; + private Course course; + public Student(String name, String address, String email){ + this.studentId=java.util.UUID.randomUUID().toString(); + this.name=name; + this.address=address; + this.email=email; + } + + public String getName() { + return name; + } + + public String getAddress() { + return address; + } + + public String getStudentId() { + return studentId; + } + + public Course getCourse() { + return course; + } + + public String getEmail() { + return email; + } + + public void setName(String name) { + this.name = name; + } + + public void setAddress(String address) { + this.address = address; + } + + public void setCourse(Course course) { + this.course = course; + } + + public void setEmail(String email) { + this.email = email; + } } From 66bffe2b28ad6b28440e2306e2fff229f3dbd338 Mon Sep 17 00:00:00 2001 From: Nuray Taghiyeva Date: Fri, 6 Mar 2026 17:37:53 +0400 Subject: [PATCH 05/12] Course added --- .../Controller/CourseController.java | 56 ++++++++++++++ .../collections/ironschool/Model/Course.java | 48 ++++++++++++ .../ironschool/Service/CourseService.java | 74 +++++++++++++++++++ .../ironschool/Service/SchoolService.java | 4 - .../ironschool/CourseServiceTest.java | 61 +++++++++++++++ 5 files changed, 239 insertions(+), 4 deletions(-) create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java delete mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java create mode 100644 ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java new file mode 100644 index 00000000..ddb3014c --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java @@ -0,0 +1,56 @@ +package org.ironhack.collections.ironschool.Controller; + +import org.ironhack.collections.ironschool.Model.Course; +import org.ironhack.collections.ironschool.Model.Teacher; +import org.ironhack.collections.ironschool.Service.CourseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/courses") +public class CourseController { + + @Autowired + private CourseService courseService; + + // Bütün course-ları göstər + @GetMapping + public List getAllCourses() { + return courseService.getCourses(); + } + + // Bir course-u göstər + @GetMapping("/{id}") + public Course getCourse(@PathVariable String id) { + Course c = courseService.getCourseById(id); + if(c == null) throw new RuntimeException("Course not found"); + return c; + } + + // Student enroll + @PostMapping("/enroll") + public String enrollStudent(@RequestParam String courseId) { + Course c = courseService.getCourseById(courseId); + if(c == null) return "Course not found!"; + c.enrollStudent(); + return "Student enrolled in course " + c.getName(); + } + + // Teacher assign + @PostMapping("/assign") + public String assignTeacher(@RequestParam String courseId, @RequestParam String teacherName) { + Course c = courseService.getCourseById(courseId); + if(c == null) return "Course not found!"; + Teacher t = new Teacher(teacherName, 500); // nümunə üçün teacher yaradılır + c.assignTeacher(t); + return "Teacher " + teacherName + " assigned to course " + c.getName(); + } + + // Total money earned + @GetMapping("/profit") + public double getTotalProfit() { + return courseService.getTotalMoneyEarned(); + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java index ed0812ad..f7e4b474 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java @@ -1,4 +1,52 @@ package org.ironhack.collections.ironschool.Model; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + public class Course { + private String courseId; + private String name; + private double price; + private double moneyEarned; + private Teacher teacher; + + public Course(String name, double price) { + this.courseId = UUID.randomUUID().toString(); + this.name = name; + this.price = price; + this.moneyEarned = 0.0; + this.teacher = null; + } + + public String getCourseId() { return courseId; } + public String getName() { return name; } + public double getPrice() { return price; } + public double getMoneyEarned() { return moneyEarned; } + public Teacher getTeacher() { return teacher; } + + // Setters + public void setName(String name) { this.name = name; } + public void setPrice(double price) { this.price = price; } + public void setTeacher(Teacher teacher) { this.teacher = teacher; } + + public void enrollStudent() { + this.moneyEarned += this.price; + System.out.println("Student enrolled in course: " + this.name); + } + + public void assignTeacher(Teacher teacher) { + this.teacher = teacher; + System.out.println("Teacher " + teacher.getName() + " assigned to course" + this.name); + } + + public void displayDetails() { + System.out.println("Course ID: " + courseId); + System.out.println("Name: " + name); + System.out.println("Price: " + price); + System.out.println("Money Earned: " + moneyEarned); + System.out.println("Teacher: " + (teacher != null ? teacher.getName() : "None")); + System.out.println("------------------------------"); + } + } diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java new file mode 100644 index 00000000..5866fb85 --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java @@ -0,0 +1,74 @@ +package org.ironhack.collections.ironschool.Service; + +import org.ironhack.collections.ironschool.Model.Course; +import org.ironhack.collections.ironschool.Model.Teacher; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class CourseService { + + private List courses; + + public CourseService() { + this.courses = new ArrayList<>(); + } + + public void addCourse(Course course) { + courses.add(course); + } + + public List getCourses() { + return courses; + } + + public Course getCourseById(String courseId) { + for (Course course : courses) { + if(course.getCourseId().equals(courseId)) { + return course; + } + } + return null; + } + + + public String enrollStudent(String courseId) { + Course c = getCourseById(courseId); + if(c != null) { + c.enrollStudent(); + return "Student enrolled in course " + c.getName(); + } else { + return "Course ID not found"; + } + } + + public String assignTeacher(String courseId, Teacher teacher) { + Course c = getCourseById(courseId); + if(c != null) { + c.assignTeacher(teacher); + return "Teacher " + teacher.getName() + " assigned to course " + c.getName(); + } else { + return "Course ID not found"; + } + } + + public double getTotalMoneyEarned() { + double total = 0.0; + for (Course c : courses) { + total += c.getMoneyEarned(); + } + return total; + } + + public void showAllCourses() { + if(courses.isEmpty()) { + System.out.println("No course available"); + return; + } + for(Course c : courses) { + System.out.println(c.getCourseId() + " - " + c.getName()); + } + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java deleted file mode 100644 index 02fa24ad..00000000 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/SchoolService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ironhack.collections.ironschool.Service; - -public class SchoolService { -} diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java new file mode 100644 index 00000000..ac7208d4 --- /dev/null +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java @@ -0,0 +1,61 @@ +package org.ironhack.collections.ironschool; + +import org.ironhack.collections.ironschool.Model.Course; +import org.ironhack.collections.ironschool.Model.Teacher; +import org.ironhack.collections.ironschool.Service.CourseService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +public class CourseServiceTest { + private CourseService courseService; + private Course course1; + private Course course2; + + @BeforeEach + public void setUp() { + courseService = new CourseService(); + course1 = new Course("Math", 100); + course2 = new Course("Physics", 200); + + courseService.addCourse(course1); + courseService.addCourse(course2); + } + @Test + public void testEnrollStudent() { + assertEquals(0, course1.getMoneyEarned()); + course1.enrollStudent(); + assertEquals(100, course1.getMoneyEarned()); + } + + @Test + public void testAssignTeacher() { + Teacher t = new Teacher("Ali", 500); + assertNull(course1.getTeacher()); + course1.assignTeacher(t); + assertEquals(t, course1.getTeacher()); + } + @Test + public void testServiceEnrollStudent() { + assertEquals(0, course1.getMoneyEarned()); + courseService.enrollStudent(course1.getCourseId()); + assertEquals(100, course1.getMoneyEarned()); + } + + @Test + public void testServiceAssignTeacher() { + Teacher t = new Teacher("Aysha", 500); + assertNull(course2.getTeacher()); + courseService.assignTeacher(course2.getCourseId(), t); + assertEquals(t, course2.getTeacher()); + } + + @Test + public void testGetTotalMoneyEarned() { + course1.enrollStudent(); + course2.enrollStudent(); + assertEquals(300, courseService.getTotalMoneyEarned()); + } +} From 874f59c65e76f06072cf6dbca6bbf90680e3b8ab Mon Sep 17 00:00:00 2001 From: "Shebnem.M" Date: Sat, 7 Mar 2026 15:30:28 +0400 Subject: [PATCH 06/12] feat: implement StudentService with search logic --- .idea/homework-java-ironschool.iml | 4 ++- .idea/misc.xml | 2 +- .idea/vcs.xml | 1 + .../Controller/CourseController.java | 2 ++ .../Controller/StudentController.java | 14 +++++++++++ .../ironschool/Service/StudentService.java | 25 +++++++++++++++++++ 6 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java diff --git a/.idea/homework-java-ironschool.iml b/.idea/homework-java-ironschool.iml index d6ebd480..6ca28ba7 100644 --- a/.idea/homework-java-ironschool.iml +++ b/.idea/homework-java-ironschool.iml @@ -2,7 +2,9 @@ - + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 3fa8ebf4..de8a14f5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1ddf..83067447 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java index ddb3014c..6a29f750 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java @@ -53,4 +53,6 @@ public String assignTeacher(@RequestParam String courseId, @RequestParam String public double getTotalProfit() { return courseService.getTotalMoneyEarned(); } + + } \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java new file mode 100644 index 00000000..86abc99c --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java @@ -0,0 +1,14 @@ +package org.ironhack.collections.ironschool.Controller; + +import org.ironhack.collections.ironschool.Model.Student; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/students") +public class StudentController { + +} diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java new file mode 100644 index 00000000..e8f30c5c --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java @@ -0,0 +1,25 @@ +package org.ironhack.collections.ironschool.Service; + +import org.ironhack.collections.ironschool.Model.Student; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class StudentService { + private final List studentList=new ArrayList<>(); + public StudentService(){} + public List getAllStudent(){ + return studentList; + } + public Student getStudentById(String id){ + for(Student student:studentList){ + if(student.getStudentId().equals(id)){ + return student; + } + } + return null; + } + +} From c1fa6f15bf1b3e544173e109bbee710a31a71f66 Mon Sep 17 00:00:00 2001 From: "Shebnem.M" Date: Sun, 8 Mar 2026 13:29:05 +0400 Subject: [PATCH 07/12] feat:implement student enrollment logic and lookup Id --- .../Controller/StudentController.java | 55 ++++++++++++++++++- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java index 86abc99c..473292ca 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java @@ -1,14 +1,63 @@ package org.ironhack.collections.ironschool.Controller; +import org.ironhack.collections.ironschool.Model.Course; import org.ironhack.collections.ironschool.Model.Student; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.ironhack.collections.ironschool.Service.CourseService; +import org.ironhack.collections.ironschool.Service.StudentService; +import org.springframework.web.bind.annotation.*; import java.util.List; @RestController @RequestMapping("/api/students") public class StudentController { + private final StudentService studentService; + private final CourseService courseService; + public StudentController(StudentService studentService, CourseService courseService){ + this.studentService=studentService; + this.courseService=courseService; + } + @GetMapping + public List displayAllStudents(){ + List students=studentService.getAllStudent(); + if(students==null || students.isEmpty()){ + System.out.println("No students found in the system"); + } + return students; + } + @GetMapping("/{id}") + public Student lookupStudent(@PathVariable String id){ + try{ + Student student=studentService.getStudentById(id); + if(student!=null){ + return student; + } + else{ + System.out.println("Student with ID " + id + " not found"); + return null; + } + } + catch(Exception e){ + System.out.println("Unexpected error happened: "+e.getMessage()); + return null; + } + } + + @PostMapping("/enroll") + public String enrollStudent(@RequestParam String id, @RequestParam String courseId) { + try { + String response = courseService.enrollStudent(courseId); + if (!response.equals("Course ID not found")) { + Student s = studentService.getStudentById(id); + if (s != null) { + s.setCourse(courseService.getCourseById(courseId)); + } + return "Success: " + s.getName() + " enrolled in " + courseId; + } + return response; + } catch (Exception e) { + return "Unexpected error happened " + e.getMessage(); + } + } } From 9a797a827de568e5f0c59fb9a7d8a855f1af17ed Mon Sep 17 00:00:00 2001 From: "Shebnem.M" Date: Sun, 8 Mar 2026 13:37:12 +0400 Subject: [PATCH 08/12] feat: implement TeacherService with salary calculation and ID lookup --- .../ironschool/Service/TeacherService.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java new file mode 100644 index 00000000..18e1fbdc --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java @@ -0,0 +1,35 @@ +package org.ironhack.collections.ironschool.Service; + +import org.ironhack.collections.ironschool.Model.Teacher; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +public class TeacherService { + private List teacherList=new ArrayList<>(); + public TeacherService(){}; + + public List getAllTeacher() { + return teacherList; + } + public Teacher getTeacherById(String teacherId){ + + for(Teacher teacher:teacherList) { + if (teacher.getTeacherId().equals(teacherId)) { + return teacher; + } + } + return null; + } + public double getTotalTeacherSalary(){ + double total=0; + for(Teacher teacher:teacherList){ + if(teacher!=null){ + total+=teacher.getSalary(); + } + } + return total; + } +} From 666a7cf1d62c95dfa15436a58363eb2e0bd265ea Mon Sep 17 00:00:00 2001 From: "Shebnem.M" Date: Sun, 8 Mar 2026 14:06:17 +0400 Subject: [PATCH 09/12] feat: implement Teacher Controller with ID lookup and total salary --- .../Controller/TeacherController.java | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java new file mode 100644 index 00000000..88d0d236 --- /dev/null +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java @@ -0,0 +1,58 @@ +package org.ironhack.collections.ironschool.Controller; + + +import org.ironhack.collections.ironschool.Model.Teacher; +import org.ironhack.collections.ironschool.Service.TeacherService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/api/teachers") +public class TeacherController { + private TeacherService teacherService; + public TeacherController(TeacherService teacherService){ + this.teacherService=teacherService; + } + + @GetMapping + public List displayAllTeacher(){ + List teachers=teacherService.getAllTeacher(); + if(teachers==null || teachers.isEmpty()){ + System.out.println("No teachers found in system"); + } + return teachers; + } + + @GetMapping("/{id}") + public Teacher lookupTeacher(@PathVariable("id") String teacherId){ + try{ + Teacher teacher=teacherService.getTeacherById(teacherId); + if(teacher!=null){ + return teacher; + } + else{ + System.out.println("Teacher with ID " + teacherId + " not found"); + return null; + } + } catch (Exception e) { + System.out.println("Unexpected error happened "+e.getMessage()); + return null; + } + } + + @GetMapping("/total-salary") + public double getTotalSalaryOfTeacher(){ + try{ + return teacherService.getTotalTeacherSalary(); + } + catch (Exception e) { + System.out.println("Error calculating total salary: " + e.getMessage()); + return 0; + } + } +} From 8084c02a140fdf43250b34464306229d67abcd44 Mon Sep 17 00:00:00 2001 From: Nuray Taghiyeva Date: Sun, 8 Mar 2026 23:10:51 +0400 Subject: [PATCH 10/12] Course part --- .../Controller/CourseController.java | 49 ++++------- .../collections/ironschool/Model/Course.java | 46 +++++------ .../ironschool/Service/CourseService.java | 58 +++++-------- .../ironschool/CourseControllerTest.java | 55 +++++++++++++ .../ironschool/CourseServiceTest.java | 81 ++++++++++--------- 5 files changed, 155 insertions(+), 134 deletions(-) create mode 100644 ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java index ddb3014c..4daac69e 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java @@ -1,9 +1,7 @@ package org.ironhack.collections.ironschool.Controller; import org.ironhack.collections.ironschool.Model.Course; -import org.ironhack.collections.ironschool.Model.Teacher; import org.ironhack.collections.ironschool.Service.CourseService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -12,45 +10,30 @@ @RequestMapping("/courses") public class CourseController { - @Autowired - private CourseService courseService; + private final CourseService courseService; - // Bütün course-ları göstər - @GetMapping - public List getAllCourses() { - return courseService.getCourses(); + public CourseController(CourseService courseService) { + this.courseService = courseService; } - // Bir course-u göstər - @GetMapping("/{id}") - public Course getCourse(@PathVariable String id) { - Course c = courseService.getCourseById(id); - if(c == null) throw new RuntimeException("Course not found"); - return c; + @PostMapping + public Course createCourse(@RequestParam String name, @RequestParam double price) { + return courseService.createCourse(name, price); } - // Student enroll - @PostMapping("/enroll") - public String enrollStudent(@RequestParam String courseId) { - Course c = courseService.getCourseById(courseId); - if(c == null) return "Course not found!"; - c.enrollStudent(); - return "Student enrolled in course " + c.getName(); + @GetMapping + public List showCourses() { + return courseService.getAllCourses(); } - // Teacher assign - @PostMapping("/assign") - public String assignTeacher(@RequestParam String courseId, @RequestParam String teacherName) { - Course c = courseService.getCourseById(courseId); - if(c == null) return "Course not found!"; - Teacher t = new Teacher(teacherName, 500); // nümunə üçün teacher yaradılır - c.assignTeacher(t); - return "Teacher " + teacherName + " assigned to course " + c.getName(); + @GetMapping("/{courseId}") + public Course lookUpCourse(@PathVariable String courseId) { + return courseService.findCourse(courseId); } - // Total money earned - @GetMapping("/profit") - public double getTotalProfit() { - return courseService.getTotalMoneyEarned(); + @PutMapping("/{courseId}/teacher/{teacherId}") + public void assignTeacher(@PathVariable String courseId, + @PathVariable String teacherId) { + courseService.assignTeacher(courseId, teacherId); } } \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java index f7e4b474..2b153ade 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java @@ -1,7 +1,5 @@ package org.ironhack.collections.ironschool.Model; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; public class Course { @@ -15,38 +13,34 @@ public Course(String name, double price) { this.courseId = UUID.randomUUID().toString(); this.name = name; this.price = price; - this.moneyEarned = 0.0; - this.teacher = null; + this.moneyEarned = 0; } - public String getCourseId() { return courseId; } - public String getName() { return name; } - public double getPrice() { return price; } - public double getMoneyEarned() { return moneyEarned; } - public Teacher getTeacher() { return teacher; } + public String getCourseId() { + return courseId; + } - // Setters - public void setName(String name) { this.name = name; } - public void setPrice(double price) { this.price = price; } - public void setTeacher(Teacher teacher) { this.teacher = teacher; } + public String getName() { + return name; + } - public void enrollStudent() { - this.moneyEarned += this.price; - System.out.println("Student enrolled in course: " + this.name); + public double getPrice() { + return price; } - public void assignTeacher(Teacher teacher) { - this.teacher = teacher; - System.out.println("Teacher " + teacher.getName() + " assigned to course" + this.name); + public double getMoneyEarned() { + return moneyEarned; } - public void displayDetails() { - System.out.println("Course ID: " + courseId); - System.out.println("Name: " + name); - System.out.println("Price: " + price); - System.out.println("Money Earned: " + moneyEarned); - System.out.println("Teacher: " + (teacher != null ? teacher.getName() : "None")); - System.out.println("------------------------------"); + public Teacher getTeacher() { + return teacher; } + public void setTeacher(Teacher teacher) { + this.teacher = teacher; + } + + public void addMoneyEarned(double amount) { + this.moneyEarned += amount; + } } diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java index 5866fb85..dd30ab3a 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java @@ -10,22 +10,25 @@ @Service public class CourseService { - private List courses; + private List courses = new ArrayList<>(); + private final TeacherService teacherService; - public CourseService() { - this.courses = new ArrayList<>(); + public CourseService(TeacherService teacherService){ + this.teacherService = teacherService; } - public void addCourse(Course course) { + public Course createCourse(String name, double price){ + Course course = new Course(name, price); courses.add(course); + return course; } - public List getCourses() { + public List getAllCourses(){ return courses; } - public Course getCourseById(String courseId) { - for (Course course : courses) { + public Course findCourse(String courseId) { + for(Course course : courses) { if(course.getCourseId().equals(courseId)) { return course; } @@ -33,42 +36,19 @@ public Course getCourseById(String courseId) { return null; } + public void assignTeacher(String courseId, String teacherId) { + Course course = findCourse(courseId); + Teacher teacher = teacherService.findTeacher(teacherId); - public String enrollStudent(String courseId) { - Course c = getCourseById(courseId); - if(c != null) { - c.enrollStudent(); - return "Student enrolled in course " + c.getName(); - } else { - return "Course ID not found"; + if(course != null && teacher != null) { + course.setTeacher(teacher); } } + public void addCourseMoney(String courseId) { + Course course = findCourse(courseId); - public String assignTeacher(String courseId, Teacher teacher) { - Course c = getCourseById(courseId); - if(c != null) { - c.assignTeacher(teacher); - return "Teacher " + teacher.getName() + " assigned to course " + c.getName(); - } else { - return "Course ID not found"; - } - } - - public double getTotalMoneyEarned() { - double total = 0.0; - for (Course c : courses) { - total += c.getMoneyEarned(); - } - return total; - } - - public void showAllCourses() { - if(courses.isEmpty()) { - System.out.println("No course available"); - return; - } - for(Course c : courses) { - System.out.println(c.getCourseId() + " - " + c.getName()); + if(course != null) { + course.addMoneyEarned(course.getPrice()); } } } \ No newline at end of file diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java new file mode 100644 index 00000000..f5532071 --- /dev/null +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java @@ -0,0 +1,55 @@ +package org.ironhack.collections.ironschool; + + +import org.ironhack.collections.ironschool.Controller.CourseController; +import org.ironhack.collections.ironschool.Model.Course; +import org.ironhack.collections.ironschool.Service.CourseService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +class CourseControllerTest { + + private CourseService courseService; + private CourseController courseController; + + @BeforeEach + void setup() { + courseService = mock(CourseService.class); + courseController = new CourseController(courseService); + } + + @Test + void showCoursesShouldReturnList() { + when(courseService.getAllCourses()).thenReturn(List.of(new Course("Java", 200))); + + List courses = courseController.showCourses(); + + assertEquals(1, courses.size()); + assertEquals("Java", courses.get(0).getName()); + } + + @Test + void lookUpCourseShouldReturnCourse() { + Course course = new Course("Java", 200); + when(courseService.findCourse(course.getCourseId())).thenReturn(course); + + Course found = courseController.lookUpCourse(course.getCourseId()); + + assertEquals(course, found); + } + + @Test + void assignTeacherEndpointShouldCallService() { + String courseId = "c1"; + String teacherId = "t1"; + + courseController.assignTeacher(courseId, teacherId); + + verify(courseService, times(1)).assignTeacher(courseId, teacherId); + } +} \ No newline at end of file diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java index ac7208d4..63b66525 100644 --- a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java @@ -1,61 +1,70 @@ package org.ironhack.collections.ironschool; +package service; + + import org.ironhack.collections.ironschool.Model.Course; -import org.ironhack.collections.ironschool.Model.Teacher; import org.ironhack.collections.ironschool.Service.CourseService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.*; + +class CourseServiceTest { -public class CourseServiceTest { private CourseService courseService; - private Course course1; - private Course course2; + private TeacherService teacherService; @BeforeEach - public void setUp() { - courseService = new CourseService(); - course1 = new Course("Math", 100); - course2 = new Course("Physics", 200); - - courseService.addCourse(course1); - courseService.addCourse(course2); + void setUp() { + teacherService = new TeacherService(); + courseService = new CourseService(teacherService); } + @Test - public void testEnrollStudent() { - assertEquals(0, course1.getMoneyEarned()); - course1.enrollStudent(); - assertEquals(100, course1.getMoneyEarned()); + void createCourseShouldWork() { + Course course = courseService.createCourse("Java", 200); + + assertEquals("Java", course.getName()); + assertEquals(200, course.getPrice()); + assertNotNull(course.getCourseId()); + assertEquals(0, course.getMoneyEarned()); } @Test - public void testAssignTeacher() { - Teacher t = new Teacher("Ali", 500); - assertNull(course1.getTeacher()); - course1.assignTeacher(t); - assertEquals(t, course1.getTeacher()); + void assignTeacherShouldWork() { + Course course = courseService.createCourse("Java", 200); + Teacher teacher = teacherService.createTeacher("Ali", 3000); + + courseService.assignTeacher(course.getCourseId(), teacher.getTeacherId()); + + assertEquals(teacher, course.getTeacher()); } + @Test - public void testServiceEnrollStudent() { - assertEquals(0, course1.getMoneyEarned()); - courseService.enrollStudent(course1.getCourseId()); - assertEquals(100, course1.getMoneyEarned()); + void findCourseShouldReturnCourse() { + Course course = courseService.createCourse("Java", 200); + + Course found = courseService.findCourse(course.getCourseId()); + + assertEquals(course, found); } @Test - public void testServiceAssignTeacher() { - Teacher t = new Teacher("Aysha", 500); - assertNull(course2.getTeacher()); - courseService.assignTeacher(course2.getCourseId(), t); - assertEquals(t, course2.getTeacher()); + void findCourseShouldReturnNullIfNotFound() { + Course found = courseService.findCourse("invalid-id"); + + assertNull(found); } @Test - public void testGetTotalMoneyEarned() { - course1.enrollStudent(); - course2.enrollStudent(); - assertEquals(300, courseService.getTotalMoneyEarned()); + void addCourseMoneyShouldIncreaseMoneyEarned() { + Course course = courseService.createCourse("C++", 400); + + courseService.addCourseMoney(course.getCourseId()); + assertEquals(400, course.getMoneyEarned()); + + courseService.addCourseMoney(course.getCourseId()); + assertEquals(800, course.getMoneyEarned()); } -} +} \ No newline at end of file From 05a0233b2111ed1beca7bce9147a8745619dde2c Mon Sep 17 00:00:00 2001 From: "Shebnem.M" Date: Mon, 9 Mar 2026 00:20:34 +0400 Subject: [PATCH 11/12] test: implement unit tests for TeacherService and StudentService --- ironschool/pom.xml | 6 ++- .../ironschool/StudentServiceTest.java | 43 +++++++++++++++++++ .../ironschool/TeacherServiceTest.java | 37 ++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 ironschool/src/test/java/org/ironhack/collections/ironschool/StudentServiceTest.java create mode 100644 ironschool/src/test/java/org/ironhack/collections/ironschool/TeacherServiceTest.java diff --git a/ironschool/pom.xml b/ironschool/pom.xml index afa17cb8..07be8ae2 100644 --- a/ironschool/pom.xml +++ b/ironschool/pom.xml @@ -39,7 +39,11 @@ org.springframework.boot spring-boot-starter-webmvc - + + org.springframework.boot + spring-boot-starter-test + test + org.springframework.boot spring-boot-devtools diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/StudentServiceTest.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/StudentServiceTest.java new file mode 100644 index 00000000..5807ef82 --- /dev/null +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/StudentServiceTest.java @@ -0,0 +1,43 @@ +package org.ironhack.collections.ironschool; + +import org.ironhack.collections.ironschool.Model.Course; +import org.ironhack.collections.ironschool.Model.Student; +import org.ironhack.collections.ironschool.Service.StudentService; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class StudentServiceTest { + private StudentService studentService; + @BeforeEach + void setUp(){ + studentService=new StudentService(); + } + @Test + void testGetStudentById(){ + Student s=new Student("Zeyneb","Baku","zeyneb06@gmail.com"); + String generatedId=s.getStudentId(); + studentService.getAllStudent().add(s); + + Student found=studentService.getStudentById(generatedId); + assertNotNull(found,"Student must found!"); + assertEquals("Zeyneb",found.getName()); + assertEquals(generatedId,found.getStudentId()); + } + + @Test + void testGetStudentById_IfNotFound() { + Student found=studentService.getStudentById("NON-EXISTENT-ID"); + assertNull(found, "Expected null for non-existent student ID"); + } + + @Test + void testStudentCourseAssignment_ShouldUpdateCourseCorrectly(){ + Student s=new Student("Kenan","Xacmaz","kenan12@gmail.com"); + Course c=new Course("Java Spring Boot", 800); + s.setCourse(c); + assertNotNull(s.getCourse(),"Course should not be null after assignment"); + assertEquals("Java Spring Boot",s.getCourse().getName(),"Course name should match the assigned course"); + + } +} diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/TeacherServiceTest.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/TeacherServiceTest.java new file mode 100644 index 00000000..cc83f44c --- /dev/null +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/TeacherServiceTest.java @@ -0,0 +1,37 @@ +package org.ironhack.collections.ironschool; + +import org.ironhack.collections.ironschool.Model.Teacher; +import org.ironhack.collections.ironschool.Service.TeacherService; +import static org.junit.jupiter.api.Assertions.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +public class TeacherServiceTest { + private TeacherService teacherService; + + @BeforeEach + void setUp(){ + teacherService=new TeacherService(); + } + + @Test + void testGetTotalTeacherSalary(){ + Teacher t1=new Teacher("Namiq",1000); + Teacher t2=new Teacher("Gulay",500); + teacherService.getAllTeacher().add(t1); + teacherService.getAllTeacher().add(t2); + double totalSalary= teacherService.getTotalTeacherSalary(); + assertEquals(1500,totalSalary,"Total salary doesn't calculate correct "); + } + + @Test + void testGetTeacherById(){ + Teacher t=new Teacher("Shabnam",1700); + String generatedId=t.getTeacherId(); + teacherService.getAllTeacher().add(t); + Teacher found=teacherService.getTeacherById(generatedId); + assertNotNull(found,"Teacher must found!"); + assertEquals("Shabnam",found.getName()); + assertEquals(generatedId,found.getTeacherId()); + } +} From 5c6989b4eb71a98629958c0812b1881edfb019d5 Mon Sep 17 00:00:00 2001 From: Nuray Taghiyeva Date: Tue, 10 Mar 2026 23:52:22 +0400 Subject: [PATCH 12/12] Homework done --- .../Controller/CourseController.java | 44 ++++++- .../Controller/StudentController.java | 117 ++++++++++-------- .../Controller/TeacherController.java | 72 ++++++----- .../collections/ironschool/Model/Course.java | 58 ++++++++- .../collections/ironschool/Model/Student.java | 47 ++++--- .../collections/ironschool/Model/Teacher.java | 35 ++++-- .../ironschool/Service/CourseService.java | 44 ++++++- .../ironschool/Service/StudentService.java | 48 +++++-- .../ironschool/Service/TeacherService.java | 49 ++++++-- .../ironschool/CourseControllerTest.java | 4 +- .../ironschool/CourseServiceTest.java | 3 +- 11 files changed, 379 insertions(+), 142 deletions(-) diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java index a86a66cb..be7869b6 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/CourseController.java @@ -2,6 +2,8 @@ import org.ironhack.collections.ironschool.Model.Course; import org.ironhack.collections.ironschool.Service.CourseService; +import org.ironhack.collections.ironschool.Service.TeacherService; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -11,16 +13,30 @@ public class CourseController { private final CourseService courseService; + private final TeacherService teacherService; - public CourseController(CourseService courseService) { + public CourseController(CourseService courseService, TeacherService teacherService) { this.courseService = courseService; + this.teacherService = teacherService; } + + @GetMapping("/profit") + public ResponseEntity showProfit() { + double totalEarned = courseService.getTotalMoneyEarned(); + double totalSpent = teacherService.getTotalTeacherSalary(); + double profit = totalEarned - totalSpent; + + return ResponseEntity.ok("Total profit: " + profit); + } + + @PostMapping - public Course createCourse(@RequestParam String name, @RequestParam double price) { - return courseService.createCourse(name, price); + public Course createCourse(@RequestBody Course course) { + return courseService.createCourse(course.getName(), course.getPrice()); } + @GetMapping public List showCourses() { return courseService.getAllCourses(); @@ -31,11 +47,27 @@ public Course lookUpCourse(@PathVariable String courseId) { return courseService.findCourse(courseId); } + + @PutMapping("/{courseId}") + public Course updateCourse(@PathVariable String courseId, @RequestBody Course updatedCourse) { + return courseService.updateCourse(courseId, updatedCourse.getName(), updatedCourse.getPrice()); + } + + @PutMapping("/{courseId}/teacher/{teacherId}") - public void assignTeacher(@PathVariable String courseId, - @PathVariable String teacherId) { - courseService.assignTeacher(courseId, teacherId); + public Course assignTeacher(@PathVariable String courseId, + @PathVariable String teacherId) { + return courseService.assignTeacher(courseId, teacherId); } + @DeleteMapping("/{courseId}") + public String deleteCourse(@PathVariable String courseId) { + Course course = courseService.findCourse(courseId); + if (course != null) { + courseService.deleteCourse(courseId); + return "Course " + course.getName() + " deleted successfully"; + } + return "Course ID not found"; + } } \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java index 473292ca..546f990b 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/StudentController.java @@ -11,53 +11,70 @@ @RestController @RequestMapping("/api/students") public class StudentController { - private final StudentService studentService; - private final CourseService courseService; - public StudentController(StudentService studentService, CourseService courseService){ - this.studentService=studentService; - this.courseService=courseService; - } - @GetMapping - public List displayAllStudents(){ - List students=studentService.getAllStudent(); - if(students==null || students.isEmpty()){ - System.out.println("No students found in the system"); - } - return students; - } - @GetMapping("/{id}") - public Student lookupStudent(@PathVariable String id){ - try{ - Student student=studentService.getStudentById(id); - if(student!=null){ - return student; - } - else{ - System.out.println("Student with ID " + id + " not found"); - return null; - } - } - catch(Exception e){ - System.out.println("Unexpected error happened: "+e.getMessage()); - return null; - } - } - - @PostMapping("/enroll") - public String enrollStudent(@RequestParam String id, @RequestParam String courseId) { - try { - String response = courseService.enrollStudent(courseId); - if (!response.equals("Course ID not found")) { - Student s = studentService.getStudentById(id); - if (s != null) { - s.setCourse(courseService.getCourseById(courseId)); - } - return "Success: " + s.getName() + " enrolled in " + courseId; - } - return response; - } catch (Exception e) { - return "Unexpected error happened " + e.getMessage(); - } - } - -} + private final StudentService studentService; + private final CourseService courseService; + + public StudentController(StudentService studentService, CourseService courseService){ + this.studentService = studentService; + this.courseService = courseService; + } + + @GetMapping + public List displayAllStudents(){ + List students = studentService.getAllStudent(); + if(students == null || students.isEmpty()){ + System.out.println("No students found in the system"); + } + return students; + } + + @GetMapping("/{id}") + public Student lookupStudent(@PathVariable String id){ + Student student = studentService.getStudentById(id); + if(student != null) return student; + System.out.println("Student with ID " + id + " not found"); + return null; + } + + + @PostMapping("/create") + public Student createStudent(@RequestBody Student student) { + return studentService.createStudent(student.getName(), student.getAddress(), student.getEmail()); + } + + @PostMapping("/enroll") + public String enrollStudent(@RequestParam String studentId, + @RequestParam String courseId) { + Student student = studentService.getStudentById(studentId); + if(student == null) return "Student ID not found"; + + return courseService.enrollStudent(student, courseId); + } + + @DeleteMapping("/{id}") + public String deleteStudent(@PathVariable String id) { + Student student = studentService.getStudentById(id); + if (student != null) { + studentService.deleteStudent(id); + return "Student " + student.getName() + " deleted successfully"; + } + return "Student ID not found"; + } + + + @PutMapping("/{id}") + public Student updateStudent(@PathVariable String id, @RequestBody Student updatedStudent) { + return studentService.updateStudent(id, + updatedStudent.getName(), + updatedStudent.getAddress(), + updatedStudent.getEmail()); + } + + @PatchMapping("/{id}") + public Student patchStudent(@PathVariable String id, @RequestBody Student updatedFields) { + return studentService.patchStudent(id, + updatedFields.getName(), + updatedFields.getAddress(), + updatedFields.getEmail()); + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java index 88d0d236..67008d5f 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Controller/TeacherController.java @@ -1,58 +1,68 @@ package org.ironhack.collections.ironschool.Controller; - import org.ironhack.collections.ironschool.Model.Teacher; import org.ironhack.collections.ironschool.Service.TeacherService; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @RestController @RequestMapping("/api/teachers") public class TeacherController { - private TeacherService teacherService; + + private final TeacherService teacherService; + public TeacherController(TeacherService teacherService){ - this.teacherService=teacherService; + this.teacherService = teacherService; } @GetMapping public List displayAllTeacher(){ - List teachers=teacherService.getAllTeacher(); - if(teachers==null || teachers.isEmpty()){ + List teachers = teacherService.getAllTeacher(); + if(teachers == null || teachers.isEmpty()){ System.out.println("No teachers found in system"); } return teachers; } @GetMapping("/{id}") - public Teacher lookupTeacher(@PathVariable("id") String teacherId){ - try{ - Teacher teacher=teacherService.getTeacherById(teacherId); - if(teacher!=null){ - return teacher; - } - else{ - System.out.println("Teacher with ID " + teacherId + " not found"); - return null; - } - } catch (Exception e) { - System.out.println("Unexpected error happened "+e.getMessage()); - return null; - } + public Teacher lookupTeacher(@PathVariable String id){ + Teacher teacher = teacherService.getTeacherById(id); + if(teacher != null) return teacher; + System.out.println("Teacher with ID " + id + " not found"); + return null; } @GetMapping("/total-salary") public double getTotalSalaryOfTeacher(){ - try{ - return teacherService.getTotalTeacherSalary(); - } - catch (Exception e) { - System.out.println("Error calculating total salary: " + e.getMessage()); - return 0; + return teacherService.getTotalTeacherSalary(); + } + + @PostMapping("/create") + public Teacher createTeacher(@RequestBody Teacher teacher) { + return teacherService.createTeacher(teacher.getName(), teacher.getSalary()); + } + + @DeleteMapping("/{id}") + public String deleteTeacher(@PathVariable String id) { + Teacher teacher = teacherService.getTeacherById(id); + if (teacher != null) { + teacherService.deleteTeacher(id); + return "Teacher " + teacher.getName() + " deleted successfully"; } + return "Teacher ID not found"; + } + + @PutMapping("/{id}") + public Teacher updateTeacher(@PathVariable String id, @RequestBody Teacher updatedTeacher) { + return teacherService.updateTeacher(id, updatedTeacher.getName(), updatedTeacher.getSalary()); + } + + + @PatchMapping("/{id}") + public Teacher patchTeacher(@PathVariable String id, @RequestBody Teacher updatedFields) { + return teacherService.patchTeacher(id, + updatedFields.getName(), + updatedFields.getSalary()); } -} +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java index 2b153ade..bf9f0e3a 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Course.java @@ -1,21 +1,35 @@ package org.ironhack.collections.ironschool.Model; +import jakarta.validation.constraints.*; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; public class Course { + private String courseId; + + @NotBlank(message = "Course name cannot be empty") private String name; + + @Min(value = 0, message = "Course price cannot be negative") private double price; + private double moneyEarned; private Teacher teacher; + private List students; - public Course(String name, double price) { + + public Course(@NotBlank(message = "Course name cannot be empty") String name, + @Min(value = 0, message = "Course price cannot be negative") double price) { this.courseId = UUID.randomUUID().toString(); this.name = name; this.price = price; this.moneyEarned = 0; + this.students = new ArrayList<>(); } + public String getCourseId() { return courseId; } @@ -36,11 +50,49 @@ public Teacher getTeacher() { return teacher; } + public List getStudents() { + return students; + } + + + public void setName(String name) { + this.name = name; + } + + public void setPrice(double price) { + this.price = price; + } + public void setTeacher(Teacher teacher) { this.teacher = teacher; } + public void setStudents(List students) { + this.students = students; + } + + + public void addStudent(Student student) { + if (student != null && !students.contains(student)) { + this.students.add(student); + student.setCourse(this); + } + } + + public void removeStudent(Student student) { + if (student != null) { + this.students.remove(student); + student.setCourse(null); + } + } + public void addMoneyEarned(double amount) { - this.moneyEarned += amount; + if (amount > 0) { + this.moneyEarned += amount; + } + } + + public void resetMoneyEarned() { + this.moneyEarned = 0; } -} +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java index 65a37026..9068074e 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Student.java @@ -1,16 +1,35 @@ package org.ironhack.collections.ironschool.Model; +import jakarta.validation.constraints.*; + +import java.util.UUID; + public class Student { + private String studentId; + + @NotBlank(message = "Student name cannot be empty") private String name; + private String address; + + @NotBlank(message = "Email cannot be empty") + @Email(message = "Email should be valid") private String email; + private Course course; - public Student(String name, String address, String email){ - this.studentId=java.util.UUID.randomUUID().toString(); - this.name=name; - this.address=address; - this.email=email; + + public Student(@NotBlank(message = "Student name cannot be empty") String name, + String address, + @NotBlank(message = "Email cannot be empty") @Email(message = "Email should be valid") String email) { + this.studentId = UUID.randomUUID().toString(); + this.name = name; + this.address = address; + this.email = email; + } + + public String getStudentId() { + return studentId; } public String getName() { @@ -21,18 +40,14 @@ public String getAddress() { return address; } - public String getStudentId() { - return studentId; + public String getEmail() { + return email; } public Course getCourse() { return course; } - public String getEmail() { - return email; - } - public void setName(String name) { this.name = name; } @@ -41,11 +56,11 @@ public void setAddress(String address) { this.address = address; } - public void setCourse(Course course) { - this.course = course; - } - public void setEmail(String email) { this.email = email; } -} + + public void setCourse(Course course) { + this.course = course; + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java index 5b8777c2..287b8363 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Model/Teacher.java @@ -1,16 +1,29 @@ package org.ironhack.collections.ironschool.Model; +import jakarta.validation.constraints.*; + import java.util.UUID; public class Teacher { - private String teacherId; - private String name; - private double salary; - public Teacher(String name, double salary){ - this.teacherId= UUID.randomUUID().toString(); - this.name=name; - this.salary=salary; - } + + private String teacherId; + + @NotBlank(message = "Teacher name cannot be empty") + private String name; + + @Min(value = 0, message = "Salary cannot be negative") + private double salary; + + public Teacher(@NotBlank(message = "Teacher name cannot be empty") String name, + @Min(value = 0, message = "Salary cannot be negative") double salary) { + this.teacherId = UUID.randomUUID().toString(); + this.name = name; + this.salary = salary; + } + + public String getTeacherId() { + return teacherId; + } public String getName() { return name; @@ -20,10 +33,6 @@ public double getSalary() { return salary; } - public String getTeacherId() { - return teacherId; - } - public void setName(String name) { this.name = name; } @@ -31,4 +40,4 @@ public void setName(String name) { public void setSalary(double salary) { this.salary = salary; } -} +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java index dd30ab3a..c2d1516b 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/CourseService.java @@ -1,6 +1,7 @@ package org.ironhack.collections.ironschool.Service; import org.ironhack.collections.ironschool.Model.Course; +import org.ironhack.collections.ironschool.Model.Student; import org.ironhack.collections.ironschool.Model.Teacher; import org.springframework.stereotype.Service; @@ -10,13 +11,14 @@ @Service public class CourseService { - private List courses = new ArrayList<>(); + private final List courses = new ArrayList<>(); private final TeacherService teacherService; public CourseService(TeacherService teacherService){ this.teacherService = teacherService; } + public Course createCourse(String name, double price){ Course course = new Course(name, price); courses.add(course); @@ -36,17 +38,51 @@ public Course findCourse(String courseId) { return null; } - public void assignTeacher(String courseId, String teacherId) { + public Course updateCourse(String courseId, String name, double price) { Course course = findCourse(courseId); - Teacher teacher = teacherService.findTeacher(teacherId); + if(course != null) { + course.setName(name); + course.setPrice(price); + } + return course; + } + + public Course assignTeacher(String courseId, String teacherId) { + Course course = findCourse(courseId); + Teacher teacher = teacherService.getTeacherById(teacherId); if(course != null && teacher != null) { course.setTeacher(teacher); } + return course; } - public void addCourseMoney(String courseId) { + + public String enrollStudent(Student student, String courseId) { Course course = findCourse(courseId); + if(course == null) return "Course ID not found"; + + course.addStudent(student); + student.setCourse(course); + course.addMoneyEarned(course.getPrice()); + return "Student " + student.getName() + " enrolled successfully in " + course.getName(); + } + + + public void deleteCourse(String courseId) { + courses.removeIf(course -> course.getCourseId().equals(courseId)); + } + + public double getTotalMoneyEarned() { + double total = 0; + for (Course course : courses) { + total += course.getMoneyEarned(); + } + return total; + } + + public void addCourseMoney(String courseId) { + Course course = findCourse(courseId); if(course != null) { course.addMoneyEarned(course.getPrice()); } diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java index e8f30c5c..3bd9879b 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/StudentService.java @@ -8,18 +8,50 @@ @Service public class StudentService { - private final List studentList=new ArrayList<>(); - public StudentService(){} - public List getAllStudent(){ + private final List studentList = new ArrayList<>(); + + public StudentService() {} + + public List getAllStudent() { return studentList; } - public Student getStudentById(String id){ - for(Student student:studentList){ - if(student.getStudentId().equals(id)){ + + public Student getStudentById(String id) { + for (Student student : studentList) { + if (student.getStudentId().equals(id)) { return student; } } return null; - } + } -} + public Student createStudent(String name, String address, String email) { + Student student = new Student(name, address, email); + studentList.add(student); + return student; + } + + public void deleteStudent(String id) { + studentList.removeIf(student -> student.getStudentId().equals(id)); + } + + public Student updateStudent(String id, String name, String address, String email) { + Student student = getStudentById(id); + if (student != null) { + student.setName(name); + student.setAddress(address); + student.setEmail(email); + } + return student; + } + + public Student patchStudent(String id, String name, String address, String email) { + Student student = getStudentById(id); + if (student != null) { + if (name != null) student.setName(name); + if (address != null) student.setAddress(address); + if (email != null) student.setEmail(email); + } + return student; + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java index 18e1fbdc..0669a274 100644 --- a/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java +++ b/ironschool/src/main/java/org/ironhack/collections/ironschool/Service/TeacherService.java @@ -8,28 +8,59 @@ @Service public class TeacherService { - private List teacherList=new ArrayList<>(); - public TeacherService(){}; + + private final List teacherList = new ArrayList<>(); + + public TeacherService() {} public List getAllTeacher() { return teacherList; } - public Teacher getTeacherById(String teacherId){ - for(Teacher teacher:teacherList) { + public Teacher getTeacherById(String teacherId){ + for(Teacher teacher : teacherList) { if (teacher.getTeacherId().equals(teacherId)) { return teacher; } } return null; } + + public Teacher createTeacher(String name, double salary) { + Teacher teacher = new Teacher(name, salary); + teacherList.add(teacher); + return teacher; + } + + public void deleteTeacher(String teacherId) { + teacherList.removeIf(teacher -> teacher.getTeacherId().equals(teacherId)); + } + + public Teacher updateTeacher(String id, String name, double salary) { + Teacher teacher = getTeacherById(id); + if (teacher != null) { + teacher.setName(name); + teacher.setSalary(salary); + } + return teacher; + } + + public Teacher patchTeacher(String id, String name, Double salary) { + Teacher teacher = getTeacherById(id); + if (teacher != null) { + if (name != null) teacher.setName(name); + if (salary != null) teacher.setSalary(salary); + } + return teacher; + } + public double getTotalTeacherSalary(){ - double total=0; - for(Teacher teacher:teacherList){ - if(teacher!=null){ - total+=teacher.getSalary(); + double total = 0; + for(Teacher teacher : teacherList){ + if(teacher != null){ + total += teacher.getSalary(); } } return total; } -} +} \ No newline at end of file diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java index f5532071..090fef67 100644 --- a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseControllerTest.java @@ -4,6 +4,7 @@ import org.ironhack.collections.ironschool.Controller.CourseController; import org.ironhack.collections.ironschool.Model.Course; import org.ironhack.collections.ironschool.Service.CourseService; +import org.ironhack.collections.ironschool.Service.TeacherService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -20,7 +21,8 @@ class CourseControllerTest { @BeforeEach void setup() { courseService = mock(CourseService.class); - courseController = new CourseController(courseService); + TeacherService teacherService = mock(TeacherService.class); + courseController = new CourseController(courseService, teacherService); } @Test diff --git a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java index 63b66525..026658ad 100644 --- a/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java +++ b/ironschool/src/test/java/org/ironhack/collections/ironschool/CourseServiceTest.java @@ -1,10 +1,11 @@ package org.ironhack.collections.ironschool; -package service; import org.ironhack.collections.ironschool.Model.Course; +import org.ironhack.collections.ironschool.Model.Teacher; import org.ironhack.collections.ironschool.Service.CourseService; +import org.ironhack.collections.ironschool.Service.TeacherService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;