Merge pull request #101 from ttthanhf/hotfix/purchase-history

UPDATE - Change type to List<OrderItem> in purchaseHistory
ttthanhf · Nov 12, 2023 · 8e44e15 · 8e44e15
2 parents 85bc9b6 + dee2658
commit 8e44e15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 40 deletions.
diff --git a/src/main/java/housemate/entities/OrderItem.java b/src/main/java/housemate/entities/OrderItem.java
@@ -4,13 +4,8 @@
  */
 package housemate.entities;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
+import jakarta.persistence.*;
+
 import java.time.LocalDateTime;
 import lombok.Data;
 
@@ -55,6 +50,7 @@ public class OrderItem {
     @Transient
     private int discountPrice;
 
-    @Transient
+    @OneToOne
+    @JoinColumn(name = "service_id", updatable = false, insertable = false)
     private Service service;
 }
diff --git a/src/main/java/housemate/responses/CustomerDetailRes.java b/src/main/java/housemate/responses/CustomerDetailRes.java
@@ -1,8 +1,8 @@
 package housemate.responses;
 
+import housemate.entities.OrderItem;
 import housemate.entities.Schedule;
 import housemate.entities.UserAccount;
-import housemate.models.responses.MyPurchasedResponse;
 import lombok.Data;
 
 import java.util.List;
@@ -14,5 +14,5 @@ public class CustomerDetailRes  {
     private UserAccount userInfo;
     private List<Schedule> usageHistory;
     private List<ReportRes> monthlyReport;
-    private List<MyPurchasedResponse> purchaseHistory;
+    private List<OrderItem> purchaseHistory;
 }
diff --git a/src/main/java/housemate/services/AccountService.java b/src/main/java/housemate/services/AccountService.java
@@ -294,40 +294,12 @@ public ResponseEntity<?> getCustomerDetail(HttpServletRequest request, int custo
         }
 
         // Get purchase history
-        List<MyPurchasedResponse> purchaseHistory = new ArrayList<>();
+        List<OrderItem> purchaseHistory = new ArrayList<>();
 
         List<Order> listOrder = orderRepository.getAllOrderCompleteByUserId(customerId);
         for (Order order : listOrder) {
             List<OrderItem> listOrderItem = orderItemRepository.getAllOrderItemByOrderId(order.getOrderId());
-            for (OrderItem orderItem : listOrderItem) {
-
-                List<String> listSingleServiceName = new ArrayList<>();
-
-                MyPurchasedResponse myPurchasedResponse = new MyPurchasedResponse();
-
-                Service service = serviceRepository.getServiceByServiceId(orderItem.getServiceId());
-                if (service.isPackage()) {
-                    List<PackageServiceItem> listPackageServiceItem = packageServiceItemRepository.findAllSingleServiceIdByPackageServiceId(service.getServiceId());
-                    for (PackageServiceItem packageServiceItem : listPackageServiceItem) {
-                        Service singleService = serviceRepository.getServiceByServiceId(packageServiceItem.getSingleServiceId());
-                        List<Image> images = imageRepository.findAllByEntityIdAndImageType(singleService.getServiceId(), housemate.constants.ImageType.SERVICE).orElse(List.of());
-                        singleService.setImages(images);
-                        listSingleServiceName.add(singleService.getTitleName());
-                    }
-                } else {
-                    List<Image> images = imageRepository.findAllByEntityIdAndImageType(service.getServiceId(), ImageType.SERVICE).orElse(List.of());
-                    service.setImages(images);
-                    listSingleServiceName.add(service.getTitleName());
-                }
-
-                myPurchasedResponse.setOrderItemId(orderItem.getOrderItemId());
-                myPurchasedResponse.setEndDate(orderItem.getExpireDate());
-                myPurchasedResponse.setStartDate(orderItem.getCreateDate());
-                myPurchasedResponse.setSingleServiceName(listSingleServiceName);
-                myPurchasedResponse.setService(service);
-
-                purchaseHistory.add(myPurchasedResponse);
-            }
+            purchaseHistory.addAll(listOrderItem);
         }
 
         // Set to CustomerDetailRes