Merge pull request #266 from PLADI-ALM/fix/PDS-112-returnResource

[PDS-112/fix] 장비 및 차량 반납 시, 반납 시간으로 종료 시간 변경
PLADI-ALM · Dec 1, 2023 · be59042 · be59042
2 parents 904c535 + bf6e564
commit be59042
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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();