From 96daa1767dc4ff62a8d0ff909cecc5c39acdb852 Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Fri, 6 Mar 2026 14:30:44 +0400 Subject: [PATCH 01/17] initialize project --- .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 | 69 ++++ .../ironschool/IronschoolApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../IronschoolApplicationTests.java | 13 + 17 files changed, 709 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/com/ironhack/ironschool/IronschoolApplication.java create mode 100644 ironschool/src/main/resources/application.properties create mode 100644 ironschool/src/test/java/com/ironhack/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..de8a14f5 --- /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..f45870c0 --- /dev/null +++ b/ironschool/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.0.3 + + + com.ironhack + ironschool + 0.0.1-SNAPSHOT + ironschool + Pet Store + + + + + + + + + + + + + + + 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-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/com/ironhack/ironschool/IronschoolApplication.java b/ironschool/src/main/java/com/ironhack/ironschool/IronschoolApplication.java new file mode 100644 index 00000000..1c2619af --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/IronschoolApplication.java @@ -0,0 +1,13 @@ +package com.ironhack.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/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/com/ironhack/ironschool/IronschoolApplicationTests.java b/ironschool/src/test/java/com/ironhack/ironschool/IronschoolApplicationTests.java new file mode 100644 index 00000000..6faca979 --- /dev/null +++ b/ironschool/src/test/java/com/ironhack/ironschool/IronschoolApplicationTests.java @@ -0,0 +1,13 @@ +package com.ironhack.ironschool; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class IronschoolApplicationTests { + + @Test + void contextLoads() { + } + +} From 93aeba880af9151976721000f96d038e8b4feea0 Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Fri, 6 Mar 2026 14:35:39 +0400 Subject: [PATCH 02/17] initialize classes --- .../src/main/java/com/ironhack/ironschool/classes/Course.java | 4 ++++ .../main/java/com/ironhack/ironschool/classes/Student.java | 4 ++++ .../main/java/com/ironhack/ironschool/classes/Teacher.java | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java new file mode 100644 index 00000000..8cf3ef89 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java @@ -0,0 +1,4 @@ +package com.ironhack.ironschool.classes; + +public class Course { +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java new file mode 100644 index 00000000..7a09eccf --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java @@ -0,0 +1,4 @@ +package com.ironhack.ironschool.classes; + +public class Student { +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java new file mode 100644 index 00000000..02ae09a9 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java @@ -0,0 +1,4 @@ +package com.ironhack.ironschool.classes; + +public class Teacher { +} From 22aef2d0fc0dc3cb52b15d1af356d4883495cb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Fri, 6 Mar 2026 14:45:14 +0400 Subject: [PATCH 03/17] Student model --- .idea/compiler.xml | 1 - .../ironhack/ironschool/classes/Course.java | 4 -- .../ironhack/ironschool/classes/Student.java | 4 -- .../ironhack/ironschool/classes/Teacher.java | 4 -- .../com/ironhack/ironschool/model/Course.java | 4 ++ .../ironhack/ironschool/model/Student.java | 55 +++++++++++++++++++ .../ironhack/ironschool/model/Teacher.java | 4 ++ 7 files changed, 63 insertions(+), 13 deletions(-) delete mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java delete mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java delete mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/model/Course.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/model/Student.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a5e723c8..04b20519 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,7 +6,6 @@ - diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java deleted file mode 100644 index 8cf3ef89..00000000 --- a/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ironhack.ironschool.classes; - -public class Course { -} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java deleted file mode 100644 index 7a09eccf..00000000 --- a/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ironhack.ironschool.classes; - -public class Student { -} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java deleted file mode 100644 index 02ae09a9..00000000 --- a/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ironhack.ironschool.classes; - -public class Teacher { -} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java new file mode 100644 index 00000000..edf12cc5 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java @@ -0,0 +1,4 @@ +package com.ironhack.ironschool.model; + +public class Course { +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java new file mode 100644 index 00000000..5f63b522 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -0,0 +1,55 @@ +package com.ironhack.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.name = name; + this.address = address; + this.email = email; + } + + public String getStudentId() { + return studentId; + } + + public void setStudentId(String studentId) { + this.studentId = studentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Course getCourse() { + return course; + } + + public void setCourse(Course course) { + this.course = course; + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java new file mode 100644 index 00000000..bd616fc2 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java @@ -0,0 +1,4 @@ +package com.ironhack.ironschool.model; + +public class Teacher { +} From 2484eb69f562d1726a7e800d64a4e50fd0c7639e Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Fri, 6 Mar 2026 14:46:12 +0400 Subject: [PATCH 04/17] Course class is finished --- .../ironhack/ironschool/classes/Course.java | 4 -- .../ironhack/ironschool/classes/Student.java | 4 -- .../ironhack/ironschool/classes/Teacher.java | 4 -- .../com/ironhack/ironschool/model/Course.java | 63 +++++++++++++++++++ .../ironhack/ironschool/model/Student.java | 4 ++ .../ironhack/ironschool/model/Teacher.java | 4 ++ 6 files changed, 71 insertions(+), 12 deletions(-) delete mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java delete mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java delete mode 100644 ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/model/Course.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/model/Student.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java deleted file mode 100644 index 8cf3ef89..00000000 --- a/ironschool/src/main/java/com/ironhack/ironschool/classes/Course.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ironhack.ironschool.classes; - -public class Course { -} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java deleted file mode 100644 index 7a09eccf..00000000 --- a/ironschool/src/main/java/com/ironhack/ironschool/classes/Student.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ironhack.ironschool.classes; - -public class Student { -} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java deleted file mode 100644 index 02ae09a9..00000000 --- a/ironschool/src/main/java/com/ironhack/ironschool/classes/Teacher.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.ironhack.ironschool.classes; - -public class Teacher { -} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java new file mode 100644 index 00000000..9bf4993c --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java @@ -0,0 +1,63 @@ +package com.ironhack.ironschool.model; + +import java.util.Random; + +public class Course { + private String courseId = generateCourseId(); + private String name; + private double price; + private double moneyEarned; + private Teacher teacher; + + public Course(String name, double price) { + this.name = name; + this.price = price; + this.moneyEarned = 0; + } + + public String getCourseId() { + return courseId; + } + + public void setCourseId(String courseId) { + this.courseId = courseId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } + + public double getMoneyEarned() { + return moneyEarned; + } + + public void setMoneyEarned(double moneyEarned) { + this.moneyEarned = moneyEarned; + } + + public Teacher getTeacher() { + return teacher; + } + + public void setTeacher(Teacher teacher) { + this.teacher = teacher; + } + public String generateCourseId(){ + Random random = new Random(); + String coursePrefix = "COU"; + int number = 1000 + random.nextInt(9000); + return coursePrefix + "-" + number; + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java new file mode 100644 index 00000000..ea9e1dce --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -0,0 +1,4 @@ +package com.ironhack.ironschool.model; + +public class Student { +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java new file mode 100644 index 00000000..bd616fc2 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java @@ -0,0 +1,4 @@ +package com.ironhack.ironschool.model; + +public class Teacher { +} From b0b34637bc3c904d001bcd165188d54d98aa1c83 Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Fri, 6 Mar 2026 14:50:45 +0400 Subject: [PATCH 05/17] merged with course --- .../com/ironhack/ironschool/model/Course.java | 60 +++++++++++++++++++ .../ironhack/ironschool/model/Student.java | 53 +++++++++++++++- 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java index edf12cc5..0f277c18 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java @@ -1,4 +1,64 @@ package com.ironhack.ironschool.model; +import java.util.Random; + public class Course { + private String courseId = generateCourseId(); + private String name; + private double price; + private double moneyEarned; + private Teacher teacher; + + public Course(String name, double price) { + this.name = name; + this.price = price; + this.moneyEarned = 0; + } + + public String getCourseId() { + return courseId; + } + + public void setCourseId(String courseId) { + this.courseId = courseId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } + + public double getMoneyEarned() { + return moneyEarned; + } + + public void setMoneyEarned(double moneyEarned) { + this.moneyEarned = moneyEarned; + } + + public Teacher getTeacher() { + return teacher; + } + + public void setTeacher(Teacher teacher) { + this.teacher = teacher; + } + + public String generateCourseId() { + Random random = new Random(); + String coursePrefix = "COU"; + int number = 1000 + random.nextInt(9000); + return coursePrefix + "-" + number; + } } diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java index ea9e1dce..55c3217f 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -1,4 +1,55 @@ package com.ironhack.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.name = name; + this.address = address; + this.email = email; + } + + public String getStudentId() { + return studentId; + } + + public void setStudentId(String studentId) { + this.studentId = studentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Course getCourse() { + return course; + } + + public void setCourse(Course course) { + this.course = course; + } +} \ No newline at end of file From dac0fa604557b02d785c95b34e892155ab2102b0 Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Fri, 6 Mar 2026 14:58:43 +0400 Subject: [PATCH 06/17] Done models and corrected id generators --- .../com/ironhack/ironschool/model/Course.java | 3 +- .../ironhack/ironschool/model/Student.java | 9 ++++ .../ironhack/ironschool/model/Teacher.java | 42 +++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java index 0f277c18..55f02fdd 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java @@ -3,13 +3,14 @@ import java.util.Random; public class Course { - private String courseId = generateCourseId(); + private String courseId; private String name; private double price; private double moneyEarned; private Teacher teacher; public Course(String name, double price) { + this.courseId = generateCourseId(); this.name = name; this.price = price; this.moneyEarned = 0; diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java index 55c3217f..46beeae7 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -1,5 +1,7 @@ package com.ironhack.ironschool.model; +import java.util.Random; + public class Student { private String studentId; private String name; @@ -8,6 +10,7 @@ public class Student { private Course course; public Student(String name, String address, String email) { + this.studentId = generateStudentId(); this.name = name; this.address = address; this.email = email; @@ -52,4 +55,10 @@ public Course getCourse() { public void setCourse(Course course) { this.course = course; } + public String generateStudentId() { + Random random = new Random(); + String coursePrefix = "STU"; + int number = 1000 + random.nextInt(9000); + return coursePrefix + "-" + number; + } } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java index bd616fc2..18becbef 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java @@ -1,4 +1,46 @@ package com.ironhack.ironschool.model; +import java.util.Random; + public class Teacher { + private String teacherId; + private String name; + private double salary; + + public Teacher(String name, double salary) { + this.teacherId = generateTeacherId(); + this.name = name; + this.salary = salary; + } + + public String generateTeacherId() { + Random random = new Random(); + String coursePrefix = "TEA"; + int number = 1000 + random.nextInt(9000); + return coursePrefix + "-" + number; + } + + public String getTeacherId() { + return teacherId; + } + + public void setTeacherId(String teacherId) { + this.teacherId = teacherId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } } From fc4071011d5736122d74a162732df79abfb97725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Fri, 6 Mar 2026 15:14:30 +0400 Subject: [PATCH 07/17] Service classes are finished --- .../ironhack/ironschool/model/Student.java | 42 ++++++---- .../ironhack/ironschool/model/Teacher.java | 41 +++++---- .../ironschool/service/CourseService.java | 84 +++++++++++++++++++ .../ironschool/service/StudentService.java | 34 ++++++++ .../ironschool/service/TeacherService.java | 34 ++++++++ 5 files changed, 200 insertions(+), 35 deletions(-) create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java index 46beeae7..01a46820 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -3,6 +3,7 @@ import java.util.Random; public class Student { + private String studentId; private String name; private String address; @@ -10,7 +11,7 @@ public class Student { private Course course; public Student(String name, String address, String email) { - this.studentId = generateStudentId(); + studentId=generateStudentId(); this.name = name; this.address = address; this.email = email; @@ -20,41 +21,48 @@ public String getStudentId() { return studentId; } - public void setStudentId(String studentId) { - this.studentId = studentId; - } - public String getName() { return name; } - public void setName(String name) { - this.name = name; - } - public String getAddress() { return address; } - public void setAddress(String address) { - this.address = address; - } - public String getEmail() { return email; } - public void setEmail(String email) { - this.email = email; - } - public Course getCourse() { return course; } + public void setName(String name) { + this.name = name; + } + + public void setAddress(String address) { + this.address = address; + } + + public void setEmail(String email) { + this.email = email; + } + public void setCourse(Course course) { this.course = course; } + + @Override + public String toString() { + return "Student{" + + "studentId='" + studentId + '\'' + + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", email='" + email + '\'' + + ", course=" + (course != null ? course.getName() : "None") + + '}'; + } public String generateStudentId() { Random random = new Random(); String coursePrefix = "STU"; diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java index 18becbef..bb4afd79 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java @@ -1,46 +1,51 @@ package com.ironhack.ironschool.model; - import java.util.Random; +import java.util.UUID; public class Teacher { + private String teacherId; private String name; private double salary; public Teacher(String name, double salary) { - this.teacherId = generateTeacherId(); + teacherId=generateTeacherId(); this.name = name; this.salary = salary; } - public String generateTeacherId() { - Random random = new Random(); - String coursePrefix = "TEA"; - int number = 1000 + random.nextInt(9000); - return coursePrefix + "-" + number; - } - public String getTeacherId() { return teacherId; } - public void setTeacherId(String teacherId) { - this.teacherId = teacherId; - } - public String getName() { return name; } - public void setName(String name) { - this.name = name; - } - public double getSalary() { return salary; } + public void setName(String name) { + this.name = name; + } + public void setSalary(double salary) { this.salary = salary; } -} + + @Override + public String toString() { + return "Teacher{" + + "teacherId='" + teacherId + '\'' + + ", name='" + name + '\'' + + ", salary=" + salary + + '}'; + } + public String generateTeacherId() { + Random random = new Random(); + String coursePrefix = "TEA"; + int number = 1000 + random.nextInt(9000); + return coursePrefix + "-" + number; + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java new file mode 100644 index 00000000..820bf0f2 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -0,0 +1,84 @@ +package com.ironhack.ironschool.service; + +import com.ironhack.ironschool.model.Course; +import com.ironhack.ironschool.model.Teacher; + +import java.util.HashMap; +import java.util.Map; + +public class CourseService { + + private Map courses = new HashMap<>(); + + public void addCourse(Course course){ + courses.put(course.getCourseId(), course); + } + + public Course findCourseById(String courseId){ + return courses.get(courseId); + } + + public void assignTeacher(String courseId, Teacher teacher){ + Course course = courses.get(courseId); + + if(course != null){ + course.setTeacher(teacher); + } + } + + public void addMoney(String courseId){ + Course course = courses.get(courseId); + + if(course != null){ + course.setMoneyEarned( + course.getMoneyEarned() + course.getPrice() + ); + } + } + + public void showCourses(){ + for(Course course : courses.values()){ + System.out.println( + course.getCourseId() + " " + + course.getName() + " " + + course.getPrice() + ); + } + } + + public void lookupCourse(String courseId){ + + Course course = courses.get(courseId); + + if(course == null){ + System.out.println("Course not found"); + return; + } + + System.out.println("Course ID: " + course.getCourseId()); + System.out.println("Name: " + course.getName()); + System.out.println("Price: " + course.getPrice()); + System.out.println("Money Earned: " + course.getMoneyEarned()); + + if(course.getTeacher() != null){ + System.out.println("Teacher: " + course.getTeacher().getName()); + } else { + System.out.println("Teacher: None"); + } + } + + public double getTotalEarned(){ + + double total = 0; + + for(Course course : courses.values()){ + total += course.getMoneyEarned(); + } + + return total; + } + + public Map getCourses(){ + return courses; + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java new file mode 100644 index 00000000..1e259bdb --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -0,0 +1,34 @@ +package com.ironhack.ironschool.service; + +import com.ironhack.ironschool.model.Student; + +import java.util.ArrayList; +import java.util.List; + +public class StudentService { + + private List students = new ArrayList<>(); + + public void addStudent(Student student){ + students.add(student); + } + + public Student findStudentById(String studentId){ + for(Student s : students){ + if(s.getStudentId().equals(studentId)){ + return s; + } + } + return null; + } + + public List getAllStudents(){ + return students; + } + + public void showStudents(){ + for(Student s : students){ + System.out.println(s); + } + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java new file mode 100644 index 00000000..42ce4efa --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -0,0 +1,34 @@ +package com.ironhack.ironschool.service; + +import com.ironhack.ironschool.model.Teacher; + +import java.util.ArrayList; +import java.util.List; + +public class TeacherService { + + private List teachers = new ArrayList<>(); + + public void addTeacher(Teacher teacher){ + teachers.add(teacher); + } + + public Teacher findTeacherById(String teacherId){ + for(Teacher t : teachers){ + if(t.getTeacherId().equals(teacherId)){ + return t; + } + } + return null; + } + + public List getAllTeachers(){ + return teachers; + } + + public void showTeachers(){ + for(Teacher t : teachers){ + System.out.println(t); + } + } +} \ No newline at end of file From 41eb66a6eede83d397fe8b4e15498e4f7f45bbce Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Fri, 6 Mar 2026 15:24:07 +0400 Subject: [PATCH 08/17] created simple menu --- .../ironhack/ironschool/menu/ConsoleMenu.java | 61 +++++++++++++++++++ .../ironschool/service/CourseService.java | 3 +- .../ironschool/service/StudentService.java | 3 +- .../ironschool/service/TeacherService.java | 3 +- 4 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java diff --git a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java new file mode 100644 index 00000000..ccdb6380 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java @@ -0,0 +1,61 @@ +package com.ironhack.ironschool.menu; + +import com.ironhack.ironschool.service.CourseService; +import com.ironhack.ironschool.service.StudentService; +import com.ironhack.ironschool.service.TeacherService; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; + +import java.util.Scanner; + +@Component +// We implement CommandLineRunner because we need to work with console +public class ConsoleMenu implements CommandLineRunner { + private Scanner scanner = new Scanner(System.in); + private final TeacherService teacherService; + private final CourseService courseService; + private final StudentService studentService; + public ConsoleMenu (TeacherService teacherService, + CourseService courseService, + StudentService studentService){ + this.teacherService = teacherService; + this.courseService = courseService; + this.studentService = studentService; + } + @Override + public void run (String... args){ + boolean isRunning = true; + System.out.println("=================================================="); + System.out.println(" WELCOME "); + System.out.println(" TO "); + System.out.println(" IRONSCHOOL "); + System.out.println("=================================================="); + while (isRunning){ + System.out.println("Choose option:"); + System.out.println("1. Course's commands"); + System.out.println("2. Teacher's commands"); + System.out.println("3. 's commands"); + System.out.println("4. Exit"); + System.out.print("Choosing (1-4): "); + int choice = scanner.nextInt(); + System.out.println(); + switch (choice){ + case 1: + System.out.println("Creating course..."); + break; + case 2: + System.out.println("Creating teacher..."); + break; + case 3: + System.out.println("Creating student"); + break; + case 4: + System.out.println("Closing menu..."); + isRunning=false; + break; + default: + System.out.println("Invalid option. Choose 1-4!"); + } + } + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java index 820bf0f2..e84c19c2 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -2,10 +2,11 @@ import com.ironhack.ironschool.model.Course; import com.ironhack.ironschool.model.Teacher; +import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; - +@Service public class CourseService { private Map courses = new HashMap<>(); diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java index 1e259bdb..2b420cb2 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -1,10 +1,11 @@ package com.ironhack.ironschool.service; import com.ironhack.ironschool.model.Student; +import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; - +@Service public class StudentService { private List students = new ArrayList<>(); diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java index 42ce4efa..311501cc 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -1,10 +1,11 @@ package com.ironhack.ironschool.service; import com.ironhack.ironschool.model.Teacher; +import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; - +@Service public class TeacherService { private List teachers = new ArrayList<>(); From 8bde91f34eee2bd57b77c5380b19750dd14df1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Fri, 6 Mar 2026 15:42:48 +0400 Subject: [PATCH 09/17] Exceptions added --- .../ironschool/exception/InvalidCommandException.java | 7 +++++++ .../ironschool/exception/InvalidInputException.java | 7 +++++++ .../ironschool/exception/ResourceNotFoundException.java | 7 +++++++ .../exception/StudentAlreadyEnrolledException.java | 7 +++++++ .../exception/TeacherAlreadyAssignedException.java | 7 +++++++ .../com/ironhack/ironschool/service/CourseService.java | 3 ++- .../com/ironhack/ironschool/service/StudentService.java | 3 ++- .../com/ironhack/ironschool/service/TeacherService.java | 3 ++- 8 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidCommandException.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidInputException.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/exception/ResourceNotFoundException.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/exception/StudentAlreadyEnrolledException.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/exception/TeacherAlreadyAssignedException.java diff --git a/ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidCommandException.java b/ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidCommandException.java new file mode 100644 index 00000000..e5fa4b48 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidCommandException.java @@ -0,0 +1,7 @@ +package com.ironhack.ironschool.exception; + +public class InvalidCommandException extends RuntimeException { + public InvalidCommandException(String message) { + super(message); + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidInputException.java b/ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidInputException.java new file mode 100644 index 00000000..4367732e --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/exception/InvalidInputException.java @@ -0,0 +1,7 @@ +package com.ironhack.ironschool.exception; + +public class InvalidInputException extends RuntimeException { + public InvalidInputException(String message) { + super(message); + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/exception/ResourceNotFoundException.java b/ironschool/src/main/java/com/ironhack/ironschool/exception/ResourceNotFoundException.java new file mode 100644 index 00000000..c68276f7 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/exception/ResourceNotFoundException.java @@ -0,0 +1,7 @@ +package com.ironhack.ironschool.exception; + +public class ResourceNotFoundException extends RuntimeException { + public ResourceNotFoundException(String message) { + super(message); + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/exception/StudentAlreadyEnrolledException.java b/ironschool/src/main/java/com/ironhack/ironschool/exception/StudentAlreadyEnrolledException.java new file mode 100644 index 00000000..b4a508c1 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/exception/StudentAlreadyEnrolledException.java @@ -0,0 +1,7 @@ +package com.ironhack.ironschool.exception; + +public class StudentAlreadyEnrolledException extends RuntimeException { + public StudentAlreadyEnrolledException(String message) { + super(message); + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/exception/TeacherAlreadyAssignedException.java b/ironschool/src/main/java/com/ironhack/ironschool/exception/TeacherAlreadyAssignedException.java new file mode 100644 index 00000000..dea5f096 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/exception/TeacherAlreadyAssignedException.java @@ -0,0 +1,7 @@ +package com.ironhack.ironschool.exception; + +public class TeacherAlreadyAssignedException extends RuntimeException { + public TeacherAlreadyAssignedException(String message) { + super(message); + } +} diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java index 820bf0f2..e84c19c2 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -2,10 +2,11 @@ import com.ironhack.ironschool.model.Course; import com.ironhack.ironschool.model.Teacher; +import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.Map; - +@Service public class CourseService { private Map courses = new HashMap<>(); diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java index 1e259bdb..2b420cb2 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -1,10 +1,11 @@ package com.ironhack.ironschool.service; import com.ironhack.ironschool.model.Student; +import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; - +@Service public class StudentService { private List students = new ArrayList<>(); diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java index 42ce4efa..311501cc 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -1,10 +1,11 @@ package com.ironhack.ironschool.service; import com.ironhack.ironschool.model.Teacher; +import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; - +@Service public class TeacherService { private List teachers = new ArrayList<>(); From 5794752743561eb53bf7cc83f9b29c9df8fad3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Fri, 6 Mar 2026 16:40:19 +0400 Subject: [PATCH 10/17] Exceptions fixed --- .../ironhack/ironschool/model/Student.java | 1 - .../ironschool/service/StudentService.java | 34 +++++------ .../ironschool/service/TeacherService.java | 33 +++++------ .../ironschool/StudentServiceTest.java | 52 +++++++++++++++++ .../ironschool/TeacherServiceTest.java | 58 +++++++++++++++++++ 5 files changed, 140 insertions(+), 38 deletions(-) create mode 100644 ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java create mode 100644 ironschool/src/test/java/com/ironhack/ironschool/TeacherServiceTest.java diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java index 01a46820..38fab88c 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -3,7 +3,6 @@ import java.util.Random; public class Student { - private String studentId; private String name; private String address; diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java index 2b420cb2..6a0d5b21 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -1,34 +1,30 @@ package com.ironhack.ironschool.service; +import com.ironhack.ironschool.exception.ResourceNotFoundException; import com.ironhack.ironschool.model.Student; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; + @Service public class StudentService { - private List students = new ArrayList<>(); - - public void addStudent(Student student){ - students.add(student); + private Map students = new HashMap<>(); + public void addStudent(Student student) { + students.put(student.getStudentId(), student); } - - public Student findStudentById(String studentId){ - for(Student s : students){ - if(s.getStudentId().equals(studentId)){ - return s; - } + public Student findStudentById(String studentId) { + Student student = students.get(studentId); + if (student == null) { + throw new ResourceNotFoundException("Student not found"); } - return null; + return student; } - - public List getAllStudents(){ - return students; + public List getAllStudents() { + return new ArrayList<>(students.values()); } - - public void showStudents(){ - for(Student s : students){ + public void showStudents() { + for (Student s : students.values()) { System.out.println(s); } } diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java index 311501cc..9f846736 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -1,34 +1,31 @@ package com.ironhack.ironschool.service; import com.ironhack.ironschool.model.Teacher; +import com.ironhack.ironschool.exception.ResourceNotFoundException; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; +import java.util.*; + @Service public class TeacherService { - private List teachers = new ArrayList<>(); - - public void addTeacher(Teacher teacher){ - teachers.add(teacher); + private Map teachers = new HashMap<>(); + public void addTeacher(Teacher teacher) { + teachers.put(teacher.getTeacherId(), teacher); } - public Teacher findTeacherById(String teacherId){ - for(Teacher t : teachers){ - if(t.getTeacherId().equals(teacherId)){ - return t; - } + public Teacher findTeacherById(String teacherId) { + Teacher teacher = teachers.get(teacherId); + if (teacher == null) { + throw new ResourceNotFoundException("Teacher not found"); } - return null; + return teacher; } - - public List getAllTeachers(){ - return teachers; + public List getAllTeachers() { + return new ArrayList<>(teachers.values()); } - - public void showTeachers(){ - for(Teacher t : teachers){ + public void showTeachers() { + for (Teacher t : teachers.values()) { System.out.println(t); } } diff --git a/ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java b/ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java new file mode 100644 index 00000000..18f2d788 --- /dev/null +++ b/ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java @@ -0,0 +1,52 @@ +package com.ironhack.ironschool; + +import com.ironhack.ironschool.exception.ResourceNotFoundException; +import com.ironhack.ironschool.model.Student; +import com.ironhack.ironschool.service.StudentService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + + +public class StudentServiceTest { + private Student student; + private StudentService studentService; + @BeforeEach + void setUp(){ + student=new Student("Miko","Khirdalan 125","miko@gmail.com"); + studentService=new StudentService(); + } + @Test + void addStudent_validData_addStudentToMap(){ + Student student=new Student("Mikayil","Khirdalan 129","miko44@gmail.com"); + studentService.addStudent(student); + assertEquals(student,studentService.findStudentById(student.getStudentId())); + } + @Test + void findStudentById_studentNotExists_throwsException(){ + assertThrows(ResourceNotFoundException.class, () -> { + studentService.findStudentById("non-existing-id"); + }); + } + @Test + void findStudentById_studentExists_returnsData(){ + studentService.addStudent(student); + assertEquals(student,studentService.findStudentById(student.getStudentId())); + } + @Test + void getAllStudents_returnsAllStudents() { + Student s1 = new Student("Alice", "Street 1", "alice@gmail.com"); + Student s2 = new Student("Bob", "Street 2", "bob@gmail.com"); + + studentService.addStudent(s1); + studentService.addStudent(s2); + + List all = studentService.getAllStudents(); + assertEquals(2, all.size()); + assertTrue(all.contains(s1)); + assertTrue(all.contains(s2)); + } +} diff --git a/ironschool/src/test/java/com/ironhack/ironschool/TeacherServiceTest.java b/ironschool/src/test/java/com/ironhack/ironschool/TeacherServiceTest.java new file mode 100644 index 00000000..e9d1610e --- /dev/null +++ b/ironschool/src/test/java/com/ironhack/ironschool/TeacherServiceTest.java @@ -0,0 +1,58 @@ +package com.ironhack.ironschool; + +import com.ironhack.ironschool.exception.ResourceNotFoundException; +import com.ironhack.ironschool.model.Teacher; +import com.ironhack.ironschool.service.TeacherService; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; + +public class TeacherServiceTest { + + private TeacherService teacherService; + private Teacher teacher; + + @BeforeEach + void setUp() { + teacherService = new TeacherService(); + teacher = new Teacher("Nurlana Huseynova", 2000.0); + } + + @Test + void addTeacher_validData_addsTeacherToMap() { + teacherService.addTeacher(teacher); + assertEquals(teacher, teacherService.findTeacherById(teacher.getTeacherId())); + } + + @Test + void findTeacherById_teacherExists_returnsTeacher() { + teacherService.addTeacher(teacher); + assertEquals(teacher, teacherService.findTeacherById(teacher.getTeacherId())); + } + + @Test + void findTeacherById_teacherNotExists_throwsException() { + assertThrows(ResourceNotFoundException.class, () -> + teacherService.findTeacherById("non-existing-id") + ); + } + + @Test + void getAllTeachers_returnsAllTeachers() { + Teacher t1 = new Teacher("Alice", 78); + Teacher t2 = new Teacher("Bob", 31); + + teacherService.addTeacher(t1); + teacherService.addTeacher(t2); + + List all = teacherService.getAllTeachers(); + assertEquals(2, all.size()); + assertTrue(all.contains(t1)); + assertTrue(all.contains(t2)); + } + + // Optional: showTeachers prints to console; test using System.out capture if needed +} \ No newline at end of file From 4870d9a2c9cea883f9d9e74aab4ec930746f7b54 Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Fri, 6 Mar 2026 16:46:22 +0400 Subject: [PATCH 11/17] Added first part of menu --- .../ironhack/ironschool/menu/ConsoleMenu.java | 174 +++++++++++++++--- .../ironhack/ironschool/model/Student.java | 3 + .../ironhack/ironschool/model/Teacher.java | 2 +- 3 files changed, 153 insertions(+), 26 deletions(-) diff --git a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java index ccdb6380..31da257c 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java @@ -1,11 +1,21 @@ package com.ironhack.ironschool.menu; +import com.ironhack.ironschool.exception.InvalidCommandException; +import com.ironhack.ironschool.exception.InvalidInputException; +import com.ironhack.ironschool.exception.TeacherAlreadyAssignedException; +import com.ironhack.ironschool.model.Course; +import com.ironhack.ironschool.model.Student; +import com.ironhack.ironschool.model.Teacher; import com.ironhack.ironschool.service.CourseService; import com.ironhack.ironschool.service.StudentService; import com.ironhack.ironschool.service.TeacherService; +import jakarta.validation.Valid; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; import java.util.Scanner; @Component @@ -22,40 +32,154 @@ public ConsoleMenu (TeacherService teacherService, this.courseService = courseService; this.studentService = studentService; } + private Map teachers = new HashMap<>(); + private Map courses = new HashMap<>(); + private Map students = new HashMap<>(); @Override public void run (String... args){ boolean isRunning = true; System.out.println("=================================================="); System.out.println(" WELCOME "); System.out.println(" TO "); - System.out.println(" IRONSCHOOL "); + System.out.println(" SYSTEM "); System.out.println("=================================================="); - while (isRunning){ - System.out.println("Choose option:"); - System.out.println("1. Course's commands"); - System.out.println("2. Teacher's commands"); - System.out.println("3. 's commands"); - System.out.println("4. Exit"); - System.out.print("Choosing (1-4): "); - int choice = scanner.nextInt(); +//========================== Assigning school name ========================== + System.out.print("Enter school name: "); + String schoolName = scanner.nextLine(); +// ========================== Initialize teachers ========================== + System.out.print("\n How many teachers?: "); + int teachersCount = scanner.nextInt(); + scanner.nextLine(); + for(int i=0; i Date: Sun, 8 Mar 2026 21:58:08 +0400 Subject: [PATCH 12/17] Added or changed services and added ASSIGN [TEACHER_ID] [COURSE_ID] command to console --- .idea/compiler.xml | 1 + .../ironhack/ironschool/menu/ConsoleMenu.java | 23 +++++++++++++++---- .../com/ironhack/ironschool/model/Course.java | 2 ++ .../ironschool/service/CourseService.java | 12 +++++++--- .../ironschool/service/StudentService.java | 14 ++++++++++- .../ironschool/service/TeacherService.java | 3 +++ 6 files changed, 47 insertions(+), 8 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 04b20519..a5e723c8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,6 +6,7 @@ + diff --git a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java index 31da257c..b4cebfed 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java @@ -68,7 +68,7 @@ public void run (String... args){ if (teacher.getName().length() <= 3) { throw new InvalidInputException("Teacher's name can not be less 3 letters."); } - teachers.put(teacher.getTeacherId(), teacher); + teacherService.addTeacher(teacher); System.out.println("Teacher created: " + teacher.getTeacherId() + " - " + teacher.getName()); } catch (InvalidInputException e) { System.out.println(e.getMessage()); @@ -101,7 +101,7 @@ public void run (String... args){ if (course.getPrice() < 0.00) { throw new InvalidInputException("Course's price can not be negative."); } - courses.put(course.getCourseId(), course); + courseService.addCourse(course); System.out.println("Course created: " + course.getCourseId() + " - " + course.getName()); } catch (InvalidInputException e) { System.out.println(e.getMessage()); @@ -139,7 +139,7 @@ public void run (String... args){ if (!student.getEmail().contains("@")) { throw new InvalidInputException("Student's email is probably invalid."); } - students.put(student.getStudentId(), student); + studentService.addStudent(student); System.out.println("Student created: " + student.getStudentId() + " - " + student.getName()); } catch (InvalidInputException e) { System.out.println(e.getMessage()); @@ -150,7 +150,7 @@ public void run (String... args){ System.out.println("Setup is done! Open the console!"); //======================= Main Console ========================== while (isRunning) { - System.out.print("Console:"); + System.out.print("Console: "); String command = scanner.nextLine().trim(); System.out.println(); if (command.isEmpty()) continue; @@ -168,6 +168,21 @@ public void run (String... args){ if (!courses.containsKey(partsOfCommand[2])) { throw new InvalidCommandException("Course with ID " + partsOfCommand[2] + " does not exist."); } + studentService.enrollStudentToCourse(partsOfCommand[1], partsOfCommand[2]); + break; + case "ASSIGN": + if (partsOfCommand.length != 3) { + throw new InvalidCommandException("Usage: ASSIGN [TEACHER_ID] [COURSE_ID]"); + } + if (!teachers.containsKey(partsOfCommand[1])) { + throw new InvalidCommandException("Teacher with ID " + partsOfCommand[1] + " does not exist."); + } + if (!courses.containsKey(partsOfCommand[2])) { + throw new InvalidCommandException("Course with ID " + partsOfCommand[2] + " does not exist."); + } + courseService.assignTeacher(partsOfCommand[1], partsOfCommand[2]); + break; + case "EXIT": isRunning = false; System.out.println("Closing console..."); diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java index 55f02fdd..8016fd0c 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java @@ -62,4 +62,6 @@ public String generateCourseId() { int number = 1000 + random.nextInt(9000); return coursePrefix + "-" + number; } + + } diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java index e84c19c2..61d40e2b 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -8,7 +8,10 @@ import java.util.Map; @Service public class CourseService { - + public final TeacherService teacherService; + public CourseService(TeacherService teacherService){ + this.teacherService = teacherService; + } private Map courses = new HashMap<>(); public void addCourse(Course course){ @@ -19,11 +22,11 @@ public Course findCourseById(String courseId){ return courses.get(courseId); } - public void assignTeacher(String courseId, Teacher teacher){ + public void assignTeacher(String courseId, String teacherId){ Course course = courses.get(courseId); if(course != null){ - course.setTeacher(teacher); + course.setTeacher(teacherService.getTeacher(teacherId)); } } @@ -82,4 +85,7 @@ public double getTotalEarned(){ public Map getCourses(){ return courses; } + public Course getCourse(String courseId){ + return courses.get(courseId); + } } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java index 6a0d5b21..317b5dee 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -1,6 +1,7 @@ package com.ironhack.ironschool.service; import com.ironhack.ironschool.exception.ResourceNotFoundException; +import com.ironhack.ironschool.model.Course; import com.ironhack.ironschool.model.Student; import org.springframework.stereotype.Service; @@ -8,7 +9,10 @@ @Service public class StudentService { - + public final CourseService courseService; + public StudentService(CourseService courseService){ + this.courseService = courseService; + } private Map students = new HashMap<>(); public void addStudent(Student student) { students.put(student.getStudentId(), student); @@ -28,4 +32,12 @@ public void showStudents() { System.out.println(s); } } +// Enroll student to course + public void enrollStudentToCourse(String studentId, String courseId){ + Student student = students.get(studentId); + student.setCourse(courseService.getCourse(courseId)); + + courseService.addMoney(courseId); + } + } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java index 9f846736..14dfd5b5 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -24,6 +24,9 @@ public Teacher findTeacherById(String teacherId) { public List getAllTeachers() { return new ArrayList<>(teachers.values()); } + public Teacher getTeacher(String teacherId){ + return teachers.get(teacherId); + } public void showTeachers() { for (Teacher t : teachers.values()) { System.out.println(t); From af003d9f4ced67dabf24804ddf5eae473c25b73c Mon Sep 17 00:00:00 2001 From: BillerPlay Date: Sun, 8 Mar 2026 22:18:50 +0400 Subject: [PATCH 13/17] Added new services, console is completed --- .../ironhack/ironschool/menu/ConsoleMenu.java | 55 +++++++++++++++++++ .../ironschool/service/CourseService.java | 4 -- .../ironschool/service/StudentService.java | 25 ++++++++- .../ironschool/service/TeacherService.java | 15 +++++ .../ironschool/StudentServiceTest.java | 4 +- 5 files changed, 97 insertions(+), 6 deletions(-) diff --git a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java index b4cebfed..ff3dd8e1 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java @@ -182,7 +182,62 @@ public void run (String... args){ } courseService.assignTeacher(partsOfCommand[1], partsOfCommand[2]); break; + case "SHOW": + if (partsOfCommand.length != 2) { + throw new InvalidCommandException("Usage: SHOW [COURSES|STUDENTS|TEACHERS|PROFIT]"); + } + + String whatToShow = partsOfCommand[1]; + + switch (whatToShow) { + case "COURSES": + courseService.showCourses(); + break; + + case "STUDENTS": + studentService.showStudents(); + break; + + case "TEACHERS": + teacherService.showTeachers(); + break; + case "PROFIT": + double total = courseService.getTotalEarned(); + System.out.println("Total profit: " + total); + break; + + default: + throw new InvalidCommandException("Usage: SHOW [COURSES|STUDENTS|TEACHERS|PROFIT]"); + } + break; + case "LOOKUP": + + if (partsOfCommand.length != 3) { + throw new InvalidCommandException("Usage: LOOKUP [COURSE|STUDENT|TEACHER] [ID]"); + } + + String type = partsOfCommand[1]; + String id = partsOfCommand[2]; + + switch (type) { + case "COURSE": + courseService.lookupCourse(id); + break; + + case "STUDENT": + studentService.lookupStudent(id); + break; + + case "TEACHER": + teacherService.lookupTeacher(id); + break; + + default: + throw new InvalidCommandException("Unknown LOOKUP command"); + } + + break; case "EXIT": isRunning = false; System.out.println("Closing console..."); diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java index 61d40e2b..699dedbb 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -18,10 +18,6 @@ public void addCourse(Course course){ courses.put(course.getCourseId(), course); } - public Course findCourseById(String courseId){ - return courses.get(courseId); - } - public void assignTeacher(String courseId, String teacherId){ Course course = courses.get(courseId); diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java index 317b5dee..bc6acafd 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -14,9 +14,11 @@ public StudentService(CourseService courseService){ this.courseService = courseService; } private Map students = new HashMap<>(); + public void addStudent(Student student) { students.put(student.getStudentId(), student); } + public Student findStudentById(String studentId) { Student student = students.get(studentId); if (student == null) { @@ -24,15 +26,17 @@ public Student findStudentById(String studentId) { } return student; } + public List getAllStudents() { return new ArrayList<>(students.values()); } + public void showStudents() { for (Student s : students.values()) { System.out.println(s); } } -// Enroll student to course + public void enrollStudentToCourse(String studentId, String courseId){ Student student = students.get(studentId); student.setCourse(courseService.getCourse(courseId)); @@ -40,4 +44,23 @@ public void enrollStudentToCourse(String studentId, String courseId){ courseService.addMoney(courseId); } + public void lookupStudent(String studentId){ + + Student student = students.get(studentId); + + if(student == null){ + System.out.println("Student not found"); + return; + } + + System.out.println("Student ID: " + student.getStudentId()); + System.out.println("Name: " + student.getName()); + System.out.println("Address: " + student.getAddress()); + System.out.println("Email: " + student.getEmail()); + if(student.getCourse() != null){ + System.out.println("Course: " + student.getCourse().getName()); + } else { + System.out.println("Course: None"); + } + } } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java index 14dfd5b5..e590cdb9 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -1,5 +1,6 @@ package com.ironhack.ironschool.service; +import com.ironhack.ironschool.model.Student; import com.ironhack.ironschool.model.Teacher; import com.ironhack.ironschool.exception.ResourceNotFoundException; import org.springframework.stereotype.Service; @@ -32,4 +33,18 @@ public void showTeachers() { System.out.println(t); } } + + public void lookupTeacher(String teacherId){ + + Teacher teacher = teachers.get(teacherId); + + if(teacher == null){ + System.out.println("Teacher not found"); + return; + } + + System.out.println("Teacher ID: " + teacher.getTeacherId()); + System.out.println("Name: " + teacher.getName()); + System.out.println("Salary: " + teacher.getSalary()); + } } \ No newline at end of file diff --git a/ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java b/ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java index 18f2d788..5a0aa45e 100644 --- a/ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java +++ b/ironschool/src/test/java/com/ironhack/ironschool/StudentServiceTest.java @@ -2,6 +2,7 @@ import com.ironhack.ironschool.exception.ResourceNotFoundException; import com.ironhack.ironschool.model.Student; +import com.ironhack.ironschool.service.CourseService; import com.ironhack.ironschool.service.StudentService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -14,10 +15,11 @@ public class StudentServiceTest { private Student student; private StudentService studentService; + private CourseService courseService; @BeforeEach void setUp(){ student=new Student("Miko","Khirdalan 125","miko@gmail.com"); - studentService=new StudentService(); + studentService=new StudentService(courseService); } @Test void addStudent_validData_addStudentToMap(){ From 02bbeedf405d56845c94cd7491e59afef3cfbf91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Tue, 10 Mar 2026 16:23:31 +0400 Subject: [PATCH 14/17] Test classes added --- .../controller/CourseController.java | 54 +++ .../controller/StudentController.java | 35 ++ .../controller/TeacherController.java | 35 ++ .../ironhack/ironschool/menu/ConsoleMenu.java | 315 +++++++++++------- .../ironhack/ironschool/model/Student.java | 2 - .../ironschool/service/CourseService.java | 89 +++-- .../ironschool/service/StudentService.java | 11 +- .../ironschool/service/TeacherService.java | 9 +- .../ironschool/CourseServiceTest.java | 128 +++++++ 9 files changed, 510 insertions(+), 168 deletions(-) create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/controller/CourseController.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/controller/StudentController.java create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/controller/TeacherController.java create mode 100644 ironschool/src/test/java/com/ironhack/ironschool/CourseServiceTest.java diff --git a/ironschool/src/main/java/com/ironhack/ironschool/controller/CourseController.java b/ironschool/src/main/java/com/ironhack/ironschool/controller/CourseController.java new file mode 100644 index 00000000..8a9e135e --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/controller/CourseController.java @@ -0,0 +1,54 @@ +package com.ironhack.ironschool.controller; + +import com.ironhack.ironschool.model.Course; +import com.ironhack.ironschool.service.CourseService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/courses") +public class CourseController { + + private final CourseService courseService; + + public CourseController(CourseService courseService) { + this.courseService = courseService; + } + + @PostMapping + public ResponseEntity addCourse(@RequestBody Course course) { + return ResponseEntity.status(HttpStatus.CREATED).body(courseService.addCourse(course)); + } + + @GetMapping + public List getAllCourses() { + return courseService.getAllCourses(); + } + + @GetMapping("/{courseId}") + public Course getCourse(@PathVariable String courseId) { + return courseService.findCourseById(courseId); + } + + @PostMapping("/{courseId}/students/{studentId}") + @ResponseStatus(HttpStatus.OK) + public void enrollStudent(@PathVariable String courseId, + @PathVariable String studentId) { + courseService.enrollStudent(courseId, studentId); + } + + @PostMapping("/{courseId}/teachers/{teacherId}") + @ResponseStatus(HttpStatus.OK) + public void assignTeacher(@PathVariable String courseId, + @PathVariable String teacherId) { + courseService.assignTeacher(courseId, teacherId); + } + + @GetMapping("/total-earned") + public double getTotalEarned() { + return courseService.getTotalEarned(); + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/controller/StudentController.java b/ironschool/src/main/java/com/ironhack/ironschool/controller/StudentController.java new file mode 100644 index 00000000..6c77233f --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/controller/StudentController.java @@ -0,0 +1,35 @@ +package com.ironhack.ironschool.controller; + +import com.ironhack.ironschool.model.Course; +import com.ironhack.ironschool.model.Student; +import com.ironhack.ironschool.service.StudentService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/students") +public class StudentController { + + private final StudentService studentService; + + public StudentController(StudentService studentService) { + this.studentService = studentService; + } + + @PostMapping + public ResponseEntity addCourse(@RequestBody Student student) { + return ResponseEntity.status(HttpStatus.CREATED).body(studentService.addStudent(student)); + } + @GetMapping + public List getStudents() { + return studentService.getAllStudents(); + } + + @GetMapping("/{studentId}") + public Student getStudent(@PathVariable String studentId) { + return studentService.findStudentById(studentId); + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/controller/TeacherController.java b/ironschool/src/main/java/com/ironhack/ironschool/controller/TeacherController.java new file mode 100644 index 00000000..f9f07413 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/controller/TeacherController.java @@ -0,0 +1,35 @@ +package com.ironhack.ironschool.controller; + +import com.ironhack.ironschool.model.Teacher; +import com.ironhack.ironschool.model.Teacher; +import com.ironhack.ironschool.service.TeacherService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/teachers") +public class TeacherController { + + private final TeacherService teacherService; + + public TeacherController(TeacherService teacherService) { + this.teacherService = teacherService; + } + + @PostMapping + public ResponseEntity addCourse(@RequestBody Teacher teacher) { + return ResponseEntity.status(HttpStatus.CREATED).body(teacherService.addTeacher(teacher)); + } + @GetMapping + public List getTeachers() { + return teacherService.getAllTeachers(); + } + + @GetMapping("/{teacherId}") + public Teacher getTeacher(@PathVariable String teacherId) { + return teacherService.findTeacherById(teacherId); + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java index 31da257c..452a4b1e 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java @@ -2,184 +2,261 @@ import com.ironhack.ironschool.exception.InvalidCommandException; import com.ironhack.ironschool.exception.InvalidInputException; -import com.ironhack.ironschool.exception.TeacherAlreadyAssignedException; import com.ironhack.ironschool.model.Course; import com.ironhack.ironschool.model.Student; import com.ironhack.ironschool.model.Teacher; import com.ironhack.ironschool.service.CourseService; import com.ironhack.ironschool.service.StudentService; import com.ironhack.ironschool.service.TeacherService; -import jakarta.validation.Valid; +import org.jspecify.annotations.NonNull; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; import java.util.Scanner; @Component -// We implement CommandLineRunner because we need to work with console public class ConsoleMenu implements CommandLineRunner { - private Scanner scanner = new Scanner(System.in); + private final TeacherService teacherService; private final CourseService courseService; private final StudentService studentService; - public ConsoleMenu (TeacherService teacherService, - CourseService courseService, - StudentService studentService){ + + private final Scanner scanner = new Scanner(System.in); + + public ConsoleMenu(TeacherService teacherService, + CourseService courseService, + StudentService studentService) { this.teacherService = teacherService; this.courseService = courseService; this.studentService = studentService; } - private Map teachers = new HashMap<>(); - private Map courses = new HashMap<>(); - private Map students = new HashMap<>(); + @Override - public void run (String... args){ + public void run(String @NonNull ... args) { boolean isRunning = true; + System.out.println("=================================================="); System.out.println(" WELCOME "); System.out.println(" TO "); System.out.println(" SYSTEM "); System.out.println("=================================================="); -//========================== Assigning school name ========================== + System.out.print("Enter school name: "); String schoolName = scanner.nextLine(); -// ========================== Initialize teachers ========================== - System.out.print("\n How many teachers?: "); - int teachersCount = scanner.nextInt(); - scanner.nextLine(); - for(int i=0; i + System.out.println(c.getCourseId() + " - " + c.getName() + " - $" + c.getPrice())); + break; + case "STUDENTS": + studentService.getAllStudents().forEach(s -> + System.out.println(s.getStudentId() + " - " + s.getName())); + break; + case "TEACHERS": + teacherService.getAllTeachers().forEach(t -> + System.out.println(t.getTeacherId() + " - " + t.getName())); + break; + case "PROFIT": + double profit = courseService.getTotalEarned() - + teacherService.getAllTeachers().stream().mapToDouble(Teacher::getSalary).sum(); + System.out.println("Total profit: $" + profit); + break; + default: + throw new InvalidCommandException("SHOW command not recognized"); + } + } + + private void lookupCommand(String type, String id) { + switch (type) { + case "COURSE": + courseService.lookupCourse(id); + break; + + case "STUDENT": + studentService.lookupStudent(id); + break; + + case "TEACHER": + teacherService.lookupTeacher(id); + break; + + default: + throw new InvalidCommandException("LOOKUP command not recognized"); + } + } + + private void setupTeachers() { + System.out.print("\nHow many teachers?: "); + int count = readInt(); + for (int i = 0; i < count; i++) { + while (true) { try { System.out.print("Enter teacher's name: "); - String teacherName = scanner.nextLine(); - + String name = scanner.nextLine(); System.out.print("Enter teacher's salary: "); - double teacherSalary = scanner.nextDouble(); - scanner.nextLine(); - - teacher = new Teacher(teacherName, teacherSalary); - if (teacher.getSalary() < 300.00) { - throw new InvalidInputException("Teacher's salary can not be less than $300 because of laws about minimal salary!"); - } - if (teacher.getName().length() <= 3) { - throw new InvalidInputException("Teacher's name can not be less 3 letters."); - } - teachers.put(teacher.getTeacherId(), teacher); + double salary = readDouble(); + + if (name.length() <= 3) throw new InvalidInputException("Teacher's name must be >3 letters"); + if (salary < 300) throw new InvalidInputException("Teacher's salary must be at least $300"); + + Teacher teacher = new Teacher(name, salary); + teacherService.addTeacher(teacher); System.out.println("Teacher created: " + teacher.getTeacherId() + " - " + teacher.getName()); + break; } catch (InvalidInputException e) { System.out.println(e.getMessage()); - teacher = null; - } catch (NumberFormatException e) { - System.out.println("Salary must be a number. Please try again."); - teacher = null; } } } -// ========================== Initialize courses ========================== - System.out.print("\n How many courses?: "); - int coursesCount = scanner.nextInt(); - scanner.nextLine(); - for(int i=0; i3 letters"); + if (price < 0) throw new InvalidInputException("Course price cannot be negative"); + + Course course = new Course(name, price); + courseService.addCourse(course); System.out.println("Course created: " + course.getCourseId() + " - " + course.getName()); + break; } catch (InvalidInputException e) { System.out.println(e.getMessage()); - course=null; - } catch (NumberFormatException e) { - System.out.println("Price must be a number. Please try again."); - course=null; } } } -// ========================== Initialize students ========================== - System.out.print("\n How many students?: "); - int studentsCount = scanner.nextInt(); - scanner.nextLine(); - for(int i=0; i3 letters"); + if (address.length() <= 3) throw new InvalidInputException("Student address must be >3 letters"); + if (!email.contains("@")) throw new InvalidInputException("Invalid email"); + + Student student = new Student(name, address, email); + studentService.addStudent(student); System.out.println("Student created: " + student.getStudentId() + " - " + student.getName()); + break; } catch (InvalidInputException e) { System.out.println(e.getMessage()); - student = null; } } } - System.out.println("Setup is done! Open the console!"); -//======================= Main Console ========================== - while (isRunning) { - System.out.print("Console:"); - String command = scanner.nextLine().trim(); - System.out.println(); - if (command.isEmpty()) continue; - String[] partsOfCommand = command.split(" "); - String mainCommand = partsOfCommand[0].toUpperCase(); + } + + private int readInt() { + while (true) { try { - switch (mainCommand) { - case "ENROLL": - if (partsOfCommand.length != 3) { - throw new InvalidCommandException("Usage: ENROLL [STUDENT_ID] [COURSE_ID]"); - } - if (!students.containsKey(partsOfCommand[1])) { - throw new InvalidCommandException("Student with ID " + partsOfCommand[1] + " does not exist."); - } - if (!courses.containsKey(partsOfCommand[2])) { - throw new InvalidCommandException("Course with ID " + partsOfCommand[2] + " does not exist."); - } - case "EXIT": - isRunning = false; - System.out.println("Closing console..."); - break; - default: - System.out.println("Invalid command!"); - } + int value = Integer.parseInt(scanner.nextLine()); + if (value < 0) throw new InvalidInputException("Value cannot be negative"); + return value; + } catch (NumberFormatException | InvalidInputException e) { + System.out.println("Please enter a valid integer."); } - catch (InvalidCommandException e) { - System.out.println(e.getMessage()); + } + } + + private double readDouble() { + while (true) { + try { + double value = Double.parseDouble(scanner.nextLine()); + if (value < 0) throw new InvalidInputException("Value cannot be negative"); + return value; + } catch (NumberFormatException | InvalidInputException e) { + System.out.println("Please enter a valid number."); } } - System.out.println("\n CONSOLE IS CLOSED!"); } -} +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java index 2f4ad0b4..89659963 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -1,6 +1,5 @@ package com.ironhack.ironschool.model; -import jakarta.validation.constraints.Email; import java.util.Random; @@ -8,7 +7,6 @@ public class Student { private String studentId; private String name; private String address; - @Email private String email; private Course course; diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java index e84c19c2..04d14b67 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -1,85 +1,84 @@ package com.ironhack.ironschool.service; +import com.ironhack.ironschool.exception.ResourceNotFoundException; import com.ironhack.ironschool.model.Course; +import com.ironhack.ironschool.model.Student; import com.ironhack.ironschool.model.Teacher; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; + @Service public class CourseService { private Map courses = new HashMap<>(); + private final TeacherService teacherService; + private final StudentService studentService; - public void addCourse(Course course){ - courses.put(course.getCourseId(), course); + public CourseService(TeacherService teacherService, StudentService studentService) { + this.teacherService = teacherService; + this.studentService = studentService; } - public Course findCourseById(String courseId){ - return courses.get(courseId); + public Course addCourse(Course course) { + courses.put(course.getCourseId(), course); + return courses.get(course.getCourseId()); } - public void assignTeacher(String courseId, Teacher teacher){ + public Course findCourseById(String courseId) { Course course = courses.get(courseId); - - if(course != null){ - course.setTeacher(teacher); + if (course == null) { + throw new ResourceNotFoundException("Course not found"); } + return course; } - public void addMoney(String courseId){ - Course course = courses.get(courseId); - - if(course != null){ - course.setMoneyEarned( - course.getMoneyEarned() + course.getPrice() - ); - } + public void enrollStudent(String courseId, String studentId) { + Student student = studentService.findStudentById(studentId); + Course course = findCourseById(courseId); + addMoney(course.getCourseId()); } - public void showCourses(){ - for(Course course : courses.values()){ - System.out.println( - course.getCourseId() + " " + - course.getName() + " " + - course.getPrice() - ); - } + public void assignTeacher(String courseId, String teacherId) { + Teacher teacher = teacherService.findTeacherById(teacherId); + Course course = findCourseById(courseId); + course.setTeacher(teacher); } - public void lookupCourse(String courseId){ - - Course course = courses.get(courseId); + public void addMoney(String courseId) { + Course course = findCourseById(courseId); + course.setMoneyEarned(course.getMoneyEarned() + course.getPrice()); + } - if(course == null){ - System.out.println("Course not found"); - return; + public void showCourses() { + for (Course course : courses.values()) { + System.out.println(course.getCourseId() + " - " + course.getName() + " - $" + course.getPrice()); } - + } + public void lookupCourse(String courseId) { + Course course = findCourseById(courseId); System.out.println("Course ID: " + course.getCourseId()); System.out.println("Name: " + course.getName()); - System.out.println("Price: " + course.getPrice()); - System.out.println("Money Earned: " + course.getMoneyEarned()); - - if(course.getTeacher() != null){ - System.out.println("Teacher: " + course.getTeacher().getName()); - } else { - System.out.println("Teacher: None"); - } + System.out.println("Price: $" + course.getPrice()); + System.out.println("Money Earned: $" + course.getMoneyEarned()); + System.out.println("Teacher: " + (course.getTeacher() != null ? course.getTeacher().getName() : "None")); } - public double getTotalEarned(){ - + public double getTotalEarned() { double total = 0; - - for(Course course : courses.values()){ + for (Course course : courses.values()) { total += course.getMoneyEarned(); } - return total; } - public Map getCourses(){ + public Map getCourses() { return courses; } + public List getAllCourses() { + return new ArrayList<>(courses.values()); + } } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java index 6a0d5b21..e7d51da6 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -1,6 +1,7 @@ package com.ironhack.ironschool.service; import com.ironhack.ironschool.exception.ResourceNotFoundException; +import com.ironhack.ironschool.model.Course; import com.ironhack.ironschool.model.Student; import org.springframework.stereotype.Service; @@ -10,8 +11,9 @@ public class StudentService { private Map students = new HashMap<>(); - public void addStudent(Student student) { + public Student addStudent(Student student) { students.put(student.getStudentId(), student); + return students.get(student.getStudentId()); } public Student findStudentById(String studentId) { Student student = students.get(studentId); @@ -28,4 +30,11 @@ public void showStudents() { System.out.println(s); } } + public void lookupStudent(String studentId) { + Student student = findStudentById(studentId); + System.out.println("Student ID: " + student.getStudentId()); + System.out.println("Name: " + student.getName()); + System.out.println("Address: " + student.getAddress()); + System.out.println("Email: " + student.getEmail()); + } } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java index 9f846736..78be7cb9 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -1,5 +1,6 @@ package com.ironhack.ironschool.service; +import com.ironhack.ironschool.model.Student; import com.ironhack.ironschool.model.Teacher; import com.ironhack.ironschool.exception.ResourceNotFoundException; import org.springframework.stereotype.Service; @@ -10,7 +11,7 @@ public class TeacherService { private Map teachers = new HashMap<>(); - public void addTeacher(Teacher teacher) { + public Teacher addTeacher(Teacher teacher) { teachers.put(teacher.getTeacherId(), teacher); } @@ -29,4 +30,10 @@ public void showTeachers() { System.out.println(t); } } + public void lookupTeacher(String teacherId) { + Teacher teacher = findTeacherById(teacherId); + System.out.println("Teacher ID: " + teacher.getTeacherId()); + System.out.println("Name: " + teacher.getName()); + System.out.println("Salary: $" + teacher.getSalary()); + } } \ No newline at end of file diff --git a/ironschool/src/test/java/com/ironhack/ironschool/CourseServiceTest.java b/ironschool/src/test/java/com/ironhack/ironschool/CourseServiceTest.java new file mode 100644 index 00000000..77fcb9f4 --- /dev/null +++ b/ironschool/src/test/java/com/ironhack/ironschool/CourseServiceTest.java @@ -0,0 +1,128 @@ +package com.ironhack.ironschool; + +import com.ironhack.ironschool.exception.ResourceNotFoundException; +import com.ironhack.ironschool.model.Course; +import com.ironhack.ironschool.model.Student; +import com.ironhack.ironschool.model.Teacher; +import com.ironhack.ironschool.service.CourseService; +import com.ironhack.ironschool.service.StudentService; +import com.ironhack.ironschool.service.TeacherService; +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.*; + +public class CourseServiceTest { + + private CourseService courseService; + private TeacherService teacherService; + private StudentService studentService; + + @BeforeEach + void setUp() { + teacherService = mock(TeacherService.class); + studentService = mock(StudentService.class); + courseService = new CourseService(teacherService, studentService); + } + + @Test + void addCourse_shouldAddCourse() { + Course course = new Course("Java", 100); + + courseService.addCourse(course); + + assertEquals(course, courseService.getCourses().get(course.getCourseId())); + } + + @Test + void findCourseById_shouldReturnCourse() { + Course course = new Course("Java", 100); + courseService.addCourse(course); + + Course result = courseService.findCourseById(course.getCourseId()); + + assertEquals("Java", result.getName()); + } + + @Test + void findCourseById_shouldThrowExceptionIfNotFound() { + assertThrows(ResourceNotFoundException.class, () -> { + courseService.findCourseById("wrong-id"); + }); + } + + @Test + void enrollStudent_shouldIncreaseMoneyEarned() { + + Course course = new Course("Java", 100); + Student student = new Student("Mike","sdjkfn","miko@gmail.com"); + + courseService.addCourse(course); + + when(studentService.findStudentById(student.getStudentId())).thenReturn(student); + + courseService.enrollStudent(course.getCourseId(), student.getStudentId()); + + assertEquals(100, course.getMoneyEarned()); + } + + @Test + void assignTeacher_shouldAssignTeacher() { + + Course course = new Course("Java", 100); + Teacher teacher = new Teacher("John",500); + + courseService.addCourse(course); + + when(teacherService.findTeacherById(teacher.getTeacherId())).thenReturn(teacher); + + courseService.assignTeacher(course.getCourseId(), teacher.getTeacherId()); + + assertEquals("John", course.getTeacher().getName()); + } + + @Test + void addMoney_shouldIncreaseMoneyEarned() { + + Course course = new Course("Java", 100); + courseService.addCourse(course); + + courseService.addMoney(course.getCourseId()); + + assertEquals(100, course.getMoneyEarned()); + } + + @Test + void getTotalEarned_shouldReturnCorrectTotal() { + + Course c1 = new Course("Java", 100); + Course c2 = new Course("Spring", 200); + + courseService.addCourse(c1); + courseService.addCourse(c2); + + courseService.addMoney(c1.getCourseId()); + courseService.addMoney(c2.getCourseId()); + + double total = courseService.getTotalEarned(); + + assertEquals(300, total); + } + + @Test + void getAllCourses_shouldReturnAllCourses() { + + Course c1 = new Course("Java", 100); + Course c2 = new Course("Spring", 200); + + courseService.addCourse(c1); + courseService.addCourse(c2); + + List courses = courseService.getAllCourses(); + + assertEquals(2, courses.size()); + } +} \ No newline at end of file From a4275fd93c4fcd016c069a465034b0cd24bab9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Tue, 10 Mar 2026 16:38:43 +0400 Subject: [PATCH 15/17] bonus commands added --- .../resources/application.properties | 1 + .../ironhack/ironschool/menu/ConsoleMenu.java | 56 ++++++++++++++++--- .../com/ironhack/ironschool/model/Course.java | 8 ++- .../ironschool/service/CourseService.java | 1 + .../ironschool/service/TeacherService.java | 1 + 5 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 ironschool/out/production/resources/application.properties diff --git a/ironschool/out/production/resources/application.properties b/ironschool/out/production/resources/application.properties new file mode 100644 index 00000000..64bb90af --- /dev/null +++ b/ironschool/out/production/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=ironschool diff --git a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java index 452a4b1e..90e899c2 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java @@ -74,9 +74,10 @@ public void run(String @NonNull ... args) { break; case "SHOW": - if (parts.length != 2) - throw new InvalidCommandException("Usage: SHOW [COURSES/STUDENTS/TEACHERS/PROFIT]"); - showCommand(parts[1].toUpperCase()); + if (parts.length < 2) throw new InvalidCommandException("Usage: SHOW [type]"); + String[] showParts = new String[parts.length - 1]; + System.arraycopy(parts, 1, showParts, 0, showParts.length); + showCommand(showParts); break; case "LOOKUP": @@ -115,25 +116,62 @@ private void assignTeacher(String teacherId, String courseId) { System.out.println("Teacher " + teacher.getName() + " assigned to course " + course.getName()); } - private void showCommand(String type) { + private void showCommand(String[] parts) { + String type = parts[0]; switch (type) { case "COURSES": courseService.getAllCourses().forEach(c -> System.out.println(c.getCourseId() + " - " + c.getName() + " - $" + c.getPrice())); break; + case "STUDENTS": - studentService.getAllStudents().forEach(s -> - System.out.println(s.getStudentId() + " - " + s.getName())); + if (parts.length == 2) { + String courseId = parts[1]; + Course course = courseService.findCourseById(courseId); + System.out.println("Students in course " + course.getName() + ":"); + for (Student s : course.getStudents()) { + System.out.println(s.getStudentId() + " - " + s.getName()); + } + } else { + studentService.getAllStudents().forEach(s -> + System.out.println(s.getStudentId() + " - " + s.getName())); + } break; + case "TEACHERS": teacherService.getAllTeachers().forEach(t -> System.out.println(t.getTeacherId() + " - " + t.getName())); break; + case "PROFIT": - double profit = courseService.getTotalEarned() - - teacherService.getAllTeachers().stream().mapToDouble(Teacher::getSalary).sum(); - System.out.println("Total profit: $" + profit); + double totalEarned = courseService.getTotalEarned(); + double totalSpent = 0; + for (Teacher t : teacherService.getAllTeachers()) totalSpent += t.getSalary(); + System.out.println("Total profit: $" + (totalEarned - totalSpent)); break; + + case "MONEY": + if (parts.length < 2) { + System.out.println("Usage: SHOW MONEY [EARNED/SPENT]"); + break; + } + String moneyType = parts[1].toUpperCase(); + switch (moneyType) { + case "EARNED": + for (Course c : courseService.getAllCourses()) { + System.out.println(c.getName() + " earned: $" + c.getMoneyEarned()); + } + break; + case "SPENT": + for (Teacher t : teacherService.getAllTeachers()) { + System.out.println(t.getName() + " salary: $" + t.getSalary()); + } + break; + default: + System.out.println("Unknown MONEY command: " + moneyType); + } + break; + default: throw new InvalidCommandException("SHOW command not recognized"); } diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java index 55f02fdd..c1e87302 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java @@ -1,5 +1,7 @@ package com.ironhack.ironschool.model; +import java.util.ArrayList; +import java.util.List; import java.util.Random; public class Course { @@ -8,14 +10,16 @@ public class Course { private double price; private double moneyEarned; private Teacher teacher; - + private List students = new ArrayList<>(); public Course(String name, double price) { this.courseId = generateCourseId(); this.name = name; this.price = price; this.moneyEarned = 0; } - + public List getStudents() { + return students; + } public String getCourseId() { return courseId; } diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java index 04d14b67..d8253ffc 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -39,6 +39,7 @@ public Course findCourseById(String courseId) { public void enrollStudent(String courseId, String studentId) { Student student = studentService.findStudentById(studentId); Course course = findCourseById(courseId); + course.getStudents().add(student); addMoney(course.getCourseId()); } diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java index 78be7cb9..a211d793 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/TeacherService.java @@ -13,6 +13,7 @@ public class TeacherService { private Map teachers = new HashMap<>(); public Teacher addTeacher(Teacher teacher) { teachers.put(teacher.getTeacherId(), teacher); + return teachers.get(teacher.getTeacherId()); } public Teacher findTeacherById(String teacherId) { From 540e171d007ca3474f4221ff658d8c48f3604d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Tue, 10 Mar 2026 16:45:47 +0400 Subject: [PATCH 16/17] bonus commands added --- .../ironhack/ironschool/menu/ConsoleMenu.java | 151 +++--------------- 1 file changed, 25 insertions(+), 126 deletions(-) diff --git a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java index 89740354..90e899c2 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/menu/ConsoleMenu.java @@ -205,16 +205,12 @@ private void setupTeachers() { System.out.print("Enter teacher's name: "); String name = scanner.nextLine(); System.out.print("Enter teacher's salary: "); - double teacherSalary = scanner.nextDouble(); - scanner.nextLine(); + double salary = readDouble(); - teacher = new Teacher(teacherName, teacherSalary); - if (teacher.getSalary() < 300.00) { - throw new InvalidInputException("Teacher's salary can not be less than $300 because of laws about minimal salary!"); - } - if (teacher.getName().length() <= 3) { - throw new InvalidInputException("Teacher's name can not be less 3 letters."); - } + if (name.length() <= 3) throw new InvalidInputException("Teacher's name must be >3 letters"); + if (salary < 300) throw new InvalidInputException("Teacher's salary must be at least $300"); + + Teacher teacher = new Teacher(name, salary); teacherService.addTeacher(teacher); System.out.println("Teacher created: " + teacher.getTeacherId() + " - " + teacher.getName()); break; @@ -234,16 +230,12 @@ private void setupCourses() { System.out.print("Enter course's name: "); String name = scanner.nextLine(); System.out.print("Enter course's price: "); - double coursePrice = scanner.nextDouble(); - scanner.nextLine(); + double price = readDouble(); - course = new Course(courseName, coursePrice); - if (course.getName().length() <= 3) { - throw new InvalidInputException("Course's name can not be less 3 letters."); - } - if (course.getPrice() < 0.00) { - throw new InvalidInputException("Course's price can not be negative."); - } + if (name.length() <= 3) throw new InvalidInputException("Course name must be >3 letters"); + if (price < 0) throw new InvalidInputException("Course price cannot be negative"); + + Course course = new Course(name, price); courseService.addCourse(course); System.out.println("Course created: " + course.getCourseId() + " - " + course.getName()); break; @@ -265,18 +257,13 @@ private void setupStudents() { System.out.print("Enter student's address: "); String address = scanner.nextLine(); System.out.print("Enter student's email: "); - String studentEmail = scanner.nextLine(); + String email = scanner.nextLine(); - student = new Student(studentName, studentAddress, studentEmail); - if (student.getName().length() <= 3) { - throw new InvalidInputException("Student's name can not be less 3 letters."); - } - if (student.getAddress().length() <= 3) { - throw new InvalidInputException("Student's name can not be less 3 letters."); - } - if (!student.getEmail().contains("@")) { - throw new InvalidInputException("Student's email is probably invalid."); - } + if (name.length() <= 3) throw new InvalidInputException("Student name must be >3 letters"); + if (address.length() <= 3) throw new InvalidInputException("Student address must be >3 letters"); + if (!email.contains("@")) throw new InvalidInputException("Invalid email"); + + Student student = new Student(name, address, email); studentService.addStudent(student); System.out.println("Student created: " + student.getStudentId() + " - " + student.getName()); break; @@ -285,104 +272,16 @@ private void setupStudents() { } } } - System.out.println("Setup is done! Open the console!"); -//======================= Main Console ========================== - while (isRunning) { - System.out.print("Console: "); - String command = scanner.nextLine().trim(); - System.out.println(); - if (command.isEmpty()) continue; - String[] partsOfCommand = command.split(" "); - String mainCommand = partsOfCommand[0].toUpperCase(); - try { - switch (mainCommand) { - case "ENROLL": - if (partsOfCommand.length != 3) { - throw new InvalidCommandException("Usage: ENROLL [STUDENT_ID] [COURSE_ID]"); - } - if (!students.containsKey(partsOfCommand[1])) { - throw new InvalidCommandException("Student with ID " + partsOfCommand[1] + " does not exist."); - } - if (!courses.containsKey(partsOfCommand[2])) { - throw new InvalidCommandException("Course with ID " + partsOfCommand[2] + " does not exist."); - } - studentService.enrollStudentToCourse(partsOfCommand[1], partsOfCommand[2]); - break; - case "ASSIGN": - if (partsOfCommand.length != 3) { - throw new InvalidCommandException("Usage: ASSIGN [TEACHER_ID] [COURSE_ID]"); - } - if (!teachers.containsKey(partsOfCommand[1])) { - throw new InvalidCommandException("Teacher with ID " + partsOfCommand[1] + " does not exist."); - } - if (!courses.containsKey(partsOfCommand[2])) { - throw new InvalidCommandException("Course with ID " + partsOfCommand[2] + " does not exist."); - } - courseService.assignTeacher(partsOfCommand[1], partsOfCommand[2]); - break; - case "SHOW": - if (partsOfCommand.length != 2) { - throw new InvalidCommandException("Usage: SHOW [COURSES|STUDENTS|TEACHERS|PROFIT]"); - } - - String whatToShow = partsOfCommand[1]; - - switch (whatToShow) { - case "COURSES": - courseService.showCourses(); - break; - - case "STUDENTS": - studentService.showStudents(); - break; - - case "TEACHERS": - teacherService.showTeachers(); - break; - - case "PROFIT": - double total = courseService.getTotalEarned(); - System.out.println("Total profit: " + total); - break; - - default: - throw new InvalidCommandException("Usage: SHOW [COURSES|STUDENTS|TEACHERS|PROFIT]"); - } - break; - case "LOOKUP": - - if (partsOfCommand.length != 3) { - throw new InvalidCommandException("Usage: LOOKUP [COURSE|STUDENT|TEACHER] [ID]"); - } - - String type = partsOfCommand[1]; - String id = partsOfCommand[2]; - - switch (type) { - case "COURSE": - courseService.lookupCourse(id); - break; - - case "STUDENT": - studentService.lookupStudent(id); - break; - - case "TEACHER": - teacherService.lookupTeacher(id); - break; - - default: - throw new InvalidCommandException("Unknown LOOKUP command"); - } + } - break; - case "EXIT": - isRunning = false; - System.out.println("Closing console..."); - break; - default: - System.out.println("Invalid command!"); - } + private int readInt() { + while (true) { + try { + int value = Integer.parseInt(scanner.nextLine()); + if (value < 0) throw new InvalidInputException("Value cannot be negative"); + return value; + } catch (NumberFormatException | InvalidInputException e) { + System.out.println("Please enter a valid integer."); } } } From 3f80f862bb79c079cb6baba9109260a33b7368f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikay=C4=B1l=20Quliyev?= Date: Fri, 13 Mar 2026 15:36:03 +0400 Subject: [PATCH 17/17] problems are fixed --- ironschool/pom.xml | 15 +++--- .../exception/GlobalExceptionHandler.java | 53 +++++++++++++++++++ .../com/ironhack/ironschool/model/Course.java | 21 ++++++-- .../ironhack/ironschool/model/Student.java | 20 ++++++- .../ironhack/ironschool/model/Teacher.java | 17 ++++-- .../ironschool/service/CourseService.java | 4 -- .../ironschool/service/StudentService.java | 4 -- 7 files changed, 109 insertions(+), 25 deletions(-) create mode 100644 ironschool/src/main/java/com/ironhack/ironschool/exception/GlobalExceptionHandler.java diff --git a/ironschool/pom.xml b/ironschool/pom.xml index f45870c0..d4d09964 100644 --- a/ironschool/pom.xml +++ b/ironschool/pom.xml @@ -30,13 +30,15 @@ 17 + org.springframework.boot - spring-boot-starter-validation + spring-boot-starter-webmvc + org.springframework.boot - spring-boot-starter-webmvc + spring-boot-starter-validation @@ -45,16 +47,13 @@ runtime true + org.springframework.boot - spring-boot-starter-validation-test - test - - - org.springframework.boot - spring-boot-starter-webmvc-test + spring-boot-starter-test test + diff --git a/ironschool/src/main/java/com/ironhack/ironschool/exception/GlobalExceptionHandler.java b/ironschool/src/main/java/com/ironhack/ironschool/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..44936069 --- /dev/null +++ b/ironschool/src/main/java/com/ironhack/ironschool/exception/GlobalExceptionHandler.java @@ -0,0 +1,53 @@ +package com.ironhack.ironschool.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + + private ResponseEntity buildResponse(Exception ex, HttpStatus status) { + Map body = new HashMap<>(); + body.put("timestamp", LocalDateTime.now()); + body.put("status", status.value()); + body.put("error", status.getReasonPhrase()); + body.put("message", ex.getMessage()); + return new ResponseEntity<>(body, status); + } + + @ExceptionHandler(InvalidCommandException.class) + public ResponseEntity handleInvalidCommand(InvalidCommandException ex) { + return buildResponse(ex, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(InvalidInputException.class) + public ResponseEntity handleInvalidInput(InvalidInputException ex) { + return buildResponse(ex, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(ResourceNotFoundException.class) + public ResponseEntity handleResourceNotFound(ResourceNotFoundException ex) { + return buildResponse(ex, HttpStatus.NOT_FOUND); + } + + @ExceptionHandler(StudentAlreadyEnrolledException.class) + public ResponseEntity handleStudentAlreadyEnrolled(StudentAlreadyEnrolledException ex) { + return buildResponse(ex, HttpStatus.CONFLICT); + } + + @ExceptionHandler(TeacherAlreadyAssignedException.class) + public ResponseEntity handleTeacherAlreadyAssigned(TeacherAlreadyAssignedException ex) { + return buildResponse(ex, HttpStatus.CONFLICT); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleAll(Exception ex) { + return buildResponse(ex, HttpStatus.INTERNAL_SERVER_ERROR); + } +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java index 452ad855..3d8df3fc 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Course.java @@ -1,25 +1,42 @@ package com.ironhack.ironschool.model; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + import java.util.ArrayList; import java.util.List; import java.util.Random; public class Course { + private String courseId; + + @NotBlank(message = "Course name cannot be blank") private String name; + + @Min(value = 0, message = "Price cannot be negative") private double price; + + @Min(value = 0, message = "Money earned cannot be negative") private double moneyEarned; + + @NotNull(message = "Teacher cannot be null") private Teacher teacher; + private List students = new ArrayList<>(); + public Course(String name, double price) { this.courseId = generateCourseId(); this.name = name; this.price = price; this.moneyEarned = 0; } + public List getStudents() { return students; } + public String getCourseId() { return courseId; } @@ -66,6 +83,4 @@ public String generateCourseId() { int number = 1000 + random.nextInt(9000); return coursePrefix + "-" + number; } - - -} +} \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java index 89659963..bbde2d19 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Student.java @@ -3,15 +3,31 @@ import java.util.Random; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + + public class Student { + private String studentId; + + @NotBlank(message = "Name cannot be blank") + @Size(min = 2, max = 50, message = "Name must be between 2 and 50 characters") private String name; + + @NotBlank(message = "Address cannot be blank") private String address; + + @NotBlank(message = "Email cannot be blank") + @Email(message = "Email must be valid") private String email; + private Course course; public Student(String name, String address, String email) { - studentId=generateStudentId(); + this.studentId = generateStudentId(); this.name = name; this.address = address; this.email = email; @@ -63,10 +79,12 @@ public String toString() { ", course=" + (course != null ? course.getName() : "None") + '}'; } + public String generateStudentId() { Random random = new Random(); String coursePrefix = "STU"; int number = 1000 + random.nextInt(9000); return coursePrefix + "-" + number; } + } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java index 484c4b01..e6d82938 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/model/Teacher.java @@ -1,17 +1,23 @@ package com.ironhack.ironschool.model; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; import java.util.Random; -import java.util.UUID; public class Teacher { private String teacherId; + + @NotBlank(message = "Teacher name cannot be blank") private String name; + + @Min(value = 0, message = "Salary cannot be negative") private double salary; public Teacher(String name, double salary) { - teacherId=generateTeacherId(); + this.teacherId = generateTeacherId(); this.name = name; - setSalary(salary); + this.salary = salary; } public String getTeacherId() { @@ -42,10 +48,11 @@ public String toString() { ", salary=" + salary + '}'; } + public String generateTeacherId() { Random random = new Random(); - String coursePrefix = "TEA"; + String teacherPrefix = "TEA"; int number = 1000 + random.nextInt(9000); - return coursePrefix + "-" + number; + return teacherPrefix + "-" + number; } } \ No newline at end of file diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java index 5c6aa053..da4b23d8 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/CourseService.java @@ -13,10 +13,6 @@ @Service public class CourseService { - public final TeacherService teacherService; - public CourseService(TeacherService teacherService){ - this.teacherService = teacherService; - } private Map courses = new HashMap<>(); private final TeacherService teacherService; private final StudentService studentService; diff --git a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java index 597ce44f..734d7a44 100644 --- a/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java +++ b/ironschool/src/main/java/com/ironhack/ironschool/service/StudentService.java @@ -9,10 +9,6 @@ @Service public class StudentService { - public final CourseService courseService; - public StudentService(CourseService courseService){ - this.courseService = courseService; - } private Map students = new HashMap<>(); public Student addStudent(Student student) { students.put(student.getStudentId(), student);