From f2d1fb964f07d29739b28ecc56ce3bc0edd6d0be Mon Sep 17 00:00:00 2001 From: Hugo <hugo.cubino@estudiantes.uva.es> Date: Sat, 16 Nov 2024 18:46:58 +0100 Subject: [PATCH] Avance en springboot --- java/services/bookings/roomBooking/.gitignore | 33 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ java/services/bookings/roomBooking/Dockerfile | 10 + java/services/bookings/roomBooking/mvnw | 259 ++++++++++++++++++ java/services/bookings/roomBooking/mvnw.cmd | 149 ++++++++++ java/services/bookings/roomBooking/pom.xml | 63 +++++ .../Controllers/BookingController.java | 80 ++++++ .../Controllers/HotelController.java | 114 ++++++++ .../Controllers/UserController.java | 117 ++++++++ .../Exceptions/GlobalExceptionHandler.java | 50 ++++ .../Exceptions/HotelNotFoundException.java | 11 + .../Exceptions/InvalidDateRangeException.java | 8 + .../Exceptions/InvalidRequestException.java | 11 + .../com/uva/roomBooking/Models/Address.java | 115 ++++++++ .../com/uva/roomBooking/Models/Booking.java | 85 ++++++ .../com/uva/roomBooking/Models/Hotel.java | 84 ++++++ .../java/com/uva/roomBooking/Models/Room.java | 105 +++++++ .../java/com/uva/roomBooking/Models/Tipo.java | 7 + .../java/com/uva/roomBooking/Models/User.java | 90 ++++++ .../uva/roomBooking/Models/UserStatus.java | 5 + .../Repositories/BookingRepository.java | 32 +++ .../Repositories/HotelRepository.java | 8 + .../Repositories/RoomRepository.java | 35 +++ .../Repositories/UserRepository.java | 9 + .../roomBooking/RoomBookingApplication.java | 13 + .../src/main/resources/application.properties | 10 + .../RoomBookingApplicationTests.java | 13 + .../target/classes/application.properties | 10 + .../users/Controllers/UserController$1.class | Bin 0 -> 857 bytes .../users/Controllers/UserController$2.class | Bin 0 -> 835 bytes .../users/Controllers/UserController.class | Bin 0 -> 8637 bytes .../Exceptions/GlobalExceptionHandler.class | Bin 0 -> 3861 bytes .../Exceptions/HotelNotFoundException.class | Bin 0 -> 1056 bytes .../InvalidDateRangeException.class | Bin 0 -> 454 bytes .../Exceptions/InvalidRequestException.class | Bin 0 -> 616 bytes .../classes/com/uva/users/Models/User.class | Bin 0 -> 2383 bytes .../com/uva/users/Models/UserStatus.class | Bin 0 -> 1195 bytes .../users/Repositories/UserRepository.class | Bin 0 -> 524 bytes .../uva/users/UserServiceApplication.class | Bin 0 -> 748 bytes .../uva/users/config/RestTemplateConfig.class | Bin 0 -> 661 bytes .../RoomBookingApplicationTests.class | Bin 0 -> 558 bytes 41 files changed, 1545 insertions(+) create mode 100644 java/services/bookings/roomBooking/.gitignore create mode 100644 java/services/bookings/roomBooking/.mvn/wrapper/maven-wrapper.properties create mode 100644 java/services/bookings/roomBooking/Dockerfile create mode 100755 java/services/bookings/roomBooking/mvnw create mode 100644 java/services/bookings/roomBooking/mvnw.cmd create mode 100644 java/services/bookings/roomBooking/pom.xml create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/BookingController.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/HotelController.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/UserController.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Address.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Booking.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Hotel.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Room.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Tipo.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/User.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/UserStatus.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java create mode 100644 java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/RoomBookingApplication.java create mode 100644 java/services/bookings/roomBooking/src/main/resources/application.properties create mode 100644 java/services/bookings/roomBooking/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java create mode 100644 java/services/users/target/classes/application.properties create mode 100644 java/services/users/target/classes/com/uva/users/Controllers/UserController$1.class create mode 100644 java/services/users/target/classes/com/uva/users/Controllers/UserController$2.class create mode 100644 java/services/users/target/classes/com/uva/users/Controllers/UserController.class create mode 100644 java/services/users/target/classes/com/uva/users/Exceptions/GlobalExceptionHandler.class create mode 100644 java/services/users/target/classes/com/uva/users/Exceptions/HotelNotFoundException.class create mode 100644 java/services/users/target/classes/com/uva/users/Exceptions/InvalidDateRangeException.class create mode 100644 java/services/users/target/classes/com/uva/users/Exceptions/InvalidRequestException.class create mode 100644 java/services/users/target/classes/com/uva/users/Models/User.class create mode 100644 java/services/users/target/classes/com/uva/users/Models/UserStatus.class create mode 100644 java/services/users/target/classes/com/uva/users/Repositories/UserRepository.class create mode 100644 java/services/users/target/classes/com/uva/users/UserServiceApplication.class create mode 100644 java/services/users/target/classes/com/uva/users/config/RestTemplateConfig.class create mode 100644 java/services/users/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class diff --git a/java/services/bookings/roomBooking/.gitignore b/java/services/bookings/roomBooking/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/java/services/bookings/roomBooking/.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/java/services/bookings/roomBooking/.mvn/wrapper/maven-wrapper.properties b/java/services/bookings/roomBooking/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/java/services/bookings/roomBooking/.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/java/services/bookings/roomBooking/Dockerfile b/java/services/bookings/roomBooking/Dockerfile new file mode 100644 index 0000000..8d0b79d --- /dev/null +++ b/java/services/bookings/roomBooking/Dockerfile @@ -0,0 +1,10 @@ +FROM maven:3-openjdk-17 AS maven +WORKDIR /app +COPY ./ ./ +RUN mvn -Dmaven.test.skip clean package +FROM openjdk:17-jdk-oracle +ARG JAR_FILE=/app/target/*.jar +COPY --from=maven ${JAR_FILE} app.jar +ENV PORT 8080 +EXPOSE $PORT +ENTRYPOINT ["java","-jar", "/app.jar"] \ No newline at end of file diff --git a/java/services/bookings/roomBooking/mvnw b/java/services/bookings/roomBooking/mvnw new file mode 100755 index 0000000..19529dd --- /dev/null +++ b/java/services/bookings/roomBooking/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-<version>,maven-mvnd-<version>-<platform>}/<hash> +[ -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/java/services/bookings/roomBooking/mvnw.cmd b/java/services/bookings/roomBooking/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/java/services/bookings/roomBooking/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-<version>,maven-mvnd-<version>-<platform>}/<hash> +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/java/services/bookings/roomBooking/pom.xml b/java/services/bookings/roomBooking/pom.xml new file mode 100644 index 0000000..476f735 --- /dev/null +++ b/java/services/bookings/roomBooking/pom.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-parent</artifactId> + <version>3.3.4</version> + <relativePath/> <!-- lookup parent from repository --> + </parent> + <groupId>com.uva</groupId> + <artifactId>roomBooking</artifactId> + <version>0.0.1-SNAPSHOT</version> + <name>roomBooking</name> + <description>Room Booking rest</description> + <url/> + <licenses> + <license/> + </licenses> + <developers> + <developer/> + </developers> + <scm> + <connection/> + <developerConnection/> + <tag/> + <url/> + </scm> + <properties> + <java.version>17</java.version> + </properties> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-jpa</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-rest</artifactId> + </dependency> + + <dependency> + <groupId>com.mysql</groupId> + <artifactId>mysql-connector-j</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project> diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/BookingController.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/BookingController.java new file mode 100644 index 0000000..5baa503 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/BookingController.java @@ -0,0 +1,80 @@ +// BookingController.java +package com.uva.roomBooking.Controllers; + +import com.uva.roomBooking.Models.Booking; +import com.uva.roomBooking.Models.Room; +import com.uva.roomBooking.Models.User; +import com.uva.roomBooking.Repositories.BookingRepository; +import com.uva.roomBooking.Repositories.RoomRepository; +import com.uva.roomBooking.Repositories.UserRepository; + +import jakarta.transaction.Transactional; + +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/bookings") +@CrossOrigin(origins = "*") +public class BookingController { + + private final BookingRepository bookingRepository; + private final UserRepository userRepository; + private final RoomRepository roomRepository; + + public BookingController(BookingRepository bookingRepository, UserRepository userRepository, + RoomRepository roomRepository) { + this.bookingRepository = bookingRepository; + this.userRepository = userRepository; + this.roomRepository = roomRepository; + } + + @GetMapping + public List<Booking> getAllBookings() { + return bookingRepository.findAll(); + } + + @PostMapping + public Booking createBooking(@RequestBody Booking booking) { + User user = userRepository.findById(booking.getUserId().getId()) + .orElseThrow(() -> new RuntimeException("User not found")); + Room room = roomRepository.findById(booking.getRoomId().getId()) + .orElseThrow(() -> new RuntimeException("Room not found")); + + // Verificar disponibilidad + List<Booking> existingBookings = bookingRepository.findByRoomIdAndDateRange( + room.getId(), booking.getStartDate(), booking.getEndDate()); + + if (!existingBookings.isEmpty()) { + throw new RuntimeException("Room is not available for the selected dates"); + } + + booking.setUserId(user); + booking.setRoomId(room); + return bookingRepository.save(booking); + } + + @GetMapping("/{id}") + public Booking getBookingById(@PathVariable Integer id) { + return bookingRepository.findById(id) + .orElseThrow(() -> new RuntimeException("Booking not found")); + } + + @DeleteMapping("/{id}") + @Transactional + public ResponseEntity<Void> deleteBooking(@PathVariable Integer id) { + try { + if (!bookingRepository.existsById(id)) + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + + bookingRepository.deleteBookingById(id); + return new ResponseEntity<>(HttpStatus.ACCEPTED); + } catch (Exception e) { + return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); + } + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/HotelController.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/HotelController.java new file mode 100644 index 0000000..803edc3 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/HotelController.java @@ -0,0 +1,114 @@ +package com.uva.roomBooking.Controllers; + +import java.util.List; +import java.util.Map; +import java.time.LocalDate; + +import com.uva.roomBooking.Exceptions.HotelNotFoundException; +import com.uva.roomBooking.Exceptions.InvalidDateRangeException; +import com.uva.roomBooking.Exceptions.InvalidRequestException; +import com.uva.roomBooking.Models.Booking; +import com.uva.roomBooking.Models.Hotel; +import com.uva.roomBooking.Models.Room; +import com.uva.roomBooking.Repositories.BookingRepository; +import com.uva.roomBooking.Repositories.HotelRepository; +import com.uva.roomBooking.Repositories.RoomRepository; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("hotels") +@CrossOrigin(origins = "*") +public class HotelController { + private final HotelRepository hotelRepository; + private final RoomRepository roomRepository; + private final BookingRepository bookingRepository; + + public HotelController(HotelRepository hotelRepository, RoomRepository roomRepository, + BookingRepository bookingRepository) { + this.hotelRepository = hotelRepository; + this.roomRepository = roomRepository; + this.bookingRepository = bookingRepository; + } + + // Obtener todos los hoteles + @GetMapping + public List<Hotel> getAllHotels() { + return hotelRepository.findAll(); + } + + // Añadir un hotel con sus habitaciones + @PostMapping + public ResponseEntity<Hotel> addHotel(@RequestBody Hotel hotel) { + Hotel savedHotel = hotelRepository.save(hotel); + return new ResponseEntity<>(savedHotel, HttpStatus.CREATED); + } + + // Obtener un hotel por su ID + @GetMapping("/{id}") + public Hotel getHotelById(@PathVariable int id) { + return hotelRepository.findById(id) + .orElseThrow(() -> new HotelNotFoundException(id)); + } + + // Borrar un hotel junto con sus habitaciones (borrado en cascada) + @DeleteMapping("/{id}") + @Transactional + public ResponseEntity<Void> deleteHotel(@PathVariable Integer id) { + Hotel target = hotelRepository.findById(id) + .orElseThrow(() -> new HotelNotFoundException(id)); + bookingRepository.deleteAllByHotelId(id); + hotelRepository.delete(target); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + // Obtener habitaciones de un hotel según disponibilidad y fechas + @GetMapping("/{hotelId}/rooms") + public ResponseEntity<List<Room>> getRoomsFromHotel( + @PathVariable int hotelId, + @RequestParam(required = false) LocalDate start, + @RequestParam(required = false) LocalDate end) { + + List<Room> rooms; + if (start != null && end != null) { + if (!start.isBefore(end)) { + throw new InvalidDateRangeException("La fecha de inicio debe ser anterior a la fecha de fin"); + } + rooms = roomRepository.findAvailableRoomsByHotelAndDates(hotelId, start, end); + } else { + rooms = roomRepository.findAllByHotelId(hotelId); + } + return new ResponseEntity<>(rooms, HttpStatus.OK); + } + + // Actualizar disponibilidad de una habitación específica en un hotel + @PatchMapping("/{hotelId}/rooms/{roomId}") + public ResponseEntity<Room> updateRoomAvailability( + @PathVariable int hotelId, + @PathVariable int roomId, + @RequestBody Map<String, Boolean> body) { + + if (!body.containsKey("available")) { + throw new InvalidRequestException("El campo 'available' es obligatorio"); + } + + Room targetRoom = roomRepository.findByIdAndHotelId(roomId, hotelId) + .orElseThrow(() -> new IllegalArgumentException("Habitación no encontrada")); + + targetRoom.setAvailable(body.get("available")); + roomRepository.save(targetRoom); + + return new ResponseEntity<>(targetRoom, HttpStatus.OK); + } + + // Obtener los detalles de una habitación específica en un hotel + @GetMapping("/{hotelId}/rooms/{roomId}") + public Room getRoomByIdFromHotel( + @PathVariable int hotelId, @PathVariable int roomId) { + return roomRepository.findByIdAndHotelId(roomId, hotelId) + .orElseThrow(() -> new HotelNotFoundException(hotelId)); + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/UserController.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/UserController.java new file mode 100644 index 0000000..a0e6397 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/UserController.java @@ -0,0 +1,117 @@ +package com.uva.roomBooking.Controllers; + +import java.time.LocalDate; +import java.util.List; +import java.util.Map; + +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.uva.roomBooking.Models.UserStatus; +import com.uva.roomBooking.Models.Booking; +import com.uva.roomBooking.Models.User; +import com.uva.roomBooking.Repositories.UserRepository; + +@RestController +@RequestMapping("users") +@CrossOrigin(origins = "*") +public class UserController { + private final UserRepository userRepository; + + public UserController(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @GetMapping + public List<User> getAllUsers() { + return userRepository.findAll(); + } + + @PostMapping + public User addUser(@RequestBody User user) { + // TODO revisar como se desea manejar estado por defecto + user.setStatus(UserStatus.NO_BOOKINGS); + // Aunque se asegure a lo mejor no es la forma de manejo esperada + return userRepository.save(user); + } + + @GetMapping("/{id}") + public User getUserById(@PathVariable int id) { + return userRepository.findById(id).orElseThrow(); + } + + @PutMapping("/{id}") + public User updateUserData(@PathVariable int id, @RequestBody Map<String, String> json) { + User target = userRepository.findById(id).orElseThrow(); + if (!json.containsKey("name") || !json.containsKey("email")) { + // TODO cambiar manejo + throw new RuntimeException("Missing required fields"); + } + target.setName(json.get("name")); + target.setEmail(json.get("email")); + return userRepository.save(target); + } + + @PatchMapping("/{id}") + public User updateUserState(@PathVariable int id, @RequestBody Map<String, String> json) { + User target = userRepository.findById(id).orElseThrow(); + String strStatus = json.get("status"); + if (strStatus == null) { + // TODO cambiar manejo + throw new RuntimeException("Missing required fields"); + } + UserStatus userStatus = UserStatus.valueOf(strStatus); + + boolean activeBookings = target.getBookings().stream() + .anyMatch(booking -> !booking.getEndDate().isBefore(LocalDate.now())); // reserva >= ahora + boolean inactiveBookings = target.getBookings().stream() + .anyMatch(booking -> booking.getStartDate().isBefore(LocalDate.now())); // reserva < ahora + + switch (userStatus) { + // TODO Buscar como validar las (in)active bookings + case NO_BOOKINGS: + if (!target.getBookings().isEmpty()) + throw new IllegalArgumentException("Invalid State: The user has at least one booking"); + break; + case WITH_ACTIVE_BOOKINGS: + if (target.getBookings().isEmpty()) + throw new IllegalArgumentException("Invalid State: The user don't has bookings"); + if (!activeBookings) + throw new IllegalArgumentException("Invalid State: The user don't has active bookings"); + break; + case WITH_INACTIVE_BOOKINGS: + if (target.getBookings().isEmpty()) + throw new IllegalArgumentException("Invalid State: The user don't has bookings"); + if (!inactiveBookings) + throw new IllegalArgumentException("Invalid State: The user don't has inactive bookings"); + break; + default: + break; + } + target.setStatus(userStatus); + return userRepository.save(target); + } + + @DeleteMapping("/{id}") + public User deleteUser(@PathVariable Integer id) { + User target; + if ((target = userRepository.findById(id).orElseThrow()) != null) { + userRepository.deleteById(id); + } + return target; + } + + @GetMapping("/{id}/bookings") + public List<Booking> getUserBookingsById(@PathVariable int id) { + User user = userRepository.findById(id).orElseThrow(); + return user.getBookings(); + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java new file mode 100644 index 0000000..03b21e2 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java @@ -0,0 +1,50 @@ +package com.uva.roomBooking.Exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(HotelNotFoundException.class) + public ResponseEntity<Map<String, Object>> handleHotelNotFound(HotelNotFoundException ex) { + Map<String, Object> body = new HashMap<>(); + body.put("timestamp", LocalDateTime.now()); + body.put("message", ex.getMessage()); + + return new ResponseEntity<>(body, HttpStatus.NOT_FOUND); + } + + @ExceptionHandler(InvalidRequestException.class) + public ResponseEntity<Map<String, Object>> handleInvalidRequest(InvalidRequestException ex) { + Map<String, Object> body = new HashMap<>(); + body.put("timestamp", LocalDateTime.now()); + body.put("message", ex.getMessage()); + + return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(InvalidDateRangeException.class) + public ResponseEntity<Map<String, Object>> handleInvalidDateRange(InvalidDateRangeException ex) { + Map<String, Object> body = new HashMap<>(); + body.put("timestamp", LocalDateTime.now()); + body.put("message", ex.getMessage()); + + return new ResponseEntity<>(body, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity<Map<String, Object>> handleGeneralException(Exception ex) { + Map<String, Object> body = new HashMap<>(); + body.put("timestamp", LocalDateTime.now()); + body.put("message", "An unexpected error occurred: " + ex.getMessage()); + + return new ResponseEntity<>(body, HttpStatus.INTERNAL_SERVER_ERROR); + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java new file mode 100644 index 0000000..3d47f5e --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java @@ -0,0 +1,11 @@ +package com.uva.roomBooking.Exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.NOT_FOUND) // Devuelve un 404 cuando se lanza la excepción +public class HotelNotFoundException extends RuntimeException { + public HotelNotFoundException(int id) { + super("Hotel not found with id: " + id); + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java new file mode 100644 index 0000000..17a8420 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java @@ -0,0 +1,8 @@ +package com.uva.roomBooking.Exceptions; + +public class InvalidDateRangeException extends RuntimeException { + public InvalidDateRangeException(String message) { + super(message); + } +} + diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java new file mode 100644 index 0000000..a8433b6 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java @@ -0,0 +1,11 @@ +package com.uva.roomBooking.Exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.BAD_REQUEST) +public class InvalidRequestException extends RuntimeException { + public InvalidRequestException(String message) { + super(message); + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Address.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Address.java new file mode 100644 index 0000000..5e51f55 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Address.java @@ -0,0 +1,115 @@ +package com.uva.roomBooking.Models; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "addresses") +public class Address { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Basic(optional = false) + private int id; + + @Basic(optional = false) + @Column(name = "street_kind") + private String streetKind; + + @Basic(optional = false) + @Column(name = "street_name") + private String streetName; + + @Basic(optional = false) + private int number; + + @Basic(optional = false) + @Column(name = "post_code") + private String postCode; + + @Basic(optional = true) + @Column(name = "other_info") + private String otherInfo; + + @JsonIgnore + @OneToOne(mappedBy = "address", fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private Hotel hotel; + + public Address() { + } + + public Address(String streetKind, String streetName, int number, String postCode, String otherInfo, Hotel hotel) { + setStreetKind(streetKind); + setStreetName(streetName); + setNumber(number); + setPostCode(postCode); + setOtherInfo(otherInfo); + setHotel(hotel); + } + + public int getId() { + return this.id; + } + + public void setId(int id) { + this.id = id; + } + + public String getStreetKind() { + return this.streetKind; + } + + public void setStreetKind(String streetKind) { + this.streetKind = streetKind; + } + + public String getStreetName() { + return this.streetName; + } + + public void setStreetName(String streetName) { + this.streetName = streetName; + } + + public int getNumber() { + return this.number; + } + + public void setNumber(int number) { + this.number = number; + } + + public String getPostCode() { + return this.postCode; + } + + public void setPostCode(String postCode) { + this.postCode = postCode; + } + + public String getOtherInfo() { + return this.otherInfo; + } + + public void setOtherInfo(String otherInfo) { + this.otherInfo = otherInfo; + } + + public Hotel getHotel() { + return this.hotel; + } + + public void setHotel(Hotel hotel) { + this.hotel = hotel; + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Booking.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Booking.java new file mode 100644 index 0000000..c546d19 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Booking.java @@ -0,0 +1,85 @@ +package com.uva.roomBooking.Models; + +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import java.time.LocalDate; + +@Entity +@Table(name = "bookings") +public class Booking { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Basic(optional = false) + private int id; + @JoinColumn(name = "user_id", referencedColumnName = "id") + @ManyToOne(optional = false, fetch = FetchType.EAGER, cascade = CascadeType.MERGE) + private User userId; + @JoinColumn(name = "room_id", referencedColumnName = "id") + @ManyToOne(optional = false, fetch = FetchType.EAGER, cascade = CascadeType.MERGE) + private Room roomId; + @Column(name = "start_date", nullable = false) + private LocalDate startDate; + @Column(name = "end_date", nullable = false) + private LocalDate endDate; + + public Booking() { + } + + public Booking(int id, User userId, Room roomID, LocalDate startDate, LocalDate endDate) { + this.id = id; + this.userId = userId; + this.roomId = roomID; + this.startDate = startDate; + this.endDate = endDate; + } + + public void setId(int id) { + this.id = id; + } + + public int getId() { + return this.id; + } + + public void setUserId(User userId) { + this.userId = userId; + } + + public User getUserId() { + return this.userId; + } + + public void setRoomId(Room roomID) { + this.roomId = roomID; + } + + public Room getRoomId() { + return this.roomId; + } + + public void setStartDate(LocalDate startDate) { + this.startDate = startDate; + } + + public LocalDate getStartDate() { + return this.startDate; + } + + public void setEndDate(LocalDate endDate) { + this.endDate = endDate; + } + + public LocalDate getEndDate() { + return this.endDate; + } + +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Hotel.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Hotel.java new file mode 100644 index 0000000..5a23005 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Hotel.java @@ -0,0 +1,84 @@ +package com.uva.roomBooking.Models; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIdentityInfo; +import com.fasterxml.jackson.annotation.ObjectIdGenerators; + +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "hotels") +// @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, +// property = "id") +public class Hotel { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Basic(optional = false) + private int id; + + @Basic(optional = false) + private String name; + + @JoinColumn(name = "address_id", referencedColumnName = "id") + @OneToOne(optional = false, cascade = CascadeType.ALL, fetch = FetchType.EAGER) + private Address address; + + @OneToMany(mappedBy = "hotel", fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private List<Room> rooms; + + public Hotel() { + } + + public Hotel(int id, String name, Address address, List<Room> rooms) { + setId(id); + setName(name); + setAddress(address); + setRooms(rooms); + } + + public int getId() { + return this.id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public Address getAddress() { + return this.address; + } + + public void setAddress(Address address) { + this.address = address; + } + + public List<Room> getRooms() { + return this.rooms; + } + + public void setRooms(List<Room> rooms) { + this.rooms = rooms; + rooms.forEach(room -> room.setHotel(this)); + } + +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Room.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Room.java new file mode 100644 index 0000000..639dfdb --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Room.java @@ -0,0 +1,105 @@ +package com.uva.roomBooking.Models; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIdentityInfo; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.ObjectIdGenerators; + +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + +@Entity +@Table(name = "rooms") +// @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, +// property = "id") +public class Room { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Basic(optional = false) + private int id; + + @ManyToOne + @JoinColumn(name = "hotel_id", referencedColumnName = "id") + @JsonIgnore + private Hotel hotel; + @Column(name = "room_number", nullable = false) + private String roomNumber; + @Column(name = "type", nullable = false) + private Tipo type; + @Column(name = "available", nullable = false) + private boolean available; + @JsonIgnore + @OneToMany(mappedBy = "roomId", fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private List<Booking> bookings; + + public Room() { + } + + public Room(int id, Hotel hotelId, String roomNumber, Tipo type, boolean available, List<Booking> bookings) { + this.id = id; + this.hotel = hotelId; + this.roomNumber = roomNumber; + this.type = type; + this.available = available; + this.bookings = bookings; + } + + public void setId(int id) { + this.id = id; + } + + public int getId() { + return this.id; + } + + public void setHotel(Hotel hotelId) { + this.hotel = hotelId; + } + + public Hotel getHotel() { + return this.hotel; + } + + public void setRoomNumber(String roomNumber) { + this.roomNumber = roomNumber; + } + + public String getRoomNumber() { + return this.roomNumber; + } + + public void setType(Tipo type) { + this.type = type; + } + + public Tipo getType() { + return this.type; + } + + public void setAvailable(boolean available) { + this.available = available; + } + + public boolean isAvailable() { + return this.available; + } + + public List<Booking> getBookings() { + return this.bookings; + } + + public void setBookings(List<Booking> bookings) { + this.bookings = bookings; + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Tipo.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Tipo.java new file mode 100644 index 0000000..e1a48b5 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Tipo.java @@ -0,0 +1,7 @@ +package com.uva.roomBooking.Models; + +public enum Tipo { + SINGLE, + DOUBLE, + SUITE +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/User.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/User.java new file mode 100644 index 0000000..c5373df --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/User.java @@ -0,0 +1,90 @@ +package com.uva.roomBooking.Models; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnore; + +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") +public class User { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Basic(optional = false) + private int id; + + @Basic(optional = false) + private String name; + + @Basic(optional = false) + private String email; + + @Basic(optional = false) + @Enumerated(EnumType.STRING) + private UserStatus status = UserStatus.NO_BOOKINGS; + + @JsonIgnore + @OneToMany(mappedBy = "userId", fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private List<Booking> bookings; + + public User() { + } + + public User(int id, String name, String email, UserStatus status, List<Booking> bookings) { + setId(id); + setEmail(email); + setStatus(status); + setBookings(bookings); + } + + public int getId() { + return this.id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return this.email; + } + + public void setEmail(String email) { + this.email = email; + } + + public UserStatus getStatus() { + return this.status; + } + + public void setStatus(UserStatus status) { + this.status = status; + } + + public List<Booking> getBookings() { + return this.bookings; + } + + public void setBookings(List<Booking> bookings) { + this.bookings = bookings; + } +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/UserStatus.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/UserStatus.java new file mode 100644 index 0000000..41adce4 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/UserStatus.java @@ -0,0 +1,5 @@ +package com.uva.roomBooking.Models; + +public enum UserStatus { + NO_BOOKINGS, WITH_ACTIVE_BOOKINGS, WITH_INACTIVE_BOOKINGS; +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java new file mode 100644 index 0000000..16c860a --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java @@ -0,0 +1,32 @@ +// BookingRepository.java +package com.uva.roomBooking.Repositories; + +import com.uva.roomBooking.Models.Booking; + +import jakarta.transaction.Transactional; + +import java.time.LocalDate; +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface BookingRepository extends JpaRepository<Booking, Integer> { + + @Query("SELECT b FROM Booking b WHERE b.roomId.id = ?1 AND b.startDate < ?2 AND b.endDate > ?3") + List<Booking> findByRoomIdAndDateRange(@Param("roomId") int roomId, @Param("startDate") LocalDate startDate, + @Param("endDate") LocalDate endDate); + + @Transactional + @Modifying + @Query("DELETE FROM Booking b WHERE b.id = ?1") + void deleteBookingById(@Param("id") Integer id); + + @Transactional + @Modifying + @Query("DELETE FROM Booking b WHERE b.roomId.hotel.id = ?1") + void deleteAllByHotelId(int hotelId); + +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java new file mode 100644 index 0000000..290f129 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java @@ -0,0 +1,8 @@ +package com.uva.roomBooking.Repositories; + +import com.uva.roomBooking.Models.Hotel; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface HotelRepository extends JpaRepository<Hotel, Integer> { + +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java new file mode 100644 index 0000000..3df9937 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java @@ -0,0 +1,35 @@ +package com.uva.roomBooking.Repositories; + +import com.uva.roomBooking.Models.Room; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.time.LocalDate; +import java.util.List; +import java.util.Optional; + +public interface RoomRepository extends JpaRepository<Room, Integer> { + + Optional<Room> findByIdAndHotelId(int id, int hotelId); + + // Encontrar todas las habitaciones de un hotel + List<Room> findAllByHotelId(int hotelId); + + // Encontrar habitaciones disponibles de un hotel en un rango de fechas + @Query(""" + SELECT r FROM Room r + WHERE r.hotel.id = ?1 + AND r.available = true + AND NOT EXISTS ( + SELECT b FROM Booking b + WHERE b.roomId.id = r.id + AND ( + b.endDate > ?2 + OR + b.startDate > ?3 + ) + ) + """) + List<Room> findAvailableRoomsByHotelAndDates( + int hotelId, LocalDate startDate, LocalDate endDate); +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java new file mode 100644 index 0000000..5f02f6d --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java @@ -0,0 +1,9 @@ +package com.uva.roomBooking.Repositories; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.uva.roomBooking.Models.User; + +public interface UserRepository extends JpaRepository<User, Integer> { + +} diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/RoomBookingApplication.java b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/RoomBookingApplication.java new file mode 100644 index 0000000..1a5f312 --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/RoomBookingApplication.java @@ -0,0 +1,13 @@ +package com.uva.roomBooking; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class RoomBookingApplication { + + public static void main(String[] args) { + SpringApplication.run(RoomBookingApplication.class, args); + } + +} diff --git a/java/services/bookings/roomBooking/src/main/resources/application.properties b/java/services/bookings/roomBooking/src/main/resources/application.properties new file mode 100644 index 0000000..563d4ad --- /dev/null +++ b/java/services/bookings/roomBooking/src/main/resources/application.properties @@ -0,0 +1,10 @@ +spring.application.name=roomBooking +spring.jpa.hibernate.ddl-auto=update +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect +spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/RoomsBooking?createDatabaseIfNotExist=true +spring.datasource.username=user +spring.datasource.password=password +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +# Usar esto para alternar entre las exposición del room repository ya que no es necesario su uso pero por defecto, al no cubrir su ruta, se expone +# spring.data.rest.base-path=false \ No newline at end of file diff --git a/java/services/bookings/roomBooking/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java b/java/services/bookings/roomBooking/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java new file mode 100644 index 0000000..3b50599 --- /dev/null +++ b/java/services/bookings/roomBooking/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java @@ -0,0 +1,13 @@ +package com.uva.roomBooking; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class RoomBookingApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/java/services/users/target/classes/application.properties b/java/services/users/target/classes/application.properties new file mode 100644 index 0000000..563d4ad --- /dev/null +++ b/java/services/users/target/classes/application.properties @@ -0,0 +1,10 @@ +spring.application.name=roomBooking +spring.jpa.hibernate.ddl-auto=update +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect +spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/RoomsBooking?createDatabaseIfNotExist=true +spring.datasource.username=user +spring.datasource.password=password +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +# Usar esto para alternar entre las exposición del room repository ya que no es necesario su uso pero por defecto, al no cubrir su ruta, se expone +# spring.data.rest.base-path=false \ No newline at end of file diff --git a/java/services/users/target/classes/com/uva/users/Controllers/UserController$1.class b/java/services/users/target/classes/com/uva/users/Controllers/UserController$1.class new file mode 100644 index 0000000000000000000000000000000000000000..d8cbf429c29adf8c8e7dcb58106ff497959fd56d GIT binary patch literal 857 zcmX^0Z`VEs1_oOO1$G7|Mh30q{9OIgvPAvT;?$yIedqkVlA`>a91uISIJF4DS21K~ zU}0o1&M!*WFD@v`%u7!zO3Y0y&o9c>PtGq&)elGn@k>&RGOJQkLMjVVgHqE{i&FEF zQyCf9N-{EwRSXyzw0wxQ&zg~e%_cK1v&4>(L05x#ZJJ?>3@pz1DXE+cj11g746F=n zTnx+%ygUr-41A0X%o-pC{63j^seYxoNvTC4iAg!Bj0{3P`N@enVTnbVAU;%(1>|f- z1|6bpS246^WDxL8Ey>7Ffrm#iBLi1(erZv1s#_+=Dq+-s)yqmOOJro=49-l?ODriZ zN@ZlI^C2UYZG1om>6eyd=IHxm7MCFNeG?0y+?>R`bp7BGQ2bd#G=N3?ld@8iORVj{ zkdcAkH7_|Qzc@259pV>u1}R1c4Pv8?he3uxmXU$Kv>+w1Bo*Y_;F83WR8Ty6LhJ-P z(l@cdS`#g3ee+XNbBgsrdaM~4cs%p+Qj45(5{rvdiy0X>{8EccJo1Z67!(*78JHOu z7#IZvKoJaLF)%Q&GjK34F>o?4FqkkfF)%SOFmP#UZ)M=p+RnhUk%57MiGiPifq{*I zk%581pFx0ufq@6i=3)?J5Mp3p5N2RtU}a=rZ2%c60@fhPAO@zz86+4O7+4r28KfEH TKn61~g0(U*Ffho2RY(E=^tSMe literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Controllers/UserController$2.class b/java/services/users/target/classes/com/uva/users/Controllers/UserController$2.class new file mode 100644 index 0000000000000000000000000000000000000000..f09cc4d705e423147ac16df6466582350307843a GIT binary patch literal 835 zcmX^0Z`VEs1_oOO1$G7|Mh30q{9OIgvPAvT;?$yIedqkVlA`>a91uISIJF4DS21E| zU}0o1&M!*WFD@v`%u7!zO3Y0y&o9c>PtGq&)elGn@k>&RGOJQkLMjVVgHqE{i&FEF zQyCf9N-{EwRSXyzw0wxQ&zg~e%_cK1v&4>(L05x#ZJJ?>3@pz1DXE+cj11g746F=n zTnx+%ygUr-41A0X%o-pC{63j^seYxoNvTC4iAg!Bj0{3P`N@enVTnbVAU;%(1>|f- z1|6bpS240?WDxL8Ey>7Ffrm#iBLi1(erZv1s#_+=Dq+-s)yqmOOJro=49-l?ODriZ zN@ZlI^C2UYZG1om>6eyd=IHxm7MCFNeG?0y+?>R`bp7BGQ2bd#G=N3?ld@8iORVj{ zkdcAkH7_|Qzc@259pV>u1}R1c4Pv8?he3uxmXSd?J+%bnRj2&??99CMVy8;a6h;PN z4Npyo#c-EeGcxda=H;apIp-u67pE38GI02%7MFPB7nd+7FfcMOGcYhP3J8Fr62xL) zU|?t9U|?e4WME)0VPIllVqjq4($e0_z@@dFfoCHF0|OHSKLY~;8v`Q)14A`~00RR9 z517rxAjlxZz`!8Pz`(%D$iUhFGE@YtL6kuZOp7x}FfcH%Fi0{;GsuAqW?%$sWnf@n JkO!-f1OPvx=zahI literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Controllers/UserController.class b/java/services/users/target/classes/com/uva/users/Controllers/UserController.class new file mode 100644 index 0000000000000000000000000000000000000000..7ddd02abcfc9bc8d58cd8824036ee930ad635818 GIT binary patch literal 8637 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 QHcmzla7&Acp@ZQn048=Je*gdg literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Exceptions/GlobalExceptionHandler.class b/java/services/users/target/classes/com/uva/users/Exceptions/GlobalExceptionHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..2dc5c7ec576f64f4f0175922eca406e6af5b3447 GIT binary patch literal 3861 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 literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Exceptions/HotelNotFoundException.class b/java/services/users/target/classes/com/uva/users/Exceptions/HotelNotFoundException.class new file mode 100644 index 0000000000000000000000000000000000000000..a44412dc39b8a39117225dd1e63aaa394b7f930c GIT binary patch literal 1056 zcmX^0Z`VEs1_oOO9d-sLMh5-l{9OIgvPAvT;?$yIeb<WQ)Pj=C{Jdg)kNlF<9KZY$ zxBSw)6u3A$0}CUAR90eHqJB<dUb=ozX<kWYZYo@!k%7%7GcU8mj*)>y!&5Vik%7fI zKP6R&fq{XOhk=WMn~_00H!(ZaIX^Esu_QdRB*QsBuec;JucVlfK~%$2(+6R8a7j^S zUb;0G12Y3J4+AR$A4mnJJjfD$pUk{eztY^K)S{5Yq?}Yn1|gsP<iwn?#G*_PA1cUF zl95@=$YAJ0qOYwP8JIFt7#SEn85sn8Q%f@PQvwo;5_3~aQj3Zi8MuP;ON)|I-7-NI zOJff>J&?Z`86=?r7M59@nUs_2n3tDdk_ZlPMg|L?{GxRI;sTJb(?F(|=NDz`m!~G_ zCuQcP=qJL}>IbD37v$#^rv{fKmXsD-GcvH2CFYc-GBT)QH6o*=q(I-Jq@)0@p3~1i zB;L(G)X#;HLBJ_LzofXND6s(Ivtlj=c?Lyx1_ee26_BGL5uKS=mY<!f4~Y{<?71Z- zm*f{!f}&N4kzs}gQq(|ILk#pt%uC5hEmrZ#&(AI`utrh_F%4M+MPo>1K`OE&RCzR# z3I0i0smUeQ$jJt3gmYp}PH<*Psx?0wgB%BgDkFmwIA#>`@=FxbK#5wRJhLQ2Av48F zfsv7c$1^W4wa7UqvA8(3n4Lj`kwF#1^Vqz@&Y;D}ActQmBLf@6?+l6zj10^SAi&7L z$iT|L#=ykD&cMLn%)rFJ#K6G7ttGvSfrEizI|I)~1_lNu27U$x1}?A^Cj%D)7lQx; z1A`ct&&?pn0LoSj4BQOD3?dAS45ADS46KX{!VC-yEDT~`?cxj)3=9ms42%qt42%p? ksSMH#G7Pc|3=A9$j10;Qj0`FaYG4}}8Ppjx8MGNB0daLHvj6}9 literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Exceptions/InvalidDateRangeException.class b/java/services/users/target/classes/com/uva/users/Exceptions/InvalidDateRangeException.class new file mode 100644 index 0000000000000000000000000000000000000000..e79000bc75f82a69a97fe92c259d1d842d8c77ec GIT binary patch literal 454 zcmX^0Z`VEs1_oOOVRi;4Mh2tg{9OIgvPAvT;?$yIeb<WQ)Pj=C{Jdg)&%Cn4oXixL z#FEsY#Ju!WxD-1B3nPP6R$^JAeokUux_(e;UP)#yLY|R<%_cK1v&4>(K~%#Bp)R<j zC^IkJS~HB1fyFsLC6$YTnSqmsft7)ck%8YQGcVPzG&d==C?qi{CzX*w$R|HJF()js zC=<ko3bK@BWEL|rnD~(HYHLOY_T1Fs;>2{Y;TX<hWDxL8Ey>7F2}mqT%uOvxEh=VY z;0n$!ElN&x%LKVd4rhqyflOmiWME`qW&i<321by#7?>E?85kJs7?>EC7#JAXw6wP~ zaBO5?U|?e4Vqjq40*kVORdO>hFo=QqYz#aMydXmu*ckX2_!$@(1Q-|?SQ#1k7#J8B J83e)Fg#c=^a^C;| literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Exceptions/InvalidRequestException.class b/java/services/users/target/classes/com/uva/users/Exceptions/InvalidRequestException.class new file mode 100644 index 0000000000000000000000000000000000000000..30520088e4d76979c3daabd7bbc32597c416bf9d GIT binary patch literal 616 zcmX^0Z`VEs1_oOO33di1Mh1iA{9OIgvPAvT;?$yIeb<WQ)Pj=C{Jdg)&%Cn4oXnJ< z)WXu#;u5$7I|B<NgH%>xS)zVUVqUs_P-$LCW^O86o{@pgCNnRy#Ey|cRKo|MF1Vy9 zGcVm*GmMde#W_DEm5YIyfs==Um4S_sf!`-HFV(L!Hz~C!Brz!`m61WnCqFqcCoHij z6U2uKvXo?G7Bey!`H<>nYeok4+|=UY#B{LH7>;6O5b#Yc$;eL$NGwXsO)W_+DrRKh z3eGPrN=|jl1i42BM`-AQ%wlAagoZ*`W^raxPO4*GUVcd;I2aijEPV2d()EiAK;BOS z8DE}Xl&xQ$nxvnUnU|uU2v@5glv-SnpI4k3T#{H)T5Qe8z*?4=Q<}=ipo-OqjFOT9 zeUFlo0=Rl^Cr6j~AlJZ9*WeHaMFvI&W(E*oWMBk^GXoO?I|BoQ9Rm{s69WSSo0j%= z29Avk3=B*RTnr2hTwqa7237_x25trh1~D+7je&=O7i0(n8v`E$KLaC!00RR9D<cCR dSfe1A6k-r&U|`^7U}O+sU}O+YWe{T!2LL^nry2kN literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Models/User.class b/java/services/users/target/classes/com/uva/users/Models/User.class new file mode 100644 index 0000000000000000000000000000000000000000..8c548de3567c77776d715be0c9331b7b25ec4d71 GIT binary patch literal 2383 zcmX^0Z`VEs1_oP(V0H#3Mh3~`{9OIgvPAvT;?$yIec$|))SP1d(Bjl0b_Nzk27#=^ zvPAuy#JqHU|D>$c<Pt^(rpy#Z21ZXt2Fak(ypqh^)UeFr%%q%D$Gp7!lEjkC{JdgD z1___6#O%bPl0^N2)S}|d;*!+7<Wzmn6l+EX6|7S3sd=eIi6yBiVTn1Vsn(1P9K|Id zetIPV9hv!gA(aJS9iA?(ej%PAk&Fz|SnY61EY3^@8J%AMa%N%<GXnzy10w@VUSe)4 zBZH6+!n468MVWc&){G3Sskw=nIgAW!#U+U)rNxX4iat0)EEufBnvp>PtM#sVrMVD4 zg3K)g`IC`B4yRJ6uh@b^f;|1)85uYV5{rw=^NUg#8Q5$x^D;~97#Wx~G{YDfSe)}y zQn?tI8RU2vq!^?*859_l*clWV8RQ8#m4`u@L4=Wk+s{AV$=~1G)6YGalYx;zm4`tX zB+l=XnV0HUnwykb6q1;f0}i76<iwn?#G*_PA1cUFl95>q3Ui#cSu-+3Yj|P?FBTD; zW<UcMQ;TL87Xu@M4iAGagB~LTYjJ9cX9^<&i-spe!hnatkim$NfxS4j#19<Lq8hji zG2vk_1*zpIPAzc-#XHDka~=i@21`Z;&f?S(h$9#oR5S>t0*LL_JPbA<6S<31O9J5W zC*Ye}l98VhkXV$Mn_7}uRLsc0nhtR{vxcT8C=MKX7+4wD7#Y~pVa^uO(8P2%NU19i zg8+jdBLhb|)YTwC4;}^~kRWF|!qv(engpHA$iSVBa4N_oUmgZYkV#y@`K3k4scxB| zgun?ZA@o4`g^@u9M-nc{EUB~xr3-9D0XXe|@&UNqVNhgXWB}zxRt6@JzZn=A*cliY zq!^ePI2afhK+fPwW#DGuVc=z8WZ;Wp;Adb0c^ayYn}HEoLWn^SyM!=<2vkChfeE2Q zl!1{!ER{i=L4tt^<X5N~6jON^7(sc9fssLmfq}t}fr){Ufq{WXYdeFi)+Pq|tqdv~ z85kIt7}OXT82G?mQD9(UkY?a!P-IXCsf4I!&|uI6mpM`lS`18Jv*t4}F|aW(FsLJ$ zr6s+ML0d~_8-u=<?luNvElHMb3}#xAtlJo@5Y{Mx!$uiujS7PRgDQh4gBpVrgF1r( zg9d{dgC^K&JBaa6s~H&7p&<-n2`~sUFo7%wr53QW)j@fmfdwok$sowU%3#aDz#z)X zz{<eDAi%)DAjH7HAk4tPAPM$|9fLhIO!OHT!G2`b+QQ(l1|Aq}U_o85OF)6hz`zQ1 z2_q=SLIVL5pdfd!X-RKoa6tHx3+y^W237_munC}eV_;x|ngC+4GJtFVxsjC->_$cg zCkAIMZgSax<|b3HiRf-JWH7>TllE2y7j!pSGO#jOfla`46DU*}!QsZr2o5tw1~;s3 zaz}TQE!aeKH<@C0lRLVb92r;{oWLevx(Sjgpy33HLq-Nq1}`k(q=N1ySFnlbZn9vo z#1>9S*#HuEo(!xEUSJb2-2};xP&a|n6eEK-)^PGccatyJM07XVU=JrB^l%DfU}Xpb nn}F#iP@0Fw9Vm@6G5CQKjz73a0u?*~3=9l`42%o{#SB3JI1Zhe literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Models/UserStatus.class b/java/services/users/target/classes/com/uva/users/Models/UserStatus.class new file mode 100644 index 0000000000000000000000000000000000000000..28fcd32b74ae75c82e55986d5f8a90569260d6ca GIT binary patch literal 1195 zcmX^0Z`VEs1_oOOGj;|hMh5xh{9OIgvPAvT;?$yIec$|))SP1d(Bjmh;F83W(qeW7 z7DfiXti-ZJ{hY+SbbZ&n(p*LcZa@EcCx3r$Pe1oyMg~P60)|*KGKhqGhIqs~I)`|M zxgu#50}FflVMuVh`i1(cggN?zx&|{cC`A)t1&2*?PG(+ai5(*Yvxa6EBLj<beo86_ z11lE;BZB}BgCK(tBLkZaREd~|55iZ$B}JKe>DHc_VVn$%3?e)XtPE@%4D29|I1d9m zh{FNmNbxXmFtCAGGCT~N3|x#1{63j^seYxoNvTC4iAg!Bj0{3P`N@enVTnbVAU;@- zi-DOzfRTZvBqOt!k%3DkHLo;RB`+~Im63rL!pSd6$;?a4VPp{SO)bgDPYFmYO3Y0y zNi8a7WMC^x%qdMRW@J#&&?FoVTny?An(Pc3j0^%u{;Mo5NzLV9&|=VLWZ+CJDoU(O z&M&BBWY9tm1^=Y1)Z`LtPo#i>33-CTlO603|1?GhQ)F$>z|$lcMWA5N=V8!cFhDcG zIVZ8W*c!=NxRD4ifD)cHBLfR0*tml8ON)|I-7-NT&W}j0dLRvq44lE4>3NAIrA4WX z48}<2f()@C=uSIp2SWx%24)5Z1{McNP+DMMaF7Hg12E0Oz{bEJAO(tlkO~G425tr( z21W*61_p*y1{MYoaNNzn7%9ZZyq$r6GlMXgBgz8ih=Dm0tYD5L+g=97Najrp!oiU& zn;67`BUv{wNCt0aklx6^z`(>H%fP_E#lQr%MxB9~K@Kbmk`ZJOVqgMWX~@6~b}GA; zw#;@0d4xtb21W)3s3ws67#P?Y6hLlgP-b9Y;ACP@6kuRb5@2B9WKdyHg?hk@ffa0; z*d_+)NN;AXeUUaGC;Bo=?_f~V*#Nd5<SK~ajBpomGUzbqLS3ZAzy!9MONdcx2ZP=L b21eZaKu%$0WH4+1dCCZEyfK3bm^K9f_%I0^ literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/Repositories/UserRepository.class b/java/services/users/target/classes/com/uva/users/Repositories/UserRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..4a647594cb80ab4190e6aa3fa3c897b662f81b1a GIT binary patch literal 524 zcmX^0Z`VEs1_oOO0d@u^Mh4B~{9OIgvPAvT;?$yI{h-u>{Nl`#{G!a%V*SwK)FQY* zB|8HPBZELzVp*boPGVlVzJF3yYH|rX0~;fQX?{_<esMujW?p()QDSatd45s0eoA6V zqJCCEqJ9y~%u0Q)f<%OYj11gqnRzKrm9DvonK_IM8X7(b(}PPurdex3gi1>?bM*ZS zN;32F5_7B>890M8)AJHbN{dn%8C;3fX5)kERp0!S)EtN>t?jHC8CX*x&JgfTEy>7F z2}lI_q$IVdn2~`iIKQ+gIn^yQCzX*w7&Tb*KyGGasDwBaDP*jD$O;vF&P1}qGp{5y zJ+;W%&YF#pfsuikfsuigfq{XMg^_`sfrEjGfs=uOfr){Ofro*Cft8Vg8_eYelYCG~ FegK(XqKp6l literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/UserServiceApplication.class b/java/services/users/target/classes/com/uva/users/UserServiceApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..bf7139776d2fa28c925d4121caeaac84a582b1a0 GIT binary patch literal 748 zcmX^0Z`VEs1_oOOS#|~{Mh2DS{9OIgvPAvT;?$yI{m|mnqTtk`vdrXE$AW^K%;dz9 z%=|od1{OvJfvm)`ME#t^ymWp4q^#8B5=I6#o6Nk-5<5l)W)00SMg|t={FGEK24)6M z9tKthHbw@1pUk{eztY^K)S{5Yq?}Yn1|gsP<iwn?#G*_PA1cUFl95@=$e`v!j9aW3 z8CY@?GxHc3#5AIP5N--CDay=Cx7G~fVi05yW@iv$WYEelO4lzg0Ewp+CFZ7<=NDz` zC*|jt=m&!Zk$lL*Ai^NZ$iQ4wn#ahHq=96vb53G$u{AcEe6SgxoS#>cT2Z3!oS&DL znO<51@+Oi!&JbykClZU&iy0Y&v6#%rAmE!?l98VhkO*>iNor9sBLi1(erZv1s#_)~ z7^ShtlO8BI7#SpkO7luGb5p}Ii!+mQQXTX1@=L(+Sj@;^ht<{KKuIhu$xntlI~5v4 zPWkyINY1xrP-I|aU}gXTCI&`OEHf}Nurn|)=rb@fFfuSOuxf2*;MmB(z`(@7#lXP8 z1{P#z;AUW8-~qE)8F(0Y85kHi8Tc6Z8JNJD%@{z2F)(llF>38#5C});=VD-DU|`^4 k0GWU=gM&egL7ahsK>}nUBZC;&I!Q1o#UKr}R)&EA0Mcf|SpWb4 literal 0 HcmV?d00001 diff --git a/java/services/users/target/classes/com/uva/users/config/RestTemplateConfig.class b/java/services/users/target/classes/com/uva/users/config/RestTemplateConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..112b10b9546add8c8ace54b07453b07f59bcf61b GIT binary patch literal 661 zcmX^0Z`VEs1_oOO33di1Mh5ld{9OIgvPAvT;?$yI{p9?-w9It<pw!}$kks6QoWzn; zXRr`E0}CUAKvrT|qJB<dUb?=2QdVkm2_plWO=ezZi5(*Yvxa6EBLj<beo87A12Y3B z4+AR$8zTe1Pi9`KUukYqYEejHQcfx(gOE>ta$-(cVo@fD4;5r7$;d2bWYF{>(mB?Q z3_L|hj$~xe*U<FIFG|-hE-1>(OHV6G%uOxNFUr<0PfgNK&dE&8D?#y<H6w#$P-$LC zW^QU&W^raxPO4*GUVcepNoIatF(ZR6R<n}x^GZ@HO7s)qO7)#m6Z5Ru8H5=bv`Mg? zi$REilaYZdIKQ+gIn^x_6fWYJfvyJ%Z$<_)VjTmCs?s8`FRU3985kLu89;!Efe{oP z42%ry3=9nV42%qn3=9mcTH6^oHZm|UFfnj3Ffg!z1vwbF85kINz-(3q9tK_p1_nk3 zJ_ddUCI$hhDnSMYut7!)AcGkgICe7#MQ&#h*??vi50Y6NP_vjAM8T@W;HHT)FaQ9q CnyIq@ literal 0 HcmV?d00001 diff --git a/java/services/users/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class b/java/services/users/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..e001ea81c0c417f90c81f0ab0c84de81f7d37559 GIT binary patch literal 558 zcmX^0Z`VEs1_oOO5q1V9Mh5-l{9OIgvPAu&{QO*}{QT_9ymb8_1lzHoASW|9u_QA; zFC?|Nq?nz7g^@uZE3qt5KPNFSUEe<`D>b=<k%7%7GcU8mj*)>`Lo<w#fyFsLC6$YT znSqmsft7)ck%8YQGcVPzG&d==C?qi{CzX*w$R|HJF()jsC=<ko3bK@BWEL|r82XUt zENeyvp5*+zlGKV4pZvs>VnznZpwhgO%-qzl%;L<XoK(lWy!;ZdH;Ne<WPI|A()F`S z^D;~Hvq}pxOHzyU6ALo+K|Zu*WZ(+UFD*(=b;|@fQvpw4=z+q4k--dXTya5BW?p() zQDSatd45s0eo}sZiGE3Hafv?EVfw*f6;Ap2C18sf6c`v8m>EETiGcwWObm<+><kPH z`V5Q=j35!M?F<|n85kIt7`PZ17}&sq><rut3=BMAHY)=U120HF10Mq$0}}&3RFwb& h1K1#K1_rP?Ms!2Ckqlvk8p6aN2)0THZj3Mk0|3pnhhhK# literal 0 HcmV?d00001 -- GitLab