From 9292c240009dd514d1feb2708f039018797bf7e8 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 14:48:45 +0400 Subject: [PATCH 01/16] Added main structure --- .idea/.gitignore | 10 + .idea/homework-java-ironschool.iml | 9 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + IronSchool_HomeWork/.gitattributes | 2 + IronSchool_HomeWork/.gitignore | 33 ++ .../.mvn/wrapper/maven-wrapper.properties | 3 + IronSchool_HomeWork/mvnw | 295 ++++++++++++++++++ IronSchool_HomeWork/mvnw.cmd | 189 +++++++++++ IronSchool_HomeWork/pom.xml | 84 +++++ .../IronSchoolHomeWorkApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../IronSchoolHomeWorkApplicationTests.java | 13 + 14 files changed, 672 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/homework-java-ironschool.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 IronSchool_HomeWork/.gitattributes create mode 100644 IronSchool_HomeWork/.gitignore create mode 100644 IronSchool_HomeWork/.mvn/wrapper/maven-wrapper.properties create mode 100644 IronSchool_HomeWork/mvnw create mode 100644 IronSchool_HomeWork/mvnw.cmd create mode 100644 IronSchool_HomeWork/pom.xml create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java create mode 100644 IronSchool_HomeWork/src/main/resources/application.properties create mode 100644 IronSchool_HomeWork/src/test/java/org/example/ironschool_homework/IronSchoolHomeWorkApplicationTests.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/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/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..f5bd2dfe --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ 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_HomeWork/.gitattributes b/IronSchool_HomeWork/.gitattributes new file mode 100644 index 00000000..3b41682a --- /dev/null +++ b/IronSchool_HomeWork/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/IronSchool_HomeWork/.gitignore b/IronSchool_HomeWork/.gitignore new file mode 100644 index 00000000..667aaef0 --- /dev/null +++ b/IronSchool_HomeWork/.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_HomeWork/.mvn/wrapper/maven-wrapper.properties b/IronSchool_HomeWork/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..8dea6c22 --- /dev/null +++ b/IronSchool_HomeWork/.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_HomeWork/mvnw b/IronSchool_HomeWork/mvnw new file mode 100644 index 00000000..bd8896bf --- /dev/null +++ b/IronSchool_HomeWork/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_HomeWork/mvnw.cmd b/IronSchool_HomeWork/mvnw.cmd new file mode 100644 index 00000000..92450f93 --- /dev/null +++ b/IronSchool_HomeWork/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_HomeWork/pom.xml b/IronSchool_HomeWork/pom.xml new file mode 100644 index 00000000..fc12bd47 --- /dev/null +++ b/IronSchool_HomeWork/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 4.0.3 + + + org.example + IronSchool_HomeWork + 0.0.1-SNAPSHOT + IronSchool_HomeWork + IronSchool_HomeWork + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-webmvc + + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + + org.springframework.boot + spring-boot-starter-validation + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.projectlombok + lombok + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java new file mode 100644 index 00000000..0b8f3f61 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java @@ -0,0 +1,13 @@ +package org.example.ironschool_homework; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class IronSchoolHomeWorkApplication { + + public static void main(String[] args) { + SpringApplication.run(IronSchoolHomeWorkApplication.class, args); + } + +} diff --git a/IronSchool_HomeWork/src/main/resources/application.properties b/IronSchool_HomeWork/src/main/resources/application.properties new file mode 100644 index 00000000..a6319321 --- /dev/null +++ b/IronSchool_HomeWork/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=IronSchool_HomeWork diff --git a/IronSchool_HomeWork/src/test/java/org/example/ironschool_homework/IronSchoolHomeWorkApplicationTests.java b/IronSchool_HomeWork/src/test/java/org/example/ironschool_homework/IronSchoolHomeWorkApplicationTests.java new file mode 100644 index 00000000..b2fa0add --- /dev/null +++ b/IronSchool_HomeWork/src/test/java/org/example/ironschool_homework/IronSchoolHomeWorkApplicationTests.java @@ -0,0 +1,13 @@ +package org.example.ironschool_homework; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class IronSchoolHomeWorkApplicationTests { + + @Test + void contextLoads() { + } + +} From c1483565c728985025a58ee3f83d52092bf3cb92 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 14:53:35 +0400 Subject: [PATCH 02/16] Added test controller --- .../ironschool_homework/controller/TeacherController.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java new file mode 100644 index 00000000..7b59e60b --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java @@ -0,0 +1,4 @@ +package org.example.ironschool_homework.controller; + +public class TeacherController { +} From 5f8bd6aca5c7413d805c257eb12aa1eb14fcfb39 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 14:54:15 +0400 Subject: [PATCH 03/16] Removed test controller --- .../ironschool_homework/controller/TeacherController.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java deleted file mode 100644 index 7b59e60b..00000000 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.example.ironschool_homework.controller; - -public class TeacherController { -} From 78ca6e0ca86d5a3db8c92f790a8c2501272c3033 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 14:55:18 +0400 Subject: [PATCH 04/16] Added test line --- .../ironschool_homework/IronSchoolHomeWorkApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java index 0b8f3f61..5dfa89da 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java @@ -8,6 +8,7 @@ public class IronSchoolHomeWorkApplication { public static void main(String[] args) { SpringApplication.run(IronSchoolHomeWorkApplication.class, args); + System.out.println("Course App Started..."); } } From 4b7077d2b6c2c5c02a21a98467aeb411354ce5c5 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 14:58:08 +0400 Subject: [PATCH 05/16] Added test model --- .../ironschool_homework/model/Teacher.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java new file mode 100644 index 00000000..31ece2da --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java @@ -0,0 +1,27 @@ +package org.example.ironschool_homework.model; + +public class Teacher { + private Long id; + private String name; + + public Teacher(Long id, String name) { + this.id = id; + this.name = name; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} From bc82fbf931cfa11bb86065d143face5eede7bad2 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 15:09:54 +0400 Subject: [PATCH 06/16] Finished Models --- .../ironschool_homework/model/Course.java | 64 +++++++++++++++++++ .../ironschool_homework/model/Student.java | 63 ++++++++++++++++++ .../ironschool_homework/model/Teacher.java | 30 +++++++-- 3 files changed, 150 insertions(+), 7 deletions(-) create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java new file mode 100644 index 00000000..276defe8 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java @@ -0,0 +1,64 @@ +package org.example.ironschool_homework.model; + +import jakarta.annotation.Nullable; + +public class Course { + private String courseId; + private String name; + private double price; + private double money_earned; + private Teacher teacher; + + public Course(String name, double price) { + this.name = name; + this.price = price; + } + + public Course(String courseId, String name, double price, double money_earned, Teacher teacher) { + this.courseId = courseId; + this.name = name; + this.price = price; + this.money_earned = money_earned; + this.teacher = teacher; + } + + 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 getMoney_earned() { + return money_earned; + } + + public void setMoney_earned(double money_earned) { + this.money_earned = money_earned; + } + + public Teacher getTeacher() { + return teacher; + } + + public void setTeacher(Teacher teacher) { + this.teacher = teacher; + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java new file mode 100644 index 00000000..fb2880d7 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java @@ -0,0 +1,63 @@ +package org.example.ironschool_homework.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 Student(String studentId, String name, String address, String email, Course course) { + this.studentId = studentId; + this.name = name; + this.address = address; + this.email = email; + this.course = course; + } + + 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_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java index 31ece2da..1dafeede 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java @@ -1,20 +1,28 @@ package org.example.ironschool_homework.model; public class Teacher { - private Long id; + private String teacherId; private String name; + private double salary; - public Teacher(Long id, String name) { - this.id = id; + + public Teacher(String name, double salary) { + this.name = name; + this.salary = salary; + } + + public Teacher(String teacherId, String name, double salary) { + this.teacherId = teacherId; this.name = name; + this.salary = salary; } - public Long getId() { - return id; + public String getTeacherId() { + return teacherId; } - public void setId(Long id) { - this.id = id; + public void setTeacherId(String teacherId) { + this.teacherId = teacherId; } public String getName() { @@ -24,4 +32,12 @@ public String getName() { public void setName(String name) { this.name = name; } + + public double getSalary() { + return salary; + } + + public void setSalary(double salary) { + this.salary = salary; + } } From 3865d771ec27b11d13fae8849b21df50bacf053b Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 15:46:34 +0400 Subject: [PATCH 07/16] Created Teacher Service --- .idea/compiler.xml | 21 +++++++++++++++++ .idea/encodings.xml | 6 +++++ .idea/jarRepositories.xml | 20 ++++++++++++++++ .idea/misc.xml | 8 +++++++ .../IronSchoolHomeWorkApplication.java | 4 ++++ .../service/TeacherService.java | 23 +++++++++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..cb73a3e8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..9c68418e --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ 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 index f5bd2dfe..51b77d74 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,13 @@ + + + + diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java index 5dfa89da..a0ced30c 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java @@ -1,8 +1,12 @@ package org.example.ironschool_homework; +import org.example.ironschool_homework.service.TeacherService; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import javax.print.DocFlavor; +import java.lang.classfile.instruction.SwitchCase; + @SpringBootApplication public class IronSchoolHomeWorkApplication { diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java new file mode 100644 index 00000000..96497105 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java @@ -0,0 +1,23 @@ +package org.example.ironschool_homework.service; + +import org.example.ironschool_homework.model.Teacher; + +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class TeacherService { + + private Map Teachers = new HashMap<>(); + + public void createTeacher(String teacherId, String name, double salary){ + Teacher teacher = new Teacher(teacherId,name,salary); + Teachers.put(teacherId,teacher); + } + + public Collection getAllTeachers(){ + Collection teachers = Teachers.values(); + return teachers; + } +} From 47876072344ac799218cfe1eb1c081bfb307b0a8 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 16:13:25 +0400 Subject: [PATCH 08/16] Created Teacher Service --- .../org/example/ironschool_homework/model/Teacher.java | 2 ++ .../ironschool_homework/service/TeacherService.java | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java index 1dafeede..0ff298fc 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java @@ -1,12 +1,14 @@ package org.example.ironschool_homework.model; public class Teacher { + private static int counter = 1; private String teacherId; private String name; private double salary; public Teacher(String name, double salary) { + this.teacherId = "T" + counter++; this.name = name; this.salary = salary; } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java index 96497105..0e38f7f0 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java @@ -11,13 +11,12 @@ public class TeacherService { private Map Teachers = new HashMap<>(); - public void createTeacher(String teacherId, String name, double salary){ - Teacher teacher = new Teacher(teacherId,name,salary); - Teachers.put(teacherId,teacher); + public void createTeacher(String name, double salary){ + Teacher teacher = new Teacher(name,salary); + Teachers.put(teacher.getTeacherId(),teacher); } public Collection getAllTeachers(){ - Collection teachers = Teachers.values(); - return teachers; + return Teachers.values(); } } From c72cb354b33ad5977e825d2399771df941182677 Mon Sep 17 00:00:00 2001 From: Mansura Date: Fri, 6 Mar 2026 16:45:25 +0400 Subject: [PATCH 09/16] modifying StudentId --- .../java/org/example/ironschool_homework/model/Student.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java index fb2880d7..862c3219 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java @@ -1,13 +1,17 @@ package org.example.ironschool_homework.model; +import java.util.UUID; + public class Student { private String studentId; private String name; private String address; private String email; private Course course; + private static int counter=1; public Student(String name, String address, String email) { + this.studentId = "T"+counter++; this.name = name; this.address = address; this.email = email; From f42a408604736249622d51a6536b67ad708c9268 Mon Sep 17 00:00:00 2001 From: Mansura Date: Fri, 6 Mar 2026 16:46:13 +0400 Subject: [PATCH 10/16] creating getStudent and addStudent --- .../service/StudentService.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java new file mode 100644 index 00000000..b421fdd2 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java @@ -0,0 +1,28 @@ +package org.example.ironschool_homework.service; + +import org.example.ironschool_homework.model.Student; +import org.example.ironschool_homework.model.Teacher; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class StudentService { + + private final Map students = new HashMap<>(); + + public List getStudents() { + return new ArrayList<>(students.values()); + } + + public Student addStudent(String studentId, String name, String address, String email) { + Student student = new Student(name, address, email); + students.put(studentId, student); + return student; + + } + + + +} From b66a7aa53d15bdcda90ceb99e4e0da7e000f7ca3 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 17:12:00 +0400 Subject: [PATCH 11/16] Created Teacher Controller and modifications. --- .idea/misc.xml | 14 -------- .../IronSchoolHomeWorkApplication.java | 3 -- .../controller/TeacherController.java | 33 +++++++++++++++++++ .../ironschool_homework/model/Teacher.java | 8 +++++ .../service/StudentService.java | 4 --- .../service/TeacherService.java | 5 ++- 6 files changed, 45 insertions(+), 22 deletions(-) delete mode 100644 .idea/misc.xml create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 51b77d74..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java index a0ced30c..3b1a0998 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/IronSchoolHomeWorkApplication.java @@ -4,9 +4,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import javax.print.DocFlavor; -import java.lang.classfile.instruction.SwitchCase; - @SpringBootApplication public class IronSchoolHomeWorkApplication { diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java new file mode 100644 index 00000000..b3316021 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java @@ -0,0 +1,33 @@ +package org.example.ironschool_homework.controller; + +import jakarta.validation.Valid; +import lombok.Locked; +import org.example.ironschool_homework.model.Teacher; +import org.example.ironschool_homework.service.TeacherService; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Collection; + +@RestController +@RequestMapping("/api/teacher") +public class TeacherController { + private final TeacherService teacherService; + + public TeacherController(TeacherService teacherService){ + this.teacherService = teacherService; + } + + @GetMapping + public ResponseEntity> findAll(){ + return ResponseEntity.ok(teacherService.getAllTeachers()); + } + + @PostMapping + public ResponseEntity create(@Valid @RequestBody Teacher teacher){ + Teacher newTeacher = teacherService.createTeacher(teacher.getName(),teacher.getSalary()); + return ResponseEntity.status(HttpStatus.CREATED).body(newTeacher); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java index 0ff298fc..aa73d7f4 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java @@ -1,9 +1,17 @@ package org.example.ironschool_homework.model; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; + public class Teacher { private static int counter = 1; private String teacherId; + + @NotBlank(message = "Name cannot be empty!") private String name; + + @Positive(message = "Salary can't be negative!") private double salary; diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java index b421fdd2..0ec0b305 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java @@ -20,9 +20,5 @@ public Student addStudent(String studentId, String name, String address, String Student student = new Student(name, address, email); students.put(studentId, student); return student; - } - - - } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java index 0e38f7f0..efb134ed 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java @@ -1,19 +1,22 @@ package org.example.ironschool_homework.service; import org.example.ironschool_homework.model.Teacher; +import org.springframework.stereotype.Service; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +@Service public class TeacherService { private Map Teachers = new HashMap<>(); - public void createTeacher(String name, double salary){ + public Teacher createTeacher(String name, double salary){ Teacher teacher = new Teacher(name,salary); Teachers.put(teacher.getTeacherId(),teacher); + return teacher; } public Collection getAllTeachers(){ From eb25a1f91a0b9874d185609fef353f9206e39536 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Fri, 6 Mar 2026 17:27:34 +0400 Subject: [PATCH 12/16] Added getById for teacher --- .../controller/TeacherController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java index b3316021..61ae4d6a 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java @@ -25,6 +25,20 @@ public ResponseEntity> findAll(){ return ResponseEntity.ok(teacherService.getAllTeachers()); } + @GetMapping("/{id}") + public ResponseEntity findById(@PathVariable String id) { + Teacher foundTeacher = teacherService.getAllTeachers() + .stream() + .filter(teacher -> teacher.getTeacherId().equals(id)) + .findFirst() + .orElse(null); + + if (foundTeacher == null) { + return ResponseEntity.notFound().build(); + } + return ResponseEntity.ok(foundTeacher); + } + @PostMapping public ResponseEntity create(@Valid @RequestBody Teacher teacher){ Teacher newTeacher = teacherService.createTeacher(teacher.getName(),teacher.getSalary()); From c6f243614356f7d602d1d4e9033761262af9abd0 Mon Sep 17 00:00:00 2001 From: URLeeo Date: Mon, 9 Mar 2026 20:01:52 +0400 Subject: [PATCH 13/16] Finished Homework --- .idea/compiler.xml | 1 + .../controller/CourseController.java | 75 ++++ .../controller/StudentController.java | 47 +++ .../controller/TeacherController.java | 16 +- .../ironschool_homework/model/Course.java | 16 + .../ironschool_homework/model/Student.java | 21 +- .../ironschool_homework/model/Teacher.java | 6 +- .../service/CourseService.java | 92 +++++ .../ironschool_homework/service/Main.java | 347 ++++++++++++++++++ .../service/StudentService.java | 19 +- .../service/TeacherService.java | 16 +- 11 files changed, 628 insertions(+), 28 deletions(-) create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/Main.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index cb73a3e8..8d257975 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java new file mode 100644 index 00000000..fdb5a56d --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java @@ -0,0 +1,75 @@ +package org.example.ironschool_homework.controller; + +import jakarta.validation.Valid; +import org.example.ironschool_homework.model.Course; +import org.example.ironschool_homework.model.Student; +import org.example.ironschool_homework.service.CourseService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Collection; +import java.util.Map; + +@RestController +@RequestMapping("/api/course") +public class CourseController { + + private final CourseService courseService; + + public CourseController(CourseService courseService) { + this.courseService = courseService; + } + + @GetMapping + public ResponseEntity> findAll() { + return ResponseEntity.ok(courseService.getAllCourses()); + } + + @GetMapping("/{id}") + public ResponseEntity findById(@PathVariable String id) { + Course course = courseService.getCourseById(id); + + if (course == null) { + return ResponseEntity.notFound().build(); + } + + return ResponseEntity.ok(course); + } + + @PostMapping + public ResponseEntity create(@Valid @RequestBody Course course) { + Course newCourse = courseService.createCourse(course.getName(), course.getPrice()); + return ResponseEntity.status(HttpStatus.CREATED).body(newCourse); + } + + @PutMapping("/{courseId}/assign/{teacherId}") + public ResponseEntity assignTeacher(@PathVariable String courseId, @PathVariable String teacherId) { + try { + Course updatedCourse = courseService.assignTeacher(teacherId, courseId); + return ResponseEntity.ok(updatedCourse); + } catch (RuntimeException ex) { + return ResponseEntity.badRequest().body(ex.getMessage()); + } + } + + @PutMapping("/{courseId}/enroll/{studentId}") + public ResponseEntity enrollStudent(@PathVariable String courseId, @PathVariable String studentId) { + try { + Student updatedStudent = courseService.enrollStudent(studentId, courseId); + return ResponseEntity.ok(updatedStudent); + } catch (RuntimeException ex) { + return ResponseEntity.badRequest().body(ex.getMessage()); + } + } + + @GetMapping("/profit") + public ResponseEntity> showProfit() { + return ResponseEntity.ok(Map.of("profit", courseService.showProfit())); + } + + @GetMapping("/money-earned") + public ResponseEntity> showMoneyEarned() { + return ResponseEntity.ok(Map.of("money_earned", courseService.showTotalMoneyEarned())); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java new file mode 100644 index 00000000..6cdf6a8b --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java @@ -0,0 +1,47 @@ +package org.example.ironschool_homework.controller; + +import jakarta.validation.Valid; +import org.example.ironschool_homework.model.Student; +import org.example.ironschool_homework.service.StudentService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Collection; + +@RestController +@RequestMapping("/api/student") +public class StudentController { + + private final StudentService studentService; + + public StudentController(StudentService studentService) { + this.studentService = studentService; + } + + @GetMapping + public ResponseEntity> findAll() { + return ResponseEntity.ok(studentService.getAllStudents()); + } + + @GetMapping("/{id}") + public ResponseEntity findById(@PathVariable String id) { + Student student = studentService.getStudentById(id); + + if (student == null) { + return ResponseEntity.notFound().build(); + } + + return ResponseEntity.ok(student); + } + + @PostMapping + public ResponseEntity create(@Valid @RequestBody Student student) { + Student newStudent = studentService.createStudent( + student.getName(), + student.getAddress(), + student.getEmail() + ); + return ResponseEntity.status(HttpStatus.CREATED).body(newStudent); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java index 61ae4d6a..c8da9837 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java @@ -14,34 +14,32 @@ @RestController @RequestMapping("/api/teacher") public class TeacherController { + private final TeacherService teacherService; - public TeacherController(TeacherService teacherService){ + public TeacherController(TeacherService teacherService) { this.teacherService = teacherService; } @GetMapping - public ResponseEntity> findAll(){ + public ResponseEntity> findAll() { return ResponseEntity.ok(teacherService.getAllTeachers()); } @GetMapping("/{id}") public ResponseEntity findById(@PathVariable String id) { - Teacher foundTeacher = teacherService.getAllTeachers() - .stream() - .filter(teacher -> teacher.getTeacherId().equals(id)) - .findFirst() - .orElse(null); + Teacher foundTeacher = teacherService.getTeacherById(id); if (foundTeacher == null) { return ResponseEntity.notFound().build(); } + return ResponseEntity.ok(foundTeacher); } @PostMapping - public ResponseEntity create(@Valid @RequestBody Teacher teacher){ - Teacher newTeacher = teacherService.createTeacher(teacher.getName(),teacher.getSalary()); + public ResponseEntity create(@Valid @RequestBody Teacher teacher) { + Teacher newTeacher = teacherService.createTeacher(teacher.getName(), teacher.getSalary()); return ResponseEntity.status(HttpStatus.CREATED).body(newTeacher); } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java index 276defe8..9b2508d2 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Course.java @@ -1,17 +1,30 @@ package org.example.ironschool_homework.model; import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.PositiveOrZero; public class Course { + private static int counter = 1; + private String courseId; + + @NotBlank(message = "Course name cannot be empty!") private String name; + + @PositiveOrZero(message = "Price cannot be negative!") private double price; + private double money_earned; + private Teacher teacher; public Course(String name, double price) { + this.courseId = "C" + counter++; this.name = name; this.price = price; + this.money_earned = 0; + this.teacher = null; } public Course(String courseId, String name, double price, double money_earned, Teacher teacher) { @@ -22,6 +35,9 @@ public Course(String courseId, String name, double price, double money_earned, T this.teacher = teacher; } + public Course() { + } + public String getCourseId() { return courseId; } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java index 862c3219..826a458b 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Student.java @@ -1,17 +1,29 @@ package org.example.ironschool_homework.model; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; + import java.util.UUID; public class Student { + private static int counter = 1; + private String studentId; + + @NotBlank(message = "Name cannot be empty!") private String name; + + @NotBlank(message = "Address cannot be empty!") private String address; + + @NotBlank(message = "Email cannot be empty!") + @Email(message = "Email format is invalid!") private String email; + private Course course; - private static int counter=1; public Student(String name, String address, String email) { - this.studentId = "T"+counter++; + this.studentId = "S" + counter++; this.name = name; this.address = address; this.email = email; @@ -25,6 +37,9 @@ public Student(String studentId, String name, String address, String email, Cour this.course = course; } + public Student() { + } + public String getStudentId() { return studentId; } @@ -64,4 +79,4 @@ public Course getCourse() { public void setCourse(Course course) { this.course = course; } -} +} \ No newline at end of file diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java index aa73d7f4..c6d8a8ab 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/model/Teacher.java @@ -11,10 +11,9 @@ public class Teacher { @NotBlank(message = "Name cannot be empty!") private String name; - @Positive(message = "Salary can't be negative!") + @Positive(message = "Salary must be greater than 0!") private double salary; - public Teacher(String name, double salary) { this.teacherId = "T" + counter++; this.name = name; @@ -27,6 +26,9 @@ public Teacher(String teacherId, String name, double salary) { this.salary = salary; } + public Teacher() { + } + public String getTeacherId() { return teacherId; } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java new file mode 100644 index 00000000..83bc207e --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java @@ -0,0 +1,92 @@ +package org.example.ironschool_homework.service; + +import org.example.ironschool_homework.model.Course; +import org.example.ironschool_homework.model.Student; +import org.example.ironschool_homework.model.Teacher; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +@Service +public class CourseService { + + private final Map courses = new HashMap<>(); + private final TeacherService teacherService; + private final StudentService studentService; + + public CourseService(TeacherService teacherService, StudentService studentService) { + this.teacherService = teacherService; + this.studentService = studentService; + } + + public Course createCourse(String name, double price) { + Course course = new Course(name, price); + courses.put(course.getCourseId(), course); + return course; + } + + public Collection getAllCourses() { + return courses.values(); + } + + public Course getCourseById(String id) { + return courses.get(id); + } + + public Course assignTeacher(String teacherId, String courseId) { + Teacher teacher = teacherService.getTeacherById(teacherId); + if (teacher == null) { + throw new RuntimeException("Teacher not found!"); + } + + Course course = getCourseById(courseId); + if (course == null) { + throw new RuntimeException("Course not found!"); + } + + course.setTeacher(teacher); + return course; + } + + public Student enrollStudent(String studentId, String courseId) { + Student student = studentService.getStudentById(studentId); + if (student == null) { + throw new RuntimeException("Student not found!"); + } + + Course course = getCourseById(courseId); + if (course == null) { + throw new RuntimeException("Course not found!"); + } + + if (student.getCourse() != null) { + throw new RuntimeException("Student already enrolled in a course!"); + } + + student.setCourse(course); + course.setMoney_earned(course.getMoney_earned() + course.getPrice()); + + return student; + } + + public double showTotalMoneyEarned() { + double total = 0; + for (Course course : courses.values()) { + total += course.getMoney_earned(); + } + return total; + } + + public double showProfit() { + double totalEarned = showTotalMoneyEarned(); + double totalSalary = 0; + + for (Teacher teacher : teacherService.getAllTeachers()) { + totalSalary += teacher.getSalary(); + } + + return totalEarned - totalSalary; + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/Main.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/Main.java new file mode 100644 index 00000000..8349d291 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/Main.java @@ -0,0 +1,347 @@ +package org.example.ironschool_homework.service; + +import org.example.ironschool_homework.model.Course; +import org.example.ironschool_homework.model.Student; +import org.example.ironschool_homework.model.Teacher; + +import java.util.Collection; +import java.util.Scanner; + +public class Main { + + public static void main(String[] args) { + Scanner scanner = new Scanner(System.in); + + TeacherService teacherService = new TeacherService(); + StudentService studentService = new StudentService(); + CourseService courseService = new CourseService(teacherService, studentService); + + System.out.println("===== SCHOOL MANAGEMENT SYSTEM ====="); + + System.out.print("Enter school name: "); + String schoolName = scanner.nextLine(); + + while (schoolName.isBlank()) { + System.out.print("School name cannot be empty. Enter school name again: "); + schoolName = scanner.nextLine(); + } + + System.out.println("Welcome to " + schoolName + "!"); + + createInitialTeachers(scanner, teacherService); + createInitialCourses(scanner, courseService); + createInitialStudents(scanner, studentService); + + printMenu(); + + while (true) { + System.out.print("\nEnter command: "); + String input = scanner.nextLine().trim(); + + if (input.equalsIgnoreCase("EXIT")) { + System.out.println("Program ended."); + break; + } + + try { + handleCommand(input, teacherService, studentService, courseService); + } catch (Exception e) { + System.out.println("Error: " + e.getMessage()); + } + } + + scanner.close(); + } + + private static void createInitialTeachers(Scanner scanner, TeacherService teacherService) { + int teacherCount = readNonNegativeInt(scanner, "\nHow many teachers do you want to create? "); + + for (int i = 1; i <= teacherCount; i++) { + System.out.println("\nEnter details for teacher #" + i); + + System.out.print("Name: "); + String name = scanner.nextLine(); + + while (name.isBlank()) { + System.out.print("Name cannot be empty. Enter again: "); + name = scanner.nextLine(); + } + + double salary = readNonNegativeDouble(scanner, "Salary: "); + + Teacher teacher = teacherService.createTeacher(name, salary); + System.out.println("Created teacher -> ID: " + teacher.getTeacherId()); + } + } + + private static void createInitialCourses(Scanner scanner, CourseService courseService) { + int courseCount = readNonNegativeInt(scanner, "\nHow many courses do you want to create? "); + + for (int i = 1; i <= courseCount; i++) { + System.out.println("\nEnter details for course #" + i); + + System.out.print("Name: "); + String name = scanner.nextLine(); + + while (name.isBlank()) { + System.out.print("Name cannot be empty. Enter again: "); + name = scanner.nextLine(); + } + + double price = readNonNegativeDouble(scanner, "Price: "); + + Course course = courseService.createCourse(name, price); + System.out.println("Created course -> ID: " + course.getCourseId()); + } + } + + private static void createInitialStudents(Scanner scanner, StudentService studentService) { + int studentCount = readNonNegativeInt(scanner, "\nHow many students do you want to create? "); + + for (int i = 1; i <= studentCount; i++) { + System.out.println("\nEnter details for student #" + i); + + System.out.print("Name: "); + String name = scanner.nextLine(); + while (name.isBlank()) { + System.out.print("Name cannot be empty. Enter again: "); + name = scanner.nextLine(); + } + + System.out.print("Address: "); + String address = scanner.nextLine(); + while (address.isBlank()) { + System.out.print("Address cannot be empty. Enter again: "); + address = scanner.nextLine(); + } + + System.out.print("Email: "); + String email = scanner.nextLine(); + while (email.isBlank()) { + System.out.print("Email cannot be empty. Enter again: "); + email = scanner.nextLine(); + } + + Student student = studentService.createStudent(name, address, email); + System.out.println("Created student -> ID: " + student.getStudentId()); + } + } + + private static void handleCommand( + String input, + TeacherService teacherService, + StudentService studentService, + CourseService courseService + ) { + String[] parts = input.split("\\s+"); + + if (input.equalsIgnoreCase("SHOW TEACHERS")) { + showTeachers(teacherService.getAllTeachers()); + return; + } + + if (input.equalsIgnoreCase("SHOW STUDENTS")) { + showStudents(studentService.getAllStudents()); + return; + } + + if (input.equalsIgnoreCase("SHOW COURSES")) { + showCourses(courseService.getAllCourses()); + return; + } + + if (input.equalsIgnoreCase("SHOW PROFIT")) { + System.out.println("Profit: " + courseService.showProfit()); + return; + } + + if (input.equalsIgnoreCase("SHOW MONEY EARNED")) { + System.out.println("Money earned: " + courseService.showTotalMoneyEarned()); + return; + } + + if (parts.length == 3 && parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("TEACHER")) { + Teacher teacher = teacherService.getTeacherById(parts[2]); + if (teacher == null) { + System.out.println("Teacher not found."); + } else { + printTeacherDetails(teacher); + } + return; + } + + if (parts.length == 3 && parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("STUDENT")) { + Student student = studentService.getStudentById(parts[2]); + if (student == null) { + System.out.println("Student not found."); + } else { + printStudentDetails(student); + } + return; + } + + if (parts.length == 3 && parts[0].equalsIgnoreCase("LOOKUP") && parts[1].equalsIgnoreCase("COURSE")) { + Course course = courseService.getCourseById(parts[2]); + if (course == null) { + System.out.println("Course not found."); + } else { + printCourseDetails(course); + } + return; + } + + if (parts.length == 3 && parts[0].equalsIgnoreCase("ASSIGN")) { + Course updatedCourse = courseService.assignTeacher(parts[1], parts[2]); + System.out.println("Teacher assigned successfully."); + printCourseDetails(updatedCourse); + return; + } + + if (parts.length == 3 && parts[0].equalsIgnoreCase("ENROLL")) { + Student updatedStudent = courseService.enrollStudent(parts[1], parts[2]); + System.out.println("Student enrolled successfully."); + printStudentDetails(updatedStudent); + return; + } + + System.out.println("Unknown command."); + } + + private static void showTeachers(Collection teachers) { + if (teachers.isEmpty()) { + System.out.println("No teachers found."); + return; + } + + System.out.println("\n--- TEACHERS ---"); + for (Teacher teacher : teachers) { + System.out.println("ID: " + teacher.getTeacherId() + + ", Name: " + teacher.getName() + + ", Salary: " + teacher.getSalary()); + } + } + + private static void showStudents(Collection students) { + if (students.isEmpty()) { + System.out.println("No students found."); + return; + } + + System.out.println("\n--- STUDENTS ---"); + for (Student student : students) { + String courseInfo = student.getCourse() == null + ? "No course assigned" + : student.getCourse().getName() + " (" + student.getCourse().getCourseId() + ")"; + + System.out.println("ID: " + student.getStudentId() + + ", Name: " + student.getName() + + ", Address: " + student.getAddress() + + ", Email: " + student.getEmail() + + ", Course: " + courseInfo); + } + } + + private static void showCourses(Collection courses) { + if (courses.isEmpty()) { + System.out.println("No courses found."); + return; + } + + System.out.println("\n--- COURSES ---"); + for (Course course : courses) { + String teacherInfo = course.getTeacher() == null + ? "No teacher assigned" + : course.getTeacher().getName() + " (" + course.getTeacher().getTeacherId() + ")"; + + System.out.println("ID: " + course.getCourseId() + + ", Name: " + course.getName() + + ", Price: " + course.getPrice() + + ", Money Earned: " + course.getMoney_earned() + + ", Teacher: " + teacherInfo); + } + } + + private static void printTeacherDetails(Teacher teacher) { + System.out.println("\n--- TEACHER DETAILS ---"); + System.out.println("ID: " + teacher.getTeacherId()); + System.out.println("Name: " + teacher.getName()); + System.out.println("Salary: " + teacher.getSalary()); + } + + private static void printStudentDetails(Student student) { + System.out.println("\n--- STUDENT DETAILS ---"); + System.out.println("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: No course assigned"); + } else { + System.out.println("Course: " + student.getCourse().getName() + + " (" + student.getCourse().getCourseId() + ")"); + } + } + + private static void printCourseDetails(Course course) { + System.out.println("\n--- COURSE DETAILS ---"); + System.out.println("ID: " + course.getCourseId()); + System.out.println("Name: " + course.getName()); + System.out.println("Price: " + course.getPrice()); + System.out.println("Money earned: " + course.getMoney_earned()); + + if (course.getTeacher() == null) { + System.out.println("Teacher: No teacher assigned"); + } else { + System.out.println("Teacher: " + course.getTeacher().getName() + + " (" + course.getTeacher().getTeacherId() + ")"); + } + } + + private static int readNonNegativeInt(Scanner scanner, String message) { + while (true) { + try { + System.out.print(message); + int value = Integer.parseInt(scanner.nextLine()); + if (value < 0) { + System.out.println("Please enter 0 or a positive integer."); + continue; + } + return value; + } catch (NumberFormatException e) { + System.out.println("Invalid number. Try again."); + } + } + } + + private static double readNonNegativeDouble(Scanner scanner, String message) { + while (true) { + try { + System.out.print(message); + double value = Double.parseDouble(scanner.nextLine()); + if (value < 0) { + System.out.println("Please enter 0 or a positive number."); + continue; + } + return value; + } catch (NumberFormatException e) { + System.out.println("Invalid number. Try again."); + } + } + } + + private static void printMenu() { + System.out.println("\n===== AVAILABLE COMMANDS ====="); + System.out.println("SHOW TEACHERS"); + System.out.println("LOOKUP TEACHER [TEACHER_ID]"); + System.out.println("SHOW STUDENTS"); + System.out.println("LOOKUP STUDENT [STUDENT_ID]"); + System.out.println("SHOW COURSES"); + System.out.println("LOOKUP COURSE [COURSE_ID]"); + System.out.println("ASSIGN [TEACHER_ID] [COURSE_ID]"); + System.out.println("ENROLL [STUDENT_ID] [COURSE_ID]"); + System.out.println("SHOW PROFIT"); + System.out.println("SHOW MONEY EARNED"); + System.out.println("EXIT"); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java index 0ec0b305..8cb98a83 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java @@ -2,23 +2,26 @@ import org.example.ironschool_homework.model.Student; import org.example.ironschool_homework.model.Teacher; +import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +@Service public class StudentService { private final Map students = new HashMap<>(); - public List getStudents() { - return new ArrayList<>(students.values()); + public Collection getAllStudents() { + return students.values(); } - public Student addStudent(String studentId, String name, String address, String email) { + public Student createStudent(String name, String address, String email) { Student student = new Student(name, address, email); - students.put(studentId, student); + students.put(student.getStudentId(), student); return student; } + + public Student getStudentById(String id) { + return students.get(id); + } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java index efb134ed..6a5d5513 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java @@ -11,15 +11,19 @@ @Service public class TeacherService { - private Map Teachers = new HashMap<>(); + private final Map teachers = new HashMap<>(); - public Teacher createTeacher(String name, double salary){ - Teacher teacher = new Teacher(name,salary); - Teachers.put(teacher.getTeacherId(),teacher); + public Teacher createTeacher(String name, double salary) { + Teacher teacher = new Teacher(name, salary); + teachers.put(teacher.getTeacherId(), teacher); return teacher; } - public Collection getAllTeachers(){ - return Teachers.values(); + public Collection getAllTeachers() { + return teachers.values(); + } + + public Teacher getTeacherById(String id) { + return teachers.get(id); } } From ebad4366d0f0f063b0099ab98d48dfa492ba1d6c Mon Sep 17 00:00:00 2001 From: Mansura Date: Tue, 10 Mar 2026 10:18:48 +0400 Subject: [PATCH 14/16] adding update delete and patch --- .../controller/CourseController.java | 11 ++++++ .../controller/StudentController.java | 16 ++++++++ .../controller/TeacherController.java | 19 +++++++++ .../service/CourseService.java | 17 ++++++++ .../service/StudentService.java | 39 +++++++++++++++++++ .../service/TeacherService.java | 31 +++++++++++++++ 6 files changed, 133 insertions(+) diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java index fdb5a56d..464b06a1 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java @@ -72,4 +72,15 @@ public ResponseEntity> showProfit() { public ResponseEntity> showMoneyEarned() { return ResponseEntity.ok(Map.of("money_earned", courseService.showTotalMoneyEarned())); } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable String id, @Valid @RequestBody Course course) { + Course currentCourse =courseService.updateCourse(id,course.getPrice(),course.getName()); + return ResponseEntity.ok(currentCourse); + } + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable String id) { + courseService.deleteCourse(id); + return ResponseEntity.noContent().build(); + } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java index 6cdf6a8b..f4b3939a 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java @@ -44,4 +44,20 @@ public ResponseEntity create(@Valid @RequestBody Student student) { ); return ResponseEntity.status(HttpStatus.CREATED).body(newStudent); } + + @PutMapping("/{id}") + public ResponseEntity update(String id,@Valid @RequestBody Student student) { + Student student1=studentService.updateStudentById(id,student.getName(),student.getAddress(),student.getEmail()); + return ResponseEntity.ok(student1); + } + @PatchMapping("/{id}") + public ResponseEntity partial(@Valid @RequestBody Student student,@PathVariable String id) { + Student student1=studentService.patchStudentById(id,student.getName(),student.getAddress(),student.getEmail()); + return ResponseEntity.ok(student1); + } + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable String id) { + studentService.deleteStudentById(id); + return ResponseEntity.noContent().build(); + } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java index c8da9837..df5e62b5 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java @@ -42,4 +42,23 @@ public ResponseEntity create(@Valid @RequestBody Teacher teacher) { Teacher newTeacher = teacherService.createTeacher(teacher.getName(), teacher.getSalary()); return ResponseEntity.status(HttpStatus.CREATED).body(newTeacher); } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable String id, @Valid @RequestBody Teacher teacher) { + Teacher teacher1=teacherService.updateTeacherById(id,teacher.getName(), teacher.getSalary()); + return ResponseEntity.ok(teacher1); + } + + @PatchMapping("/{id}") + public ResponseEntity patch(@PathVariable String id, @Valid @RequestBody Teacher teacher) { + Teacher teacher1=teacherService.patchTeacherById(id,teacher.getName(), teacher.getSalary()); + return ResponseEntity.ok(teacher1); + + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable String id) { + teacherService.deleteTeacherById(id); + return ResponseEntity.noContent().build(); + } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java index 83bc207e..1a7e761d 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java @@ -89,4 +89,21 @@ public double showProfit() { return totalEarned - totalSalary; } + public Course updateCourse(String id, double price,String name ) { + Course course = getCourseById(id); + if (course != null) { + course.setName(name); + course.setPrice(price); + courses.put(id, course); + return course; + } + throw new RuntimeException("Course not found!"); + } + + public void deleteCourse(String id) { + if (!courses.containsKey(id)) { + throw new RuntimeException("Course not found!"); + } + courses.remove(id); + } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java index 8cb98a83..6c1c75ff 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java @@ -24,4 +24,43 @@ public Student createStudent(String name, String address, String email) { public Student getStudentById(String id) { return students.get(id); } + + + public Student updateStudentById(String id, String name,String address,String email) { + Student student1 = getStudentById(id); + if (student1 != null) { + student1.setName(name); + student1.setAddress(address); + student1.setEmail(email); + students.put(student1.getStudentId(), student1); + return student1; + } + throw new RuntimeException("Student not found"); + } + + public Student patchStudentById(String id, String name,String address,String email) { + Student student1 = getStudentById(id); + if (student1 != null) { + if(name!=null){ + student1.setName(name); + } + if(address!=null){ + student1.setAddress(address); + } + if(email!=null){ + student1.setEmail(email); + } + students.put(student1.getStudentId(), student1); + return student1; + } + throw new RuntimeException("Student not found"); + } + + public void deleteStudentById(String id) { + if (!students.containsKey(id)) { + throw new RuntimeException("Student not found"); + } + students.remove(id); + } + } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java index 6a5d5513..54581d85 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java @@ -26,4 +26,35 @@ public Collection getAllTeachers() { public Teacher getTeacherById(String id) { return teachers.get(id); } + + public Teacher updateTeacherById(String id, String name, double salary) { + Teacher oldTeacher = getTeacherById(id); + if (oldTeacher != null) { + oldTeacher.setName(name); + oldTeacher.setSalary(salary); + teachers.put(oldTeacher.getTeacherId(), oldTeacher); + return oldTeacher; + } + throw new RuntimeException("Teacher not found"); + } + + public Teacher patchTeacherById(String id, String name, double salary) { + Teacher oldTeacher = getTeacherById(id); + if (oldTeacher != null) { + if(name!=null){ + oldTeacher.setName(name); + } + teachers.put(oldTeacher.getTeacherId(), oldTeacher); + return oldTeacher; + + } + throw new RuntimeException("Teacher not found"); + } + + public void deleteTeacherById(String id) { + if (!teachers.containsKey(id)) { + throw new RuntimeException("Teacher not found"); + } + teachers.remove(id); + } } From 3336238677cf49fb1ec125a962214eb6ed6b7e28 Mon Sep 17 00:00:00 2001 From: Mansura Date: Thu, 12 Mar 2026 11:13:36 +0400 Subject: [PATCH 15/16] adding exception handling --- .../controller/CourseController.java | 24 ++--- .../controller/StudentController.java | 15 ++- .../controller/TeacherController.java | 11 +-- .../exception/CourseNotFoundException.java | 7 ++ .../exception/ErrorResponse.java | 33 +++++++ .../exception/GlobalExceptionHandler.java | 94 +++++++++++++++++++ .../StudentAlreadyEnrolledException.java | 7 ++ .../exception/StudentNotFoundException.java | 7 ++ .../exception/TeacherNotFoundException.java | 7 ++ .../exception/ValidationErrorResponse.java | 35 +++++++ .../service/CourseService.java | 44 +++------ .../service/StudentService.java | 51 +++++----- .../service/TeacherService.java | 30 +++--- 13 files changed, 256 insertions(+), 109 deletions(-) create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/CourseNotFoundException.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ErrorResponse.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/GlobalExceptionHandler.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentAlreadyEnrolledException.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentNotFoundException.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/TeacherNotFoundException.java create mode 100644 IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ValidationErrorResponse.java diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java index 464b06a1..1bf3237a 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/CourseController.java @@ -29,11 +29,6 @@ public ResponseEntity> findAll() { @GetMapping("/{id}") public ResponseEntity findById(@PathVariable String id) { Course course = courseService.getCourseById(id); - - if (course == null) { - return ResponseEntity.notFound().build(); - } - return ResponseEntity.ok(course); } @@ -45,22 +40,14 @@ public ResponseEntity create(@Valid @RequestBody Course course) { @PutMapping("/{courseId}/assign/{teacherId}") public ResponseEntity assignTeacher(@PathVariable String courseId, @PathVariable String teacherId) { - try { - Course updatedCourse = courseService.assignTeacher(teacherId, courseId); - return ResponseEntity.ok(updatedCourse); - } catch (RuntimeException ex) { - return ResponseEntity.badRequest().body(ex.getMessage()); - } + Course updatedCourse = courseService.assignTeacher(teacherId, courseId); + return ResponseEntity.ok(updatedCourse); } @PutMapping("/{courseId}/enroll/{studentId}") public ResponseEntity enrollStudent(@PathVariable String courseId, @PathVariable String studentId) { - try { - Student updatedStudent = courseService.enrollStudent(studentId, courseId); - return ResponseEntity.ok(updatedStudent); - } catch (RuntimeException ex) { - return ResponseEntity.badRequest().body(ex.getMessage()); - } + Student updatedStudent = courseService.enrollStudent(studentId, courseId); + return ResponseEntity.ok(updatedStudent); } @GetMapping("/profit") @@ -75,9 +62,10 @@ public ResponseEntity> showMoneyEarned() { @PutMapping("/{id}") public ResponseEntity update(@PathVariable String id, @Valid @RequestBody Course course) { - Course currentCourse =courseService.updateCourse(id,course.getPrice(),course.getName()); + Course currentCourse = courseService.updateCourse(id, course.getPrice(), course.getName()); return ResponseEntity.ok(currentCourse); } + @DeleteMapping("/{id}") public ResponseEntity delete(@PathVariable String id) { courseService.deleteCourse(id); diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java index f4b3939a..2bd7cecf 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/StudentController.java @@ -27,11 +27,6 @@ public ResponseEntity> findAll() { @GetMapping("/{id}") public ResponseEntity findById(@PathVariable String id) { Student student = studentService.getStudentById(id); - - if (student == null) { - return ResponseEntity.notFound().build(); - } - return ResponseEntity.ok(student); } @@ -46,15 +41,17 @@ public ResponseEntity create(@Valid @RequestBody Student student) { } @PutMapping("/{id}") - public ResponseEntity update(String id,@Valid @RequestBody Student student) { - Student student1=studentService.updateStudentById(id,student.getName(),student.getAddress(),student.getEmail()); + public ResponseEntity update(@PathVariable String id, @Valid @RequestBody Student student) { + Student student1 = studentService.updateStudentById(id, student.getName(), student.getAddress(), student.getEmail()); return ResponseEntity.ok(student1); } + @PatchMapping("/{id}") - public ResponseEntity partial(@Valid @RequestBody Student student,@PathVariable String id) { - Student student1=studentService.patchStudentById(id,student.getName(),student.getAddress(),student.getEmail()); + public ResponseEntity partial(@PathVariable String id, @RequestBody Student student) { + Student student1 = studentService.patchStudentById(id, student.getName(), student.getAddress(), student.getEmail()); return ResponseEntity.ok(student1); } + @DeleteMapping("/{id}") public ResponseEntity delete(@PathVariable String id) { studentService.deleteStudentById(id); diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java index df5e62b5..354a4e13 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/controller/TeacherController.java @@ -29,11 +29,6 @@ public ResponseEntity> findAll() { @GetMapping("/{id}") public ResponseEntity findById(@PathVariable String id) { Teacher foundTeacher = teacherService.getTeacherById(id); - - if (foundTeacher == null) { - return ResponseEntity.notFound().build(); - } - return ResponseEntity.ok(foundTeacher); } @@ -45,13 +40,13 @@ public ResponseEntity create(@Valid @RequestBody Teacher teacher) { @PutMapping("/{id}") public ResponseEntity update(@PathVariable String id, @Valid @RequestBody Teacher teacher) { - Teacher teacher1=teacherService.updateTeacherById(id,teacher.getName(), teacher.getSalary()); + Teacher teacher1 = teacherService.updateTeacherById(id, teacher.getName(), teacher.getSalary()); return ResponseEntity.ok(teacher1); } @PatchMapping("/{id}") - public ResponseEntity patch(@PathVariable String id, @Valid @RequestBody Teacher teacher) { - Teacher teacher1=teacherService.patchTeacherById(id,teacher.getName(), teacher.getSalary()); + public ResponseEntity patch(@PathVariable String id, @RequestBody Teacher teacher) { + Teacher teacher1 = teacherService.patchTeacherById(id, teacher.getName(), teacher.getSalary()); return ResponseEntity.ok(teacher1); } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/CourseNotFoundException.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/CourseNotFoundException.java new file mode 100644 index 00000000..90ab8a75 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/CourseNotFoundException.java @@ -0,0 +1,7 @@ +package org.example.ironschool_homework.exception; + +public class CourseNotFoundException extends RuntimeException { + public CourseNotFoundException(String message) { + super(message); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ErrorResponse.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ErrorResponse.java new file mode 100644 index 00000000..797e7865 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ErrorResponse.java @@ -0,0 +1,33 @@ +package org.example.ironschool_homework.exception; + +import java.time.LocalDateTime; + +public class ErrorResponse { + private int status; + private String error; + private String message; + private LocalDateTime timestamp; + + public ErrorResponse(int status, String error, String message, LocalDateTime timestamp) { + this.status = status; + this.error = error; + this.message = message; + this.timestamp = LocalDateTime.now(); + } + + public int getStatus() { + return status; + } + + public String getError() { + return error; + } + + public String getMessage() { + return message; + } + + public LocalDateTime getTimestamp() { + return timestamp; + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/GlobalExceptionHandler.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..bee14e9a --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/GlobalExceptionHandler.java @@ -0,0 +1,94 @@ +package org.example.ironschool_homework.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import java.time.LocalDateTime; +import java.util.List; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(StudentNotFoundException.class) + public ResponseEntity handleStudentNotFoundException(StudentNotFoundException ex){ + ErrorResponse error= new ErrorResponse( + HttpStatus.NOT_FOUND.value(), + "Not Found", + ex.getMessage() , + LocalDateTime.now() + ); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error); + + } + + @ExceptionHandler(TeacherNotFoundException.class) + public ResponseEntity handleTeacherNotFoundException(TeacherNotFoundException ex){ + ErrorResponse error= new ErrorResponse( + HttpStatus.NOT_FOUND.value(), + "Not Found", + ex.getMessage() , + LocalDateTime.now() + ); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error); + } + + @ExceptionHandler(CourseNotFoundException.class) + public ResponseEntity handleCourseNotFoundException(CourseNotFoundException ex){ + ErrorResponse error= new ErrorResponse( + HttpStatus.NOT_FOUND.value(), + "Not Found", + ex.getMessage() , + LocalDateTime.now() + ); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(error); + } + + @ExceptionHandler(StudentAlreadyEnrolledException.class) + public ResponseEntity handleStudentAlreadyEnrolledException(StudentAlreadyEnrolledException ex){ + ErrorResponse error= new ErrorResponse( + HttpStatus.BAD_REQUEST.value(), + "Student Already Enrolled", + ex.getMessage() , + LocalDateTime.now() + ); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(error); + } + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleValidation( + MethodArgumentNotValidException ex) { + + List errors = ex.getBindingResult() + .getFieldErrors() + .stream() + .map(error -> error.getField() + ": " + error.getDefaultMessage()) + .toList(); + + ValidationErrorResponse response = new ValidationErrorResponse( + HttpStatus.BAD_REQUEST.value(), + "Validation Failed", + errors, + LocalDateTime.now() + ); + return ResponseEntity.badRequest().body(response); + } + @ExceptionHandler(Exception.class) + public ResponseEntity handleGeneral(Exception ex) { + ErrorResponse error = new ErrorResponse( + HttpStatus.INTERNAL_SERVER_ERROR.value(), + "Internal Server Error", + "An unexpected error occurred", + LocalDateTime.now() + ); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(error); + } + + + + + + + +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentAlreadyEnrolledException.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentAlreadyEnrolledException.java new file mode 100644 index 00000000..7de1ccec --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentAlreadyEnrolledException.java @@ -0,0 +1,7 @@ +package org.example.ironschool_homework.exception; + +public class StudentAlreadyEnrolledException extends RuntimeException { + public StudentAlreadyEnrolledException(String message) { + super(message); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentNotFoundException.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentNotFoundException.java new file mode 100644 index 00000000..d35b9b14 --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/StudentNotFoundException.java @@ -0,0 +1,7 @@ +package org.example.ironschool_homework.exception; + +public class StudentNotFoundException extends RuntimeException { + public StudentNotFoundException(String message) { + super(message); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/TeacherNotFoundException.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/TeacherNotFoundException.java new file mode 100644 index 00000000..e6efcb2f --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/TeacherNotFoundException.java @@ -0,0 +1,7 @@ +package org.example.ironschool_homework.exception; + +public class TeacherNotFoundException extends RuntimeException { + public TeacherNotFoundException(String message) { + super(message); + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ValidationErrorResponse.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ValidationErrorResponse.java new file mode 100644 index 00000000..d9f27d7a --- /dev/null +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/exception/ValidationErrorResponse.java @@ -0,0 +1,35 @@ +package org.example.ironschool_homework.exception; + +import java.time.LocalDateTime; +import java.util.List; + +public class ValidationErrorResponse { + + private int status; + private String error; + private List messages; + private LocalDateTime timestamp; + + public ValidationErrorResponse(int status, String error, List messages, LocalDateTime timestamp) { + this.status = status; + this.error = error; + this.messages = messages; + this.timestamp = LocalDateTime.now(); + } + + public int getStatus() { + return status; + } + + public String getError() { + return error; + } + + public List getMessages() { + return messages; + } + + public LocalDateTime getTimestamp() { + return timestamp; + } +} diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java index 1a7e761d..498da6ee 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/CourseService.java @@ -1,5 +1,9 @@ package org.example.ironschool_homework.service; +import org.example.ironschool_homework.exception.CourseNotFoundException; +import org.example.ironschool_homework.exception.StudentAlreadyEnrolledException; +import org.example.ironschool_homework.exception.StudentNotFoundException; +import org.example.ironschool_homework.exception.TeacherNotFoundException; import org.example.ironschool_homework.model.Course; import org.example.ironschool_homework.model.Student; import org.example.ironschool_homework.model.Teacher; @@ -32,42 +36,27 @@ public Collection getAllCourses() { } public Course getCourseById(String id) { + if (!courses.containsKey(id)) { + throw new CourseNotFoundException("Course not found"); + } return courses.get(id); } public Course assignTeacher(String teacherId, String courseId) { Teacher teacher = teacherService.getTeacherById(teacherId); - if (teacher == null) { - throw new RuntimeException("Teacher not found!"); - } - Course course = getCourseById(courseId); - if (course == null) { - throw new RuntimeException("Course not found!"); - } - course.setTeacher(teacher); return course; } public Student enrollStudent(String studentId, String courseId) { Student student = studentService.getStudentById(studentId); - if (student == null) { - throw new RuntimeException("Student not found!"); - } - Course course = getCourseById(courseId); - if (course == null) { - throw new RuntimeException("Course not found!"); - } - if (student.getCourse() != null) { - throw new RuntimeException("Student already enrolled in a course!"); + throw new StudentAlreadyEnrolledException("Student already enrolled in a course!"); } - student.setCourse(course); course.setMoney_earned(course.getMoney_earned() + course.getPrice()); - return student; } @@ -89,21 +78,16 @@ public double showProfit() { return totalEarned - totalSalary; } - public Course updateCourse(String id, double price,String name ) { + + public Course updateCourse(String id, double price, String name) { Course course = getCourseById(id); - if (course != null) { - course.setName(name); - course.setPrice(price); - courses.put(id, course); - return course; - } - throw new RuntimeException("Course not found!"); + course.setName(name); + course.setPrice(price); + return course; } public void deleteCourse(String id) { - if (!courses.containsKey(id)) { - throw new RuntimeException("Course not found!"); - } + getCourseById(id); courses.remove(id); } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java index 6c1c75ff..2d44ddeb 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java @@ -1,5 +1,6 @@ package org.example.ironschool_homework.service; +import org.example.ironschool_homework.exception.StudentNotFoundException; import org.example.ironschool_homework.model.Student; import org.example.ironschool_homework.model.Teacher; import org.springframework.stereotype.Service; @@ -22,45 +23,43 @@ public Student createStudent(String name, String address, String email) { } public Student getStudentById(String id) { + if (!students.containsKey(id)) { + throw new StudentNotFoundException("Student with id " + id + " not found"); + } + return students.get(id); } + public Student updateStudentById(String id, String name, String address, String email) { + Student student1 = getStudentById(id); + + student1.setName(name); + student1.setAddress(address); + student1.setEmail(email); + students.put(id, student1); + return student1; + + } - public Student updateStudentById(String id, String name,String address,String email) { + public Student patchStudentById(String id, String name, String address, String email) { Student student1 = getStudentById(id); - if (student1 != null) { + if (name != null) { student1.setName(name); + } + if (address != null) { student1.setAddress(address); + } + if (email != null) { student1.setEmail(email); - students.put(student1.getStudentId(), student1); - return student1; } - throw new RuntimeException("Student not found"); - } + students.put(student1.getStudentId(), student1); + return student1; - public Student patchStudentById(String id, String name,String address,String email) { - Student student1 = getStudentById(id); - if (student1 != null) { - if(name!=null){ - student1.setName(name); - } - if(address!=null){ - student1.setAddress(address); - } - if(email!=null){ - student1.setEmail(email); - } - students.put(student1.getStudentId(), student1); - return student1; - } - throw new RuntimeException("Student not found"); } public void deleteStudentById(String id) { - if (!students.containsKey(id)) { - throw new RuntimeException("Student not found"); - } - students.remove(id); + Student student = getStudentById(id); + students.remove(id); } } diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java index 54581d85..8590b5d7 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/TeacherService.java @@ -1,5 +1,6 @@ package org.example.ironschool_homework.service; +import org.example.ironschool_homework.exception.TeacherNotFoundException; import org.example.ironschool_homework.model.Teacher; import org.springframework.stereotype.Service; @@ -24,37 +25,30 @@ public Collection getAllTeachers() { } public Teacher getTeacherById(String id) { + if (!teachers.containsKey(id)) { + throw new TeacherNotFoundException("Teacher with id " + id + " does not exist"); + } return teachers.get(id); } public Teacher updateTeacherById(String id, String name, double salary) { Teacher oldTeacher = getTeacherById(id); - if (oldTeacher != null) { - oldTeacher.setName(name); - oldTeacher.setSalary(salary); - teachers.put(oldTeacher.getTeacherId(), oldTeacher); - return oldTeacher; - } - throw new RuntimeException("Teacher not found"); + oldTeacher.setName(name); + oldTeacher.setSalary(salary); + return oldTeacher; } public Teacher patchTeacherById(String id, String name, double salary) { Teacher oldTeacher = getTeacherById(id); - if (oldTeacher != null) { - if(name!=null){ - oldTeacher.setName(name); - } - teachers.put(oldTeacher.getTeacherId(), oldTeacher); - return oldTeacher; - + if (name != null) { + oldTeacher.setName(name); } - throw new RuntimeException("Teacher not found"); + return oldTeacher; + } public void deleteTeacherById(String id) { - if (!teachers.containsKey(id)) { - throw new RuntimeException("Teacher not found"); - } + getTeacherById(id); teachers.remove(id); } } From 599cb874be57e059a16805ec290806e09bd687ca Mon Sep 17 00:00:00 2001 From: Mansura Date: Thu, 12 Mar 2026 11:19:59 +0400 Subject: [PATCH 16/16] some refactoring --- .../example/ironschool_homework/service/StudentService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java index 2d44ddeb..906b58e2 100644 --- a/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java +++ b/IronSchool_HomeWork/src/main/java/org/example/ironschool_homework/service/StudentService.java @@ -26,17 +26,14 @@ public Student getStudentById(String id) { if (!students.containsKey(id)) { throw new StudentNotFoundException("Student with id " + id + " not found"); } - return students.get(id); } public Student updateStudentById(String id, String name, String address, String email) { Student student1 = getStudentById(id); - student1.setName(name); student1.setAddress(address); student1.setEmail(email); - students.put(id, student1); return student1; } @@ -52,7 +49,6 @@ public Student patchStudentById(String id, String name, String address, String e if (email != null) { student1.setEmail(email); } - students.put(student1.getStudentId(), student1); return student1; }