Changeset deea3c4 for src/main/java/com/example/rezevirajmasa/demo/model/TableEntity.java

Timestamp:

04/28/25 14:21:17 (3 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

e15e8d9

Parents:

f5b256e

Message:

Big change done fully handle_reservation_update() trigger works

File:

• src/main/java/com/example/rezevirajmasa/demo/model/TableEntity.java (modified) (5 diffs)

src/main/java/com/example/rezevirajmasa/demo/model/TableEntity.java

@@ -2 +2 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import jakarta.persistence.*;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
@@ -15 +19 @@
 
 @Entity
+@Getter
+@Setter
 @Table(name = "tables")
 public class TableEntity {
@@ -39 +45 @@
     private String description;
 
-    @ElementCollection(fetch = FetchType.EAGER)
-    @CollectionTable(name = "table_time_slots", joinColumns = @JoinColumn(name = "table_id"))
-    @Column(name = "time_slot", columnDefinition = "timestamp without time zone")
-    @OrderBy("time_slot ASC")
-    private List<LocalDateTime> timeSlots = new ArrayList<>();
-
     @Column(name = "reservation_duration_hours", nullable = true)
     private int reservationDurationHours = 2;
+
+    @OneToMany(mappedBy = "table", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @JsonIgnore
+    private List<Reservation> reservations = new ArrayList<>(); // Store reservations, not time slots
+
     public void cleanUnusedTimeSlots(LocalDate threeDaysAgo) {
-        // Iterate over the time slots and remove those that are in the past
-        timeSlots.removeIf(timeSlot -> timeSlot.isBefore(threeDaysAgo.atStartOfDay()));
+        reservations.removeIf(reservation -> reservation.getReservationDateTime().toLocalDate().isBefore(threeDaysAgo));
     }
 
-    public void addTimeSlot(LocalDateTime timeSlot) {
-        this.timeSlots.add(timeSlot);
-    }
-
-
-    @Transient
-    public boolean isAvailable(LocalDateTime desiredTimeSlot) {
-        if (timeSlots == null || timeSlots.isEmpty()) {
-            return true;
+    public boolean isAvailable(LocalDateTime desiredTimeSlot, int partySize) {
+        if (this.capacity < partySize) {
+            return false;
         }
 
-        for (LocalDateTime reservedTimeSlot : timeSlots) {
-            LocalDateTime endTime = reservedTimeSlot.plusHours(reservationDurationHours);
+        for (Reservation reservation : reservations) {
+            LocalDateTime startTime = reservation.getReservationDateTime();
+            LocalDateTime endTime = startTime.plusHours(reservation.getTable().getReservationDurationHours());
 
-            // Check if the desired time slot overlaps with any existing reservation
-            if ((desiredTimeSlot.equals(reservedTimeSlot) || desiredTimeSlot.isAfter(reservedTimeSlot))
+            if ((desiredTimeSlot.isEqual(startTime) || desiredTimeSlot.isAfter(startTime))
                     && desiredTimeSlot.isBefore(endTime)) {
-                return false; // Table is reserved for the desired time slot
+                return false;
             }
         }
 
-        return true; // No conflicting reservations, table is available
+        return true;
     }
 
-    public boolean hasTimeSlot(LocalDateTime dateTime) {
-        // Check if the given dateTime exists in the list of time slots
-        return timeSlots.contains(dateTime);
+    public void addReservation(Reservation reservation) {
+        LocalDateTime startTime = reservation.getReservationDateTime();
+        LocalDateTime endTime = startTime.plusHours(reservation.getTable().getReservationDurationHours());
+        for (LocalDateTime timeSlot = startTime; timeSlot.isBefore(endTime); timeSlot = timeSlot.plusMinutes(15)) {
+
+        }
+        this.reservations.add(reservation);
     }
 
-    public List<LocalDateTime> initializeTimeSlots(LocalTime startTime, LocalTime endTime, List<LocalDate> dates, List<LocalDateTime> listOfUsedCheckIns) {
-        // Check if time slots are already initialized and cover all provided dates
-        List<LocalDate> generatedDates = timeSlots.stream()
-                .map(LocalDateTime::toLocalDate)
-                .distinct()
-                .toList();
+    public void removeReservation(Reservation reservation) {
+        LocalDateTime startTime = reservation.getReservationDateTime();
+        LocalDateTime endTime = startTime.plusHours(reservation.getTable().getReservationDurationHours());
+        for (LocalDateTime timeSlot = startTime; timeSlot.isBefore(endTime); timeSlot = timeSlot.plusMinutes(15)) {
 
-        if (generatedDates.containsAll(dates) && dates.containsAll(generatedDates)) {
-            System.out.println("Time slots already cover all provided dates.");
-            return timeSlots;
         }
-
-        // Generate time slots for the remaining dates
-        for (LocalDate date : dates) {
-            if (!generatedDates.contains(date)) {
-                LocalTime currentTime = startTime;
-                while (currentTime.isBefore(LocalTime.of(23, 0))) {
-                    LocalDateTime currentDateTime = LocalDateTime.of(date, currentTime);
-                    boolean isUsed = false;
-                    if (listOfUsedCheckIns != null) {
-                        for (LocalDateTime checkIns : listOfUsedCheckIns) {
-                            if (checkIns.isEqual(currentDateTime)) {
-                                isUsed = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!isUsed) {
-                        timeSlots.add(currentDateTime);
-                        System.out.println("Added time slot: " + currentDateTime); // Debug output
-                    } else {
-                        // Remove conflicting time slots
-                        timeSlots.removeIf(x -> x.isAfter(currentDateTime.minusHours(2)) && x.isBefore(currentDateTime.plusHours(2)));
-                    }
-                    // Increment currentTime
-                    currentTime = currentTime.plusMinutes(15);
-                }
-            }
-        }
-
-        return timeSlots;
+        this.reservations.remove(reservation);
     }
 
-
-
-    public TableEntity(Restaurant restaurant, int capacity, String location, boolean isSmokingArea, String description, List<LocalDateTime> timeSlots, int reservationDurationHours) {
+    public TableEntity(Restaurant restaurant, int capacity, String location, boolean isSmokingArea, String description, int reservationDurationHours) {
         this.restaurant = restaurant;
         this.capacity = capacity;
@@ -132 +98 @@
         this.isSmokingArea = isSmokingArea;
         this.description = description;
-        this.timeSlots = timeSlots;
         this.reservationDurationHours = reservationDurationHours;
     }
@@ -138 +103 @@
     public TableEntity() {
     }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Restaurant getRestaurant() {
-        return restaurant;
-    }
-
-    public void setRestaurant(Restaurant restaurant) {
-        this.restaurant = restaurant;
-    }
-
-    public int getCapacity() {
-        return capacity;
-    }
-
-    public void setCapacity(int capacity) {
-        this.capacity = capacity;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public void setSmokingArea(Boolean isSmokingArea) {
-        this.isSmokingArea = isSmokingArea;
-    }
-
-    public void setSmokingArea(boolean smokingArea) {
-        isSmokingArea = smokingArea;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public List<LocalDateTime> getTimeSlots() {
-        return timeSlots;
-    }
-
-    public void setTimeSlots(List<LocalDateTime> timeSlots) {
-        this.timeSlots = timeSlots;
-    }
-
-    public int getReservationDurationHours() {
-        return reservationDurationHours;
-    }
-
-    public void setReservationDurationHours(int reservationDurationHours) {
-        this.reservationDurationHours = reservationDurationHours;
-    }
 }