feature: return/kg sell for rejected or expired products (#133)

* feature: add updateProductReturnState api * refactor: moved api location from clothingsales to product * refactor: save salesStartDate in clothingSales * fix: get products by userClothingSales api * refactor: use generic type and separate dto * chore: fix getProductsByUserClothingSales * chore: add swagger doc * chore: add swagger doc
Repick-official · Aug 11, 2024 · bd6abdf · bd6abdf
1 parent a57597a
commit bd6abdf
Show file tree

Hide file tree

Showing 19 changed files with 297 additions and 124 deletions.
diff --git a/src/main/java/com/example/repick/domain/clothingSales/api/ClothingSalesController.java b/src/main/java/com/example/repick/domain/clothingSales/api/ClothingSalesController.java
@@ -4,7 +4,6 @@
 import com.example.repick.domain.clothingSales.service.BagService;
 import com.example.repick.domain.clothingSales.service.BoxService;
 import com.example.repick.domain.clothingSales.service.ClothingSalesService;
-import com.example.repick.domain.product.entity.ProductStateType;
 import com.example.repick.global.page.DateCondition;
 import com.example.repick.global.page.PageCondition;
 import com.example.repick.global.page.PageResponse;
@@ -116,21 +115,6 @@ public SuccessResponse<Boolean> updateClothingSalesStatus(@RequestBody PostCloth
         return SuccessResponse.success(clothingSalesService.updateClothingSalesState(postClothingSalesState));
     }
 
-    @Operation(summary = "상품 종합 현황")
-    @GetMapping("/product-count")
-    public SuccessResponse<PageResponse<List<GetClothingSalesProductCount>>> getClothingSalesProductCount(@RequestParam(required = false) Long userId,
-                                                                                                          @ParameterObject PageCondition pageCondition) {
-        return SuccessResponse.success(clothingSalesService.getClothingSalesProductCount(userId, pageCondition));
-    }
-
-    @Operation(summary = "유저 상품 현황")
-    @GetMapping("/products/{clothingSalesId}/{productStateType}")
-    public SuccessResponse<PageResponse<List<GetClothingSalesProduct>>> getClothingSalesProduct(@PathVariable Long clothingSalesId,
-                                                                                  @PathVariable ProductStateType productStateType,
-                                                                                  @ParameterObject PageCondition pageCondition) {
-        return SuccessResponse.success(clothingSalesService.getClothingSalesProduct(clothingSalesId, productStateType, pageCondition));
-    }
-
     @Operation(summary = "옷장 정리 상품 무게 등록")
     @PatchMapping("/weight")
     public SuccessResponse<Boolean> updateClothingSalesWeight(@RequestBody PatchClothingSalesWeight patchClothingSalesWeight) {

diff --git a/src/main/java/com/example/repick/domain/clothingSales/dto/GetClothingSales.java b/src/main/java/com/example/repick/domain/clothingSales/dto/GetClothingSales.java
@@ -43,9 +43,9 @@ public static GetClothingSales of(ClothingSales clothingSales) {
                 .status(clothingSalesState.getAdminValue())
                 .requestDate(clothingSales.getCreatedDate().format(formatter))
                 .isForCollect(!ClothingSalesStateType.BEFORE_COLLECTION.contains(clothingSalesState))
-                .productStartDate(isSelling? clothingSales.getProductList().get(0).getSalesStartDate().format(formatter) : null)
-                .salesPeriod(isSelling? clothingSales.getProductList().get(0).getSalesStartDate().format(formatter)
-                        + " ~ " + clothingSales.getProductList().get(0).getSalesStartDate().plusDays(90).format(formatter) : null)
+                .productStartDate(isSelling? clothingSales.getSalesStartDate().format(formatter) : null)
+                .salesPeriod(isSelling? clothingSales.getSalesStartDate().format(formatter)
+                        + " ~ " + clothingSales.getSalesStartDate().plusDays(90).format(formatter) : null)
                 .settlementRequestDate(clothingSales.getUser().getSettlementRequestDate() != null ? clothingSales.getUser().getSettlementRequestDate().format(formatter) : null)
                 .settlementCompleteDate(clothingSales.getUser().getSettlementCompleteDate() != null ? clothingSales.getUser().getSettlementCompleteDate().format(formatter) : null)
                 .isRejected(isProducted? clothingSales.getProductList().stream().anyMatch(product -> product.getProductState() == ProductStateType.REJECTED) : null)

diff --git a/src/main/java/com/example/repick/domain/clothingSales/entity/ClothingSales.java b/src/main/java/com/example/repick/domain/clothingSales/entity/ClothingSales.java
@@ -61,6 +61,9 @@ public abstract class ClothingSales {
     @OneToMany(mappedBy = "clothingSales")
     private List<Product> productList;
 
+    private LocalDateTime salesStartDate; // 판매 시작일
+    private LocalDateTime returnRequestDate; // kg 매입요청/반송 요청일
+
     @CreatedDate
     @Column(updatable = false)
     private LocalDateTime createdDate;
@@ -94,4 +97,12 @@ public void updateBagCollectInfo(Integer bagQuantity, String postalCode, String
         this.address = new Address(postalCode, mainAddress, detailAddress);
         this.collectionDate = LocalDate.parse(collectionDate);
     }
+
+    public void updateSalesStartDate(LocalDateTime salesStartDate) {
+        this.salesStartDate = salesStartDate;
+    }
+
+    public void updateReturnRequestDate(LocalDateTime returnRequestDate) {
+        this.returnRequestDate = returnRequestDate;
+    }
 }
diff --git a/...main/java/com/example/repick/domain/clothingSales/repository/ClothingSalesRepository.java b/...main/java/com/example/repick/domain/clothingSales/repository/ClothingSalesRepository.java
@@ -14,6 +14,7 @@
 
 public interface ClothingSalesRepository extends JpaRepository<ClothingSales, Long> {
     Page<ClothingSales> findAllByOrderByCreatedDateDesc(Pageable pageable);
+    List<ClothingSales> findByClothingSalesState(ClothingSalesStateType clothingSalesStateType);
     List<ClothingSales> findByUserAndClothingSalesState(User user, ClothingSalesStateType clothingSalesStateType);
     Page<ClothingSales> findByCreatedDateBetweenOrderByCreatedDateDesc(LocalDateTime startDate, LocalDateTime endDate, Pageable pageable);
     List<ClothingSales> findByUserOrderByCreatedDateDesc(User user);

diff --git a/src/main/java/com/example/repick/domain/clothingSales/service/ClothingSalesService.java b/src/main/java/com/example/repick/domain/clothingSales/service/ClothingSalesService.java
@@ -47,11 +47,6 @@ public class ClothingSalesService {
     private final ClothingSalesStateRepository clothingSalesStateRepository;
     private final ProductOrderRepository productOrderRepository;
 
-    public void updateSellingExpired(Product product) {
-        ClothingSalesState clothingSalesState = ClothingSalesState.of(product.getClothingSales().getId(), ClothingSalesStateType.SELLING_EXPIRED);
-        clothingSalesStateRepository.save(clothingSalesState);
-    }
-
     public List<GetPendingClothingSales> getPendingClothingSales() {
         User user = userRepository.findByProviderId(SecurityContextHolder.getContext().getAuthentication().getName())
                 .orElseThrow(() -> new CustomException(USER_NOT_FOUND));
@@ -96,14 +91,14 @@ public Boolean updateProductPrice(List<PostProductPrice> postProductPriceList) {
         productList.forEach(product -> {
             productService.calculateDiscountPriceAndPredictDiscountRateAndSave(product);
             productService.changeSellingState(product, ProductStateType.SELLING);
-            product.updateSalesStartDate(LocalDateTime.now());
         });
         productRepository.saveAll(productList);
 
         ClothingSales clothingSales = productList.get(0).getClothingSales();
         ClothingSalesState clothingSalesState = ClothingSalesState.of(clothingSales.getId(), ClothingSalesStateType.SELLING);
         clothingSalesStateRepository.save(clothingSalesState);
         clothingSales.updateClothingSalesState(ClothingSalesStateType.SELLING);
+        clothingSales.updateSalesStartDate(LocalDateTime.now());
         clothingSalesRepository.save(clothingSales);
 
         return true;
@@ -121,8 +116,7 @@ public List<GetSellingClothingSales> getSellingClothingSales() {
             if(productList.isEmpty()) {
                 continue;
             }
-            LocalDateTime salesStartDate = productList.get(0).getSalesStartDate();
-            int remainingSalesDays = (int) ChronoUnit.DAYS.between(LocalDate.now(), salesStartDate.toLocalDate().plusDays(90));
+            int remainingSalesDays = (int) ChronoUnit.DAYS.between(LocalDate.now(), clothingSales.getSalesStartDate().toLocalDate().plusDays(90));
             int sellingQuantity = 0;
             int pendingQuantity = 0;
             int soldQuantity = 0;
@@ -139,7 +133,7 @@ public List<GetSellingClothingSales> getSellingClothingSales() {
                     }
                 }
             }
-            sellingClothingSalesList.add(GetSellingClothingSales.of(clothingSales, salesStartDate.format(DateTimeFormatter.ofPattern("yyyy.MM.dd")), remainingSalesDays, sellingQuantity, pendingQuantity, soldQuantity));
+            sellingClothingSalesList.add(GetSellingClothingSales.of(clothingSales, clothingSales.getSalesStartDate().format(DateTimeFormatter.ofPattern("yyyy.MM.dd")), remainingSalesDays, sellingQuantity, pendingQuantity, soldQuantity));
         }
         return sellingClothingSalesList;
 
@@ -208,12 +202,6 @@ public Boolean updateClothingSalesState(PostClothingSalesState postClothingSales
         return true;
     }
 
-    @Transactional
-    public PageResponse<List<GetClothingSalesProductCount>> getClothingSalesProductCount(Long userId, PageCondition pageCondition) {
-        Page<GetClothingSalesProductCount> pages = productRepository.getClothingSalesProductCount(pageCondition.toPageable(), userId);
-        return PageResponse.of(pages.getContent(), pages.getTotalPages(), pages.getTotalElements());
-    }
-
     @Transactional
     public void updateClothingSalesWeight(PatchClothingSalesWeight patchClothingSalesWeight) {
         ClothingSales clothingSales = clothingSalesRepository.findById(patchClothingSalesWeight.clothingSalesId())
@@ -222,17 +210,6 @@ public void updateClothingSalesWeight(PatchClothingSalesWeight patchClothingSale
         clothingSalesRepository.save(clothingSales);
     }
 
-    public PageResponse<List<GetClothingSalesProduct>> getClothingSalesProduct(Long clothingSalesId, ProductStateType productStateType, PageCondition pageCondition) {
-        Page<GetClothingSalesProduct> pages;
-        if (productStateType == ProductStateType.SELLING || productStateType == ProductStateType.SOLD_OUT) {
-            pages = productRepository.getClothingSalesPendingProduct(clothingSalesId, productStateType, pageCondition.toPageable());
-        }
-        else {
-            pages = productRepository.getClothingSalesCancelledProduct(clothingSalesId, productStateType, pageCondition.toPageable());
-        }
-        return PageResponse.of(pages.getContent(), pages.getTotalPages(), pages.getTotalElements());
-    }
-
     public GetClothingSalesUser getClothingSalesUser(Long clothingSalesId){
         ClothingSales clothingSales = clothingSalesRepository.findById(clothingSalesId)
                 .orElseThrow(() -> new CustomException(INVALID_CLOTHING_SALES_ID));

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
@@ -1,5 +1,6 @@
 package com.example.repick.domain.product.api;
 
+import com.example.repick.domain.product.dto.productClothingSales.GetProductCountClothingSales;
 import com.example.repick.domain.product.dto.product.*;
 import com.example.repick.domain.product.dto.productOrder.GetProductCart;
 import com.example.repick.domain.product.service.ProductService;
@@ -214,4 +215,45 @@ public SuccessResponse<GetProductDetail> getProductDetail(
         return SuccessResponse.success(productService.getProductDetail(productId));
     }
 
+    @Operation(summary = "상품 리턴 상태 변경",
+        description = """
+                    상품 리턴 상태 변경은 다음 상황에서 사용합니다:
+                    
+                    (리젝된 경우, 만료된 경우)
+                    
+                    사용자: kg 매입 신청/돌려받기 신청
+                    
+                    관리자: 반송 완료 업데이트
+                    
+                    **returnState: kg 매입, 반송 요청, 반송 완료**
+                    
+                    """)
+    @PatchMapping("/return")
+    public SuccessResponse<Boolean> patchProductReturn(@RequestBody PatchProductReturn patchProductReturn) {
+        return SuccessResponse.success(productService.updateProductReturnState(patchProductReturn));
+    }
+
+    @Operation(summary = "상품 종합 현황")
+    @GetMapping("/count")
+    public SuccessResponse<PageResponse<List<GetProductCountClothingSales>>> getProductCountByClothingSales(@RequestParam(required = false) Long userId,
+                                                                                                            @ParameterObject PageCondition pageCondition) {
+        return SuccessResponse.success(productService.getProductCountByClothingSales(userId, pageCondition));
+    }
+
+    @Operation(summary = "유저 상품 현황",
+            description = """
+                    
+                    productState: selling, sold-out, rejected, selling-end, kg-sell
+                    
+                    isExpired: kg 매입 화면에서만 사용 (true: 만료된 상품 조회, false: 리젝 상품 조회)
+                    
+                    """)
+    @GetMapping("/{clothingSalesId}/{productState}")
+    public SuccessResponse<PageResponse<List<?>>> getProductsByUserClothingSales(@PathVariable Long clothingSalesId,
+                                                                                                        @PathVariable String productState,
+                                                                                                        @ParameterObject PageCondition pageCondition,
+                                                                                                        @RequestParam(required = false) Boolean isExpired) {
+        return SuccessResponse.success(productService.getProductsByUserClothingSales(clothingSalesId, productState, isExpired, pageCondition));
+    }
+
 }
diff --git a/src/main/java/com/example/repick/domain/product/dto/product/PatchProductReturn.java b/src/main/java/com/example/repick/domain/product/dto/product/PatchProductReturn.java
@@ -0,0 +1,11 @@
+package com.example.repick.domain.product.dto.product;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.List;
+
+public record PatchProductReturn(
+        @Schema(description = "반품 상태") String returnState,
+        @Schema(description = "상품 id 목룍") List<Long> productIds
+        ) {
+}
diff --git a/...example/repick/domain/product/dto/productClothingSales/GetKgSellProductClothingSales.java b/...example/repick/domain/product/dto/productClothingSales/GetKgSellProductClothingSales.java
@@ -0,0 +1,14 @@
+package com.example.repick.domain.product.dto.productClothingSales;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record GetKgSellProductClothingSales(
+        @Schema(description = "상품코드") String productCode,
+        @Schema(description = "썸네일") String thumbnailImageUrl,
+        @Schema(description = "상품명") String productName,
+        @Schema(description = "등급") String grade,
+        @Schema(description = "신청일") String requestDate,
+        @Schema(description = "만료 여부 (kg 매입 경로용)") Boolean isExpired,
+        @Schema(description = "kg 매입 정산 상태") Boolean settlementStatus
+) {
+}
diff --git a/...les/dto/GetClothingSalesProductCount.java → ...ngSales/GetProductCountClothingSales.java b/...les/dto/GetClothingSalesProductCount.java → ...ngSales/GetProductCountClothingSales.java
@@ -1,10 +1,10 @@
-package com.example.repick.domain.clothingSales.dto;
+package com.example.repick.domain.product.dto.productClothingSales;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.time.LocalDateTime;
 
-public record GetClothingSalesProductCount (
+public record GetProductCountClothingSales(
         @Schema(description = "코드") String code,
         @Schema(description = "이름") String name,
         @Schema(description = "유저 ID") Long userId,

diff --git a/...ingSales/dto/GetClothingSalesProduct.java → ...othingSales/GetProductsClothingSales.java b/...ingSales/dto/GetClothingSalesProduct.java → ...othingSales/GetProductsClothingSales.java
@@ -1,17 +1,15 @@
-package com.example.repick.domain.clothingSales.dto;
+package com.example.repick.domain.product.dto.productClothingSales;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
-public record GetClothingSalesProduct(
+public record GetProductsClothingSales(
         @Schema(description = "상품코드") String productCode,
         @Schema(description = "썸네일") String thumbnailImageUrl,
         @Schema(description = "상품명") String productName,
         @Schema(description = "등급") String grade,
         @Schema(description = "판매기간") String salesPeriod,
         @Schema(description = "판매 금액") Long salesPrice,
         @Schema(description = "정산금") Long settlementPrice,
-        @Schema(description = "수수료") Long fee,
-        @Schema(description = "신청일") String requestDate,
-        @Schema(description = "반송 여부") Boolean isReturned
+        @Schema(description = "수수료") Long fee
 ) {
 }
diff --git a/...ample/repick/domain/product/dto/productClothingSales/GetReturnedProductClothingSales.java b/...ample/repick/domain/product/dto/productClothingSales/GetReturnedProductClothingSales.java
@@ -0,0 +1,12 @@
+package com.example.repick.domain.product.dto.productClothingSales;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record GetReturnedProductClothingSales(
+        @Schema(description = "상품코드") String productCode,
+        @Schema(description = "썸네일") String thumbnailImageUrl,
+        @Schema(description = "상품명") String productName,
+        @Schema(description = "등급") String grade,
+        @Schema(description = "신청일") String requestDate
+) {
+}
diff --git a/src/main/java/com/example/repick/domain/product/entity/Product.java b/src/main/java/com/example/repick/domain/product/entity/Product.java
@@ -9,7 +9,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter
@@ -46,9 +45,10 @@ public class Product extends BaseEntity {
     private Gender gender;
     @Column(length = 1000)
     private String thumbnailImageUrl;
-    private LocalDateTime salesStartDate;
     @Enumerated(EnumType.STRING)
     private ProductStateType productState;
+    @Enumerated(EnumType.STRING)
+    private ProductReturnStateType returnState; // 리젝되거나 만료된 상품의 상태
     private long settlement; // 정산금
 
     @OneToMany(mappedBy = "product", cascade = CascadeType.ALL)
@@ -162,14 +162,14 @@ public void updateThumbnailImageUrl(String thumbnailImageUrl) {
         this.thumbnailImageUrl = thumbnailImageUrl;
     }
 
-    public void updateSalesStartDate(LocalDateTime salesStartDate) {
-        this.salesStartDate = salesStartDate;
-    }
-
     public void updateProductState(ProductStateType productState) {
         this.productState = productState;
     }
 
+    public void updateReturnState(ProductReturnStateType returnState) {
+        this.returnState = returnState;
+    }
+
     public void updateSettlement(long settlement) {
         this.settlement = settlement;
     }

diff --git a/src/main/java/com/example/repick/domain/product/entity/ProductReturnStateType.java b/src/main/java/com/example/repick/domain/product/entity/ProductReturnStateType.java
@@ -0,0 +1,29 @@
+package com.example.repick.domain.product.entity;
+
+import com.example.repick.global.error.exception.CustomException;
+import com.example.repick.global.error.exception.ErrorCode;
+import lombok.Getter;
+
+@Getter
+public enum ProductReturnStateType {
+    KG_SELL(1, "KG 매입"),
+    RETURN_REQUESTED(2, "반송 요청"),
+    RETURN_COMPLETED(3, "반송 완료");
+
+    private final int id;
+    private final String value;
+
+    ProductReturnStateType(int id, String value) {
+        this.id = id;
+        this.value = value;
+    }
+
+    public static ProductReturnStateType fromValue(String keyword) {
+        for (ProductReturnStateType productReturnStateType : values()) {
+            if (productReturnStateType.getValue().equals(keyword)) {
+                return productReturnStateType;
+            }
+        }
+        throw new CustomException(ErrorCode.INVALID_PRODUCT_RETURN_STATE);
+    }
+}
diff --git a/src/main/java/com/example/repick/domain/product/entity/ProductStateType.java b/src/main/java/com/example/repick/domain/product/entity/ProductStateType.java
@@ -7,21 +7,23 @@
 @Getter
 public enum ProductStateType {
 
-    PREPARING(1, "판매준비중"),
-    SELLING(2, "판매중"),
-    SOLD_OUT(3, "판매완료"),
-    SETTLING(4, "정산중"),
-    SETTLED(5, "정산완료"),
-    REJECTED(6, "리젝됨"),
-    SELLING_END(7, "판매종료"),
-    RETURN_REQUESTED(8, "반품요청됨");
+    PREPARING(1, "판매준비중", "preparing"),
+    SELLING(2, "판매중", "selling"),
+    SOLD_OUT(3, "판매완료", "sold-out"),
+    SETTLING(4, "정산중", "settling"),
+    SETTLED(5, "정산완료", "settled"),
+    REJECTED(6, "리젝됨", "rejected"),
+    SELLING_END(7, "판매종료", "selling-end"),
+    RETURN_REQUESTED(8, "반품요청됨", "return-requested");
 
     private final int id;
     private final String value;
+    private final String engValue;
 
-    ProductStateType(int id, String value) {
+    ProductStateType(int id, String value, String engValue) {
         this.id = id;
         this.value = value;
+        this.engValue = engValue;
     }
 
     public static ProductStateType fromId(int id) {
@@ -41,4 +43,13 @@ public static ProductStateType fromValue(String keyword) {
         }
         throw new CustomException(ErrorCode.INVALID_SELLING_STATE_NAME);
     }
+
+    public static ProductStateType fromEngValue(String keyword) {
+        for (ProductStateType productStateType : values()) {
+            if (productStateType.getEngValue().equals(keyword)) {
+                return productStateType;
+            }
+        }
+        throw new CustomException(ErrorCode.INVALID_SELLING_STATE_NAME);
+    }
 }