refactor #197: DiscountController 태스트 결과에 따른 기존 코드 수정

Author: willjsw

src/main/java/com/irum/come2us/domain/discount/application/service/DiscountService.java

@@ -20,12 +20,14 @@
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 @Transactional
+@Slf4j
 public class DiscountService {
     private final DiscountRepository discountRepository;
     private final ProductRepository productRepository;
@@ -46,16 +48,20 @@ public DiscountInfoResponse findDiscountInfoByProduct(UUID productId) {
 
     @Transactional(readOnly = true)
     public DiscountInfoListResponse findDiscountInfoListByStore(
-            UUID storeId, UUID cursor, int pageSize) {
+            UUID storeId, UUID cursor, Integer size) {
         Store store = assertOwnerStore(storeId);
-        int limit = pageSize + 1;
+        if (size == null || (size != 10 && size != 30 && size != 50)) {
+            log.warn("허용되지 않은 size 요청: {} -> 기본값 10으로 대체", size);
+            size = 10;
+        }
+        int limit = size + 1;
         List<DiscountInfoResponse> discountList =
                 discountRepository.findDiscountListByCursor(store.getId(), cursor, limit);
 
-        boolean hasNext = discountList.size() > pageSize;
+        boolean hasNext = discountList.size() > size;
         UUID nextCursor = null;
         List<DiscountInfoResponse> responseList =
-                hasNext ? discountList.subList(0, pageSize) : discountList;
+                hasNext ? discountList.subList(0, size) : discountList;
         if (!responseList.isEmpty()) {
             nextCursor = responseList.get(responseList.size() - 1).discountId();
         }

src/main/java/com/irum/come2us/domain/discount/domain/repository/DiscountRepository.java

@@ -14,6 +14,6 @@ public interface DiscountRepository
             "SELECT CASE WHEN COUNT(d) > 0 THEN TRUE ELSE FALSE END FROM Discount d WHERE d.product.id = :productId")
     boolean existsByProductId(@Param("productId") UUID productId);
 
-    @Query("SELECT d FROM Discount d WHERE d.product.id = :productId")
+    @Query("SELECT d FROM Discount d JOIN FETCH d.product p WHERE d.product.id = :productId")
     Optional<Discount> findByProductId(@Param("productId") UUID productId);
 }

src/main/java/com/irum/come2us/domain/discount/presentation/controller/DiscountController.java

@@ -36,8 +36,8 @@ public DiscountInfoResponse getDiscountInfo(@PathVariable UUID productId) {
     public DiscountInfoListResponse getDiscountListInfoByStore(
             @PathVariable UUID storeId,
             @RequestParam(required = false) UUID cursor,
-            @RequestParam(required = false) Integer pageSize) {
-        return discountService.findDiscountInfoListByStore(storeId, cursor, pageSize);
+            @RequestParam(required = false) Integer size) {
+        return discountService.findDiscountInfoListByStore(storeId, cursor, size);
     }
 
     @PatchMapping("/discounts/{discountId}")

src/main/java/com/irum/come2us/domain/discount/presentation/dto/response/DiscountInfoListResponse.java

@@ -4,4 +4,4 @@
 import java.util.UUID;
 
 public record DiscountInfoListResponse(
-        List<DiscountInfoResponse> discountList, UUID nextCursor, boolean hasNext) {}
+        List<DiscountInfoResponse> discountInfoList, UUID nextCursor, boolean hasNext) {}

src/main/java/com/irum/come2us/domain/discount/presentation/dto/response/DiscountInfoResponse.java

@@ -1,12 +1,14 @@
 package com.irum.come2us.domain.discount.presentation.dto.response;
 
 import com.irum.come2us.domain.discount.domain.entity.Discount;
-import com.irum.come2us.domain.product.domain.entity.Product;
 import java.util.UUID;
 
-public record DiscountInfoResponse(UUID discountId, String name, int amount, Product product) {
+public record DiscountInfoResponse(UUID discountId, String name, int amount, UUID productId) {
     public static DiscountInfoResponse of(Discount discount) {
         return new DiscountInfoResponse(
-                discount.getId(), discount.getName(), discount.getAmount(), discount.getProduct());
+                discount.getId(),
+                discount.getName(),
+                discount.getAmount(),
+                discount.getProduct().getId());
     }
 }