diff --git a/java/services/bookings/roomBooking/mvnw b/java/services/bookings/mvnw similarity index 100% rename from java/services/bookings/roomBooking/mvnw rename to java/services/bookings/mvnw diff --git a/java/services/bookings/roomBooking/mvnw.cmd b/java/services/bookings/mvnw.cmd similarity index 100% rename from java/services/bookings/roomBooking/mvnw.cmd rename to java/services/bookings/mvnw.cmd diff --git a/java/services/bookings/roomBooking/pom.xml b/java/services/bookings/pom.xml similarity index 100% rename from java/services/bookings/roomBooking/pom.xml rename to java/services/bookings/pom.xml diff --git a/java/services/bookings/roomBooking/.gitignore b/java/services/bookings/roomBooking/.gitignore deleted file mode 100644 index 549e00a2a96fa9d7c5dbc9859664a78d980158c2..0000000000000000000000000000000000000000 --- a/java/services/bookings/roomBooking/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -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 deleted file mode 100644 index d58dfb70bab565a697e6854eb012d17e0fd39bd4..0000000000000000000000000000000000000000 --- a/java/services/bookings/roomBooking/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,19 +0,0 @@ -# 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 deleted file mode 100644 index 8d0b79d6514534deddac782fc9367bcdbcaf89c3..0000000000000000000000000000000000000000 --- a/java/services/bookings/roomBooking/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -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/src/main/java/com/uva/roomBooking/Controllers/BookingController.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Controllers/BookingController.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/BookingController.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Controllers/BookingController.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/HotelController.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Controllers/HotelController.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/HotelController.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Controllers/HotelController.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/UserController.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Controllers/UserController.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Controllers/UserController.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Controllers/UserController.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/HotelNotFoundException.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/InvalidDateRangeException.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Exceptions/InvalidRequestException.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Address.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Models/Address.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Address.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Models/Address.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Booking.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Models/Booking.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Booking.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Models/Booking.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Hotel.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Models/Hotel.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Hotel.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Models/Hotel.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Room.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Models/Room.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Room.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Models/Room.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Tipo.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Models/Tipo.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/Tipo.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Models/Tipo.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/User.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Models/User.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/User.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Models/User.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/UserStatus.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Models/UserStatus.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Models/UserStatus.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Models/UserStatus.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/BookingRepository.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/HotelRepository.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/RoomRepository.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java b/java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/Repositories/UserRepository.java diff --git a/java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/RoomBookingApplication.java b/java/services/bookings/src/main/java/com/uva/roomBooking/RoomBookingApplication.java similarity index 100% rename from java/services/bookings/roomBooking/src/main/java/com/uva/roomBooking/RoomBookingApplication.java rename to java/services/bookings/src/main/java/com/uva/roomBooking/RoomBookingApplication.java diff --git a/java/services/bookings/roomBooking/src/main/resources/application.properties b/java/services/bookings/src/main/resources/application.properties similarity index 100% rename from java/services/bookings/roomBooking/src/main/resources/application.properties rename to java/services/bookings/src/main/resources/application.properties diff --git a/java/services/bookings/roomBooking/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java b/java/services/bookings/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java similarity index 100% rename from java/services/bookings/roomBooking/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java rename to java/services/bookings/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java diff --git a/java/services/bookings/target/classes/application.properties b/java/services/bookings/target/classes/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..563d4ad07ad10e7fb52bb3defcc3b736d889447b --- /dev/null +++ b/java/services/bookings/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/bookings/target/classes/com/uva/roomBooking/Controllers/BookingController.class b/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/BookingController.class new file mode 100644 index 0000000000000000000000000000000000000000..106d09044e7f06ac127f37d09474ee4ee71ef71d Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/BookingController.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/HotelController.class b/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/HotelController.class new file mode 100644 index 0000000000000000000000000000000000000000..9f1da0e949cc823f1693a7b646facdb4a185d0af Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/HotelController.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/UserController.class b/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/UserController.class new file mode 100644 index 0000000000000000000000000000000000000000..48250147622903d789c60ca7a7e10902b3c5fd5f Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Controllers/UserController.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.class b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..f37dcb6e7892f51ce598e55327a018f4c0c07810 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/GlobalExceptionHandler.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/HotelNotFoundException.class b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/HotelNotFoundException.class new file mode 100644 index 0000000000000000000000000000000000000000..793b38320948c74b9d76e95aecaa98cdc0d52c49 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/HotelNotFoundException.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/InvalidDateRangeException.class b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/InvalidDateRangeException.class new file mode 100644 index 0000000000000000000000000000000000000000..908291f1b9e8fc99d59a86743b6e35a4c1b12e26 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/InvalidDateRangeException.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/InvalidRequestException.class b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/InvalidRequestException.class new file mode 100644 index 0000000000000000000000000000000000000000..d84f1067f65d5d0186d15cbdc59662bd3e47c3e7 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Exceptions/InvalidRequestException.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Models/Address.class b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Address.class new file mode 100644 index 0000000000000000000000000000000000000000..577b9f74f32aac0e9b3eaa13a840ae59fd38bf09 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Address.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Models/Booking.class b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Booking.class new file mode 100644 index 0000000000000000000000000000000000000000..a5ee91b9b51857ae5a869f006c3311bd8c2c78be Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Booking.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Models/Hotel.class b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Hotel.class new file mode 100644 index 0000000000000000000000000000000000000000..d72ceb99fad6aca5b773352af067e684400e300e Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Hotel.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Models/Room.class b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Room.class new file mode 100644 index 0000000000000000000000000000000000000000..639dfc6c14c9d8d35644111bc82e559c85320f64 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Room.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Models/Tipo.class b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Tipo.class new file mode 100644 index 0000000000000000000000000000000000000000..5135c701a6b3615a52f22343bfe31eb6d574d0c1 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Models/Tipo.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Models/User.class b/java/services/bookings/target/classes/com/uva/roomBooking/Models/User.class new file mode 100644 index 0000000000000000000000000000000000000000..394ebce81f001ce6d49d3ba0e61ad9849789bd7d Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Models/User.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Models/UserStatus.class b/java/services/bookings/target/classes/com/uva/roomBooking/Models/UserStatus.class new file mode 100644 index 0000000000000000000000000000000000000000..61c762de029dfc346db4ec48cd71170419987eb9 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Models/UserStatus.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/BookingRepository.class b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/BookingRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..acea7157a6e378b53cac42161cfad3721d990743 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/BookingRepository.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/HotelRepository.class b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/HotelRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..b73aac1a1369502b5a75ca393138c15128208a85 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/HotelRepository.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/RoomRepository.class b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/RoomRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..b3854e3d17c9d211309eb82205a68b60efa16539 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/RoomRepository.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/UserRepository.class b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/UserRepository.class new file mode 100644 index 0000000000000000000000000000000000000000..85a2cf78e1629cccc1a35a91af8d6a0ca15c79c1 Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/Repositories/UserRepository.class differ diff --git a/java/services/bookings/target/classes/com/uva/roomBooking/RoomBookingApplication.class b/java/services/bookings/target/classes/com/uva/roomBooking/RoomBookingApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..93ff822c7862a70776fd6464fc805130d94c00dd Binary files /dev/null and b/java/services/bookings/target/classes/com/uva/roomBooking/RoomBookingApplication.class differ diff --git a/java/services/bookings/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class b/java/services/bookings/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..e001ea81c0c417f90c81f0ab0c84de81f7d37559 Binary files /dev/null and b/java/services/bookings/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class differ