Refactor/product (#41)

* refactor: delete unused field in dto * refactor: get products * refactor: productRepository findProducts * refactor: productSellingStateType parameter
Repick-official · Apr 26, 2024 · 1316e36 · 1316e36
1 parent b1c9711
commit 1316e36
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 276 deletions.
diff --git a/src/main/java/com/example/repick/domain/product/api/ProductController.java b/src/main/java/com/example/repick/domain/product/api/ProductController.java
@@ -70,14 +70,16 @@ public SuccessResponse<List<GetProductThumbnail>> getMainPageRecommendation(
         return SuccessResponse.success(productService.getMainPageRecommendation(gender, cursorId, pageSize));
     }
 
-    @Operation(summary = "최신순 조회",
-            description = """
-                    최신순으로 상품 리스트 페이지를 조회합니다. 무한스크롤 방식을 사용합니다.
+    @Operation(summary = "상품 조회",
+        description = """
+                    최신순, 가격 낮은순, 가격 높은순, 할인율 높은순으로 상품 리스트 페이지를 조회합니다.
+                    무한스크롤 방식을 사용합니다.
                     
                     각각의 파라미터는 옵셔널입니다.
                     """)
-    @GetMapping("/latest")
-    public SuccessResponse<List<GetProductThumbnail>> getLatestProduct(
+    @GetMapping("/{type}")
+    public SuccessResponse<List<GetProductThumbnail>> getProducts(
+            @Parameter(description = "조회 타입 (latest, lowest-price, highest-price, highest-discount)") @PathVariable String type,
             @Parameter(description = "조회 의류 성별") @RequestParam(required = false) String gender,
             @Parameter(description = "카테고리") @RequestParam(required = false) String category,
             @Parameter(description = "스타일") @RequestParam(required = false) List<String> styles,
@@ -88,74 +90,8 @@ public SuccessResponse<List<GetProductThumbnail>> getLatestProduct(
             @Parameter(description = "사이즈") @RequestParam(required = false) List<String> sizes,
             @Parameter(description = "1번째 페이지 조회시 null, " +
                     "2번째 이상 페이지 조회시 직전 페이지의 마지막 episode id") @RequestParam(required = false) Long cursorId,
-            @Parameter(description = "한 페이지에 가져올 에피소드 개수, 기본값 4") @RequestParam(required = false) Integer pageSize) {
-        return SuccessResponse.success(productService.getLatest(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize));
-    }
-
-    @Operation(summary = "가격 낮은순 조회",
-            description = """
-                    가격 낮은순으로 상품 리스트 페이지를 조회합니다. 무한스크롤 방식을 사용합니다.
-                    
-                    각각의 파라미터는 옵셔널입니다.
-                    """)
-    @GetMapping("/lowest-price")
-    public SuccessResponse<List<GetProductThumbnail>> getLowestProduct(
-            @Parameter(description = "조회 의류 성별") @RequestParam(required = false) String gender,
-            @Parameter(description = "카테고리") @RequestParam(required = false) String category,
-            @Parameter(description = "스타일") @RequestParam(required = false) List<String> styles,
-            @Parameter(description = "최소 가격") @RequestParam(required = false) Long minPrice,
-            @Parameter(description = "최대 가격") @RequestParam(required = false) Long maxPrice,
-            @Parameter(description = "브랜드") @RequestParam(required = false) List<String> brandNames,
-            @Parameter(description = "상품등급") @RequestParam(required = false) List<String> qualityRates,
-            @Parameter(description = "사이즈") @RequestParam(required = false) List<String> sizes,
-            @Parameter(description = "1번째 페이지 조회시 null, " +
-                    "2번째 이상 페이지 조회시 직전 페이지의 마지막 episode id") @RequestParam(required = false) Long cursorId,
-            @Parameter(description = "한 페이지에 가져올 에피소드 개수, 기본값 4") @RequestParam(required = false) Integer pageSize) {
-        return SuccessResponse.success(productService.getLowest(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize));
-    }
-
-    @Operation(summary = "가격 높은순 조회",
-            description = """
-                    가격 높은순으로 상품 리스트 페이지를 조회합니다. 무한스크롤 방식을 사용합니다.
-                    
-                    각각의 파라미터는 옵셔널입니다.
-                    """)
-    @GetMapping("/highest-price")
-    public SuccessResponse<List<GetProductThumbnail>> getHighestProduct(
-            @Parameter(description = "조회 의류 성별") @RequestParam(required = false) String gender,
-            @Parameter(description = "카테고리") @RequestParam(required = false) String category,
-            @Parameter(description = "스타일") @RequestParam(required = false) List<String> styles,
-            @Parameter(description = "최소 가격") @RequestParam(required = false) Long minPrice,
-            @Parameter(description = "최대 가격") @RequestParam(required = false) Long maxPrice,
-            @Parameter(description = "브랜드") @RequestParam(required = false) List<String> brandNames,
-            @Parameter(description = "상품등급") @RequestParam(required = false) List<String> qualityRates,
-            @Parameter(description = "사이즈") @RequestParam(required = false) List<String> sizes,
-            @Parameter(description = "1번째 페이지 조회시 null, " +
-                    "2번째 이상 페이지 조회시 직전 페이지의 마지막 episode id") @RequestParam(required = false) Long cursorId,
-            @Parameter(description = "한 페이지에 가져올 에피소드 개수, 기본값 4") @RequestParam(required = false) Integer pageSize) {
-        return SuccessResponse.success(productService.getHighest(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize));
-    }
-
-    @Operation(summary = "할인율 높은순 조회",
-            description = """
-                    할인율 높은순으로 상품 리스트 페이지를 조회합니다. 무한스크롤 방식을 사용합니다.
-                    
-                    각각의 파라미터는 옵셔널입니다.
-                    """)
-    @GetMapping("/highest-discount")
-    public SuccessResponse<List<GetProductThumbnail>> getHighestDiscountProduct(
-            @Parameter(description = "조회 의류 성별") @RequestParam(required = false) String gender,
-            @Parameter(description = "카테고리") @RequestParam(required = false) String category,
-            @Parameter(description = "스타일") @RequestParam(required = false) List<String> styles,
-            @Parameter(description = "최소 가격") @RequestParam(required = false) Long minPrice,
-            @Parameter(description = "최대 가격") @RequestParam(required = false) Long maxPrice,
-            @Parameter(description = "브랜드") @RequestParam(required = false) List<String> brandNames,
-            @Parameter(description = "상품등급") @RequestParam(required = false) List<String> qualityRates,
-            @Parameter(description = "사이즈") @RequestParam(required = false) List<String> sizes,
-            @Parameter(description = "1번째 페이지 조회시 null, " +
-                    "2번째 이상 페이지 조회시 직전 페이지의 마지막 episode id") @RequestParam(required = false) Long cursorId,
-            @Parameter(description = "한 페이지에 가져올 에피소드 개수, 기본값 4") @RequestParam(required = false) Integer pageSize) {
-        return SuccessResponse.success(productService.getHighestDiscount(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize));
+            @Parameter(description = "한 페이지에 가져올 에피소드 개수, 기본값 4") @RequestParam(required = false) Integer pageSize){
+        return SuccessResponse.success(productService.getProducts(type, gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize));
     }
 
     // TODO: !!ADMIN ACCESS REQUIRED!!

diff --git a/src/main/java/com/example/repick/domain/product/dto/PostPayment.java b/src/main/java/com/example/repick/domain/product/dto/PostPayment.java
@@ -8,6 +8,5 @@
 public record PostPayment(
         @Schema(description = "결제 고유번호") String iamportUid,
         @Schema(description = "주문 아이디") String merchantUid,
-        @Schema(description = "결제 금액") Long paymentAmount,
         Address address) {
 }
diff --git a/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryCustom.java b/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryCustom.java
@@ -20,8 +20,7 @@ List<GetProductThumbnail> findLatestProducts(
             List<String> sizes,
             Long cursorId,
             Integer pageSize,
-            Long userId,
-            ProductSellingStateType productSellingStateType);
+            Long userId);
 
     List<GetProductThumbnail> findLowestProducts(
             String gender,
@@ -34,8 +33,7 @@ List<GetProductThumbnail> findLowestProducts(
             List<String> sizes,
             Long cursorId,
             Integer pageSize,
-            Long userId,
-            ProductSellingStateType productSellingStateType);
+            Long userId);
 
     List<GetProductThumbnail> findHighestProducts(
             String gender,
@@ -48,8 +46,7 @@ List<GetProductThumbnail> findHighestProducts(
             List<String> sizes,
             Long cursorId,
             Integer pageSize,
-            Long userId,
-            ProductSellingStateType productSellingStateType);
+            Long userId);
 
     List<GetProductThumbnail> findHighestDiscountProducts(
             String gender,
@@ -62,8 +59,7 @@ List<GetProductThumbnail> findHighestDiscountProducts(
             List<String> sizes,
             Long cursorId,
             Integer pageSize,
-            Long userId,
-            ProductSellingStateType productSellingStateType);
+            Long userId);
 
     List<GetProductThumbnail> findMainPageRecommendation(Long cursorId, Integer pageSize, Long userId, String gender, ProductSellingStateType productSellingStateType);
 

diff --git a/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryImpl.java b/src/main/java/com/example/repick/domain/product/repository/ProductRepositoryImpl.java
@@ -7,6 +7,7 @@
 import com.example.repick.domain.product.entity.Gender;
 import com.example.repick.domain.product.entity.ProductSellingStateType;
 import com.example.repick.domain.product.entity.Style;
+import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
@@ -29,8 +30,7 @@ public class ProductRepositoryImpl implements ProductRepositoryCustom {
 
     private final JPAQueryFactory jpaQueryFactory;
 
-    @Override
-    public List<GetProductThumbnail> findLatestProducts(
+    private List<GetProductThumbnail> findProducts(
             String gender,
             String category,
             List<String> styles,
@@ -42,7 +42,7 @@ public List<GetProductThumbnail> findLatestProducts(
             Long cursorId,
             Integer pageSize,
             Long userId,
-            ProductSellingStateType productSellingStateType) {
+            OrderSpecifier<?> orderBy) {
 
         return jpaQueryFactory
                 .select(Projections.constructor(GetProductThumbnail.class,
@@ -74,8 +74,8 @@ public List<GetProductThumbnail> findLatestProducts(
                         sizesFilter(sizes),
                         ltProductId(cursorId),
                         deletedFilter(),
-                        sellingStateFilter(productSellingStateType))
-                .orderBy(product.id.desc())
+                        sellingStateFilter(ProductSellingStateType.SELLING))
+                .orderBy(orderBy)
                 .limit(pageSize)
                 .fetch()
                 .stream()
@@ -84,165 +84,31 @@ public List<GetProductThumbnail> findLatestProducts(
     }
 
     @Override
-    public List<GetProductThumbnail> findLowestProducts(
-            String gender,
-            String category,
-            List<String> styles,
-            Long minPrice,
-            Long maxPrice,
-            List<String> brandNames,
-            List<String> qualityRates,
-            List<String> sizes,
-            Long cursorId,
-            Integer pageSize,
-            Long userId,
-            ProductSellingStateType productSellingStateType) {
+    public List<GetProductThumbnail> findLatestProducts(
+            String gender, String category, List<String> styles, Long minPrice, Long maxPrice, List<String> brandNames,
+            List<String> qualityRates, List<String> sizes, Long cursorId, Integer pageSize, Long userId) {
+        return findProducts(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize, userId, product.id.desc());
+    }
 
-        return jpaQueryFactory
-                .select(Projections.constructor(GetProductThumbnail.class,
-                        product.id,
-                        product.thumbnailImageUrl,
-                        product.productName,
-                        product.price,
-                        product.discountRate,
-                        product.brandName,
-                        product.qualityRate.stringValue(),
-                        productLike.id.isNotNull()))
-                .from(product)
-                .leftJoin(productLike)
-                .on(product.id.eq(productLike.productId)
-                        .and(productLike.userId.eq(userId)))
-                .leftJoin(productStyle)
-                .on(product.id.eq(productStyle.product.id))
-                .leftJoin(productCategory)
-                .on(product.id.eq(productCategory.product.id))
-                .leftJoin(productSellingState)
-                .on(product.id.eq(productSellingState.productId))
-                .where(
-                        genderFilter(gender),
-                        categoryFilter(category),
-                        stylesFilter(styles),
-                        priceFilter(minPrice, maxPrice),
-                        brandFilter(brandNames),
-                        qualityFilter(qualityRates),
-                        sizesFilter(sizes),
-                        ltProductId(cursorId),
-                        deletedFilter(),
-                        sellingStateFilter(productSellingStateType))
-                .orderBy(product.price.asc())
-                .limit(pageSize)
-                .fetch()
-                .stream()
-                .distinct()
-                .collect(Collectors.toList());
+    @Override
+    public List<GetProductThumbnail> findLowestProducts(
+            String gender, String category, List<String> styles, Long minPrice, Long maxPrice, List<String> brandNames,
+            List<String> qualityRates, List<String> sizes, Long cursorId, Integer pageSize, Long userId) {
+        return findProducts(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize, userId, product.price.asc());
     }
 
     @Override
     public List<GetProductThumbnail> findHighestProducts(
-            String gender,
-            String category,
-            List<String> styles,
-            Long minPrice,
-            Long maxPrice,
-            List<String> brandNames,
-            List<String> qualityRates,
-            List<String> sizes,
-            Long cursorId,
-            Integer pageSize,
-            Long userId,
-            ProductSellingStateType productSellingStateType) {
-
-        return jpaQueryFactory
-                .select(Projections.constructor(GetProductThumbnail.class,
-                        product.id,
-                        product.thumbnailImageUrl,
-                        product.productName,
-                        product.price,
-                        product.discountRate,
-                        product.brandName,
-                        product.qualityRate.stringValue(),
-                        productLike.id.isNotNull()))
-                .from(product)
-                .leftJoin(productLike)
-                .on(product.id.eq(productLike.productId)
-                        .and(productLike.userId.eq(userId)))
-                .leftJoin(productStyle)
-                .on(product.id.eq(productStyle.product.id))
-                .leftJoin(productCategory)
-                .on(product.id.eq(productCategory.product.id))
-                .leftJoin(productSellingState)
-                .on(product.id.eq(productSellingState.productId))
-                .where(
-                        genderFilter(gender),
-                        categoryFilter(category),
-                        stylesFilter(styles),
-                        priceFilter(minPrice, maxPrice),
-                        brandFilter(brandNames),
-                        qualityFilter(qualityRates),
-                        sizesFilter(sizes),
-                        ltProductId(cursorId),
-                        deletedFilter(),
-                        sellingStateFilter(productSellingStateType))
-                .orderBy(product.price.desc())
-                .limit(pageSize)
-                .fetch()
-                .stream()
-                .distinct()
-                .collect(Collectors.toList());
+            String gender, String category, List<String> styles, Long minPrice, Long maxPrice, List<String> brandNames,
+            List<String> qualityRates, List<String> sizes, Long cursorId, Integer pageSize, Long userId) {
+        return findProducts(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize, userId, product.price.desc());
     }
 
     @Override
     public List<GetProductThumbnail> findHighestDiscountProducts(
-            String gender,
-            String category,
-            List<String> styles,
-            Long minPrice,
-            Long maxPrice,
-            List<String> brandNames,
-            List<String> qualityRates,
-            List<String> sizes,
-            Long cursorId,
-            Integer pageSize,
-            Long userId,
-            ProductSellingStateType productSellingStateType) {
-
-        return jpaQueryFactory
-                .select(Projections.constructor(GetProductThumbnail.class,
-                        product.id,
-                        product.thumbnailImageUrl,
-                        product.productName,
-                        product.price,
-                        product.discountRate,
-                        product.brandName,
-                        product.qualityRate.stringValue(),
-                        productLike.id.isNotNull()))
-                .from(product)
-                .leftJoin(productLike)
-                .on(product.id.eq(productLike.productId)
-                        .and(productLike.userId.eq(userId)))
-                .leftJoin(productStyle)
-                .on(product.id.eq(productStyle.product.id))
-                .leftJoin(productCategory)
-                .on(product.id.eq(productCategory.product.id))
-                .leftJoin(productSellingState)
-                .on(product.id.eq(productSellingState.productId))
-                .where(
-                        genderFilter(gender),
-                        categoryFilter(category),
-                        stylesFilter(styles),
-                        priceFilter(minPrice, maxPrice),
-                        brandFilter(brandNames),
-                        qualityFilter(qualityRates),
-                        sizesFilter(sizes),
-                        ltProductId(cursorId),
-                        deletedFilter(),
-                        sellingStateFilter(productSellingStateType))
-                .orderBy(product.discountRate.desc())
-                .limit(pageSize)
-                .fetch()
-                .stream()
-                .distinct()
-                .collect(Collectors.toList());
+            String gender, String category, List<String> styles, Long minPrice, Long maxPrice, List<String> brandNames,
+            List<String> qualityRates, List<String> sizes, Long cursorId, Integer pageSize, Long userId) {
+        return findProducts(gender, category, styles, minPrice, maxPrice, brandNames, qualityRates, sizes, cursorId, pageSize, userId, product.discountRate.desc());
     }
 
     @Override