From 04bc656fa1bc89704266e47379fe8fa22b7554b3 Mon Sep 17 00:00:00 2001 From: Kim HyunSik Date: Fri, 5 Jun 2020 13:20:19 +0900 Subject: [PATCH] =?UTF-8?q?[#38]=20feat:=20=EC=BF=A0=ED=82=A4=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/exception/GlobalRestExceptionHandler.java | 11 +++++++++-- .../airbnb/reservation/ui/ReservationController.java | 2 +- .../java/com/codesquad/airbnb/room/infra/RoomDAO.java | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) 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) ); } };