Merge pull request #141 from sylee6529/round5

Round5

Author: sylee6529

apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java

@@ -4,8 +4,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import java.util.TimeZone;
 
+@EnableScheduling
 @ConfigurationPropertiesScan
 @SpringBootApplication
 public class CommerceApiApplication {

apps/commerce-api/src/main/java/com/loopers/application/like/LikeFacade.java

@@ -12,11 +12,11 @@ public class LikeFacade {
 
     private final LikeService likeService;
 
-    public void likeProduct(String memberId, Long productId) {
+    public void likeProduct(Long memberId, Long productId) {
         likeService.like(memberId, productId);
     }
 
-    public void unlikeProduct(String memberId, Long productId) {
+    public void unlikeProduct(Long memberId, Long productId) {
         likeService.unlike(memberId, productId);
     }
 }

apps/commerce-api/src/main/java/com/loopers/application/members/MemberFacade.java

@@ -19,7 +19,7 @@ public class MemberFacade {
     @Transactional
     public MemberInfo registerMember(String memberId, String email, String password, String birthDate, Gender gender) {
         Member member = memberService.registerMember(memberId, email, password, birthDate, gender);
-        pointService.initializeMemberPoints(memberId);
+        pointService.initializeMemberPoints(member.getId());  // Member PK 사용
         return MemberInfo.from(member);
     }
 

apps/commerce-api/src/main/java/com/loopers/application/order/OrderCommand.java

@@ -9,19 +9,19 @@
 @Builder
 public class OrderCommand {
 
-    private final String memberId;
+    private final Long memberId;
     private final List<OrderLineCommand> orderLines;
     private final Long memberCouponId;
 
-    public static OrderCommand of(String memberId, List<OrderLineCommand> orderLines) {
+    public static OrderCommand of(Long memberId, List<OrderLineCommand> orderLines) {
         return OrderCommand.builder()
                 .memberId(memberId)
                 .orderLines(orderLines)
                 .memberCouponId(null)
                 .build();
     }
 
-    public static OrderCommand of(String memberId, List<OrderLineCommand> orderLines, Long memberCouponId) {
+    public static OrderCommand of(Long memberId, List<OrderLineCommand> orderLines, Long memberCouponId) {
         return OrderCommand.builder()
                 .memberId(memberId)
                 .orderLines(orderLines)

apps/commerce-api/src/main/java/com/loopers/application/order/OrderInfo.java

@@ -14,7 +14,7 @@
 public class OrderInfo {
 
     private final Long id;
-    private final String memberId;
+    private final Long memberId;
     private final Money totalPrice;
     private final List<OrderItemInfo> items;
     private final ZonedDateTime orderedAt;

apps/commerce-api/src/main/java/com/loopers/application/product/CursorPageInfo.java

@@ -0,0 +1,23 @@
+package com.loopers.application.product;
+
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class CursorPageInfo<T> {
+
+    private final List<T> content;
+    private final String nextCursor;
+    private final boolean hasNext;
+
+    private CursorPageInfo(List<T> content, String nextCursor, boolean hasNext) {
+        this.content = content;
+        this.nextCursor = nextCursor;
+        this.hasNext = hasNext;
+    }
+
+    public static <T> CursorPageInfo<T> of(List<T> content, String nextCursor, boolean hasNext) {
+        return new CursorPageInfo<>(content, nextCursor, hasNext);
+    }
+}

apps/commerce-api/src/main/java/com/loopers/application/product/ProductCursorSearchCommand.java

@@ -0,0 +1,28 @@
+package com.loopers.application.product;
+
+import com.loopers.domain.product.enums.ProductSortCondition;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class ProductCursorSearchCommand {
+
+    private final Long brandId;
+    private final String keyword;
+    private final ProductSortCondition sort;
+    private final String cursor;
+    private final int size;
+    private final Long memberIdOrNull;
+
+    public static ProductCursorSearchCommand of(Long brandId, String keyword, ProductSortCondition sort, String cursor, int size, Long memberIdOrNull) {
+        return ProductCursorSearchCommand.builder()
+                .brandId(brandId)
+                .keyword(keyword)
+                .sort(sort)
+                .cursor(cursor)
+                .size(size)
+                .memberIdOrNull(memberIdOrNull)
+                .build();
+    }
+}

apps/commerce-api/src/main/java/com/loopers/application/product/ProductDetailInfo.java

@@ -1,13 +1,16 @@
 package com.loopers.application.product;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.loopers.domain.common.vo.Money;
 import com.loopers.domain.product.vo.Stock;
 import lombok.Builder;
 
 @Builder
+@JsonDeserialize(builder = ProductDetailInfo.ProductDetailInfoBuilder.class)
 public class ProductDetailInfo {
-    
+
     private final Long id;
     private final String name;
     private final String description;
@@ -17,7 +20,7 @@ public class ProductDetailInfo {
     private final Stock stock;
     private final int likeCount;
     private final boolean isLikedByMember;
-    
+
     public Long getId() { return id; }
     public String getName() { return name; }
     public String getDescription() { return description; }
@@ -26,7 +29,11 @@ public class ProductDetailInfo {
     public Money getPrice() { return price; }
     public Stock getStock() { return stock; }
     public int getLikeCount() { return likeCount; }
-    
+
     @JsonProperty("likedByMember")
     public boolean isLikedByMember() { return isLikedByMember; }
+
+    @JsonPOJOBuilder(withPrefix = "")
+    public static class ProductDetailInfoBuilder {
+    }
 }

apps/commerce-api/src/main/java/com/loopers/application/product/ProductFacade.java

@@ -1,39 +1,129 @@
 package com.loopers.application.product;
 
+import com.loopers.domain.like.service.LikeReadService;
 import com.loopers.domain.product.service.ProductReadService;
 import com.loopers.domain.product.command.ProductSearchFilter;
+import com.loopers.domain.product.enums.ProductSortCondition;
+import com.loopers.infrastructure.cache.ProductDetailCache;
+import com.loopers.infrastructure.cache.ProductListCache;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @RequiredArgsConstructor
 @Component
 @Transactional
 public class ProductFacade {
 
     private final ProductReadService productReadService;
+    private final LikeReadService likeReadService;
+    private final ProductDetailCache productDetailCache;
+    private final ProductListCache productListCache;
 
     @Transactional(readOnly = true)
     public Page<ProductSummaryInfo> getProducts(ProductSearchCommand command) {
+        // Cache only for LIKES_DESC sort
+        if (command.getSort() == ProductSortCondition.LIKES_DESC) {
+            return productListCache.get(
+                    command.getBrandId(),
+                    command.getSort(),
+                    command.getPage(),
+                    command.getSize()
+            ).orElseGet(() -> {
+                Page<ProductSummaryInfo> result = fetchProducts(command);
+                productListCache.set(
+                        command.getBrandId(),
+                        command.getSort(),
+                        command.getPage(),
+                        command.getSize(),
+                        result
+                );
+                return result;
+            });
+        }
+
+        return fetchProducts(command);
+    }
+
+    private Page<ProductSummaryInfo> fetchProducts(ProductSearchCommand command) {
         ProductSearchFilter filter = ProductSearchFilter.of(
+                command.getBrandId(),
                 command.getKeyword(),
                 command.getSort()
         );
 
         Pageable pageable = PageRequest.of(command.getPage(), command.getSize());
 
         return productReadService.getProducts(
-                filter, 
-                pageable, 
+                filter,
+                pageable,
                 command.getMemberIdOrNull()
         );
     }
 
     @Transactional(readOnly = true)
-    public ProductDetailInfo getProductDetail(Long productId, String memberIdOrNull) {
-        return productReadService.getProductDetail(productId, memberIdOrNull);
+    public CursorPageInfo<ProductSummaryInfo> getProductsByCursor(ProductCursorSearchCommand command) {
+        ProductSearchFilter filter = ProductSearchFilter.of(
+                command.getBrandId(),
+                command.getKeyword(),
+                command.getSort()
+        );
+
+        return productReadService.getProductsByCursor(
+                filter,
+                command.getCursor(),
+                command.getSize(),
+                command.getMemberIdOrNull()
+        );
+    }
+
+    @Transactional(readOnly = true)
+    public ProductDetailInfo getProductDetail(Long productId, Long memberIdOrNull) {
+        // 1. 캐시에서 상품 정보 조회 (isLikedByMember=false인 상태)
+        ProductDetailInfo cachedInfo = productDetailCache.get(productId)
+                .orElseGet(() -> {
+                    // 캐시 miss: DB 조회 (isLikedByMember는 나중에 계산)
+                    ProductDetailInfo result = productReadService.getProductDetail(productId, null);
+                    productDetailCache.set(productId, result);
+                    return result;
+                });
+
+        // 2. 로그인하지 않은 경우 바로 반환
+        if (memberIdOrNull == null) {
+            return cachedInfo;  // isLikedByMember=false 그대로
+        }
+
+        // 3. isLikedByMember만 동적 계산
+        boolean isLiked = likeReadService.isLikedBy(memberIdOrNull, productId);
+
+        // 4. isLikedByMember 필드만 교체해서 반환
+        return ProductDetailInfo.builder()
+                .id(cachedInfo.getId())
+                .name(cachedInfo.getName())
+                .description(cachedInfo.getDescription())
+                .brandName(cachedInfo.getBrandName())
+                .brandDescription(cachedInfo.getBrandDescription())
+                .price(cachedInfo.getPrice())
+                .stock(cachedInfo.getStock())
+                .likeCount(cachedInfo.getLikeCount())
+                .isLikedByMember(isLiked)  // ⭐ 동적 계산
+                .build();
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProductSummaryInfo> getPopularProducts(Long memberIdOrNull) {
+        // 캐시 제거 - 순수 DB 조회
+        return productReadService.getPopularProducts(memberIdOrNull);
+    }
+
+    @Transactional(readOnly = true)
+    public List<ProductSummaryInfo> getBrandPopularProducts(Long brandId, int limit, Long memberIdOrNull) {
+        // 캐시 제거 - 순수 DB 조회
+        return productReadService.getBrandPopularProducts(brandId, limit, memberIdOrNull);
     }
 }

apps/commerce-api/src/main/java/com/loopers/application/product/ProductSearchCommand.java

@@ -7,15 +7,17 @@
 @Getter
 @Builder
 public class ProductSearchCommand {
-    
+
+    private final Long brandId;
     private final String keyword;
     private final ProductSortCondition sort;
     private final int page;
     private final int size;
-    private final String memberIdOrNull;
-    
-    public static ProductSearchCommand of(String keyword, ProductSortCondition sort, int page, int size, String memberIdOrNull) {
+    private final Long memberIdOrNull;
+
+    public static ProductSearchCommand of(Long brandId, String keyword, ProductSortCondition sort, int page, int size, Long memberIdOrNull) {
         return ProductSearchCommand.builder()
+                .brandId(brandId)
                 .keyword(keyword)
                 .sort(sort)
                 .page(page)