RSWW-134 fix errors in random selection methods

Microarchitecturovisco · Jun 3, 2024 · 5b85468 · 5b85468
1 parent d2e885a
commit 5b85468
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/data-generator/src/main/java/cloud/project/datagenerator/hotels/HotelsDataGenerator.java b/data-generator/src/main/java/cloud/project/datagenerator/hotels/HotelsDataGenerator.java
@@ -3,7 +3,6 @@
 import cloud.project.datagenerator.hotels.domain.Hotel;
 import cloud.project.datagenerator.hotels.domain.Room;
 import cloud.project.datagenerator.hotels.repositories.HotelRepository;
-import cloud.project.datagenerator.hotels.repositories.RoomRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -17,14 +16,13 @@
 public class HotelsDataGenerator {
 
     private final HotelRepository hotelRepository;
-    private final RoomRepository roomRepository;
     private final Random random = new Random();
 
     @Scheduled(fixedDelay = 5000, initialDelay = 5000)
     public void generateRandomHotelData() {
         System.out.println("Generating Hotel Data...");
 
-        int action = random.nextInt(3);  // Generate a random number: 0, 1, or 2
+        int action = random.nextInt(3);
 
         switch (action) {
             case 0:
@@ -55,7 +53,7 @@ private void createNewRoom() {
         System.out.println("Creating new room: " + newRoom);
 
         // Todo: send the room using rabbitmq
-        
+
     }
 
     private void updateRandomRoom() {
@@ -64,10 +62,10 @@ private void updateRandomRoom() {
 
         Room randomRoom = randomHotel.getRooms().get(random.nextInt(randomHotel.getRooms().size()));
         int currentGuestCapacity = randomRoom.getGuestCapacity();
-        int newGuestCapacity = random.nextInt(3, currentGuestCapacity + 1);
+        int newGuestCapacity = random.nextInt(1, currentGuestCapacity + 10);
 
         System.out.println("Updating room " + randomRoom.getName() + " in hotel " + randomHotel.getName() +
-                " with new guest capacity: " + newGuestCapacity);
+                " - old guest capacity: " + currentGuestCapacity + " new guest capacity: " + newGuestCapacity);
 
         // Todo: send the room using rabbitmq
         randomRoom.setGuestCapacity(newGuestCapacity);
@@ -86,21 +84,26 @@ private void deleteRandomRoom() {
     }
 
     private Hotel getRandomHotel() {
-        // Fetch all hotels
         List<Hotel> hotels = hotelRepository.findAll();
 
         if (hotels.isEmpty()) {
             System.out.println("No hotels found.");
             return null;
         }
 
-        // Select a random hotel
-        Hotel randomHotel = hotels.get(random.nextInt(hotels.size()));
+        Hotel randomHotel;
+        int attempts = 0;
+        do {
+            randomHotel = hotels.get(random.nextInt(hotels.size()));
+            attempts++;
+        } while (randomHotel.getRooms().isEmpty() && attempts < hotels.size());
 
         if (randomHotel.getRooms().isEmpty()) {
             System.out.println("No rooms found in the selected hotel.");
             return null;
         }
+
         return randomHotel;
     }
+
 }