diff --git a/java/services/bookings/roomBooking/.gitignore b/java/services/bookings/roomBooking/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..549e00a2a96fa9d7c5dbc9859664a78d980158c2 --- /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 0000000000000000000000000000000000000000..d58dfb70bab565a697e6854eb012d17e0fd39bd4 --- /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 0000000000000000000000000000000000000000..8d0b79d6514534deddac782fc9367bcdbcaf89c3 --- /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 0000000000000000000000000000000000000000..19529ddf8c6eaa08c5c75ff80652d21ce4b72f8c --- /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 0000000000000000000000000000000000000000..249bdf3822221aa612d1da2605316cabd7b07e50 --- /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 0000000000000000000000000000000000000000..476f735b695a459292a258d72d89261c89dca993 --- /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 0000000000000000000000000000000000000000..5baa50358b36dfffd3184fd0e7e46a9177b2ef55 --- /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 0000000000000000000000000000000000000000..803edc35fdcbf2b5ec7fc96972e8ee2a7777391d --- /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 0000000000000000000000000000000000000000..a0e6397b9cabc191f7d5d24ecde162e8da6b2f14 --- /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 0000000000000000000000000000000000000000..03b21e27ffa7e4e921cc9801187911d9f1be6a52 --- /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 0000000000000000000000000000000000000000..3d47f5efad71b6fbf3b3f5912493c9c0af1ca412 --- /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 0000000000000000000000000000000000000000..17a8420453ef402411b61b965d001560a4dd51ce --- /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 0000000000000000000000000000000000000000..a8433b6f620da742dab87dae96a2e0f0193709ff --- /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 0000000000000000000000000000000000000000..5e51f55e710c68ac38d4cb1c5769e574b06654bf --- /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 0000000000000000000000000000000000000000..c546d1916b1c29a10f95c97f03db34e64ffbe7d2 --- /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 0000000000000000000000000000000000000000..5a23005de99c022b5fff9570e2c515fcfc75e07e --- /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 0000000000000000000000000000000000000000..639dfdb0bd3be629b16c719373fa51c9a7584898 --- /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 0000000000000000000000000000000000000000..e1a48b53450e1f87ae070b1bf70bd6a9afc1ea34 --- /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 0000000000000000000000000000000000000000..c5373df6edc5e936d9c94f794ae36d3289d173d5 --- /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 0000000000000000000000000000000000000000..41adce4ba6df6332286f0971b7f8e43b9126e401 --- /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 0000000000000000000000000000000000000000..16c860a30fd168d4e03018ef02466dcd5adb7f99 --- /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 0000000000000000000000000000000000000000..290f129a7be376279300062d4bf3d7a614abefcc --- /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 0000000000000000000000000000000000000000..3df9937f1ba7dc7c8bc0aa839a7a93ffd0baa8de --- /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 0000000000000000000000000000000000000000..5f02f6d4a3b2147d181b8db36736d85ccfd884b5 --- /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 0000000000000000000000000000000000000000..1a5f312d49b2d1db4ffe587e4ae02c35e1e9a506 --- /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 0000000000000000000000000000000000000000..563d4ad07ad10e7fb52bb3defcc3b736d889447b --- /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 0000000000000000000000000000000000000000..3b50599492c36017391c0dcabd81573f123a809a --- /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 0000000000000000000000000000000000000000..563d4ad07ad10e7fb52bb3defcc3b736d889447b --- /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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Controllers/UserController$1.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Controllers/UserController$2.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Controllers/UserController.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Exceptions/GlobalExceptionHandler.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Exceptions/HotelNotFoundException.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Exceptions/InvalidDateRangeException.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Exceptions/InvalidRequestException.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Models/User.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Models/UserStatus.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/Repositories/UserRepository.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/UserServiceApplication.class differ 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 Binary files /dev/null and b/java/services/users/target/classes/com/uva/users/config/RestTemplateConfig.class differ 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 Binary files /dev/null and b/java/services/users/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class differ