Refactor: create parent class for BoxCollect, BagCollect (#119)

* refactor: create parent class for BoxCollect, BagCollect

* chore: delete unused import

* fix: get user Info from clothingSalesId

* fix: get clothingSales api

* refactor: builder pattern in dto

* fix: enable createdDate on clothingSales

* fix: register product

* fix: get ClothingSalesProductCount

* refactor: reduce query for pendingClothingSales

src/main/java/com/example/repick/domain/clothingSales/api/ClothingSalesController.java

@@ -25,7 +25,7 @@ public class ClothingSalesController {
 
     @Operation(summary = "백 초기 요청", description = """
             백 초기 요청을 합니다.
-            백 초기 요청 등록 시 '대기중' 상태로 등록됩니다.
+            백 초기 요청 등록 시 '신청 완료' 상태로 등록됩니다.
             
             MediaType: multipart/form-data
             """)
@@ -36,7 +36,7 @@ public SuccessResponse<BagInitResponse> handleBagInit(@ModelAttribute PostBagIni
 
     @Operation(summary = "백 수거 요청", description = """
             백 수거 요청을 합니다.
-            백 수거 요청 등록 시 '대기중' 상태로 등록됩니다.
+            백 수거 요청 등록 시 '신청 완료' 상태로 등록됩니다.
             
             MediaType: multipart/form-data
             """)
@@ -47,8 +47,8 @@ public SuccessResponse<BagCollectResponse> handleRepickBagCollectionRequest(@Mod
 
     @Operation(summary = "박스 수거 요청", description = """
             박스 수거 요청을 합니다.
-            박스 수거 요청 등록 시 '대기중' 상태로 등록됩니다.
-            
+            박스 수거 요청 등록 시 '신청 완료' 상태로 등록됩니다.
+           
             MediaType: multipart/form-data
             """)
     @PostMapping(value = "/box/collection", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@@ -58,28 +58,14 @@ public SuccessResponse<BoxCollectResponse> handleBoxCollectionRequest(@ModelAttr
 
     @Operation(summary = "옷장 정리 통합 조회: 진행 중인 수거", description = """
             옷장 정리 통합 조회: 진행 중인 수거, 신청 완료일 순으로 정렬되어 리스트로 반환합니다.
-            - id: 수거 ID, '백 수거 요청' 시 '백 요청 ID'를 조회하기 위해 사용됩니다.
-            - clothingSalesCount: 수거 회차(각각의 유저에 대해 고유한 값입니다).
-            - type: 박스/백
-            - requestDate: 신청 완료일
-            - bagArriveDate: 백 도착일 (박스의 경우 항상 null)
-            - collectDate: 수거 완료일
-            - productDate: 상품화 완료일
             """)
     @GetMapping("/pending")
     public SuccessResponse<List<GetPendingClothingSales>> getPendingClothingSales() {
-        return SuccessResponse.createSuccess(clothingSalesService.getPendingClothingSales());
+        return SuccessResponse.success(clothingSalesService.getPendingClothingSales());
     }
 
     @Operation(summary = "옷장 정리 통합 조회: 판매 중인 옷장", description = """
-            옷장 정리 통합 조회: 판매 중인 옷장, 신청 완료일 순으로 정렬되어 리스트로 반환합니다.
-            - id: 수거 ID
-            - clothingSalesCount: 수거 회차(각각의 유저에 대해 고유한 값입니다).
-            - clothingSalesPeriod: 신청 완료일 ~ 판매 진행 시작일
-            - sellingQuantity: 판매 중인 의류 수량
-            - pendingQuantity: 구매 확정 대기 수량
-            - soldQuantity: 판매 완료 수량
-            - totalPoint: 총 포인트
+            옷장 정리 통합 조회: 판매 중인 옷장, 신청 완료일 내림차순으로 정렬되어 리스트로 반환합니다.
             """)
     @GetMapping("/selling")
     public SuccessResponse<List<GetSellingClothingSales>> getSellingClothingSales() {
@@ -92,9 +78,9 @@ public SuccessResponse<List<GetSellingClothingSales>> getSellingClothingSales()
             - requestedQuantity: 신청한 의류 수량
             - productQuantity: 판매 가능한 의류 수량
             """)
-    @GetMapping("/products/{clothingSalesCount}")
-    public SuccessResponse<GetProductListByClothingSales> getProductsByClothingSalesCount(@PathVariable Integer clothingSalesCount) {
-        return SuccessResponse.success(clothingSalesService.getProductsByClothingSalesCount(clothingSalesCount));
+    @GetMapping("/products/{clothingSalesId}")
+    public SuccessResponse<GetProductListByClothingSales> getProductsByClothingSalesId(@PathVariable Long clothingSalesId) {
+        return SuccessResponse.success(clothingSalesService.getProductsByClothingSalesId(clothingSalesId));
     }
 
     @Operation(summary = "상품 가격 입력하기", description = """
@@ -108,7 +94,7 @@ public SuccessResponse<GetProductListByClothingSales> getProductsByClothingSales
             """)
     @PatchMapping("/products/price")
     public SuccessResponse<Boolean> updateProductPrice(@RequestBody List<PostProductPrice> postProductPriceList) {
-        return SuccessResponse.createSuccess(clothingSalesService.updateProductPrice(postProductPriceList));
+        return SuccessResponse.success(clothingSalesService.updateProductPrice(postProductPriceList));
     }
 
     // TODO: ADMIN ACCESS
@@ -136,24 +122,24 @@ public SuccessResponse<PageResponse<List<GetClothingSalesProductCount>>> getClot
     }
 
     @Operation(summary = "유저 상품 현황")
-    @GetMapping("/products/{userId}/{clothingSalesCount}/{productStateType}")
-    public SuccessResponse<PageResponse<List<GetClothingSalesProduct>>> getClothingSalesProduct(@PathVariable Long userId,
-                                                                                  @PathVariable Integer clothingSalesCount,
+    @GetMapping("/products/{clothingSalesId}/{productStateType}")
+    public SuccessResponse<PageResponse<List<GetClothingSalesProduct>>> getClothingSalesProduct(@PathVariable Long clothingSalesId,
                                                                                   @PathVariable ProductStateType productStateType,
                                                                                   @ParameterObject PageCondition pageCondition) {
-        return SuccessResponse.success(clothingSalesService.getClothingSalesProduct(userId, clothingSalesCount, productStateType, pageCondition));
+        return SuccessResponse.success(clothingSalesService.getClothingSalesProduct(clothingSalesId, productStateType, pageCondition));
     }
 
     @Operation(summary = "옷장 정리 상품 무게 등록")
-    @PostMapping("/weight")
-    public SuccessResponse<Boolean> updateClothingSalesWeight(@RequestBody PostClothingSalesWeight postClothingSalesWeight) {
-        return SuccessResponse.success(clothingSalesService.updateClothingSalesWeight(postClothingSalesWeight));
+    @PatchMapping("/weight")
+    public SuccessResponse<Boolean> updateClothingSalesWeight(@RequestBody PatchClothingSalesWeight patchClothingSalesWeight) {
+        clothingSalesService.updateClothingSalesWeight(patchClothingSalesWeight);
+        return SuccessResponse.success(true);
     }
 
     @Operation(summary = "옷장 정리 유저 정보")
-    @GetMapping("/{userId}/{clothingSalesCount}")
-    public SuccessResponse<GetClothingSalesUser> getClothingSalesUserInfo(@PathVariable Long userId, @PathVariable Integer clothingSalesCount) {
-        return SuccessResponse.success(clothingSalesService.getClothingSalesUser(userId, clothingSalesCount));
+    @GetMapping("/{clothingSalesId}")
+    public SuccessResponse<GetClothingSalesUser> getClothingSalesUserInfo(@PathVariable Long clothingSalesId) {
+        return SuccessResponse.success(clothingSalesService.getClothingSalesUser(clothingSalesId));
     }
 
 }

src/main/java/com/example/repick/domain/clothingSales/dto/BagCollectResponse.java

@@ -9,13 +9,13 @@ public record BagCollectResponse(
         @Schema(description = "의류 사진 url", example = "https://repick.s3.ap-northeast-2.amazonaws.com/repick/2021/09/15/1631690136_1.jpg") String imageUrl,
         @Schema(description = "백 수량", example = "3") Integer bagQuantity,
         Address address,
-        @Schema(description = "백 상태", example = "대기중") String bagInitState
+        @Schema(description = "백 상태", example = "신청 완료") String bagCollectState
 ) {
     public static BagCollectResponse of(BagCollect bagCollect, String bagCollectStateType) {
         return new BagCollectResponse(
                 bagCollect.getId(),
                 bagCollect.getImageUrl(),
-                bagCollect.getBagQuantity(),
+                bagCollect.getQuantity(),
                 bagCollect.getAddress(),
                 bagCollectStateType
         );

src/main/java/com/example/repick/domain/clothingSales/dto/BagInitResponse.java

@@ -6,15 +6,13 @@
 
 public record BagInitResponse(
         @Schema(description = "백 초기 요청 ID", example = "1") Long bagInitId,
-        @Schema(description = "의류 사진 url", example = "https://repick.s3.ap-northeast-2.amazonaws.com/repick/2021/09/15/1631690136_1.jpg") String imageUrl,
         @Schema(description = "백 수량", example = "3") Integer bagQuantity,
         Address address,
         @Schema(description = "백 상태", example = "대기중") String bagInitState
 ) {
     public static BagInitResponse of(BagInit bagInit, String bagInitStateType) {
         return new BagInitResponse(
                 bagInit.getId(),
-                bagInit.getImageUrl(),
                 bagInit.getBagQuantity(),
                 bagInit.getAddress(),
                 bagInitStateType

src/main/java/com/example/repick/domain/clothingSales/dto/BoxCollectResponse.java

@@ -15,7 +15,7 @@ public static BoxCollectResponse of(BoxCollect boxCollect, String boxCollectStat
         return new BoxCollectResponse(
                 boxCollect.getId(),
                 boxCollect.getImageUrl(),
-                boxCollect.getBoxQuantity(),
+                boxCollect.getQuantity(),
                 boxCollect.getAddress(),
                 boxCollectStateType
         );

src/main/java/com/example/repick/domain/clothingSales/dto/GetClothingSales.java

@@ -1,25 +1,23 @@
 package com.example.repick.domain.clothingSales.dto;
 
-import com.example.repick.domain.clothingSales.entity.BagInit;
-import com.example.repick.domain.clothingSales.entity.BoxCollect;
-import com.example.repick.domain.clothingSales.entity.ClothingSalesStateType;
-import com.example.repick.domain.product.entity.Product;
+import com.example.repick.domain.clothingSales.entity.*;
 import com.example.repick.domain.product.entity.ProductState;
 import com.example.repick.domain.product.entity.ProductStateType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 
+@Builder
 public record GetClothingSales(
+        @Schema(description = "옷장 정리 id (리픽백 배송 요청인 경우 리픽백 배송 요청 id)") Long id,
+        @Schema(description = "(백일 경우) 백 배송 여부, true: 백 배송까지 단계 false: 백 수거부터") Boolean isBagDelivered,
         @Schema(description = "코드") String code,
         @Schema(description = "이름") String name,
-        @Schema(description = "유저 ID") Long userId,
-        @Schema(description = "옷장 정리 회차") Integer clothingSalesCount,
         @Schema(description = "박스 수거 여부, true: 박스 수거 false: 백 수거", example = "true") Boolean isBoxCollect,
         @Schema(description = "현황") String status,
         @Schema(description = "신청일") String requestDate,
-        @Schema(description = "(백일 경우) 백 배송 여부, true: 백 배송까지 단계 false: 백 수거부터") Boolean isBagDelivered,
         @Schema(description = "수거 진행 여부") Boolean isForCollect,
         @Schema(description = "상품화 시작일") String productStartDate,
         @Schema(description = "판매기간") String salesPeriod,
@@ -29,47 +27,42 @@ public record GetClothingSales(
         @Schema(description = "판매만료 리턴") Boolean isExpiredAndReturned
 ) {
 
-    public static GetClothingSales of(BoxCollect boxCollect, List<Product> products, List<ProductState> productStates) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
-        return new GetClothingSales(
-                boxCollect.getUser().getId().toString() + "-" + boxCollect.getClothingSalesCount(),
-                boxCollect.getUser().getNickname(),
-                boxCollect.getUser().getId(),
-                boxCollect.getClothingSalesCount(),
-                true,
-                boxCollect.getClothingSalesState().getValue(),
-                boxCollect.getCreatedDate().format(formatter),
-                null,
-                boxCollect.getClothingSalesState() != ClothingSalesStateType.REQUEST_CANCELLED,
-                boxCollect.getClothingSalesState().getId() >= 14 ? products.get(0).getSalesStartDate().format(formatter) : null,
-                boxCollect.getClothingSalesState().getId() >= 14 ? products.get(0).getSalesStartDate().format(formatter)
-                        + " ~ " + products.get(0).getSalesStartDate().plusDays(90).format(formatter) : null,
-                boxCollect.getUser().getSettlementRequestDate() != null ? boxCollect.getUser().getSettlementRequestDate().format(formatter) : null,
-                boxCollect.getUser().getSettlementCompleteDate() != null ? boxCollect.getUser().getSettlementCompleteDate().format(formatter) : null,
-                boxCollect.getClothingSalesState().getId() >= 13? productStates.stream().anyMatch(productState -> productState.getProductStateType() == ProductStateType.REJECTED) : null,
-                boxCollect.getClothingSalesState() == ClothingSalesStateType.SELLING_EXPIRED
-        );
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/yy");
+
+    // 수거 요청일 경우
+    public static GetClothingSales ofClothingSales(ClothingSales clothingSales, List<ProductState> productStates) {
+        ClothingSalesStateType clothingSalesState = clothingSales.getClothingSalesState();
+        boolean isBoxCollect = clothingSales instanceof BoxCollect;
+        boolean isProducted = ClothingSalesStateType.AFTER_PRODUCTION.contains(clothingSalesState);
+        boolean isSelling = ClothingSalesStateType.AFTER_SELLING.contains(clothingSalesState);
+
+        return GetClothingSales.builder()
+                .id(clothingSales.getId())
+                .isBagDelivered(isBoxCollect? null : true)
+                .code(clothingSales.getUser().getId().toString() + "-" + clothingSales.getClothingSalesCount())
+                .name(clothingSales.getUser().getNickname())
+                .isBoxCollect(isBoxCollect)
+                .status(clothingSalesState.getAdminValue())
+                .requestDate(clothingSales.getCreatedDate().format(formatter))
+                .isForCollect(clothingSalesState != ClothingSalesStateType.REQUEST_CANCELLED)
+                .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)
+                .settlementRequestDate(clothingSales.getUser().getSettlementRequestDate() != null ? clothingSales.getUser().getSettlementRequestDate().format(formatter) : null)
+                .settlementCompleteDate(clothingSales.getUser().getSettlementCompleteDate() != null ? clothingSales.getUser().getSettlementCompleteDate().format(formatter) : null)
+                .isRejected(isProducted? productStates.stream().anyMatch(productState -> productState.getProductStateType() == ProductStateType.REJECTED) : null)
+                .isExpiredAndReturned(clothingSalesState == ClothingSalesStateType.SELLING_EXPIRED)
+                .build();
     }
 
-    public static GetClothingSales of(BagInit bagInit, List<Product> products, List<ProductState> productStates) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
-        return new GetClothingSales(
-                bagInit.getUser().getId().toString() + "-" + bagInit.getClothingSalesCount(),
-                bagInit.getUser().getNickname(),
-                bagInit.getUser().getId(),
-                bagInit.getClothingSalesCount(),
-                false,
-                bagInit.getClothingSalesState() != ClothingSalesStateType.BAG_COLLECT_REQUEST? bagInit.getClothingSalesState().getValue() : "리픽백 배송 완료",
-                bagInit.getCreatedDate().format(formatter),
-                bagInit.getBagCollect() != null,
-                bagInit.getClothingSalesState().getId() >= 6,
-                bagInit.getClothingSalesState().getId() >= 14 ? products.get(0).getSalesStartDate().format(formatter) : null,
-                bagInit.getClothingSalesState().getId() >= 14 ? products.get(0).getSalesStartDate().format(formatter)
-                        + " ~ " + products.get(0).getSalesStartDate().plusDays(90).format(formatter) : null,
-                bagInit.getUser().getSettlementRequestDate() != null ? bagInit.getUser().getSettlementRequestDate().format(formatter) : null,
-                bagInit.getUser().getSettlementCompleteDate() != null ? bagInit.getUser().getSettlementCompleteDate().format(formatter) : null,
-                bagInit.getClothingSalesState().getId() >= 13? productStates.stream().anyMatch(productState -> productState.getProductStateType() == ProductStateType.REJECTED) : null,
-                bagInit.getClothingSalesState() == ClothingSalesStateType.SELLING_EXPIRED
-        );
+    // 백 배송 요청일 경우
+    public static GetClothingSales ofBagInit(BagInit bagInit, BagInitState bagInitState) {
+        return GetClothingSales.builder()
+                .id(bagInit.getId())
+                .isBagDelivered(false)
+                .name(bagInit.getUser().getNickname())
+                .status(bagInitState.getBagInitStateType().getAdminValue())
+                .requestDate(bagInit.getCreatedDate().format(formatter))
+                .build();
     }
 }

src/main/java/com/example/repick/domain/clothingSales/dto/GetPendingClothingSales.java

@@ -1,24 +1,29 @@
 package com.example.repick.domain.clothingSales.dto;
 
+import com.example.repick.domain.clothingSales.entity.BoxCollect;
+import com.example.repick.domain.clothingSales.entity.ClothingSales;
 import io.swagger.v3.oas.annotations.media.Schema;
 
+import java.time.LocalDateTime;
+
+
 public record GetPendingClothingSales(
         @Schema(description = "수거 ID", example = "1") Long id,
         @Schema(description = "옷장 정리 회차", example = "1") Integer clothingSalesCount,
-        @Schema(description = "타입(박스/백)", example = "박스") String type,
-        @Schema(description = "신청 완료일", example = "24.09.15") String requestDate,
-        @Schema(description = "백 도착일", example = "24.09.16") String bagArriveDate,
-        @Schema(description = "수거 완료일", example = "24.09.17") String collectDate,
-        @Schema(description = "상품화 완료일", example = "24.09.18") String productDate
+        @Schema(description = "박스 수거 여부 true: 박스 수거, false: 리픽백 수거") boolean isBoxCollect,
+        @Schema(description = "신청 완료일") LocalDateTime requestDate,
+        @Schema(description = "수거 완료일") LocalDateTime collectDate,
+        @Schema(description = "상품 촬영일") LocalDateTime shootDate,
+        @Schema(description = "상품화 완료일") LocalDateTime productDate
 ) {
-    public static GetPendingClothingSales of(Long id, Integer clothingSalesCount, String type, String requestDate, String bagArriveDate, String collectDate, String productDate) {
+    public static GetPendingClothingSales of(ClothingSales clothingSales, LocalDateTime requestDate, LocalDateTime collectDate, LocalDateTime shootDate, LocalDateTime productDate) {
         return new GetPendingClothingSales(
-                id,
-                clothingSalesCount,
-                type,
+                clothingSales.getId(),
+                clothingSales.getClothingSalesCount(),
+                clothingSales instanceof BoxCollect,
                 requestDate,
-                bagArriveDate,
                 collectDate,
+                shootDate,
                 productDate
         );
     }