fix(#125) : 인증서 조회 수정

Troth-Cam · Aug 20, 2023 · 5a8062a · 5a8062a
1 parent 6df3eb0
commit 5a8062a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/src/main/java/trothly/trothcam/dto/web/ProductsResDto.java b/src/main/java/trothly/trothcam/dto/web/ProductsResDto.java
@@ -5,6 +5,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
@@ -13,7 +15,7 @@ public class ProductsResDto<T> {
     private Long productId;
     private String title;
     private String ownerWebId;
-    private String soldAt;
+    private LocalDateTime soldAt;
     private Long price;
     private boolean isLiked;
 }
diff --git a/src/main/java/trothly/trothcam/service/web/ProductService.java b/src/main/java/trothly/trothcam/service/web/ProductService.java
@@ -54,18 +54,16 @@ public List<ProductsResDto> findPublicProducts(String webId) throws BaseExceptio
         if (findProducts == null || findProducts.isEmpty())
             throw new BaseException(ErrorCode.PRODUCT_NOT_FOUND);
 
-        List<ProductsResDto> result = new ArrayList<>();
-        for (int i = 0; i < findProducts.size(); i++) {
-            Product p = findProducts.get(i);
-            LocalDateTime soldAt = historyRepository.findTopByProduct_IdOrderBySoldAt(p.getId())
-                    .orElse(p.getLastModifiedAt());
-            boolean isLiked = likeProductRepository.existsByProduct_IdAndMember_Id(p.getId(), p.getMember().getId());
+        List<ProductsResDto> result = findProducts.stream()
+                .map(p -> {
+                    LocalDateTime soldAt = historyRepository.findTopByProduct_IdOrderBySoldAt(p.getId())
+                            .orElse(p.getLastModifiedAt());
+                    boolean isLiked = likeProductRepository.existsByProduct_IdAndMember_Id(p.getId(), p.getMember().getId());
 
-            ProductsResDto dto = new ProductsResDto(p.getId(), p.getTitle(), p.getMember().getWebId(),
-                    soldAt.format(DateTimeFormatter.ofPattern("YYYYMMdd")), p.getPrice(), isLiked);
-
-            result.add(dto);
-        }
+                    return new ProductsResDto(p.getId(), p.getTitle(), p.getMember().getWebId(),
+                            soldAt, p.getPrice(), isLiked);
+                })
+                .collect(Collectors.toList());
 
         return result;
     }
@@ -78,21 +76,19 @@ public List<ProductsResDto> findPrivateProducts(String webId) throws BaseExcepti
         if (findProducts == null || findProducts.isEmpty())
             throw new BaseException(ErrorCode.PRODUCT_NOT_FOUND);
 
-        List<ProductsResDto> result = new ArrayList<>();
-        for (int i = 0; i < findProducts.size(); i++) {
-            Product p = findProducts.get(i);
-            LocalDateTime soldAt = p.getLastModifiedAt();
-            boolean isLiked = likeProductRepository.existsByProduct_IdAndMember_Id(p.getId(), p.getMember().getId());
-            Long price = p.getPrice();
-            if (price == null) {
-                price = 0L;
-            }
-
-            ProductsResDto dto = new ProductsResDto(p.getId(), p.getTitle(), p.getMember().getWebId(),
-                    soldAt.format(DateTimeFormatter.ofPattern("YYYYMMdd")), price, isLiked);
-
-            result.add(dto);
-        }
+        List<ProductsResDto> result = findProducts.stream()
+                .map(p->{
+                    LocalDateTime soldAt = p.getLastModifiedAt();
+                    boolean isLiked = likeProductRepository.existsByProduct_IdAndMember_Id(p.getId(), p.getMember().getId());
+                    Long price = p.getPrice();
+                    if (price == null) {
+                        price = 0L;
+                    }
+
+                    return new ProductsResDto(p.getId(), p.getTitle(), p.getMember().getWebId(),
+                            soldAt, price, isLiked);
+                })
+                .collect(Collectors.toList());
 
         return result;
     }