Merge pull request #114 from ttthanhf/hotfix/missing-image-in-my-purc…

…hased FIx - Fix missing image in my purchased
ttthanhf · Nov 16, 2023 · efa3a1b · efa3a1b
2 parents a5e77f9 + bd4909d
commit efa3a1b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/housemate/services/UserUsageService.java b/src/main/java/housemate/services/UserUsageService.java
@@ -168,15 +168,14 @@ public ResponseEntity<List<MyPurchasedResponse>> getAllUserUsageForMyPurchased(H
                     List<PackageServiceItem> listPackageServiceItem = packageServiceItemRepository.findAllSingleServiceIdByPackageServiceId(service.getServiceId());
                     for (PackageServiceItem packageServiceItem : listPackageServiceItem) {
                         Service singleService = serviceRepository.getServiceByServiceId(packageServiceItem.getSingleServiceId());
-                        List<Image> images = imageRepository.findAllByEntityIdAndImageType(singleService.getServiceId(), 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());
                 }
+
+                List<Image> images = imageRepository.findAllByEntityIdAndImageType(service.getServiceId(), ImageType.SERVICE).orElse(List.of());
+                service.setImages(images);
                 myPurchasedResponse.setOrderItemId(orderItem.getOrderItemId());
                 myPurchasedResponse.setEndDate(orderItem.getExpireDate());
                 myPurchasedResponse.setStartDate(orderItem.getCreateDate());