Merge pull request #119 from Hoang-Nguyen-Huy/feat/socket

[PBS-85][NguyenHCP] feat: update cancelReason to request
Hoang-Nguyen-Huy · Oct 29, 2024 · 220c285 · 220c285
2 parents c33297a + 5ff732f
commit 220c285
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,8 @@
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
         <sonar.organization>swp-pod-booking-system-server</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-        <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/jacoco/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
     <dependencies>
         <dependency>
@@ -137,8 +138,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>22</source>
-                    <target>22</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>

diff --git a/src/main/java/com/swp/PodBookingSystem/dto/request/Order/OrderUpdateRequest.java b/src/main/java/com/swp/PodBookingSystem/dto/request/Order/OrderUpdateRequest.java
@@ -17,6 +17,7 @@
 public class OrderUpdateRequest {
     String id;
     OrderStatus status;
+    String cancelReason;
     Account orderHandler;
     List<OrderDetailUpdateRoomRequest> orderDetails;
 }
diff --git a/src/main/java/com/swp/PodBookingSystem/service/OrderDetailService.java b/src/main/java/com/swp/PodBookingSystem/service/OrderDetailService.java
@@ -394,6 +394,9 @@ public void updateOrderDetail(OrderUpdateRequest request) {
                 Account orderHandler = accountService.getAccountById(request.getOrderHandler().getId());
                 od.setOrderHandler(orderHandler);
             }
+            if (request.getCancelReason() != null) {
+                od.setCancelReason(request.getCancelReason());
+            }
             if (request.getOrderDetails() != null && !request.getOrderDetails().isEmpty()) {
                 for (OrderDetailUpdateRoomRequest odr : request.getOrderDetails()) {
                     if (odr.getId().equals(od.getId())) {