Merge pull request #79 from daadaadaah/fix/add-missing-startedAt-and-…

…finishedAt-in-DealProductDetail `TimeDealProductDetail`에 빠진 `startedAt`, `finishedAt` 추가
f-lab-edu · Jun 30, 2023 · 3bd8e5e · 3bd8e5e
2 parents 9acadac + cb36377
commit 3bd8e5e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/com/hcommerce/heecommerce/deal/DealQueryRepository.java b/src/main/java/com/hcommerce/heecommerce/deal/DealQueryRepository.java
@@ -104,6 +104,8 @@ private TimeDealProductDetail convertTimeDealProductToTimeDealProductDetail(Time
             .productMainImgUrl(timeDealProductEntity.getProductMainImgUrl())
             .productDetailImgUrls(timeDealProductEntity.getProductDetailImgUrls())
             .maxOrderQuantityPerOrder(timeDealProductEntity.getMaxOrderQuantityPerOrder())
+            .startedAt(timeDealProductEntity.getStartedAt())
+            .finishedAt(timeDealProductEntity.getFinishedAt())
             .build();
     }
 

diff --git a/src/main/java/com/hcommerce/heecommerce/deal/TimeDealProductDetail.java b/src/main/java/com/hcommerce/heecommerce/deal/TimeDealProductDetail.java
@@ -1,5 +1,6 @@
 package com.hcommerce.heecommerce.deal;
 
+import java.time.Instant;
 import java.util.UUID;
 import lombok.Builder;
 import lombok.Getter;
@@ -16,6 +17,9 @@ public class TimeDealProductDetail {
     private final int dealProductDiscountValue;
     private final int dealProductDealQuantity;
     private final int maxOrderQuantityPerOrder;
+    private final Instant startedAt;
+    private final Instant finishedAt;
+
     @Builder
     public TimeDealProductDetail(
         UUID dealProductUuid,
@@ -26,7 +30,9 @@ public TimeDealProductDetail(
         DiscountType dealProductDiscountType,
         int dealProductDiscountValue,
         int dealProductDealQuantity,
-        int maxOrderQuantityPerOrder
+        int maxOrderQuantityPerOrder,
+        Instant startedAt,
+        Instant finishedAt
     ) {
         this.dealProductUuid = dealProductUuid;
         this.dealProductTile = dealProductTile;
@@ -37,5 +43,7 @@ public TimeDealProductDetail(
         this.dealProductDiscountValue = dealProductDiscountValue;
         this.dealProductDealQuantity = dealProductDealQuantity;
         this.maxOrderQuantityPerOrder = maxOrderQuantityPerOrder;
+        this.startedAt = startedAt;
+        this.finishedAt = finishedAt;
     }
 }
diff --git a/src/test/java/com/hcommerce/heecommerce/deal/DealControllerTest.java b/src/test/java/com/hcommerce/heecommerce/deal/DealControllerTest.java
@@ -146,6 +146,8 @@ void It_returns_200_OK() throws Exception {
                 .dealProductDiscountValue(1000)
                 .dealProductDealQuantity(3)
                 .maxOrderQuantityPerOrder(10)
+                .startedAt(STARTED_AT)
+                .finishedAt(FINISHED_AT)
                 .build();
 
             given(dealService.getTimeDealProductDetailByDealProductUuid(DEAL_PRODUCT_UUID)).willReturn(timeDealProductDetailFixture);

diff --git a/src/test/java/com/hcommerce/heecommerce/deal/DealServiceTest.java b/src/test/java/com/hcommerce/heecommerce/deal/DealServiceTest.java
@@ -93,6 +93,8 @@ void It_return_dealProducts() {
                 .dealProductDiscountValue(1000)
                 .dealProductDealQuantity(3)
                 .maxOrderQuantityPerOrder(10)
+                .startedAt(STARTED_AT)
+                .finishedAt(FINISHED_AT)
                 .build();
 
             given(dealQueryRepository.getTimeDealProductDetailByDealProductUuid(dealProductUuid)).willReturn(timeDealProductDetailFixture);