diff --git a/BE/src/main/java/com/codesquad/airbnb/common/exception/GlobalRestExceptionHandler.java b/BE/src/main/java/com/codesquad/airbnb/common/exception/GlobalRestExceptionHandler.java index 862a95d..c711ef5 100644 --- a/BE/src/main/java/com/codesquad/airbnb/common/exception/GlobalRestExceptionHandler.java +++ b/BE/src/main/java/com/codesquad/airbnb/common/exception/GlobalRestExceptionHandler.java @@ -16,10 +16,17 @@ @RestControllerAdvice public class GlobalRestExceptionHandler { + @ExceptionHandler(IllegalStateException.class) + protected ResponseEntity handleIllegalStateException(IllegalStateException e) { + log.error("handleIllegalStateException", e); + final ErrorResponse response = ErrorResponse.of(e.getMessage(), HttpStatus.FORBIDDEN.value()); + return new ResponseEntity<>(response, HttpStatus.FORBIDDEN); + } + @ExceptionHandler(IllegalReservationDateException.class) - protected ResponseEntity IllegalReservationDateException(IllegalReservationDateException e) { + protected ResponseEntity handleIllegalReservationDateException(IllegalReservationDateException e) { + log.error("handleIllegalReservationDateException", e); final ErrorResponse response = ErrorResponse.of(e.getMessage(), HttpStatus.BAD_REQUEST.value()); - return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST); } diff --git a/BE/src/main/java/com/codesquad/airbnb/reservation/ui/ReservationController.java b/BE/src/main/java/com/codesquad/airbnb/reservation/ui/ReservationController.java index 2fbd22e..56aec7a 100644 --- a/BE/src/main/java/com/codesquad/airbnb/reservation/ui/ReservationController.java +++ b/BE/src/main/java/com/codesquad/airbnb/reservation/ui/ReservationController.java @@ -32,7 +32,7 @@ public Confirmation showBillAndReview(@RequestParam Long roomId, @Valid Reservat public ResponseEntity reserve(@RequestParam Long roomId, @Valid ReservationDate reservationDate, @Valid Guest guest, - HttpServletRequest request) { + @CookieValue(value = "jwt")) { Long id = (Long) request.getAttribute("id"); boolean canReserve = managerDAO.canReserve(roomId, reservationDate); diff --git a/BE/src/main/java/com/codesquad/airbnb/room/infra/RoomDAO.java b/BE/src/main/java/com/codesquad/airbnb/room/infra/RoomDAO.java index d48b68e..4038ccb 100644 --- a/BE/src/main/java/com/codesquad/airbnb/room/infra/RoomDAO.java +++ b/BE/src/main/java/com/codesquad/airbnb/room/infra/RoomDAO.java @@ -73,7 +73,7 @@ public RoomDetail mapRow(ResultSet rs, int rowNum) throws SQLException { price, medias, rs.getString("host"), - managerDAO.canReserve(rs.getLong("id"), checkInDate, checkOutDate) + managerDAO.canReserve(rs.getLong("id"), reservationDate) ); } };