Changeset deea3c4 for src/main/java/com/example/rezevirajmasa/demo/service/impl/TableServiceImpl.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/service/impl/TableServiceImpl.java (modified) (9 diffs)

src/main/java/com/example/rezevirajmasa/demo/service/impl/TableServiceImpl.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.service.impl;
 
+import com.example.rezevirajmasa.demo.dto.ReservationDTO;
+import com.example.rezevirajmasa.demo.dto.RestaurantDTO;
+import com.example.rezevirajmasa.demo.dto.TableDTO;
+import com.example.rezevirajmasa.demo.model.Reservation;
 import com.example.rezevirajmasa.demo.model.Restaurant;
 import com.example.rezevirajmasa.demo.model.TableEntity;
-import com.example.rezevirajmasa.demo.model.exceptions.InvalidRestaurantIdException;
 import com.example.rezevirajmasa.demo.model.exceptions.InvalidTableNumberException;
+import com.example.rezevirajmasa.demo.repository.ReservationRepository;
 import com.example.rezevirajmasa.demo.repository.RestaurantRepository;
 import com.example.rezevirajmasa.demo.repository.TableRepository;
 import com.example.rezevirajmasa.demo.service.TableService;
+import jakarta.persistence.Table;
+import org.modelmapper.ModelMapper;
+import org.openqa.selenium.InvalidArgumentException;
 import org.springframework.cglib.core.Local;
 import org.springframework.stereotype.Service;
@@ -18 +25 @@
 import java.time.chrono.ChronoLocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -25 +33 @@
     private final TableRepository tableRepository;
     private final RestaurantRepository restaurantRepository;
+    private final ReservationRepository reservationRepository;
+    private ModelMapper modelMapper = new ModelMapper();
 
-    public TableServiceImpl(TableRepository tableRepository, RestaurantRepository restaurantRepository) {
+    public TableServiceImpl(TableRepository tableRepository, RestaurantRepository restaurantRepository, ReservationRepository reservationRepository) {
         this.tableRepository = tableRepository;
         this.restaurantRepository = restaurantRepository;
-    }
-
-    @Override
-    public TableEntity findById(Long id) {
-        return tableRepository.findById(id).orElseThrow(InvalidTableNumberException::new);
+        this.reservationRepository = reservationRepository;
     }
 
@@ -41 +47 @@
     }
 
+    @Override
+    public TableDTO findById(Long id) {
+        TableEntity table = tableRepository.findById(id)
+                .orElseThrow(InvalidTableNumberException::new);
+
+        TableDTO tableDTO = modelMapper.map(table, TableDTO.class);
+
+        List<ReservationDTO> reservationDTOS = new ArrayList<>();
+        for (Reservation reservation : table.getReservations()) {
+            ReservationDTO reservationDTO = modelMapper.map(reservation, ReservationDTO.class);
+            reservationDTOS.add(reservationDTO);
+        }
+
+        tableDTO.setReservations(reservationDTOS);
+
+        return tableDTO;
+    }
+
+    @Override
+    public TableEntity findByIdTable(Long id) {
+        return tableRepository.findById(id).orElseThrow(() -> new InvalidArgumentException("Invalid table id"));
+    }
+
+
+    @Override
     public void save(int numberOfTables, List<Integer> tableCapacities, List<String> tableLocations, List<String> tableSmokingAreas, List<String> tableDescriptions, Restaurant restaurant) {
         for (int i = 0; i < numberOfTables; i++) {
@@ -55 +86 @@
     @Override
     public void deleteTimeSlotsForReservation(Long tableId, LocalDateTime reservationTime) {
-        LocalDateTime startTime = reservationTime.minusHours(2);
-        LocalDateTime endTime = reservationTime.plusHours(2);
-
-        TableEntity table = findById(tableId);
-        List<LocalDateTime> timeSlots = table.getTimeSlots();
-
-        timeSlots.removeIf(timeSlot -> timeSlot.isAfter(startTime) && timeSlot.isBefore(endTime));
-
-        table.setTimeSlots(timeSlots);
+        TableDTO tableDTO = findById(tableId);
+        TableEntity table = convertFromDTO(tableDTO);
+        LocalDate threeDaysAgo = LocalDate.now().minusDays(3);
+        table.cleanUnusedTimeSlots(threeDaysAgo);
 
         tableRepository.saveAndFlush(table);
@@ -70 +96 @@
     @Override
     public void canceledTimeSlots(Long tableId, LocalDateTime reservationTime) {
-        TableEntity table = findById(tableId);
-        List<LocalDateTime> timeSlots = table.getTimeSlots();
+        TableDTO tableDTO = findById(tableId);
+        TableEntity table = convertFromDTO(tableDTO);
         LocalDateTime startTime = reservationTime.minusHours(1).minusMinutes(45);
         LocalDateTime endTime = reservationTime.plusHours(1).plusMinutes(45);
 
-        LocalDate localDate = reservationTime.toLocalDate();
-
         String[] hours = table.getRestaurant().getOperatingHours().split("-");
         LocalTime openingHourTime = LocalTime.parse(hours[0], DateTimeFormatter.ofPattern("HH:mm"));
+        LocalDateTime openingHour = openingHourTime.atDate(reservationTime.toLocalDate());
+        LocalDateTime closingHour = LocalTime.of(23, 45).atDate(reservationTime.toLocalDate());
 
-        LocalDateTime openingHour = openingHourTime.atDate(localDate);
-        LocalDateTime closingHour = LocalTime.of(23, 45).atDate(localDate);
-        if(startTime.isBefore(openingHour)) {
-            startTime = LocalDateTime.from(openingHour);
+        if (startTime.isBefore(openingHour)) {
+            startTime = openingHour;
         }
-        while(startTime.isBefore(endTime) || startTime.equals(endTime)) {
-            timeSlots.add(startTime);
-            startTime = startTime.plusMinutes(15);
-            if(startTime.isAfter(closingHour) || startTime.equals(closingHour)) {
+
+        while (startTime.isBefore(endTime) || startTime.equals(endTime)) {
+            if (startTime.isAfter(closingHour) || startTime.equals(closingHour)) {
                 break;
             }
+
+            Reservation reservation = new Reservation();
+            reservation.setReservationDateTime(startTime);
+            reservation.setTable(table);
+            reservationRepository.save(reservation);
+
+            startTime = startTime.plusMinutes(15);
         }
-        table.setTimeSlots(timeSlots);
+
         tableRepository.saveAndFlush(table);
     }
@@ -105 +135 @@
         return tableRepository.findById(number).orElseThrow(InvalidTableNumberException::new);
     }
+
     @Override
     public TableEntity deleteTable(Long number) {
@@ -116 +147 @@
         List<TableEntity> tables = tableRepository.findByRestaurant(restaurant);
 
-        // Iterate through each table to check for available time slots
         for (TableEntity table : tables) {
             boolean hasAvailableTimeSlots = hasAvailableTimeSlotsForTableAndDate(table, today);
             if (hasAvailableTimeSlots) {
-                return true; // If any table has available time slots, return true
+                return true;
             }
         }
@@ -128 +158 @@
 
     public boolean hasAvailableTimeSlotsForTableAndDate(TableEntity table, LocalDate date) {
-        List<LocalDateTime> timeSlots = table.getTimeSlots();
+        for (Reservation reservation : table.getReservations()) {
+            LocalDateTime startTime = reservation.getReservationDateTime();
+            LocalDateTime endTime = startTime.plusHours(reservation.getTable().getReservationDurationHours());
 
-        // Implement your logic to check if the table has available time slots for the given date
-        // This could involve querying the database for reservations for the given table and date,
-        // and checking if there are any open time slots.
-        // You may need to consider factors such as operating hours, existing reservations, etc.
-        // Return true if there are available time slots, false otherwise.
-        return false;
+            if (startTime.toLocalDate().equals(date) || endTime.toLocalDate().equals(date)) {
+                return false;
+            }
+        }
+        return true;
     }
 
+    public RestaurantDTO convertToDto(Restaurant restaurant) {
+        return modelMapper.map(restaurant, RestaurantDTO.class);
+    }
+
+    public TableDTO convertToDto(TableEntity table) {
+        return modelMapper.map(table, TableDTO.class);
+    }
+
+    public ReservationDTO convertToDto(Reservation reservation) {
+        return modelMapper.map(reservation, ReservationDTO.class);
+    }
+
+    public TableEntity convertFromDTO(TableDTO tableDTO) {
+        return modelMapper.map(tableDTO, TableEntity.class);
+    }
 }