[FEAT] 세일 탭 조회 기능 구현

devchlee12 · devchlee12 · commit 2d2a49a80546 · 2024-11-06T23:34:29.000+09:00
diff --git a/src/main/java/com/freshman/freshmanbackend/domain/product/controller/ProductController.java b/src/main/java/com/freshman/freshmanbackend/domain/product/controller/ProductController.java
@@ -13,6 +13,7 @@
 import com.freshman.freshmanbackend.domain.product.dto.request.ReviewCommentModifyRequest;
 import com.freshman.freshmanbackend.domain.product.dto.request.ReviewEntryRequest;
 import com.freshman.freshmanbackend.domain.product.dto.request.ReviewModifyRequest;
+import com.freshman.freshmanbackend.domain.product.dto.request.SaleProductListRequest;
 import com.freshman.freshmanbackend.domain.product.dto.response.ProductRankingResponse;
 import com.freshman.freshmanbackend.domain.product.service.SearchLogService;
 import com.freshman.freshmanbackend.domain.product.service.command.category.ProductCategoryDeleteService;
@@ -420,4 +421,13 @@ public ResponseEntity<?> getRankingProducts() {
         ProductRankingResponse rankingProducts = productListService.getRankingProducts();
         return ResponseEntity.ok(new ListResponse(rankingProducts.getProducts()));
     }
+
+    /**
+     * 세일 상품 조회
+     */
+    @GetMapping("/sale-rank")
+    public ResponseEntity<?> getSaleRanks(@ModelAttribute SaleProductListRequest request) {
+        NoOffsetPageResponse saleList = productListService.getSaleList(request);
+        return ResponseEntity.ok(saleList);
+    }
 }
diff --git a/src/main/java/com/freshman/freshmanbackend/domain/product/dao/ProductListDao.java b/src/main/java/com/freshman/freshmanbackend/domain/product/dao/ProductListDao.java
@@ -6,6 +6,7 @@
 import com.freshman.freshmanbackend.domain.product.domain.enums.ProductSortType;
 import com.freshman.freshmanbackend.domain.product.dto.request.ProductListRequest;
 import com.freshman.freshmanbackend.domain.product.dto.request.ProductSearchRequest;
+import com.freshman.freshmanbackend.domain.product.dto.request.SaleProductListRequest;
 import com.freshman.freshmanbackend.domain.product.dto.response.ProductListResponse;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.ConstructorExpression;
@@ -65,6 +66,23 @@ public List<Long> getProductsPageSeqList(ProductListRequest param) {
                 .fetch();
     }
 
+    /**
+     * 세일 상품 아이디 목록 조회
+     *
+     * @param request
+     * @return
+     */
+    public List<Long> getSaleProductPageList(SaleProductListRequest request) {
+        QProductSale sale = QProductSale.productSale;
+
+        return queryFactory.select(sale.productSeq)
+                .from(sale)
+                .where(getSaleCondition(request))
+                .orderBy(sale.productSeq.desc())
+                .limit(PAGE_SIZE + 1)
+                .fetch();
+    }
+
     /**
      * 상품 정보 조회
      *
@@ -175,6 +193,21 @@ private BooleanBuilder getCondition(ProductListRequest param) {
         return booleanBuilder;
     }
 
+    private BooleanBuilder getSaleCondition(SaleProductListRequest request) {
+        BooleanBuilder booleanBuilder = new BooleanBuilder();
+        LocalDateTime now = LocalDateTime.now();
+        QProductSale sale = QProductSale.productSale;
+
+        booleanBuilder.and(sale.saleStartAt.loe(now));
+        booleanBuilder.and(sale.saleEndAt.gt(now));
+
+        if (request.getNextSeq() != null) {
+            booleanBuilder.and(sale.productSeq.loe(request.getNextSeq()));
+        }
+
+        return booleanBuilder;
+    }
+
     /**
      * 상품 검색 조회 조건 반환
      */
diff --git a/src/main/java/com/freshman/freshmanbackend/domain/product/dto/request/SaleProductListRequest.java b/src/main/java/com/freshman/freshmanbackend/domain/product/dto/request/SaleProductListRequest.java
@@ -0,0 +1,13 @@
+package com.freshman.freshmanbackend.domain.product.dto.request;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Getter
+public class SaleProductListRequest {
+    /**
+     * 다음에 읽어올 productSeq
+     */
+    private Long nextSeq;
+}
diff --git a/src/main/java/com/freshman/freshmanbackend/domain/product/service/query/product/ProductListService.java b/src/main/java/com/freshman/freshmanbackend/domain/product/service/query/product/ProductListService.java
@@ -4,6 +4,7 @@
 import com.freshman.freshmanbackend.domain.product.domain.enums.ProductSortType;
 import com.freshman.freshmanbackend.domain.product.dto.request.ProductListRequest;
 import com.freshman.freshmanbackend.domain.product.dto.request.ProductSearchRequest;
+import com.freshman.freshmanbackend.domain.product.dto.request.SaleProductListRequest;
 import com.freshman.freshmanbackend.domain.product.dto.response.ProductListResponse;
 import com.freshman.freshmanbackend.domain.product.dto.response.ProductRankingResponse;
 import com.freshman.freshmanbackend.domain.product.service.SearchLogService;
@@ -35,7 +36,7 @@ public class ProductListService {
      */
     @Transactional(readOnly = true)
     public NoOffsetPageResponse getList(ProductListRequest param) {
-        Boolean isEnd = true;
+        boolean isEnd = true;
         Long nextSeq = null;
         Long nextPrice = null;
         Integer nextOrderCount = null;
@@ -69,7 +70,7 @@ public NoOffsetPageResponse getList(ProductListRequest param) {
      */
     @Transactional(readOnly = true)
     public NoOffsetPageResponse getList(ProductSearchRequest param) {
-        Boolean isEnd = true;
+        boolean isEnd = true;
         // 최근 검색어 등록
         searchLogService.entry(param.getKeyword());
         List<ProductListResponse> products = productListDao.select(param);
@@ -80,9 +81,15 @@ public NoOffsetPageResponse getList(ProductSearchRequest param) {
         return new NoOffsetPageResponse(products, isEnd);
     }
 
+    /**
+     * 어드민용 전체 상품 조회
+     *
+     * @param page 페이지
+     * @return 상품 리스트
+     */
     @Transactional(readOnly = true)
     public NoOffsetPageResponse getAllList(int page) {
-        Boolean isEnd = true;
+        boolean isEnd = true;
         List<ProductListResponse> products = productListDao.selectAll(page);
         if (products.size() == PAGE_SIZE + 1) {
             products.remove(PAGE_SIZE);
@@ -91,6 +98,25 @@ public NoOffsetPageResponse getAllList(int page) {
         return new NoOffsetPageResponse(products, isEnd);
     }
 
+    /**
+     * 세일 상품 목록 조회
+     */
+    @Transactional(readOnly = true)
+    public NoOffsetPageResponse getSaleList(SaleProductListRequest request) {
+        List<Long> products = productListDao.getSaleProductPageList(request);
+        if (products.size() == PAGE_SIZE + 1) {
+            Long nextSeq = products.get(PAGE_SIZE);
+            products.remove(PAGE_SIZE);
+            List<ProductListResponse> productInfos = productListDao.getProductInfo(products,
+                    ProductSortType.NEWEST.getCode());
+            return new NoOffsetPageResponse(productInfos, false, nextSeq);
+        } else {
+            List<ProductListResponse> productInfos = productListDao.getProductInfo(products,
+                    ProductSortType.NEWEST.getCode());
+            return new NoOffsetPageResponse(productInfos, true);
+        }
+    }
+
     /**
      * 랭킹 조회
      */
@@ -103,6 +129,9 @@ public ProductRankingResponse getRankingProducts() {
         return new ProductRankingResponse(productInfo);
     }
 
+    /**
+     * 캐시 최신화
+     */
     @CachePut(value = "ranking")
     public ProductRankingResponse cacheUpdate() {
         List<Long> productsPageSeqList = productListDao.getProductsPageSeqList(
diff --git a/src/main/java/com/freshman/freshmanbackend/global/common/response/NoOffsetPageResponse.java b/src/main/java/com/freshman/freshmanbackend/global/common/response/NoOffsetPageResponse.java
@@ -30,12 +30,10 @@ public NoOffsetPageResponse(Collection<?> list, Boolean isEnd, Long nextSeq, Lon
         this.nextOrderCount = nextOrderCount;
     }
 
-    public NoOffsetPageResponse(Collection<?> list, Boolean isEnd, Long nextSeq,
-                                Integer nextOrderCount) {
+    public NoOffsetPageResponse(Collection<?> list, Boolean isEnd, Long nextSeq) {
         this.list = list;
         this.isEnd = isEnd;
         this.count = list == null ? 0 : list.size();
         this.nextSeq = nextSeq;
-        this.nextOrderCount = nextOrderCount;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,10 @@ public NoOffsetPageResponse(Collection<?> list, Boolean isEnd, Long nextSeq, Lon`
`30`	`30`	`this.nextOrderCount = nextOrderCount;`
`31`	`31`	`}`
`32`	`32`
`33`		`- public NoOffsetPageResponse(Collection<?> list, Boolean isEnd, Long nextSeq,`
`34`		`- Integer nextOrderCount) {`
	`33`	`+ public NoOffsetPageResponse(Collection<?> list, Boolean isEnd, Long nextSeq) {`
`35`	`34`	`this.list = list;`
`36`	`35`	`this.isEnd = isEnd;`
`37`	`36`	`this.count = list == null ? 0 : list.size();`
`38`	`37`	`this.nextSeq = nextSeq;`
`39`		`- this.nextOrderCount = nextOrderCount;`
`40`	`38`	`}`
`41`	`39`	`}`