Merge pull request #20 from Kimjipang/round10

refactor: product_metrics 테이블 컬럼 수정

Author: Kimjipang

apps/commerce-streamer/src/main/java/com/loopers/domain/ProductMetric.java

@@ -22,43 +22,47 @@ public class ProductMetric extends BaseEntity {
     @Column(name = "sales_volume", nullable = false)
     private Long salesVolume;
 
+    @Column(name = "metric_date", nullable = false)
+    private String metricDate;
+
     @Enumerated(EnumType.STRING)
     @Column(name = "event_type", nullable = false)
     private ProductEventType eventType;
 
-    public ProductMetric(Long productId, Long viewCount, Long likeCount, Long salesVolume, ProductEventType eventType) {
+    public ProductMetric(Long productId, Long viewCount, Long likeCount, Long salesVolume, String metricDate, ProductEventType eventType) {
         this.productId = productId;
         this.viewCount = viewCount;
         this.likeCount = likeCount;
         this.salesVolume = salesVolume;
+        this.metricDate = metricDate;
         this.eventType = eventType;
     }
 
     /*
     - [ ] 리팩토링 예정
      */
-    public static ProductMetric of(Long productId, ProductEventType eventType) {
+    public static ProductMetric of(Long productId, String date, ProductEventType eventType) {
         if (eventType == null) {
             throw new IllegalArgumentException("정의되지 않은 event type입니다.");
         }
 
         return switch (eventType) {
-            case PRODUCT_VIEWED -> ofProductViewed(productId);
-            case PRODUCT_LIKED -> ofProductLiked(productId);
-            case PRODUCT_SALES -> ofProductSales(productId);
+            case PRODUCT_VIEWED -> ofProductViewed(productId, date);
+            case PRODUCT_LIKED -> ofProductLiked(productId, date);
+            case PRODUCT_SALES -> ofProductSales(productId, date);
         };
     }
 
-    public static ProductMetric ofProductViewed(Long productId) {
-        return new ProductMetric(productId, 1L, 0L, 0L, ProductEventType.PRODUCT_VIEWED);
+    public static ProductMetric ofProductViewed(Long productId, String date) {
+        return new ProductMetric(productId, 1L, 0L, 0L, date, ProductEventType.PRODUCT_VIEWED);
     }
 
-    public static ProductMetric ofProductLiked(Long productId) {
-        return new ProductMetric(productId, 0L, 1L, 0L, ProductEventType.PRODUCT_LIKED);
+    public static ProductMetric ofProductLiked(Long productId, String date) {
+        return new ProductMetric(productId, 0L, 1L, 0L, date, ProductEventType.PRODUCT_LIKED);
     }
 
-    public static ProductMetric ofProductSales(Long productId) {
-        return new ProductMetric(productId, 0L, 0L, 1L, ProductEventType.PRODUCT_SALES);
+    public static ProductMetric ofProductSales(Long productId, String date) {
+        return new ProductMetric(productId, 0L, 0L, 1L, date, ProductEventType.PRODUCT_SALES);
     }
 
     public void increaseProductMetric(ProductEventType eventType) {

apps/commerce-streamer/src/main/java/com/loopers/domain/ProductMetricRepository.java

@@ -2,7 +2,7 @@
 
 
 public interface ProductMetricRepository {
-    ProductMetric findByProductId(Long productId);
+    ProductMetric findByProductIdAndDate(Long productId, String date);
 
     ProductMetric save(ProductMetric of);
 }

apps/commerce-streamer/src/main/java/com/loopers/infrastructure/ProductMetricJpaRepository.java

@@ -6,4 +6,6 @@
 
 public interface ProductMetricJpaRepository extends JpaRepository<ProductMetric, Long> {
     ProductMetric findByProductId(Long productId);
+
+    ProductMetric findByProductIdAndMetricDate(Long productId, String date);
 }

apps/commerce-streamer/src/main/java/com/loopers/infrastructure/ProductMetricRepositoryImpl.java

@@ -12,8 +12,8 @@ public class ProductMetricRepositoryImpl implements ProductMetricRepository {
     private final ProductMetricJpaRepository productMetricJpaRepository;
 
     @Override
-    public ProductMetric findByProductId(Long productId) {
-        return productMetricJpaRepository.findByProductId(productId);
+    public ProductMetric findByProductIdAndDate(Long productId, String date) {
+        return productMetricJpaRepository.findByProductIdAndMetricDate(productId, date);
     }
 
     @Override

apps/commerce-streamer/src/main/java/com/loopers/interfaces/consumer/KafkaOutboxConsumer.java

@@ -46,17 +46,19 @@ public void productViewedListener(
 
         Map<Long, Double> scoreDelta = new HashMap<>();
 
+        String date = LocalDate.now(KST).format(YYYYMMDD);
+
         for (var record : messages) {
             OutboxEvent value = objectMapper.readValue(record.value(), OutboxEvent.class);
             Long productId = value.aggregateId();
             ProductEventType eventType = ProductEventType.valueOf(value.eventType());
 
             scoreDelta.merge(productId, weight(eventType), Double::sum);
 
-            ProductMetric productMetric = productMetricRepository.findByProductId(productId);
+            ProductMetric productMetric = productMetricRepository.findByProductIdAndDate(productId, date);
 
             if (productMetric == null) {
-                ProductMetric newProductMetric = ProductMetric.of(productId, eventType);
+                ProductMetric newProductMetric = ProductMetric.of(productId, date, eventType);
 
                 productMetricRepository.save(newProductMetric);
             }
@@ -65,7 +67,7 @@ public void productViewedListener(
             }
         }
 
-        String key = "ranking:all:" + LocalDate.now(KST).format(YYYYMMDD);
+        String key = "ranking:all:" + date;
         ZSetOperations<String, String> zset = redisTemplate.opsForZSet();
 
         for (var e : scoreDelta.entrySet()) {
@@ -85,3 +87,4 @@ public void productViewedListener(
         };
     }
 }
+