diff --git a/.env b/.env
index 5f4d4f89f7a9503eed479cf9ae40a7b9325a5823..02d0a3080242683127c4046ca9c08987b7fba4eb 100644
--- a/.env
+++ b/.env
@@ -2,5 +2,7 @@ AUTH_SERVICE_HOSTNAME=auth-api
USERS_SERVICE_HOSTNAME=users-api
HOTELS_SERVICE_HOSTNAME=hotels-api
BOOKINGS_SERVICE_HOSTNAME=bookings-api
-DB_SERVICE_HOSTNAME=roomsbooking
-DB_DATABASE_NAME=RoomsBooking
\ No newline at end of file
+DB_SERVICE_HOSTNAME=RoomsBooking-database
+DB_DATABASE_NAME=RoomsBooking
+DB_USER=user
+BD_PASSWORD=password
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 103bd2c647aba772a54dd4140f55da75da9f20f9..d272472a60ed42d464084017fd58f4a764860e9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
### Own ###
taller
-*.pdf
\ No newline at end of file
+*.pdf
+**/target/
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 14b336d0c6c805a3bfc02c08b613432a8ae2807d..40484328bc7cb6aa6b3d94b2616393b3e0cab264 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,43 +1,81 @@
-version: "3.7"
-
volumes:
kong_data: {}
users_data: {}
-networks: #Red interna para comunicar los servicios (“Services on the same network can communicate with each other using their nameâ€)
+networks:
kong-net: {}
services:
- RoomsBooking-WEB:
- image: roomsbooking-web-image
+ Auth-API:
+ image: auth-api-image
+ hostname: ${AUTH_SERVICE_HOSTNAME}
build:
- context: ./angular/RestClient
- dockerfile: ./Dockerfile
+ context: ./java/services/auth
+ dockerfile: Dockerfile
restart: unless-stopped
ports:
- - 4221:80
- networks: # Networks to join
+ - 8101:8101
+ networks:
- kong-net
+ environment:
+ SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
depends_on:
- - RoomsBooking-API
- RoomsBooking-API:
- image: roomsbooking-api-image
+ - RoomsBooking-database
+
+ Users-API:
+ image: users-api-image
+ hostname: "${USERS_SERVICE_HOSTNAME}"
build:
- context: ./java/roomBooking
- dockerfile: ./Dockerfile
+ context: ./java/services/users
+ dockerfile: Dockerfile
+ restart: unless-stopped
+ ports:
+ - 8111:8111
+ networks:
+ - kong-net
+ environment:
+ SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
+ depends_on:
+ - RoomsBooking-database
+
+ Hotels-API:
+ image: hotels-api-image
+ hostname: ${HOTELS_SERVICE_HOSTNAME}
+ build:
+ context: ./java/services/hotels
+ dockerfile: Dockerfile
+ restart: unless-stopped
+ ports:
+ - 8121:8121
+ networks:
+ - kong-net
+ environment:
+ SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
+ SPRING_DATASOURCE_USER: ${USER_DATABASE}
+ SPRING_DATASOURCE_PASSWORD: ${}
+ depends_on:
+ - RoomsBooking-database
+ - Bookings-API
+
+ Bookings-API:
+ image: bookings-api-image
+ hostname: ${BOOKINGS_SERVICE_HOSTNAME}
+ build:
+ context: ./java/services/bookings
+ dockerfile: Dockerfile
restart: unless-stopped
ports:
- - 8080:8080
- networks: # Networks to join
+ - 8131:8131
+ networks:
- kong-net
environment:
- SPRING_DATASOURCE_URL: jdbc:mysql://RoomsBooking-database:3306/RoomsBooking?createDatabaseIfNotExist=true
+ SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
depends_on:
- RoomsBooking-database
RoomsBooking-database:
- image: mysql #Usamos imagen del respositorio ya creada
- hostname: RoomsBooking-database
+ image: mysql
+ hostname: ${DB_SERVICE_HOSTNAME}
cap_add:
- SYS_NICE
restart: unless-stopped
@@ -53,3 +91,18 @@ services:
MYSQL_PASSWORD: password
MYSQL_DATABASE: RoomsBooking
MYSQL_ROOT_HOST: "%"
+
+ RoomsBooking-Web:
+ image: roomsbooking-web-image
+ build:
+ context: ./angular/RestClient
+ dockerfile: ./Dockerfile
+ restart: unless-stopped
+ ports:
+ - 3328:80
+ networks:
+ - kong-net
+ environment:
+ SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
+ depends_on:
+ - RoomsBooking-database
diff --git a/docker-compose_test.yml b/docker-compose_test.yml
deleted file mode 100644
index 9e542345a0a36b2c3d97d31454ce948e911e84eb..0000000000000000000000000000000000000000
--- a/docker-compose_test.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-volumes:
- kong_data: {}
- users_data: {}
-
-networks:
- kong-net: {}
-
-services:
- Auth-API:
- image: auth-api-image
- hostname: ${AUTH_SERVICE_HOSTNAME}
- build:
- context: ./java/services/auth
- dockerfile: Dockerfile
- restart: unless-stopped
- ports:
- - 8101:8080
- networks:
- - kong-net
- environment:
- SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
- depends_on:
- - RoomsBooking-database
-
- Users-API:
- image: users-api-image
- hostname: "${USERS_SERVICE_HOSTNAME}"
- build:
- context: ./java/services/users
- dockerfile: Dockerfile
- restart: unless-stopped
- ports:
- - 8111:8080
- networks:
- - kong-net
- environment:
- SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
- depends_on:
- - RoomsBooking-database
-
- Hotels-API:
- image: hotels-api-image
- hostname: ${HOTES_SERVICE_HOSTNAME}
- build:
- context: ./java/services/hotels
- dockerfile: Dockerfile
- restart: unless-stopped
- ports:
- - 8121:8080
- networks:
- - kong-net
- environment:
- SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
- depends_on:
- - RoomsBooking-database
- - Bookings-API
-
- Bookings-API:
- image: bookings-api-image
- hostname: ${BOOKINGS_SERVICE_HOSTNAME}
- build:
- context: ./java/services/bookings
- dockerfile: Dockerfile
- restart: unless-stopped
- ports:
- - 8131:8080
- networks:
- - kong-net
- environment:
- SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
- depends_on:
- - RoomsBooking-database
-
- RoomsBooking-database:
- image: mysql
- hostname: RoomsBooking-database
- cap_add:
- - SYS_NICE
- restart: unless-stopped
- ports:
- - "3307:3306"
- networks:
- - kong-net
- volumes:
- - users_data:/var/lib/mysql
- environment:
- MYSQL_ROOT_PASSWORD: ClaveRoot
- MYSQL_USER: user
- MYSQL_PASSWORD: password
- MYSQL_DATABASE: RoomsBooking
- MYSQL_ROOT_HOST: "%"
-
- RoomsBooking-Web:
- image: roomsbooking-web-image
- build:
- context: ./angular/RestClient
- dockerfile: ./Dockerfile
- restart: unless-stopped
- ports:
- - 3328:80
- networks:
- - kong-net
- environment:
- SPRING_DATASOURCE_URL: jdbc:mysql://${DB_SERVICE_HOSTNAME}:3306/${DB_DATABASE_NAME}?createDatabaseIfNotExist=true
- depends_on:
- - RoomsBooking-database
diff --git a/java/services/auth/.gitignore b/java/services/auth/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..549e00a2a96fa9d7c5dbc9859664a78d980158c2
--- /dev/null
+++ b/java/services/auth/.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/authentication/Dockerfile b/java/services/auth/Dockerfile
similarity index 100%
rename from java/services/authentication/Dockerfile
rename to java/services/auth/Dockerfile
diff --git a/java/services/authentication/mvnw b/java/services/auth/mvnw
similarity index 100%
rename from java/services/authentication/mvnw
rename to java/services/auth/mvnw
diff --git a/java/services/authentication/mvnw.cmd b/java/services/auth/mvnw.cmd
similarity index 100%
rename from java/services/authentication/mvnw.cmd
rename to java/services/auth/mvnw.cmd
diff --git a/java/services/authentication/pom.xml b/java/services/auth/pom.xml
similarity index 100%
rename from java/services/authentication/pom.xml
rename to java/services/auth/pom.xml
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/AuthenticationApplication.java b/java/services/auth/src/main/java/com/uva/authentication/AuthenticationApplication.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/AuthenticationApplication.java
rename to java/services/auth/src/main/java/com/uva/authentication/AuthenticationApplication.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/Controllers/AuthenticationController.java b/java/services/auth/src/main/java/com/uva/authentication/Controllers/AuthenticationController.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/Controllers/AuthenticationController.java
rename to java/services/auth/src/main/java/com/uva/authentication/Controllers/AuthenticationController.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/Exceptions/GlobalExceptionHandler.java b/java/services/auth/src/main/java/com/uva/authentication/Exceptions/GlobalExceptionHandler.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/Exceptions/GlobalExceptionHandler.java
rename to java/services/auth/src/main/java/com/uva/authentication/Exceptions/GlobalExceptionHandler.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/Exceptions/HotelNotFoundException.java b/java/services/auth/src/main/java/com/uva/authentication/Exceptions/HotelNotFoundException.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/Exceptions/HotelNotFoundException.java
rename to java/services/auth/src/main/java/com/uva/authentication/Exceptions/HotelNotFoundException.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/Exceptions/InvalidDateRangeException.java b/java/services/auth/src/main/java/com/uva/authentication/Exceptions/InvalidDateRangeException.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/Exceptions/InvalidDateRangeException.java
rename to java/services/auth/src/main/java/com/uva/authentication/Exceptions/InvalidDateRangeException.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/Exceptions/InvalidRequestException.java b/java/services/auth/src/main/java/com/uva/authentication/Exceptions/InvalidRequestException.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/Exceptions/InvalidRequestException.java
rename to java/services/auth/src/main/java/com/uva/authentication/Exceptions/InvalidRequestException.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/Models/User.java b/java/services/auth/src/main/java/com/uva/authentication/Models/User.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/Models/User.java
rename to java/services/auth/src/main/java/com/uva/authentication/Models/User.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/Models/UserStatus.java b/java/services/auth/src/main/java/com/uva/authentication/Models/UserStatus.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/Models/UserStatus.java
rename to java/services/auth/src/main/java/com/uva/authentication/Models/UserStatus.java
diff --git a/java/services/authentication/src/main/java/com/uva/authentication/config/RestTemplateConfig.java b/java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateConfig.java
similarity index 100%
rename from java/services/authentication/src/main/java/com/uva/authentication/config/RestTemplateConfig.java
rename to java/services/auth/src/main/java/com/uva/authentication/config/RestTemplateConfig.java
diff --git a/java/services/users/target/classes/application.properties b/java/services/auth/src/main/resources/application.properties
similarity index 90%
rename from java/services/users/target/classes/application.properties
rename to java/services/auth/src/main/resources/application.properties
index 563d4ad07ad10e7fb52bb3defcc3b736d889447b..394adbeb066350dbc703341658ee10a64b666856 100644
--- a/java/services/users/target/classes/application.properties
+++ b/java/services/auth/src/main/resources/application.properties
@@ -1,4 +1,5 @@
-spring.application.name=roomBooking
+spring.application.name=authService
+server.port=8101
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
diff --git a/java/services/authentication/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java b/java/services/auth/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java
similarity index 100%
rename from java/services/authentication/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java
rename to java/services/auth/src/test/java/com/uva/roomBooking/RoomBookingApplicationTests.java
diff --git a/java/services/authentication/src/main/resources/application.properties b/java/services/authentication/src/main/resources/application.properties
deleted file mode 100644
index 563d4ad07ad10e7fb52bb3defcc3b736d889447b..0000000000000000000000000000000000000000
--- a/java/services/authentication/src/main/resources/application.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-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/authentication/target/classes/application.properties b/java/services/authentication/target/classes/application.properties
deleted file mode 100644
index 563d4ad07ad10e7fb52bb3defcc3b736d889447b..0000000000000000000000000000000000000000
--- a/java/services/authentication/target/classes/application.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-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/authentication/target/classes/com/uva/authentication/AuthenticationApplication.class b/java/services/authentication/target/classes/com/uva/authentication/AuthenticationApplication.class
deleted file mode 100644
index b39f6591ce3e7fa6337963fd9bab233d6ef95e8e..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/AuthenticationApplication.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController$AuthResponse.class b/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController$AuthResponse.class
deleted file mode 100644
index db96150ba1cd9595efd1ad664a7fd258fb934a39..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController$AuthResponse.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController$LoginRequest.class b/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController$LoginRequest.class
deleted file mode 100644
index 53266baaaadada05f9c236caa3b8f65746f9d574..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController$LoginRequest.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController.class b/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController.class
deleted file mode 100644
index cd9ad41b233b9ab745ec8e88a7992f84a2ef8f4d..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Controllers/AuthenticationController.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/GlobalExceptionHandler.class b/java/services/authentication/target/classes/com/uva/authentication/Exceptions/GlobalExceptionHandler.class
deleted file mode 100644
index 18defe064a456cff1aba5997b24ad77b74384bfb..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/GlobalExceptionHandler.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/HotelNotFoundException.class b/java/services/authentication/target/classes/com/uva/authentication/Exceptions/HotelNotFoundException.class
deleted file mode 100644
index ae3df083a3ba4961e7ad49bb1c236a4fd2f8f013..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/HotelNotFoundException.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/InvalidDateRangeException.class b/java/services/authentication/target/classes/com/uva/authentication/Exceptions/InvalidDateRangeException.class
deleted file mode 100644
index 5341f53fc2b82699a37cda781d8c03c0332343b1..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/InvalidDateRangeException.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/InvalidRequestException.class b/java/services/authentication/target/classes/com/uva/authentication/Exceptions/InvalidRequestException.class
deleted file mode 100644
index 341e25c34ff2a6609ed77d4e98e63c157d4c6f3d..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Exceptions/InvalidRequestException.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Models/User.class b/java/services/authentication/target/classes/com/uva/authentication/Models/User.class
deleted file mode 100644
index fa2a9fbe65d12c75d03d38e98875672ddf7ff74c..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Models/User.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/Models/UserStatus.class b/java/services/authentication/target/classes/com/uva/authentication/Models/UserStatus.class
deleted file mode 100644
index 88c0fc46940678e6d5e7a9c8dc407796a01e5b55..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/Models/UserStatus.class and /dev/null differ
diff --git a/java/services/authentication/target/classes/com/uva/authentication/config/RestTemplateConfig.class b/java/services/authentication/target/classes/com/uva/authentication/config/RestTemplateConfig.class
deleted file mode 100644
index ce8e79538157b4e0462b2f7be8386d56ba3bcc10..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/classes/com/uva/authentication/config/RestTemplateConfig.class and /dev/null differ
diff --git a/java/services/authentication/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class b/java/services/authentication/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class
deleted file mode 100644
index e001ea81c0c417f90c81f0ab0c84de81f7d37559..0000000000000000000000000000000000000000
Binary files a/java/services/authentication/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class and /dev/null differ
diff --git a/java/services/bookings/.gitignore b/java/services/bookings/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..549e00a2a96fa9d7c5dbc9859664a78d980158c2
--- /dev/null
+++ b/java/services/bookings/.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/src/main/resources/application.properties b/java/services/bookings/src/main/resources/application.properties
index 563d4ad07ad10e7fb52bb3defcc3b736d889447b..afaa0e3df29833b5a13dc71cbbdfb523897f4cc8 100644
--- a/java/services/bookings/src/main/resources/application.properties
+++ b/java/services/bookings/src/main/resources/application.properties
@@ -1,4 +1,5 @@
-spring.application.name=roomBooking
+spring.application.name=bookingService
+server.port=8131
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
diff --git a/java/services/bookings/target/classes/application.properties b/java/services/bookings/target/classes/application.properties
deleted file mode 100644
index 563d4ad07ad10e7fb52bb3defcc3b736d889447b..0000000000000000000000000000000000000000
--- a/java/services/bookings/target/classes/application.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-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/bookings/Controllers/BookingController.class b/java/services/bookings/target/classes/com/uva/bookings/Controllers/BookingController.class
deleted file mode 100644
index df36faa8a4aaad6b43a8c64632b8ef6c7608c91a..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/Controllers/BookingController.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/GlobalExceptionHandler.class b/java/services/bookings/target/classes/com/uva/bookings/Exceptions/GlobalExceptionHandler.class
deleted file mode 100644
index af04e5fe6afffb285b6d0afb3e54aa27a6fca067..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/GlobalExceptionHandler.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/HotelNotFoundException.class b/java/services/bookings/target/classes/com/uva/bookings/Exceptions/HotelNotFoundException.class
deleted file mode 100644
index 27f817a237d4d0d3933261f906af9129e3ea05a2..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/HotelNotFoundException.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/InvalidDateRangeException.class b/java/services/bookings/target/classes/com/uva/bookings/Exceptions/InvalidDateRangeException.class
deleted file mode 100644
index 74aaa2e5b4574c30a3456bf561bef81b43d9b7e6..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/InvalidDateRangeException.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/InvalidRequestException.class b/java/services/bookings/target/classes/com/uva/bookings/Exceptions/InvalidRequestException.class
deleted file mode 100644
index 449f756baf19e02459d425561349993b6fa894c1..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/Exceptions/InvalidRequestException.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/Models/Booking.class b/java/services/bookings/target/classes/com/uva/bookings/Models/Booking.class
deleted file mode 100644
index 3fade65200d9d54097c9dbcab3f0cd49ab153042..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/Models/Booking.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/Repositories/BookingRepository.class b/java/services/bookings/target/classes/com/uva/bookings/Repositories/BookingRepository.class
deleted file mode 100644
index fd8eee6dec0c291fe8dcc4eee8ac6d6ba232e846..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/Repositories/BookingRepository.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/bookingServiceApplication.class b/java/services/bookings/target/classes/com/uva/bookings/bookingServiceApplication.class
deleted file mode 100644
index af8b7863a6b4bdaaec859c2f7b10b2963d599561..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/bookingServiceApplication.class and /dev/null differ
diff --git a/java/services/bookings/target/classes/com/uva/bookings/config/RestTemplateConfig.class b/java/services/bookings/target/classes/com/uva/bookings/config/RestTemplateConfig.class
deleted file mode 100644
index 4d41aeb1804028479e51193554bac1e4b6aab2d9..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/classes/com/uva/bookings/config/RestTemplateConfig.class and /dev/null 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
deleted file mode 100644
index e001ea81c0c417f90c81f0ab0c84de81f7d37559..0000000000000000000000000000000000000000
Binary files a/java/services/bookings/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class and /dev/null differ
diff --git a/java/services/check_service.sh b/java/services/check_service.sh
new file mode 100644
index 0000000000000000000000000000000000000000..2a474f277d1a5b2d2974f793b9f2dd4b169bb6ee
--- /dev/null
+++ b/java/services/check_service.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+servicesdir="$PWD"
+for i in $(ls $servicesdir); do
+ if [ -d "$servicesdir/$i" ]; then
+ logfile="/tmp/debug_$i.log"
+ echo -n Log file for $i service:
+ [ ! -f ] && echo -n " NOT"
+ echo " FOUND"
+ fi
+done
+
+for i in {0..30..10}; do
+ port=$((8101 + $i))
+ curl "http://localhost:$port" > /dev/null 2>/dev/null
+ if [ $? -eq 0 ]; then
+ echo "Port $port is open"
+ else
+ echo "Port $port is closed"
+ fi
+done
\ No newline at end of file
diff --git a/java/services/hotels/src/main/java/com/uva/hotelService/config/RestTemplateConfig.java b/java/services/hotels/src/main/java/com/uva/hotelService/config/RestTemplateConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..05af4ebcc1528bb428c9ac6022d61f109c7dc4d5
--- /dev/null
+++ b/java/services/hotels/src/main/java/com/uva/hotelService/config/RestTemplateConfig.java
@@ -0,0 +1,14 @@
+package com.uva.hotelService.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+ @Bean
+ public RestTemplate restTemplate() {
+ return new RestTemplate();
+ }
+}
diff --git a/java/services/hotels/src/main/resources/application.properties b/java/services/hotels/src/main/resources/application.properties
index 782e1ce4be03bed36931f4595f940bf7a755ef8b..5021e2005773ae5544474798099ed2b72bb1edb4 100644
--- a/java/services/hotels/src/main/resources/application.properties
+++ b/java/services/hotels/src/main/resources/application.properties
@@ -1,4 +1,5 @@
spring.application.name=hotelService
+server.port=8121
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
diff --git a/java/services/launch.sh b/java/services/launch.sh
new file mode 100644
index 0000000000000000000000000000000000000000..7224e675de8f43307adc80214a8453266d140fbb
--- /dev/null
+++ b/java/services/launch.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/bash
+servicesdir="$PWD"
+pidfile=$servicesdir/servers.pid
+echo "Pids of launch `date`" > $pidfile
+for i in $(ls $servicesdir); do
+ if [ -d $servicesdir/$i ]; then
+ cd $servicesdir/$i
+ logfile="/tmp/debug_$i.log"
+ mvn spring-boot:run > $logfile &
+ pid=$!
+ # echo "El servicio se está ejecutando en segundo plano con PID: $pid"
+ # Opcionalmente, puedes guardar el PID en un archivo
+ echo "$i running in pid $pid" >> $pidfile
+ echo Launched $i service, view the log in $logfile
+ fi
+done
diff --git a/java/services/servers.pid b/java/services/servers.pid
new file mode 100644
index 0000000000000000000000000000000000000000..689f217b8da2a2b0f56e68aeeebb43cfa149e491
--- /dev/null
+++ b/java/services/servers.pid
@@ -0,0 +1,5 @@
+Pids of launch dom 17 nov 2024 12:30:54 CET
+auth running in pid 104539
+bookings running in pid 104540
+hotels running in pid 104541
+users running in pid 104542
diff --git a/java/services/stop-service.sh b/java/services/stop-service.sh
new file mode 100644
index 0000000000000000000000000000000000000000..87a710ea48416c38e6ccfada5a7fe6bb96bdb530
--- /dev/null
+++ b/java/services/stop-service.sh
@@ -0,0 +1,4 @@
+for i in {0..30..10}; do
+ port=$((8101 + $i))
+ kill `sudo lsof -t -i :$port`
+done
\ No newline at end of file
diff --git a/java/services/users/src/main/resources/application.properties b/java/services/users/src/main/resources/application.properties
index 563d4ad07ad10e7fb52bb3defcc3b736d889447b..f56d92d0392f20307e5c1cb9e27f16cfb2162ba2 100644
--- a/java/services/users/src/main/resources/application.properties
+++ b/java/services/users/src/main/resources/application.properties
@@ -1,4 +1,5 @@
-spring.application.name=roomBooking
+spring.application.name=userService
+server.port=8111
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
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
deleted file mode 100644
index d8cbf429c29adf8c8e7dcb58106ff497959fd56d..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Controllers/UserController$1.class and /dev/null 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
deleted file mode 100644
index f09cc4d705e423147ac16df6466582350307843a..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Controllers/UserController$2.class and /dev/null 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
deleted file mode 100644
index 7ddd02abcfc9bc8d58cd8824036ee930ad635818..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Controllers/UserController.class and /dev/null 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
deleted file mode 100644
index 2dc5c7ec576f64f4f0175922eca406e6af5b3447..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Exceptions/GlobalExceptionHandler.class and /dev/null 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
deleted file mode 100644
index a44412dc39b8a39117225dd1e63aaa394b7f930c..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Exceptions/HotelNotFoundException.class and /dev/null 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
deleted file mode 100644
index e79000bc75f82a69a97fe92c259d1d842d8c77ec..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Exceptions/InvalidDateRangeException.class and /dev/null 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
deleted file mode 100644
index 30520088e4d76979c3daabd7bbc32597c416bf9d..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Exceptions/InvalidRequestException.class and /dev/null 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
deleted file mode 100644
index 8c548de3567c77776d715be0c9331b7b25ec4d71..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Models/User.class and /dev/null 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
deleted file mode 100644
index 28fcd32b74ae75c82e55986d5f8a90569260d6ca..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Models/UserStatus.class and /dev/null 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
deleted file mode 100644
index 4a647594cb80ab4190e6aa3fa3c897b662f81b1a..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/Repositories/UserRepository.class and /dev/null 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
deleted file mode 100644
index bf7139776d2fa28c925d4121caeaac84a582b1a0..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/UserServiceApplication.class and /dev/null 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
deleted file mode 100644
index 112b10b9546add8c8ace54b07453b07f59bcf61b..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/classes/com/uva/users/config/RestTemplateConfig.class and /dev/null 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
deleted file mode 100644
index e001ea81c0c417f90c81f0ab0c84de81f7d37559..0000000000000000000000000000000000000000
Binary files a/java/services/users/target/test-classes/com/uva/roomBooking/RoomBookingApplicationTests.class and /dev/null differ