Merge pull request #157 from Femcoders-SleepUp/refactor/reservation-exceptions

refactor(reservation): extract exceptions AccommodationConstraintsExc…

Author: isanort

src/main/java/com/SleepUp/SU/reservation/exceptions/AccommodationConstraintsException.java

@@ -1,9 +1,12 @@
 package com.SleepUp.SU.reservation.exceptions;
 
+import com.SleepUp.SU.accommodation.entity.Accommodation;
 import com.SleepUp.SU.exceptions.AppException;
+import com.SleepUp.SU.reservation.dto.ReservationRequest;
 
 public class AccommodationConstraintsException extends AppException {
-    public AccommodationConstraintsException(String message) {
-        super(message);
+        public AccommodationConstraintsException(Accommodation accommodation, ReservationRequest reservationRequest) {
+        super(String.format("Accommodation supports maximum %d guests, but %d guests requested",
+                accommodation.getGuestNumber(), reservationRequest.guestNumber()));
     }
 }

src/main/java/com/SleepUp/SU/reservation/exceptions/AccommodationUnavailableException.java

@@ -1,9 +1,9 @@
 package com.SleepUp.SU.reservation.exceptions;
 
+import com.SleepUp.SU.accommodation.entity.Accommodation;
 import com.SleepUp.SU.exceptions.AppException;
-
 public class AccommodationUnavailableException extends AppException {
-    public AccommodationUnavailableException(String message) {
-        super(message);
+    public AccommodationUnavailableException(Accommodation accommodation) {
+        super(String.format("Accommodation is only available from %s to %s", accommodation.getAvailableFrom(), accommodation.getAvailableTo()));
     }
 }

src/main/java/com/SleepUp/SU/reservation/utils/ReservationServiceHelper.java

@@ -84,18 +84,12 @@ public void validateAccommodationAvailability(Accommodation accommodation, Reser
 
         if (reservationRequest.checkInDate().isBefore(availableFrom) ||
                 reservationRequest.checkOutDate().isAfter(availableTo)) {
-            throw new AccommodationUnavailableException(
-                    String.format("Accommodation is only available from %s to %s",
-                            availableFrom, availableTo)
-            );
-        }
+            throw new AccommodationUnavailableException(accommodation);
+            }
 
         if (reservationRequest.guestNumber() > accommodation.getGuestNumber()) {
-            throw new AccommodationConstraintsException(
-                    String.format("Accommodation supports maximum %d guests, but %d guests requested",
-                            accommodation.getGuestNumber(), reservationRequest.guestNumber())
-            );
-        }
+            throw new AccommodationConstraintsException(accommodation, reservationRequest);
+            }
     }
 
     public void validateUserReservationOverlap(Long userId, ReservationRequest reservationRequest) {

src/test/java/com/SleepUp/SU/exceptions/GlobalExceptionHandlerTest.java

@@ -1,7 +1,9 @@
 package com.SleepUp.SU.exceptions;
 
+import com.SleepUp.SU.accommodation.entity.Accommodation;
 import com.SleepUp.SU.accommodation.exceptions.AccommodationAlreadyExistsByNameException;
 import com.SleepUp.SU.accommodation.exceptions.AccommodationNotFoundByIdException;
+import com.SleepUp.SU.reservation.dto.ReservationRequest;
 import com.SleepUp.SU.reservation.exceptions.*;
 import com.SleepUp.SU.utils.exceptions.*;
 import jakarta.servlet.http.HttpServletRequest;
@@ -21,6 +23,7 @@
 import org.springframework.validation.FieldError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 
+import java.time.LocalDate;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
@@ -82,9 +85,12 @@ public void testHandleBadRequest_InvalidDateRange() {
 
     @Test
     public void testHandleBadRequest_AccommodationUnavailable() {
-        AccommodationUnavailableException ex = new AccommodationUnavailableException("Unavailable");
+        Accommodation accommodation = mock(Accommodation.class);
+        AccommodationUnavailableException ex = new AccommodationUnavailableException(accommodation);
         ResponseEntity<ErrorResponse> response = handler.handleBadRequest(ex, request);
         assertEquals(HttpStatus.BAD_REQUEST, response.getStatusCode());
+        String expectedMessage = String.format("Accommodation is only available from %s to %s", accommodation.getAvailableFrom(), accommodation.getAvailableTo());
+        assertEquals(expectedMessage, response.getBody().message().toString());
     }
 
     // === Validation Handlers ===