From bf6e564e67cb053b6a06217dc2fc4f27b4a25275 Mon Sep 17 00:00:00 2001
From: sojungpp <sophie2458@naver.com>
Date: Fri, 1 Dec 2023 03:53:12 +0900
Subject: [PATCH] =?UTF-8?q?[PDS-112]=20fix:=20=EC=9E=A5=EB=B9=84=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=B0=A8=EB=9F=89=20=EB=B0=98=EB=82=A9=20=EC=8B=9C?=
 =?UTF-8?q?,=20=EB=B0=98=EB=82=A9=20=EC=8B=9C=EA=B0=84=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EC=A2=85=EB=A3=8C=20=EC=8B=9C=EA=B0=84=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/pladialmserver/booking/entity/CarBooking.java   | 6 ++++--
 .../pladialmserver/booking/entity/ResourceBooking.java      | 6 ++++--
 .../pladialmserver/booking/service/CarBookingService.java   | 2 +-
 .../booking/service/ResourceBookingService.java             | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/pladialmserver/booking/entity/CarBooking.java b/src/main/java/com/example/pladialmserver/booking/entity/CarBooking.java
index 29e1a4fd..105d85d4 100644
--- a/src/main/java/com/example/pladialmserver/booking/entity/CarBooking.java
+++ b/src/main/java/com/example/pladialmserver/booking/entity/CarBooking.java
@@ -13,6 +13,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 @Entity
 @Getter
@@ -71,10 +72,11 @@ public boolean checkBookingStatus(BookingStatus bookingStatus) {
         return status.equals(bookingStatus);
     }
 
-    public void returnBookingCar(String remark) {
+    public void returnBookingCar(String remark, LocalDateTime now) {
         changeBookingStatus(BookingStatus.FINISHED);
-        this.returnDate = LocalDateTime.now();
+        this.returnDate = now;
         this.remark = remark;
+        this.endDate = LocalDateTime.of(now.toLocalDate(), LocalTime.of(now.getHour(), 0).plusHours(1));
     }
 
 
diff --git a/src/main/java/com/example/pladialmserver/booking/entity/ResourceBooking.java b/src/main/java/com/example/pladialmserver/booking/entity/ResourceBooking.java
index 66589fa8..e8723be0 100644
--- a/src/main/java/com/example/pladialmserver/booking/entity/ResourceBooking.java
+++ b/src/main/java/com/example/pladialmserver/booking/entity/ResourceBooking.java
@@ -13,6 +13,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 @Entity
 @Getter
@@ -64,10 +65,11 @@ public static ResourceBooking toDto(User user, Resource resource, ProductReq pro
             .build();
   }
 
-  public void returnBookingResource(String remark) {
+  public void returnBookingResource(String remark, LocalDateTime now) {
     changeBookingStatus(BookingStatus.FINISHED);
-    this.returnDate = LocalDateTime.now();
+    this.returnDate = now;
     this.remark = remark;
+    this.endDate = LocalDateTime.of(now.toLocalDate(), LocalTime.of(now.getHour(), 0).plusHours(1));
   }
 
   public void changeBookingStatus(BookingStatus bookingStatus) {
diff --git a/src/main/java/com/example/pladialmserver/booking/service/CarBookingService.java b/src/main/java/com/example/pladialmserver/booking/service/CarBookingService.java
index e64dada6..a5be4b3b 100644
--- a/src/main/java/com/example/pladialmserver/booking/service/CarBookingService.java
+++ b/src/main/java/com/example/pladialmserver/booking/service/CarBookingService.java
@@ -160,7 +160,7 @@ private void returnBookingCar(CarBooking carBooking, ReturnProductReq request) {
             throw new BaseException(BaseResponseCode.MUST_BE_IN_USE);
 
         // 차량 반납
-        carBooking.returnBookingCar(request.getRemark());
+        carBooking.returnBookingCar(request.getRemark(), LocalDateTime.now());
         carBookingRepository.save(carBooking);
 
         Car car = carBooking.getCar();
diff --git a/src/main/java/com/example/pladialmserver/booking/service/ResourceBookingService.java b/src/main/java/com/example/pladialmserver/booking/service/ResourceBookingService.java
index 45578046..fb30f25e 100644
--- a/src/main/java/com/example/pladialmserver/booking/service/ResourceBookingService.java
+++ b/src/main/java/com/example/pladialmserver/booking/service/ResourceBookingService.java
@@ -81,7 +81,7 @@ private void returnBookingResource(ResourceBooking resourceBooking, ReturnProduc
             throw new BaseException(BaseResponseCode.MUST_BE_IN_USE);
 
         // 장비 반납
-        resourceBooking.returnBookingResource(request.getRemark());
+        resourceBooking.returnBookingResource(request.getRemark(), LocalDateTime.now());
         resourceBookingRepository.save(resourceBooking);
 
         Resource resource = resourceBooking.getResource();