From f17349c96df3a6613e5c38e9a91ab5f2ec8407c5 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 22 Apr 2025 15:13:25 +0200 Subject: [PATCH 01/24] Commit inicial --- .gitattributes | 2 + .gitignore | 33 +++ .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++ mvnw.cmd | 149 ++++++++++ pom.xml | 63 +++++ .../homework/library/LibraryApplication.java | 13 + src/main/resources/application.properties | 1 + .../library/LibraryApplicationTests.java | 13 + 9 files changed, 552 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/homework/library/LibraryApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/homework/library/LibraryApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..3b41682a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/.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/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..d58dfb70 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# 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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 00000000..19529ddf --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# 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.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..249bdf38 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM 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.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..6796f012 --- /dev/null +++ b/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.4 + + + com.homework + library + 0.0.1-SNAPSHOT + library + Demo project for Spring Boot + + + + + + + + + + + + + + + 21 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.mysql + mysql-connector-j + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/homework/library/LibraryApplication.java b/src/main/java/com/homework/library/LibraryApplication.java new file mode 100644 index 00000000..1c25dd01 --- /dev/null +++ b/src/main/java/com/homework/library/LibraryApplication.java @@ -0,0 +1,13 @@ +package com.homework.library; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class LibraryApplication { + + public static void main(String[] args) { + SpringApplication.run(LibraryApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..0a5191d2 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=library diff --git a/src/test/java/com/homework/library/LibraryApplicationTests.java b/src/test/java/com/homework/library/LibraryApplicationTests.java new file mode 100644 index 00000000..ff9f973b --- /dev/null +++ b/src/test/java/com/homework/library/LibraryApplicationTests.java @@ -0,0 +1,13 @@ +package com.homework.library; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class LibraryApplicationTests { + + @Test + void contextLoads() { + } + +} From 19bbbd63e9f3932fbaedd67ef08c5d890e4c3fc6 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 22 Apr 2025 15:24:53 +0200 Subject: [PATCH 02/24] Commit con carpetas --- src/main/java/com/homework/library/LibraryApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/homework/library/LibraryApplication.java b/src/main/java/com/homework/library/LibraryApplication.java index 1c25dd01..1fbd794e 100644 --- a/src/main/java/com/homework/library/LibraryApplication.java +++ b/src/main/java/com/homework/library/LibraryApplication.java @@ -1,5 +1,5 @@ package com.homework.library; - +//commit con carpetas import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; From 3ec9134d6e3decca4bb029dc7466e52c3234967d Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 22 Apr 2025 15:28:51 +0200 Subject: [PATCH 03/24] Commit con carpetas en test --- src/main/java/com/homework/library/LibraryApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/homework/library/LibraryApplication.java b/src/main/java/com/homework/library/LibraryApplication.java index 1fbd794e..509e056d 100644 --- a/src/main/java/com/homework/library/LibraryApplication.java +++ b/src/main/java/com/homework/library/LibraryApplication.java @@ -1,5 +1,5 @@ package com.homework.library; -//commit con carpetas +//commit con carpetas en test import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; From 149047416a1971a2596a01070a53e185ffdb02f2 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 22 Apr 2025 15:40:27 +0200 Subject: [PATCH 04/24] Commit creacion clases --- .../com/homework/library/models/Issue.java | 57 +++++++++++++++++++ .../com/homework/library/models/Student.java | 27 +++++++++ 2 files changed, 84 insertions(+) create mode 100644 src/main/java/com/homework/library/models/Issue.java create mode 100644 src/main/java/com/homework/library/models/Student.java diff --git a/src/main/java/com/homework/library/models/Issue.java b/src/main/java/com/homework/library/models/Issue.java new file mode 100644 index 00000000..5240ae08 --- /dev/null +++ b/src/main/java/com/homework/library/models/Issue.java @@ -0,0 +1,57 @@ +package com.homework.library.models; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +public class Issue { + private int issueId; + private String issueDate; + private String returnDate; + private Student issueStudent; + private Book issueBook; + private static int idCounter = 1; + + public Issue(String issueDate, String returnDate, Student issueStudent, Book issueBook) { + this.issueId = idCounter++; + this.issueDate = issueDate; + this.returnDate = returnDate; + this.issueStudent = issueStudent; + this.issueBook = issueBook; + } + + public int getIssueId() { + return issueId; + } + + public String getIssueDate() { + return issueDate; + } + + public void setIssueDate(String issueDate) { + this.issueDate = issueDate; + } + + public String getReturnDate() { + return returnDate; + } + + public void setReturnDate(String returnDate) { + this.returnDate = returnDate; + } + + public Student getIssueStudent() { + return issueStudent; + } + + public void setIssueStudent(Student issueStudent) { + this.issueStudent = issueStudent; + } + + public Book getIssueBook() { + return issueBook; + } + + public void setIssueBook(Book issueBook) { + this.issueBook = issueBook; + } +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/models/Student.java b/src/main/java/com/homework/library/models/Student.java new file mode 100644 index 00000000..d4f71b09 --- /dev/null +++ b/src/main/java/com/homework/library/models/Student.java @@ -0,0 +1,27 @@ +package com.homework.library.models; + +public class Student { + private String usn; + private String name; + + public Student(String usn, String name) { + this.usn = usn; + this.name = name; + } + + public String getUsn() { + return usn; + } + + public void setUsn(String usn) { + this.usn = usn; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} From 8d4de6f8e4e3b274d91cb5eaf7074aed3322a0e6 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 22 Apr 2025 15:47:51 +0200 Subject: [PATCH 05/24] Commit para ver carpetas --- src/main/java/com/homework/library/models/Student.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/homework/library/models/Student.java b/src/main/java/com/homework/library/models/Student.java index d4f71b09..dce87570 100644 --- a/src/main/java/com/homework/library/models/Student.java +++ b/src/main/java/com/homework/library/models/Student.java @@ -25,3 +25,4 @@ public void setName(String name) { this.name = name; } } +//commit \ No newline at end of file From d51700835718f4e7f47c56e5b3767a71fd9f2156 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 22 Apr 2025 15:52:02 +0200 Subject: [PATCH 06/24] Commit para ver carpetas 2 --- src/main/java/com/homework/library/repositories/prueba.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/com/homework/library/repositories/prueba.java diff --git a/src/main/java/com/homework/library/repositories/prueba.java b/src/main/java/com/homework/library/repositories/prueba.java new file mode 100644 index 00000000..5c98ac19 --- /dev/null +++ b/src/main/java/com/homework/library/repositories/prueba.java @@ -0,0 +1,4 @@ +package com.homework.library.repositories; + +public interface prueba { +} From ce963b8e45bbbbcd1ba629348b54cdb11cccfb12 Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Tue, 22 Apr 2025 16:05:50 +0200 Subject: [PATCH 07/24] =?UTF-8?q?A=C3=B1adida=20clase=20Author=20ironlibra?= =?UTF-8?q?ry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/homework/library/Author.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/com/homework/library/Author.java diff --git a/src/main/java/com/homework/library/Author.java b/src/main/java/com/homework/library/Author.java new file mode 100644 index 00000000..e5432cdd --- /dev/null +++ b/src/main/java/com/homework/library/Author.java @@ -0,0 +1,4 @@ +package com.homework.library; + +public class Author { +} From f40ef58a26fc4d08da85adea39648d38013bf77a Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Tue, 22 Apr 2025 16:08:06 +0200 Subject: [PATCH 08/24] commit creacion clase --- .../java/com/homework/library/Author.java | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/homework/library/Author.java b/src/main/java/com/homework/library/Author.java index e5432cdd..e71aba94 100644 --- a/src/main/java/com/homework/library/Author.java +++ b/src/main/java/com/homework/library/Author.java @@ -1,4 +1,45 @@ package com.homework.library; public class Author { -} + // Variables privadas + private int authorId; // Autoincrementada + private String name; + private String email; + private Book authorBook; // Relación uno a uno con la clase Libro + private static int nextId = 1; // Para autoincrementar el ID + + public Author(String name, String email, Book authorBook) { + this.authorId = nextId++; + this.name = name; + this.email = email; + this.authorBook = authorBook; + } + + public int getAuthorId() { + return authorId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Book getAuthorBook() { + return authorBook; + } + + public void setAuthorBook(Book authorBook) { + this.authorBook = authorBook; + } +} \ No newline at end of file From 70ca271199e9ca21a3ccab3d66dd11f8418ad22f Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 22 Apr 2025 16:11:59 +0200 Subject: [PATCH 09/24] Commit cambio lugar archivo --- .../java/com/homework/library/Author.java | 45 ------------------- 1 file changed, 45 deletions(-) delete mode 100644 src/main/java/com/homework/library/Author.java diff --git a/src/main/java/com/homework/library/Author.java b/src/main/java/com/homework/library/Author.java deleted file mode 100644 index e71aba94..00000000 --- a/src/main/java/com/homework/library/Author.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.homework.library; - -public class Author { - // Variables privadas - private int authorId; // Autoincrementada - private String name; - private String email; - private Book authorBook; // Relación uno a uno con la clase Libro - private static int nextId = 1; // Para autoincrementar el ID - - public Author(String name, String email, Book authorBook) { - this.authorId = nextId++; - this.name = name; - this.email = email; - this.authorBook = authorBook; - } - - public int getAuthorId() { - return authorId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public Book getAuthorBook() { - return authorBook; - } - - public void setAuthorBook(Book authorBook) { - this.authorBook = authorBook; - } -} \ No newline at end of file From dc4d844ae32cc370d725f28bb9743eda00a2926f Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Tue, 22 Apr 2025 16:20:50 +0200 Subject: [PATCH 10/24] commit creacion clase Author ok --- .../com/homework/library/models/Author.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/main/java/com/homework/library/models/Author.java diff --git a/src/main/java/com/homework/library/models/Author.java b/src/main/java/com/homework/library/models/Author.java new file mode 100644 index 00000000..bdd3e14d --- /dev/null +++ b/src/main/java/com/homework/library/models/Author.java @@ -0,0 +1,45 @@ +package com.homework.library.models; + +public class Author { + private int authorId; + private String name; + private String email; + private Book authorBook; + private static int nextId = 1; + + + public Author(String name, String email, Book authorBook) { + this.authorId = nextId++; + this.name = name; + this.email = email; + this.authorBook = authorBook; + } + + public int getAuthorId() { + return authorId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Book getAuthorBook() { + return authorBook; + } + + public void setAuthorBook(Book authorBook) { + this.authorBook = authorBook; + } + From a006375a065440838557ec8ed100c5873c5f4848 Mon Sep 17 00:00:00 2001 From: Josemargal <126793937+Josemargal@users.noreply.github.com> Date: Wed, 23 Apr 2025 12:19:59 +0200 Subject: [PATCH 11/24] clase Book --- .../com/homework/library/models/Book.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/main/java/com/homework/library/models/Book.java diff --git a/src/main/java/com/homework/library/models/Book.java b/src/main/java/com/homework/library/models/Book.java new file mode 100644 index 00000000..59612a09 --- /dev/null +++ b/src/main/java/com/homework/library/models/Book.java @@ -0,0 +1,51 @@ +package com.homework.library.models; + +public class Book { + // Private attributes + private String isbn; + private String title; + private String category; + private int quantity; + + // Constructor + public Book(String isbn, String title, String category, int quantity) { + this.isbn = isbn; + this.title = title; + this.category = category; + this.quantity = quantity; + } + + // Getters + public String getIsbn() { + return isbn; + } + + public String getTitle() { + return title; + } + + public String getCategory() { + return category; + } + + public int getQuantity() { + return quantity; + } + + // Setters + public void setIsbn(String isbn) { + this.isbn = isbn; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setCategory(String category) { + this.category = category; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } +} From 2eaf1cb6aa580abceab4d913aa04f8b1383087bd Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Wed, 23 Apr 2025 12:32:27 +0200 Subject: [PATCH 12/24] =?UTF-8?q?A=C3=B1adidos=20archivos=20de=20modelos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/homework/library/models/Author.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 src/main/java/com/homework/library/models/Author.java diff --git a/src/main/java/com/homework/library/models/Author.java b/src/main/java/com/homework/library/models/Author.java new file mode 100644 index 00000000..e71aba94 --- /dev/null +++ b/src/main/java/com/homework/library/models/Author.java @@ -0,0 +1,45 @@ +package com.homework.library; + +public class Author { + // Variables privadas + private int authorId; // Autoincrementada + private String name; + private String email; + private Book authorBook; // Relación uno a uno con la clase Libro + private static int nextId = 1; // Para autoincrementar el ID + + public Author(String name, String email, Book authorBook) { + this.authorId = nextId++; + this.name = name; + this.email = email; + this.authorBook = authorBook; + } + + public int getAuthorId() { + return authorId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public Book getAuthorBook() { + return authorBook; + } + + public void setAuthorBook(Book authorBook) { + this.authorBook = authorBook; + } +} \ No newline at end of file From 8cbe9d6fe2378d8a0d191d154f05cf8e5a2ca61c Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Wed, 23 Apr 2025 12:34:58 +0200 Subject: [PATCH 13/24] commit resuelto problema llave --- src/main/java/com/homework/library/models/Author.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/homework/library/models/Author.java b/src/main/java/com/homework/library/models/Author.java index bdd3e14d..4f7c935f 100644 --- a/src/main/java/com/homework/library/models/Author.java +++ b/src/main/java/com/homework/library/models/Author.java @@ -42,4 +42,4 @@ public Book getAuthorBook() { public void setAuthorBook(Book authorBook) { this.authorBook = authorBook; } - +} From ca9d973640aaa3fe3dde68e46658881b52419f9b Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Wed, 23 Apr 2025 12:50:36 +0200 Subject: [PATCH 14/24] Commit cambio git ignore --- .gitignore | 5 ++++- src/main/resources/application.properties.example | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/application.properties.example diff --git a/.gitignore b/.gitignore index 549e00a2..0e78d4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,7 @@ build/ !**/src/test/**/build/ ### VS Code ### -.vscode/ +.vscode + +### SQL### +.application.properties \ No newline at end of file diff --git a/src/main/resources/application.properties.example b/src/main/resources/application.properties.example new file mode 100644 index 00000000..9b7b8a48 --- /dev/null +++ b/src/main/resources/application.properties.example @@ -0,0 +1,7 @@ +spring.application.name=22_ABR +spring.datasource.url=jdbc:mysql://localhost:3306/ +spring.datasource.username=root +spring.datasource.password=1234 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jpa.hibernate.ddl-auto=validate \ No newline at end of file From 206eb2ce50b212278defa1ad43a903fe99a5ac30 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Wed, 23 Apr 2025 17:27:03 +0200 Subject: [PATCH 15/24] Commit con menu --- pom.xml | 5 + .../homework/library/LibraryApplication.java | 244 +++++++++++++++++- .../com/homework/library/models/Author.java | 55 ++-- .../com/homework/library/models/Book.java | 60 ++--- .../library/models/DatabaseInitializer.java | 39 +++ .../com/homework/library/models/Issue.java | 76 +++--- .../com/homework/library/models/Student.java | 34 +-- .../repositories/AuthorRepository.java | 8 + .../library/repositories/BookRepository.java | 11 + .../repositories/StudentRepository.java | 8 + src/main/resources/application.properties | 7 + .../resources/application.properties.example | 2 +- 12 files changed, 428 insertions(+), 121 deletions(-) create mode 100644 src/main/java/com/homework/library/models/DatabaseInitializer.java create mode 100644 src/main/java/com/homework/library/repositories/AuthorRepository.java create mode 100644 src/main/java/com/homework/library/repositories/BookRepository.java create mode 100644 src/main/java/com/homework/library/repositories/StudentRepository.java diff --git a/pom.xml b/pom.xml index 6796f012..1cd4198a 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-jdbc + + diff --git a/src/main/java/com/homework/library/LibraryApplication.java b/src/main/java/com/homework/library/LibraryApplication.java index 509e056d..affc7ba4 100644 --- a/src/main/java/com/homework/library/LibraryApplication.java +++ b/src/main/java/com/homework/library/LibraryApplication.java @@ -1,13 +1,251 @@ package com.homework.library; -//commit con carpetas en test + +import com.homework.library.models.Book; +import com.homework.library.models.Author; +import com.homework.library.models.Student; +import com.homework.library.repositories.BookRepository; +import com.homework.library.repositories.AuthorRepository; +import com.homework.library.repositories.StudentRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.transaction.annotation.Transactional; // Importante para la transacción + +import java.util.List; +import java.util.Optional; +import java.util.Scanner; @SpringBootApplication -public class LibraryApplication { +@ComponentScan(basePackages = "com.homework.library") // Asegura que Spring escanee tus componentes +public class LibraryApplication implements CommandLineRunner { + + private final BookRepository bookRepository; + private final AuthorRepository authorRepository; + private final StudentRepository studentRepository; + private final Scanner scanner = new Scanner(System.in); + + @Autowired + public LibraryApplication(BookRepository bookRepository, AuthorRepository authorRepository, StudentRepository studentRepository) { + this.bookRepository = bookRepository; + this.authorRepository = authorRepository; + this.studentRepository = studentRepository; + } public static void main(String[] args) { SpringApplication.run(LibraryApplication.class, args); } -} + @Override + public void run(String... args) { + displayMenu(); + } + + public void displayMenu() { + boolean exit = false; + while (!exit) { + System.out.println("\n--- Sistema de Gestión de Biblioteca ---"); + System.out.println("1. Añadir un libro"); + System.out.println("2. Buscar libro por título"); + System.out.println("3. Buscar libro por categoría"); + System.out.println("4. Buscar libro por autor"); + System.out.println("5. Listar todos los libros con autor"); + System.out.println("6. Prestar libro a estudiante"); + System.out.println("7. Listar libros por USN"); + System.out.println("8. Borrar un libro"); + System.out.println("9. Salir"); + System.out.print("Ingrese su opción: "); + + int choice = scanner.nextInt(); + scanner.nextLine(); // Consume la nueva línea + + switch (choice) { + case 1: + addBook(); + break; + case 2: + searchBookByTitle(); + break; + case 3: + searchBookByCategory(); + break; + case 4: + searchBookByAuthor(); + break; + case 5: + listAllBooksWithAuthors(); + break; + case 6: + issueBookToStudent(); + break; + case 7: + listBooksByUsn(); + break; + case 8: + deleteBook(); + break; + case 9: + exit = true; + System.out.println("Saliendo..."); + break; + default: + System.out.println("Opción inválida. Por favor, intente de nuevo."); + } + } + } + + private void addBook() { + System.out.println("\n--- Añadir un Libro ---"); + System.out.print("Ingrese ISBN: "); + String isbn = scanner.nextLine(); + System.out.print("Ingrese Título: "); + String title = scanner.nextLine(); + System.out.print("Ingrese Categoría: "); + String category = scanner.nextLine(); + System.out.print("Ingrese Cantidad: "); + int quantity = scanner.nextInt(); + scanner.nextLine(); // Consume la nueva línea + + Book book = new Book(isbn, title, category, quantity); + bookRepository.save(book); + + System.out.print("Ingrese Nombre del Autor: "); + String authorName = scanner.nextLine(); + System.out.print("Ingrese Email del Autor: "); + String authorEmail = scanner.nextLine(); + + Author author = new Author(authorName, authorEmail, book); + authorRepository.save(author); + + System.out.println("Libro añadido exitosamente!"); + + } + + private void searchBookByTitle() { + System.out.println("\n--- Buscar Libro por Título ---"); + System.out.print("Ingrese título a buscar: "); + String title = scanner.nextLine(); + List books = bookRepository.findAll().stream() + .filter(b -> b.getTitle().toLowerCase().contains(title.toLowerCase())) + .toList(); + displayBooks(books); + } + + private void searchBookByCategory() { + System.out.println("\n--- Buscar Libro por Categoría ---"); + System.out.print("Ingrese categoría a buscar: "); + String category = scanner.nextLine(); + List books = bookRepository.findAll().stream() + .filter(b -> b.getCategory().toLowerCase().contains(category.toLowerCase())) + .toList(); + displayBooks(books); + } + + private void searchBookByAuthor() { + System.out.println("\n--- Buscar Libro por Autor ---"); + System.out.print("Ingrese nombre del autor a buscar: "); + String authorName = scanner.nextLine(); + List books = bookRepository.findAll().stream() + .filter(book -> { + Optional author = authorRepository.findAll().stream() + .filter(a -> a.getAuthorBook() != null && a.getAuthorBook().equals(book)) + .findFirst(); + return author.isPresent() && author.get().getName().toLowerCase().contains(authorName.toLowerCase()); + }) + .toList(); + displayBooks(books); + } + + private void listAllBooksWithAuthors() { + System.out.println("\n--- Listar Todos los Libros con Autores ---"); + List books = bookRepository.findAll(); + if (books.isEmpty()) { + System.out.println("No se encontraron libros."); + } else { + System.out.println("ISBN\tTítulo\tCategoría\tCantidad\tNombre del Autor\tEmail del Autor"); + for (Book book : books) { + Optional author = authorRepository.findAll().stream() + .filter(a -> a.getAuthorBook() != null && a.getAuthorBook().equals(book)) + .findFirst(); + if (author.isPresent()) { + System.out.println(book.getIsbn() + "\t" + book.getTitle() + "\t" + book.getCategory() + "\t" + + book.getQuantity() + "\t" + author.get().getName() + "\t" + author.get().getEmail()); + } else { + System.out.println(book.getIsbn() + "\t" + book.getTitle() + "\t" + book.getCategory() + "\t" + + book.getQuantity() + "\t" + "Sin Autor" + "\t" + "Sin Autor"); + } + } + } + } + + private void issueBookToStudent() { + System.out.println("\n--- Prestar Libro a Estudiante ---"); + System.out.print("Ingrese USN del Estudiante: "); + String usn = scanner.nextLine(); + System.out.print("Ingrese Nombre del Estudiante: "); + String studentName = scanner.nextLine(); + System.out.print("Ingrese ISBN del Libro a Prestar: "); + String isbn = scanner.nextLine(); + System.out.print("Ingrese Fecha de Préstamo: "); + String issueDate = scanner.nextLine(); + System.out.print("Ingrese Fecha de Devolución: "); + String returnDate = scanner.nextLine(); + + Optional book = bookRepository.findById(String.valueOf(Long.valueOf(isbn))); + Optional student = studentRepository.findById(String.valueOf(Long.valueOf(usn))); + + if (book.isPresent() && book.get().getQuantity() > 0) { + Student student1 = new Student(usn, studentName); + studentRepository.save(student1); + book.get().setQuantity(book.get().getQuantity() - 1); + bookRepository.save(book.get()); + System.out.println("Libro prestado exitosamente!"); + } else { + System.out.println("El libro no está disponible o el estudiante no existe."); + } + } + + private void listBooksByUsn() { + System.out.println("\n--- Listar Libros por USN ---"); + System.out.print("Ingrese USN del Estudiante: "); + String usn = scanner.nextLine(); + Optional student = studentRepository.findById(String.valueOf(Long.valueOf(usn))); + if (student.isPresent()) { + System.out.println("Funcionalidad no implementada aún"); + } else { + System.out.println("Estudiante no encontrado"); + } + } + + @Transactional + private void deleteBook() { + System.out.println("\n--- Borrar un Libro ---"); + System.out.print("Ingrese el ISBN del libro a borrar: "); + String isbn = scanner.nextLine(); + + try { + // Primero, buscamos el libro para obtener su ID (si es necesario) + Optional bookToDelete = bookRepository.findById(String.valueOf(Long.valueOf(isbn))); + if (bookToDelete.isPresent()) { + bookRepository.delete(bookToDelete.get()); // Borramos el libro + System.out.println("Libro borrado exitosamente!"); + } else { + System.out.println("No se encontró ningún libro con ese ISBN."); + } + } catch (Exception e) { + System.out.println("Error al borrar el libro: " + e.getMessage()); + } + } + + private void displayBooks(List books) { + if (books.isEmpty()) { + System.out.println("No se encontraron libros."); + } else { + System.out.println("ISBN\tTítulo\tCategoría\tCantidad"); + for (Book book : books) { + System.out.println(book.getIsbn() + "\t" + book.getTitle() + "\t" + book.getCategory() + "\t" + book.getQuantity()); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/models/Author.java b/src/main/java/com/homework/library/models/Author.java index 4f7c935f..89ec4d0b 100644 --- a/src/main/java/com/homework/library/models/Author.java +++ b/src/main/java/com/homework/library/models/Author.java @@ -1,45 +1,42 @@ package com.homework.library.models; +import jakarta.persistence.*; + +@Entity public class Author { - private int authorId; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long authorId; // Use Long for IDs (more scalable) private String name; private String email; - private Book authorBook; - private static int nextId = 1; - - public Author(String name, String email, Book authorBook) { - this.authorId = nextId++; - this.name = name; - this.email = email; - this.authorBook = authorBook; - } - - public int getAuthorId() { - return authorId; - } + @ManyToOne + @JoinColumn(name = "book_isbn", referencedColumnName = "isbn") // Corrected column name + private Book book; // Changed name to 'book' for clarity - public String getName() { - return name; + public Author(String joshuaBloch, String mail) { } - public void setName(String name) { + public Author(String name, String email, Book book) { this.name = name; + this.email = email; + this.book = book; } - public String getEmail() { - return email; - } + // Getters and Setters + public Long getAuthorId() { return authorId; } + public void setAuthorId(Long authorId) { this.authorId = authorId; } - public void setEmail(String email) { - this.email = email; - } + public String getName() { return name; } + public void setName(String name) { this.name = name; } - public Book getAuthorBook() { - return authorBook; - } + public String getEmail() { return email; } + public void setEmail(String email) { this.email = email; } + + public Book getBook() { return book; } + public void setBook(Book book) { this.book = book; } - public void setAuthorBook(Book authorBook) { - this.authorBook = authorBook; + public Object getAuthorBook() { + return null; } -} +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/models/Book.java b/src/main/java/com/homework/library/models/Book.java index 59612a09..6b305114 100644 --- a/src/main/java/com/homework/library/models/Book.java +++ b/src/main/java/com/homework/library/models/Book.java @@ -1,13 +1,28 @@ package com.homework.library.models; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Column; + +@Entity public class Book { - // Private attributes + + @Id private String isbn; + + @Column(nullable = false) // Added not-null constraint private String title; + + @Column(nullable = false) private String category; + private int quantity; - // Constructor + public Book() { + } + public Book(String isbn, String title, String category, int quantity) { this.isbn = isbn; this.title = title; @@ -15,37 +30,16 @@ public Book(String isbn, String title, String category, int quantity) { this.quantity = quantity; } - // Getters - public String getIsbn() { - return isbn; - } - - public String getTitle() { - return title; - } + // Getters and Setters + public String getIsbn() { return isbn; } + public void setIsbn(String isbn) { this.isbn = isbn; } - public String getCategory() { - return category; - } + public String getTitle() { return title; } + public void setTitle(String title) { this.title = title; } - public int getQuantity() { - return quantity; - } + public String getCategory() { return category; } + public void setCategory(String category) { this.category = category; } - // Setters - public void setIsbn(String isbn) { - this.isbn = isbn; - } - - public void setTitle(String title) { - this.title = title; - } - - public void setCategory(String category) { - this.category = category; - } - - public void setQuantity(int quantity) { - this.quantity = quantity; - } -} + public int getQuantity() { return quantity; } + public void setQuantity(int quantity) { this.quantity = quantity; } +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/models/DatabaseInitializer.java b/src/main/java/com/homework/library/models/DatabaseInitializer.java new file mode 100644 index 00000000..4c78fdbc --- /dev/null +++ b/src/main/java/com/homework/library/models/DatabaseInitializer.java @@ -0,0 +1,39 @@ +package com.homework.library.models; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; +import com.homework.library.repositories.BookRepository; +import com.homework.library.repositories.AuthorRepository; + +import java.util.List; + +@Component +public class DatabaseInitializer implements CommandLineRunner { + + private final BookRepository bookRepository; + private final AuthorRepository authorRepository; + + @Autowired + public DatabaseInitializer(BookRepository bookRepository, AuthorRepository authorRepository) { + this.bookRepository = bookRepository; + this.authorRepository = authorRepository; + } + + @Override + public void run(String... args) throws Exception { + // Create a Book + Book javaBook = new Book("978-0134685991", "Effective Java", "Programming", 10); + bookRepository.save(javaBook); // Save the book first + + // Create an Author and associate it with the Book + Author author = new Author("Joshua Bloch", "joshua@example.com", javaBook); + authorRepository.save(author); + + System.out.println("Base de datos inicializada correctamente"); + + // Example of fetching books + List javaBooks = bookRepository.findByTitleContainingIgnoreCase("Java"); + System.out.println("Libros encontrados: " + javaBooks.size()); + } +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/models/Issue.java b/src/main/java/com/homework/library/models/Issue.java index 5240ae08..cd1db8dc 100644 --- a/src/main/java/com/homework/library/models/Issue.java +++ b/src/main/java/com/homework/library/models/Issue.java @@ -1,57 +1,55 @@ package com.homework.library.models; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; +import jakarta.persistence.*; +import java.time.LocalDate; +@Entity +@Table(name = "issues") // Specify table name public class Issue { - private int issueId; - private String issueDate; - private String returnDate; - private Student issueStudent; - private Book issueBook; - private static int idCounter = 1; - - public Issue(String issueDate, String returnDate, Student issueStudent, Book issueBook) { - this.issueId = idCounter++; - this.issueDate = issueDate; - this.returnDate = returnDate; - this.issueStudent = issueStudent; - this.issueBook = issueBook; - } - public int getIssueId() { - return issueId; - } + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long issueId; - public String getIssueDate() { - return issueDate; - } + @Column(nullable = false) + private LocalDate issueDate; - public void setIssueDate(String issueDate) { - this.issueDate = issueDate; - } + @Column(nullable = false) + private LocalDate returnDate; - public String getReturnDate() { - return returnDate; + @ManyToOne + @JoinColumn(name = "student_usn", referencedColumnName = "usn", nullable = false) + private Student student; + + @ManyToOne + @JoinColumn(name = "book_isbn", referencedColumnName = "isbn", nullable = false) + private Book book; + + public Issue() { } - public void setReturnDate(String returnDate) { + public Issue(LocalDate issueDate, LocalDate returnDate, Student student, Book book) { + this.issueDate = issueDate; this.returnDate = returnDate; + this.student = student; + this.book = book; } - public Student getIssueStudent() { - return issueStudent; - } + // Getters and Setters + public Long getIssueId() { return issueId; } + public void setIssueId(Long issueId) { this.issueId = issueId; } - public void setIssueStudent(Student issueStudent) { - this.issueStudent = issueStudent; - } + public LocalDate getIssueDate() { return issueDate; } + public void setIssueDate(LocalDate issueDate) { this.issueDate = issueDate; } - public Book getIssueBook() { - return issueBook; + public LocalDate getReturnDate() { + return returnDate; } + public void setReturnDate(LocalDate returnDate) { this.returnDate = returnDate; } - public void setIssueBook(Book issueBook) { - this.issueBook = issueBook; - } + public Student getStudent() { return student; } + public void setStudent(Student student) { this.student = student; } + + public Book getBook() { return book; } + public void setBook(Book book) { this.book = book; } } \ No newline at end of file diff --git a/src/main/java/com/homework/library/models/Student.java b/src/main/java/com/homework/library/models/Student.java index dce87570..c18951a6 100644 --- a/src/main/java/com/homework/library/models/Student.java +++ b/src/main/java/com/homework/library/models/Student.java @@ -1,28 +1,30 @@ package com.homework.library.models; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Column; + +@Entity public class Student { + + @Id private String usn; - private String name; - public Student(String usn, String name) { - this.usn = usn; - this.name = name; - } + @Column(nullable = false) + private String name; - public String getUsn() { - return usn; + public Student() { } - public void setUsn(String usn) { + public Student(String usn, String name) { this.usn = usn; + this.name = name; } - public String getName() { - return name; - } + // Getters and Setters + public String getUsn() { return usn; } + public void setUsn(String usn) { this.usn = usn; } - public void setName(String name) { - this.name = name; - } -} -//commit \ No newline at end of file + public String getName() { return name; } + public void setName(String name) { this.name = name; } +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/repositories/AuthorRepository.java b/src/main/java/com/homework/library/repositories/AuthorRepository.java new file mode 100644 index 00000000..1022b311 --- /dev/null +++ b/src/main/java/com/homework/library/repositories/AuthorRepository.java @@ -0,0 +1,8 @@ +package com.homework.library.repositories; + +import com.homework.library.models.Author; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface AuthorRepository extends JpaRepository { + // You can add custom query methods here if needed +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/repositories/BookRepository.java b/src/main/java/com/homework/library/repositories/BookRepository.java new file mode 100644 index 00000000..2cbfe6f9 --- /dev/null +++ b/src/main/java/com/homework/library/repositories/BookRepository.java @@ -0,0 +1,11 @@ +package com.homework.library.repositories; + +import com.homework.library.models.Book; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + +public interface BookRepository extends JpaRepository { + List findByTitleContainingIgnoreCase(String title); + List findByCategoryContainingIgnoreCase(String category); + // You can add more custom query methods here +} \ No newline at end of file diff --git a/src/main/java/com/homework/library/repositories/StudentRepository.java b/src/main/java/com/homework/library/repositories/StudentRepository.java new file mode 100644 index 00000000..3d9aac01 --- /dev/null +++ b/src/main/java/com/homework/library/repositories/StudentRepository.java @@ -0,0 +1,8 @@ +package com.homework.library.repositories; + +import com.homework.library.models.Student; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StudentRepository extends JpaRepository { + // You can add custom query methods here if needed +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0a5191d2..6e029f75 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,8 @@ spring.application.name=library +spring.datasource.url=jdbc:mysql://localhost:3306/library +spring.datasource.username=root +spring.datasource.password=1234 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +//spring.jpa.hibernate.ddl-auto=validate +spring.jpa.hibernate.ddl-auto=update \ No newline at end of file diff --git a/src/main/resources/application.properties.example b/src/main/resources/application.properties.example index 9b7b8a48..c75fc289 100644 --- a/src/main/resources/application.properties.example +++ b/src/main/resources/application.properties.example @@ -1,4 +1,4 @@ -spring.application.name=22_ABR +spring.application.name=library spring.datasource.url=jdbc:mysql://localhost:3306/ spring.datasource.username=root spring.datasource.password=1234 From 91169e8ff4bc08ce20e7f3dd10042f450e774578 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Mon, 28 Apr 2025 12:33:12 +0200 Subject: [PATCH 16/24] Commit con solucion menu --- .../homework/library/LibraryApplication.java | 29 ++++--------------- .../com/homework/library/models/Author.java | 4 +-- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/homework/library/LibraryApplication.java b/src/main/java/com/homework/library/LibraryApplication.java index affc7ba4..38c037df 100644 --- a/src/main/java/com/homework/library/LibraryApplication.java +++ b/src/main/java/com/homework/library/LibraryApplication.java @@ -53,8 +53,8 @@ public void displayMenu() { System.out.println("5. Listar todos los libros con autor"); System.out.println("6. Prestar libro a estudiante"); System.out.println("7. Listar libros por USN"); - System.out.println("8. Borrar un libro"); - System.out.println("9. Salir"); + + System.out.println("8. Salir"); System.out.print("Ingrese su opción: "); int choice = scanner.nextInt(); @@ -82,10 +82,8 @@ public void displayMenu() { case 7: listBooksByUsn(); break; + case 8: - deleteBook(); - break; - case 9: exit = true; System.out.println("Saliendo..."); break; @@ -166,7 +164,7 @@ private void listAllBooksWithAuthors() { System.out.println("ISBN\tTítulo\tCategoría\tCantidad\tNombre del Autor\tEmail del Autor"); for (Book book : books) { Optional author = authorRepository.findAll().stream() - .filter(a -> a.getAuthorBook() != null && a.getAuthorBook().equals(book)) + .filter(a -> a.getBook() != null && a.getBook().getIsbn().equals(book.getIsbn())) .findFirst(); if (author.isPresent()) { System.out.println(book.getIsbn() + "\t" + book.getTitle() + "\t" + book.getCategory() + "\t" + @@ -179,6 +177,7 @@ private void listAllBooksWithAuthors() { } } + private void issueBookToStudent() { System.out.println("\n--- Prestar Libro a Estudiante ---"); System.out.print("Ingrese USN del Estudiante: "); @@ -218,25 +217,7 @@ private void listBooksByUsn() { } } - @Transactional - private void deleteBook() { - System.out.println("\n--- Borrar un Libro ---"); - System.out.print("Ingrese el ISBN del libro a borrar: "); - String isbn = scanner.nextLine(); - try { - // Primero, buscamos el libro para obtener su ID (si es necesario) - Optional bookToDelete = bookRepository.findById(String.valueOf(Long.valueOf(isbn))); - if (bookToDelete.isPresent()) { - bookRepository.delete(bookToDelete.get()); // Borramos el libro - System.out.println("Libro borrado exitosamente!"); - } else { - System.out.println("No se encontró ningún libro con ese ISBN."); - } - } catch (Exception e) { - System.out.println("Error al borrar el libro: " + e.getMessage()); - } - } private void displayBooks(List books) { if (books.isEmpty()) { diff --git a/src/main/java/com/homework/library/models/Author.java b/src/main/java/com/homework/library/models/Author.java index 89ec4d0b..20acfb88 100644 --- a/src/main/java/com/homework/library/models/Author.java +++ b/src/main/java/com/homework/library/models/Author.java @@ -14,8 +14,8 @@ public class Author { @JoinColumn(name = "book_isbn", referencedColumnName = "isbn") // Corrected column name private Book book; // Changed name to 'book' for clarity - public Author(String joshuaBloch, String mail) { - } + public Author(){} + public Author(String name, String email, Book book) { this.name = name; From b550b86f824e19d389db96aae19a842fd89122ed Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 29 Apr 2025 10:01:56 +0200 Subject: [PATCH 17/24] Create Readme1.md --- Readme1.md | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 Readme1.md diff --git a/Readme1.md b/Readme1.md new file mode 100644 index 00000000..0242fbf7 --- /dev/null +++ b/Readme1.md @@ -0,0 +1,151 @@ + + + + + + README - Sistema de Gestión de Biblioteca + + + + +

Sistema de Gestión de Biblioteca

+ +
+
+ José Martín +

José Martín

+
+
+ José Manuel Siguero +

José Manuel Siguero

+
+
+ Rafael Gamero +

Rafael Gamero

+
+
+ +

Descripción del Proyecto

+

+ Este proyecto es un sistema de gestión de biblioteca desarrollado en Java con Spring Boot. + Permite la administración de libros, autores, estudiantes y préstamos. + El sistema ofrece una interfaz de línea de comandos para interactuar con las funcionalidades. +

+ +

Funcionalidades

+

+ El sistema de gestión de biblioteca incluye las siguientes funcionalidades: +

+
    +
  • Añadir un libro
  • +
  • Buscar libro por título
  • +
  • Buscar libro por categoría
  • +
  • Buscar libro por autor
  • +
  • Listar todos los libros con autor
  • +
  • Prestar libro a estudiante
  • +
  • Listar libros por USN (Número de Identificación de Estudiante)
  • +
  • Borrar un libro
  • +
  • Salir del sistema
  • +
+ +

Tecnologías Utilizadas

+
    +
  • Java
  • +
  • Spring Boot
  • +
  • JPA (Java Persistence API)
  • +
  • Hibernate
  • +
  • Base de Datos Relacional (e.g., H2, MySQL, PostgreSQL)
  • +
+ +

Estructura del Proyecto

+

+ La estructura principal del proyecto se organiza en los siguientes paquetes: +

+
    +
  • + com.homework.library: Paquete principal que contiene la clase LibraryApplication, + el punto de entrada de la aplicación. +
  • +
  • + com.homework.library.models: Contiene las clases que representan las entidades del dominio + (Book, Author, Student, Issue). +
  • +
  • + com.homework.library.repositories: Contiene las interfaces que extienden JpaRepository + para interactuar con la base de datos. +
  • +
+ +

Cómo Ejecutar el Proyecto

+
    +
  1. Asegúrate de tener instalado Java y un IDE (como IntelliJ IDEA o Eclipse).
  2. +
  3. Clona el repositorio del proyecto.
  4. +
  5. Importa el proyecto en tu IDE.
  6. +
  7. Configura la conexión a la base de datos (puedes modificar application.properties).
  8. +
  9. Ejecuta la clase LibraryApplication.
  10. +
  11. Interactúa con el sistema a través de la consola, siguiendo el menú de opciones.
  12. +
+ +

Consideraciones Adicionales

+
    +
  • + Se han implementado mejoras en la gestión de autores y libros, incluyendo la corrección de errores en la + relación entre entidades y la optimización de consultas a la base de datos. +
  • +
  • + Se recomienda utilizar la cascada de eliminación para mantener la integridad de los datos al borrar libros. +
  • +
  • + El proyecto utiliza Spring Boot para facilitar el desarrollo y la configuración de la aplicación. +
  • +
+ +

Contacto

+

+ Para cualquier consulta o sugerencia, no dudes en contactar con los autores. +

+ + + From 76750f97edb484e88be69b83f3369facb10786eb Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Tue, 29 Apr 2025 10:33:51 +0200 Subject: [PATCH 18/24] Commit funcionalidad ok --- .../homework/library/LibraryApplication.java | 82 +++++++++---------- .../library/repositories/IssueRepository.java | 10 +++ src/main/resources/application.properties | 2 +- 3 files changed, 49 insertions(+), 45 deletions(-) create mode 100644 src/main/java/com/homework/library/repositories/IssueRepository.java diff --git a/src/main/java/com/homework/library/LibraryApplication.java b/src/main/java/com/homework/library/LibraryApplication.java index 38c037df..2f63bbce 100644 --- a/src/main/java/com/homework/library/LibraryApplication.java +++ b/src/main/java/com/homework/library/LibraryApplication.java @@ -3,45 +3,43 @@ import com.homework.library.models.Book; import com.homework.library.models.Author; import com.homework.library.models.Student; +import com.homework.library.models.Issue; // Importamos la entidad Issue import com.homework.library.repositories.BookRepository; import com.homework.library.repositories.AuthorRepository; import com.homework.library.repositories.StudentRepository; +import com.homework.library.repositories.IssueRepository; // Importamos el repositorio IssueRepository import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import org.springframework.transaction.annotation.Transactional; // Importante para la transacción - +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; // Importamos LocalDate para las fechas import java.util.List; import java.util.Optional; import java.util.Scanner; - @SpringBootApplication -@ComponentScan(basePackages = "com.homework.library") // Asegura que Spring escanee tus componentes +@ComponentScan(basePackages = "com.homework.library") public class LibraryApplication implements CommandLineRunner { - private final BookRepository bookRepository; private final AuthorRepository authorRepository; private final StudentRepository studentRepository; + private final IssueRepository issueRepository; // Agregamos el IssueRepository private final Scanner scanner = new Scanner(System.in); - @Autowired - public LibraryApplication(BookRepository bookRepository, AuthorRepository authorRepository, StudentRepository studentRepository) { + public LibraryApplication(BookRepository bookRepository, AuthorRepository authorRepository, StudentRepository studentRepository, IssueRepository issueRepository) { this.bookRepository = bookRepository; this.authorRepository = authorRepository; this.studentRepository = studentRepository; + this.issueRepository = issueRepository; // Inicializamos el IssueRepository } - public static void main(String[] args) { SpringApplication.run(LibraryApplication.class, args); } - @Override public void run(String... args) { displayMenu(); } - public void displayMenu() { boolean exit = false; while (!exit) { @@ -53,13 +51,10 @@ public void displayMenu() { System.out.println("5. Listar todos los libros con autor"); System.out.println("6. Prestar libro a estudiante"); System.out.println("7. Listar libros por USN"); - System.out.println("8. Salir"); System.out.print("Ingrese su opción: "); - int choice = scanner.nextInt(); - scanner.nextLine(); // Consume la nueva línea - + scanner.nextLine(); switch (choice) { case 1: addBook(); @@ -92,7 +87,6 @@ public void displayMenu() { } } } - private void addBook() { System.out.println("\n--- Añadir un Libro ---"); System.out.print("Ingrese ISBN: "); @@ -103,23 +97,17 @@ private void addBook() { String category = scanner.nextLine(); System.out.print("Ingrese Cantidad: "); int quantity = scanner.nextInt(); - scanner.nextLine(); // Consume la nueva línea - + scanner.nextLine(); Book book = new Book(isbn, title, category, quantity); bookRepository.save(book); - System.out.print("Ingrese Nombre del Autor: "); String authorName = scanner.nextLine(); System.out.print("Ingrese Email del Autor: "); String authorEmail = scanner.nextLine(); - Author author = new Author(authorName, authorEmail, book); authorRepository.save(author); - System.out.println("Libro añadido exitosamente!"); - } - private void searchBookByTitle() { System.out.println("\n--- Buscar Libro por Título ---"); System.out.print("Ingrese título a buscar: "); @@ -129,7 +117,6 @@ private void searchBookByTitle() { .toList(); displayBooks(books); } - private void searchBookByCategory() { System.out.println("\n--- Buscar Libro por Categoría ---"); System.out.print("Ingrese categoría a buscar: "); @@ -139,7 +126,6 @@ private void searchBookByCategory() { .toList(); displayBooks(books); } - private void searchBookByAuthor() { System.out.println("\n--- Buscar Libro por Autor ---"); System.out.print("Ingrese nombre del autor a buscar: "); @@ -154,7 +140,6 @@ private void searchBookByAuthor() { .toList(); displayBooks(books); } - private void listAllBooksWithAuthors() { System.out.println("\n--- Listar Todos los Libros con Autores ---"); List books = bookRepository.findAll(); @@ -164,7 +149,7 @@ private void listAllBooksWithAuthors() { System.out.println("ISBN\tTítulo\tCategoría\tCantidad\tNombre del Autor\tEmail del Autor"); for (Book book : books) { Optional author = authorRepository.findAll().stream() - .filter(a -> a.getBook() != null && a.getBook().getIsbn().equals(book.getIsbn())) + .filter(a -> a.getAuthorBook() != null && a.getAuthorBook().equals(book)) .findFirst(); if (author.isPresent()) { System.out.println(book.getIsbn() + "\t" + book.getTitle() + "\t" + book.getCategory() + "\t" + @@ -176,8 +161,6 @@ private void listAllBooksWithAuthors() { } } } - - private void issueBookToStudent() { System.out.println("\n--- Prestar Libro a Estudiante ---"); System.out.print("Ingrese USN del Estudiante: "); @@ -186,39 +169,50 @@ private void issueBookToStudent() { String studentName = scanner.nextLine(); System.out.print("Ingrese ISBN del Libro a Prestar: "); String isbn = scanner.nextLine(); - System.out.print("Ingrese Fecha de Préstamo: "); - String issueDate = scanner.nextLine(); - System.out.print("Ingrese Fecha de Devolución: "); - String returnDate = scanner.nextLine(); - - Optional book = bookRepository.findById(String.valueOf(Long.valueOf(isbn))); - Optional student = studentRepository.findById(String.valueOf(Long.valueOf(usn))); - + System.out.print("Ingrese Fecha de Préstamo (YYYY-MM-DD): "); + LocalDate issueDate = LocalDate.parse(scanner.nextLine()); + System.out.print("Ingrese Fecha de Devolución (YYYY-MM-DD): "); + LocalDate returnDate = LocalDate.parse(scanner.nextLine()); + Optional book = bookRepository.findById(isbn); + Optional student = studentRepository.findById(usn); if (book.isPresent() && book.get().getQuantity() > 0) { - Student student1 = new Student(usn, studentName); - studentRepository.save(student1); + // Aseguramos que el estudiante exista o lo creamos si no existe + if (!student.isPresent()) { + Student newStudent = new Student(usn, studentName); + studentRepository.save(newStudent); + student = Optional.of(newStudent); // Actualizamos la referencia student + } + Issue issue = new Issue(issueDate, returnDate, student.get(), book.get()); + issueRepository.save(issue); book.get().setQuantity(book.get().getQuantity() - 1); bookRepository.save(book.get()); System.out.println("Libro prestado exitosamente!"); } else { - System.out.println("El libro no está disponible o el estudiante no existe."); + System.out.println("El libro no está disponible."); } } - private void listBooksByUsn() { System.out.println("\n--- Listar Libros por USN ---"); System.out.print("Ingrese USN del Estudiante: "); String usn = scanner.nextLine(); - Optional student = studentRepository.findById(String.valueOf(Long.valueOf(usn))); + Optional student = studentRepository.findById(usn); if (student.isPresent()) { - System.out.println("Funcionalidad no implementada aún"); + System.out.println("USN: " + student.get().getUsn()); + System.out.println("Nombre: " + student.get().getName()); + System.out.println("Libros prestados:"); + List issues = issueRepository.findByStudent_Usn(usn); // Buscamos los prestamos por USN + if (issues.isEmpty()) { + System.out.println("No hay libros prestados a este estudiante."); + } else { + for (Issue issue : issues) { + System.out.println("- " + issue.getBook().getTitle() + " (Devolución: " + issue.getReturnDate() + ")"); + } + } } else { System.out.println("Estudiante no encontrado"); } } - - private void displayBooks(List books) { if (books.isEmpty()) { System.out.println("No se encontraron libros."); diff --git a/src/main/java/com/homework/library/repositories/IssueRepository.java b/src/main/java/com/homework/library/repositories/IssueRepository.java new file mode 100644 index 00000000..d6eda2c7 --- /dev/null +++ b/src/main/java/com/homework/library/repositories/IssueRepository.java @@ -0,0 +1,10 @@ +package com.homework.library.repositories; + + +import com.homework.library.models.Issue; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + +public interface IssueRepository extends JpaRepository { + List findByStudent_Usn(String usn); +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6e029f75..82d491d8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.application.name=library spring.datasource.url=jdbc:mysql://localhost:3306/library spring.datasource.username=root -spring.datasource.password=1234 +spring.datasource.password=Paula2020$ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver //spring.jpa.hibernate.ddl-auto=validate From 665fe6e80b0c4308fdbffe8899fefc5d0557a6b1 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 29 Apr 2025 10:41:05 +0200 Subject: [PATCH 19/24] Update Readme1.md --- Readme1.md | 213 ++++++++++++++++------------------------------------- 1 file changed, 62 insertions(+), 151 deletions(-) diff --git a/Readme1.md b/Readme1.md index 0242fbf7..4c77926b 100644 --- a/Readme1.md +++ b/Readme1.md @@ -1,151 +1,62 @@ - - - - - - README - Sistema de Gestión de Biblioteca - - - - -

Sistema de Gestión de Biblioteca

- -
-
- José Martín -

José Martín

-
-
- José Manuel Siguero -

José Manuel Siguero

-
-
- Rafael Gamero -

Rafael Gamero

-
-
- -

Descripción del Proyecto

-

- Este proyecto es un sistema de gestión de biblioteca desarrollado en Java con Spring Boot. - Permite la administración de libros, autores, estudiantes y préstamos. - El sistema ofrece una interfaz de línea de comandos para interactuar con las funcionalidades. -

- -

Funcionalidades

-

- El sistema de gestión de biblioteca incluye las siguientes funcionalidades: -

-
    -
  • Añadir un libro
  • -
  • Buscar libro por título
  • -
  • Buscar libro por categoría
  • -
  • Buscar libro por autor
  • -
  • Listar todos los libros con autor
  • -
  • Prestar libro a estudiante
  • -
  • Listar libros por USN (Número de Identificación de Estudiante)
  • -
  • Borrar un libro
  • -
  • Salir del sistema
  • -
- -

Tecnologías Utilizadas

-
    -
  • Java
  • -
  • Spring Boot
  • -
  • JPA (Java Persistence API)
  • -
  • Hibernate
  • -
  • Base de Datos Relacional (e.g., H2, MySQL, PostgreSQL)
  • -
- -

Estructura del Proyecto

-

- La estructura principal del proyecto se organiza en los siguientes paquetes: -

-
    -
  • - com.homework.library: Paquete principal que contiene la clase LibraryApplication, - el punto de entrada de la aplicación. -
  • -
  • - com.homework.library.models: Contiene las clases que representan las entidades del dominio - (Book, Author, Student, Issue). -
  • -
  • - com.homework.library.repositories: Contiene las interfaces que extienden JpaRepository - para interactuar con la base de datos. -
  • -
- -

Cómo Ejecutar el Proyecto

-
    -
  1. Asegúrate de tener instalado Java y un IDE (como IntelliJ IDEA o Eclipse).
  2. -
  3. Clona el repositorio del proyecto.
  4. -
  5. Importa el proyecto en tu IDE.
  6. -
  7. Configura la conexión a la base de datos (puedes modificar application.properties).
  8. -
  9. Ejecuta la clase LibraryApplication.
  10. -
  11. Interactúa con el sistema a través de la consola, siguiendo el menú de opciones.
  12. -
- -

Consideraciones Adicionales

-
    -
  • - Se han implementado mejoras en la gestión de autores y libros, incluyendo la corrección de errores en la - relación entre entidades y la optimización de consultas a la base de datos. -
  • -
  • - Se recomienda utilizar la cascada de eliminación para mantener la integridad de los datos al borrar libros. -
  • -
  • - El proyecto utiliza Spring Boot para facilitar el desarrollo y la configuración de la aplicación. -
  • -
- -

Contacto

-

- Para cualquier consulta o sugerencia, no dudes en contactar con los autores. -

- - - +# Sistema de Gestión de Biblioteca + +Desarrollado por: + +* José Martín +* José Manuel Siguero +* Rafael Gamero + +## Descripción del Proyecto + +Este proyecto es un sistema de gestión de biblioteca desarrollado en Java con Spring Boot. +Permite la administración de libros, autores, estudiantes y préstamos. +El sistema ofrece una interfaz de línea de comandos para interactuar con las funcionalidades. + +## Funcionalidades + +El sistema de gestión de biblioteca incluye las siguientes funcionalidades: + +* Añadir un libro +* Buscar libro por título +* Buscar libro por categoría +* Buscar libro por autor +* Listar todos los libros con autor +* Prestar libro a estudiante +* Listar libros por USN (Número de Identificación de Estudiante) +* Borrar un libro +* Salir del sistema + +## Tecnologías Utilizadas + +* Java +* Spring Boot +* JPA (Java Persistence API) +* Hibernate +* Base de Datos Relacional (e.g., H2, MySQL, PostgreSQL) + +## Estructura del Proyecto + +La estructura principal del proyecto se organiza en los siguientes paquetes: + +* `com.homework.library`: Paquete principal que contiene la clase `LibraryApplication`, el punto de entrada de la aplicación. +* `com.homework.library.models`: Contiene las clases que representan las entidades del dominio (`Book`, `Author`, `Student`, `Issue`). +* `com.homework.library.repositories`: Contiene las interfaces que extienden `JpaRepository` para interactuar con la base de datos. + +## Cómo Ejecutar el Proyecto + +1. Asegúrate de tener instalado Java y un IDE (como IntelliJ IDEA o Eclipse). +2. Clona el repositorio del proyecto. +3. Importa el proyecto en tu IDE. +4. Configura la conexión a la base de datos (puedes modificar `application.properties`). +5. Ejecuta la clase `LibraryApplication`. +6. Interactúa con el sistema a través de la consola, siguiendo el menú de opciones. + +## Consideraciones Adicionales + +* Se han implementado mejoras en la gestión de autores y libros, incluyendo la corrección de errores en la relación entre entidades y la optimización de consultas a la base de datos. +* Se recomienda utilizar la cascada de eliminación para mantener la integridad de los datos al borrar libros. +* El proyecto utiliza Spring Boot para facilitar el desarrollo y la configuración de la aplicación. + +## Contacto + +Para cualquier consulta o sugerencia, no dudes en contactar con los autores. From a98a5ef1eab249430810c3233d11b8138cc437be Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 29 Apr 2025 10:41:35 +0200 Subject: [PATCH 20/24] Update Readme1.md --- Readme1.md | 1 - 1 file changed, 1 deletion(-) diff --git a/Readme1.md b/Readme1.md index 4c77926b..148b55db 100644 --- a/Readme1.md +++ b/Readme1.md @@ -23,7 +23,6 @@ El sistema de gestión de biblioteca incluye las siguientes funcionalidades: * Listar todos los libros con autor * Prestar libro a estudiante * Listar libros por USN (Número de Identificación de Estudiante) -* Borrar un libro * Salir del sistema ## Tecnologías Utilizadas From 6f38cf2ec8b7e45ba2c03a6d1665f3d82222f188 Mon Sep 17 00:00:00 2001 From: Rafa-Gamero Date: Tue, 29 Apr 2025 11:04:41 +0200 Subject: [PATCH 21/24] Commit con test --- .../homework/library/LibraryApplication.java | 82 ++++++++++--------- .../library/repositories/IssueRepository.java | 3 +- .../library/LibraryApplicationTests.java | 60 ++++++++++++-- .../repositories/BookRepositoryTests.java | 40 +++++++++ .../library/repositories/ModelTests.java | 38 +++++++++ 5 files changed, 176 insertions(+), 47 deletions(-) create mode 100644 src/test/java/com/homework/library/repositories/BookRepositoryTests.java create mode 100644 src/test/java/com/homework/library/repositories/ModelTests.java diff --git a/src/main/java/com/homework/library/LibraryApplication.java b/src/main/java/com/homework/library/LibraryApplication.java index 2f63bbce..38c037df 100644 --- a/src/main/java/com/homework/library/LibraryApplication.java +++ b/src/main/java/com/homework/library/LibraryApplication.java @@ -3,43 +3,45 @@ import com.homework.library.models.Book; import com.homework.library.models.Author; import com.homework.library.models.Student; -import com.homework.library.models.Issue; // Importamos la entidad Issue import com.homework.library.repositories.BookRepository; import com.homework.library.repositories.AuthorRepository; import com.homework.library.repositories.StudentRepository; -import com.homework.library.repositories.IssueRepository; // Importamos el repositorio IssueRepository import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; // Importamos LocalDate para las fechas +import org.springframework.transaction.annotation.Transactional; // Importante para la transacción + import java.util.List; import java.util.Optional; import java.util.Scanner; + @SpringBootApplication -@ComponentScan(basePackages = "com.homework.library") +@ComponentScan(basePackages = "com.homework.library") // Asegura que Spring escanee tus componentes public class LibraryApplication implements CommandLineRunner { + private final BookRepository bookRepository; private final AuthorRepository authorRepository; private final StudentRepository studentRepository; - private final IssueRepository issueRepository; // Agregamos el IssueRepository private final Scanner scanner = new Scanner(System.in); + @Autowired - public LibraryApplication(BookRepository bookRepository, AuthorRepository authorRepository, StudentRepository studentRepository, IssueRepository issueRepository) { + public LibraryApplication(BookRepository bookRepository, AuthorRepository authorRepository, StudentRepository studentRepository) { this.bookRepository = bookRepository; this.authorRepository = authorRepository; this.studentRepository = studentRepository; - this.issueRepository = issueRepository; // Inicializamos el IssueRepository } + public static void main(String[] args) { SpringApplication.run(LibraryApplication.class, args); } + @Override public void run(String... args) { displayMenu(); } + public void displayMenu() { boolean exit = false; while (!exit) { @@ -51,10 +53,13 @@ public void displayMenu() { System.out.println("5. Listar todos los libros con autor"); System.out.println("6. Prestar libro a estudiante"); System.out.println("7. Listar libros por USN"); + System.out.println("8. Salir"); System.out.print("Ingrese su opción: "); + int choice = scanner.nextInt(); - scanner.nextLine(); + scanner.nextLine(); // Consume la nueva línea + switch (choice) { case 1: addBook(); @@ -87,6 +92,7 @@ public void displayMenu() { } } } + private void addBook() { System.out.println("\n--- Añadir un Libro ---"); System.out.print("Ingrese ISBN: "); @@ -97,17 +103,23 @@ private void addBook() { String category = scanner.nextLine(); System.out.print("Ingrese Cantidad: "); int quantity = scanner.nextInt(); - scanner.nextLine(); + scanner.nextLine(); // Consume la nueva línea + Book book = new Book(isbn, title, category, quantity); bookRepository.save(book); + System.out.print("Ingrese Nombre del Autor: "); String authorName = scanner.nextLine(); System.out.print("Ingrese Email del Autor: "); String authorEmail = scanner.nextLine(); + Author author = new Author(authorName, authorEmail, book); authorRepository.save(author); + System.out.println("Libro añadido exitosamente!"); + } + private void searchBookByTitle() { System.out.println("\n--- Buscar Libro por Título ---"); System.out.print("Ingrese título a buscar: "); @@ -117,6 +129,7 @@ private void searchBookByTitle() { .toList(); displayBooks(books); } + private void searchBookByCategory() { System.out.println("\n--- Buscar Libro por Categoría ---"); System.out.print("Ingrese categoría a buscar: "); @@ -126,6 +139,7 @@ private void searchBookByCategory() { .toList(); displayBooks(books); } + private void searchBookByAuthor() { System.out.println("\n--- Buscar Libro por Autor ---"); System.out.print("Ingrese nombre del autor a buscar: "); @@ -140,6 +154,7 @@ private void searchBookByAuthor() { .toList(); displayBooks(books); } + private void listAllBooksWithAuthors() { System.out.println("\n--- Listar Todos los Libros con Autores ---"); List books = bookRepository.findAll(); @@ -149,7 +164,7 @@ private void listAllBooksWithAuthors() { System.out.println("ISBN\tTítulo\tCategoría\tCantidad\tNombre del Autor\tEmail del Autor"); for (Book book : books) { Optional author = authorRepository.findAll().stream() - .filter(a -> a.getAuthorBook() != null && a.getAuthorBook().equals(book)) + .filter(a -> a.getBook() != null && a.getBook().getIsbn().equals(book.getIsbn())) .findFirst(); if (author.isPresent()) { System.out.println(book.getIsbn() + "\t" + book.getTitle() + "\t" + book.getCategory() + "\t" + @@ -161,6 +176,8 @@ private void listAllBooksWithAuthors() { } } } + + private void issueBookToStudent() { System.out.println("\n--- Prestar Libro a Estudiante ---"); System.out.print("Ingrese USN del Estudiante: "); @@ -169,50 +186,39 @@ private void issueBookToStudent() { String studentName = scanner.nextLine(); System.out.print("Ingrese ISBN del Libro a Prestar: "); String isbn = scanner.nextLine(); - System.out.print("Ingrese Fecha de Préstamo (YYYY-MM-DD): "); - LocalDate issueDate = LocalDate.parse(scanner.nextLine()); - System.out.print("Ingrese Fecha de Devolución (YYYY-MM-DD): "); - LocalDate returnDate = LocalDate.parse(scanner.nextLine()); - Optional book = bookRepository.findById(isbn); - Optional student = studentRepository.findById(usn); + System.out.print("Ingrese Fecha de Préstamo: "); + String issueDate = scanner.nextLine(); + System.out.print("Ingrese Fecha de Devolución: "); + String returnDate = scanner.nextLine(); + + Optional book = bookRepository.findById(String.valueOf(Long.valueOf(isbn))); + Optional student = studentRepository.findById(String.valueOf(Long.valueOf(usn))); + if (book.isPresent() && book.get().getQuantity() > 0) { - // Aseguramos que el estudiante exista o lo creamos si no existe - if (!student.isPresent()) { - Student newStudent = new Student(usn, studentName); - studentRepository.save(newStudent); - student = Optional.of(newStudent); // Actualizamos la referencia student - } - Issue issue = new Issue(issueDate, returnDate, student.get(), book.get()); - issueRepository.save(issue); + Student student1 = new Student(usn, studentName); + studentRepository.save(student1); book.get().setQuantity(book.get().getQuantity() - 1); bookRepository.save(book.get()); System.out.println("Libro prestado exitosamente!"); } else { - System.out.println("El libro no está disponible."); + System.out.println("El libro no está disponible o el estudiante no existe."); } } + private void listBooksByUsn() { System.out.println("\n--- Listar Libros por USN ---"); System.out.print("Ingrese USN del Estudiante: "); String usn = scanner.nextLine(); - Optional student = studentRepository.findById(usn); + Optional student = studentRepository.findById(String.valueOf(Long.valueOf(usn))); if (student.isPresent()) { - System.out.println("USN: " + student.get().getUsn()); - System.out.println("Nombre: " + student.get().getName()); - System.out.println("Libros prestados:"); - List issues = issueRepository.findByStudent_Usn(usn); // Buscamos los prestamos por USN - if (issues.isEmpty()) { - System.out.println("No hay libros prestados a este estudiante."); - } else { - for (Issue issue : issues) { - System.out.println("- " + issue.getBook().getTitle() + " (Devolución: " + issue.getReturnDate() + ")"); - } - } + System.out.println("Funcionalidad no implementada aún"); } else { System.out.println("Estudiante no encontrado"); } } + + private void displayBooks(List books) { if (books.isEmpty()) { System.out.println("No se encontraron libros."); diff --git a/src/main/java/com/homework/library/repositories/IssueRepository.java b/src/main/java/com/homework/library/repositories/IssueRepository.java index d6eda2c7..31b4f687 100644 --- a/src/main/java/com/homework/library/repositories/IssueRepository.java +++ b/src/main/java/com/homework/library/repositories/IssueRepository.java @@ -1,10 +1,9 @@ package com.homework.library.repositories; - import com.homework.library.models.Issue; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; public interface IssueRepository extends JpaRepository { List findByStudent_Usn(String usn); -} +} \ No newline at end of file diff --git a/src/test/java/com/homework/library/LibraryApplicationTests.java b/src/test/java/com/homework/library/LibraryApplicationTests.java index ff9f973b..04bd8329 100644 --- a/src/test/java/com/homework/library/LibraryApplicationTests.java +++ b/src/test/java/com/homework/library/LibraryApplicationTests.java @@ -1,13 +1,59 @@ package com.homework.library; +import com.homework.library.models.Book; +import com.homework.library.repositories.BookRepository; +import com.homework.library.repositories.AuthorRepository; +import com.homework.library.repositories.StudentRepository; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import java.util.ArrayList; +import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.when; -@SpringBootTest -class LibraryApplicationTests { +public class LibraryApplicationTests { - @Test - void contextLoads() { - } + @Mock + private BookRepository bookRepository; -} + @Mock + private AuthorRepository authorRepository; + + @Mock + private StudentRepository studentRepository; + + @InjectMocks + private LibraryApplication libraryApp; // La clase que estamos probando + + @BeforeEach + void setUp() { + MockitoAnnotations.openMocks(this); // Inicializa los mocks de Mockito + } + + @Test + void testDisplayBooks_NoBooks() { + when(bookRepository.findAll()).thenReturn(new ArrayList<>()); + // Dado que displayBooks es privado, es posible que debas usar la reflexión + // o refactorizar tu código para que sea más fácil de probar. + // Por ejemplo, extrae la lógica en una clase separada. + // Este ejemplo muestra el concepto, pero deberás adaptarlo. + // libraryApp.displayBooks(bookRepository.findAll()); + // La forma en que afirmas la salida depende de cómo captures la salida de la consola + // (lo cual está más allá del alcance de este ejemplo rápido). + System.out.println("Prueba: Escenario sin libros"); + } + + @Test + void testDisplayBooks_WithBooks() { + List books = new ArrayList<>(); + books.add(new Book("111", "Título 1", "Categoría 1", 1)); + books.add(new Book("222", "Título 2", "Categoría 2", 2)); + when(bookRepository.findAll()).thenReturn(books); + // La misma nota sobre la prueba de la salida de la consola que arriba. + // libraryApp.displayBooks(bookRepository.findAll()); + System.out.println("Prueba: Escenario con libros"); + } +} \ No newline at end of file diff --git a/src/test/java/com/homework/library/repositories/BookRepositoryTests.java b/src/test/java/com/homework/library/repositories/BookRepositoryTests.java new file mode 100644 index 00000000..cf1493b5 --- /dev/null +++ b/src/test/java/com/homework/library/repositories/BookRepositoryTests.java @@ -0,0 +1,40 @@ +package com.homework.library.repositories; + +import com.homework.library.models.Book; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; + +import static org.junit.jupiter.api.Assertions.*; +import java.util.List; // Import the List class + +@DataJpaTest +public class BookRepositoryTests { + + @Autowired + private BookRepository bookRepository; + + @Autowired + private TestEntityManager entityManager; + + @Test + void testSaveBook() { + Book book = new Book("789-012", "New Book", "Mystery", 3); + Book savedBook = bookRepository.save(book); + assertNotNull(savedBook.getIsbn()); + assertEquals("New Book", savedBook.getTitle()); + } + + @Test + void testFindBookByTitle() { + Book book = new Book("456-789", "Find Me", "Thriller", 2); + entityManager.persist(book); + entityManager.flush(); + + List foundBooks = bookRepository.findByTitleContainingIgnoreCase("find me"); + + assertEquals(1, foundBooks.size()); + assertEquals("Find Me", foundBooks.get(0).getTitle()); + } +} \ No newline at end of file diff --git a/src/test/java/com/homework/library/repositories/ModelTests.java b/src/test/java/com/homework/library/repositories/ModelTests.java new file mode 100644 index 00000000..a3bd8f9a --- /dev/null +++ b/src/test/java/com/homework/library/repositories/ModelTests.java @@ -0,0 +1,38 @@ +package com.homework.library.repositories; + +import com.homework.library.models.Author; +import com.homework.library.models.Book; +import com.homework.library.models.Student; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +public class ModelTests { + + @Test + void testCreateBook() { + Book book = new Book("123-456", "Libro de Prueba", "Ficción", 5); + assertNotNull(book); + assertEquals("123-456", book.getIsbn()); + assertEquals("Libro de Prueba", book.getTitle()); + assertEquals("Ficción", book.getCategory()); + assertEquals(5, book.getQuantity()); + } + + @Test + void testCreateAuthor() { + Book book = new Book("123-456", "Libro de Prueba", "Ficción", 5); + Author author = new Author("Autor de Prueba", "prueba@ejemplo.com", book); + assertNotNull(author); + assertEquals("Autor de Prueba", author.getName()); + assertEquals("prueba@ejemplo.com", author.getEmail()); + assertEquals(book, author.getBook()); + } + + @Test + void testCreateStudent() { + Student student = new Student("S123", "Estudiante de Prueba"); + assertNotNull(student); + assertEquals("S123", student.getUsn()); + assertEquals("Estudiante de Prueba", student.getName()); + } +} \ No newline at end of file From 1b345dce5580cef6db98d5cc4711dd2c70787ae5 Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Wed, 30 Apr 2025 17:20:07 +0200 Subject: [PATCH 22/24] Commit test ok --- .../homework/library/LibraryApplicationTests.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/test/java/com/homework/library/LibraryApplicationTests.java b/src/test/java/com/homework/library/LibraryApplicationTests.java index 04bd8329..9d7ccfd5 100644 --- a/src/test/java/com/homework/library/LibraryApplicationTests.java +++ b/src/test/java/com/homework/library/LibraryApplicationTests.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.when; public class LibraryApplicationTests { - + // con mock creamos objetos simulados para los repositorios siguientes, y evitamos acceso real a la bbdd. @Mock private BookRepository bookRepository; @@ -27,7 +27,7 @@ public class LibraryApplicationTests { @InjectMocks private LibraryApplication libraryApp; // La clase que estamos probando - + // inyectamos automaticamente los mocks en una instancia de la aplicacion, la clase que estamos probando. @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); // Inicializa los mocks de Mockito @@ -36,13 +36,9 @@ void setUp() { @Test void testDisplayBooks_NoBooks() { when(bookRepository.findAll()).thenReturn(new ArrayList<>()); - // Dado que displayBooks es privado, es posible que debas usar la reflexión - // o refactorizar tu código para que sea más fácil de probar. - // Por ejemplo, extrae la lógica en una clase separada. - // Este ejemplo muestra el concepto, pero deberás adaptarlo. + // simula el caso en que no hay libros en la base de datos; // libraryApp.displayBooks(bookRepository.findAll()); - // La forma en que afirmas la salida depende de cómo captures la salida de la consola - // (lo cual está más allá del alcance de este ejemplo rápido). + System.out.println("Prueba: Escenario sin libros"); } @@ -52,7 +48,7 @@ void testDisplayBooks_WithBooks() { books.add(new Book("111", "Título 1", "Categoría 1", 1)); books.add(new Book("222", "Título 2", "Categoría 2", 2)); when(bookRepository.findAll()).thenReturn(books); - // La misma nota sobre la prueba de la salida de la consola que arriba. + // simula un caso donde hay dos libros dispobibles; // libraryApp.displayBooks(bookRepository.findAll()); System.out.println("Prueba: Escenario con libros"); } From 9613ba636deccdc1bd3293804b2b4433d9209d55 Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Mon, 5 May 2025 17:50:09 +0200 Subject: [PATCH 23/24] Update application.properties --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 82d491d8..0f824526 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,8 +1,8 @@ spring.application.name=library spring.datasource.url=jdbc:mysql://localhost:3306/library spring.datasource.username=root -spring.datasource.password=Paula2020$ +spring.datasource.password=1234 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver //spring.jpa.hibernate.ddl-auto=validate -spring.jpa.hibernate.ddl-auto=update \ No newline at end of file +spring.jpa.hibernate.ddl-auto=update From 9e35982413f565953c03adff31feb26c6fd089c7 Mon Sep 17 00:00:00 2001 From: Saiguer10 Date: Mon, 5 May 2025 17:50:45 +0200 Subject: [PATCH 24/24] Delete src/main/resources/application.properties --- src/main/resources/application.properties | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 src/main/resources/application.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 0f824526..00000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,8 +0,0 @@ -spring.application.name=library -spring.datasource.url=jdbc:mysql://localhost:3306/library -spring.datasource.username=root -spring.datasource.password=1234 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -//spring.jpa.hibernate.ddl-auto=validate -spring.jpa.hibernate.ddl-auto=update