Merge pull request #28 from NET-ZERO-FitFit/develop

main <- develop

Author: stlahxm

src/main/java/fitfit/domain/clothes/controller/ClothesRestController.java

@@ -12,13 +12,15 @@
 import fitfit.global.apiPayload.ApiResponse;
 import fitfit.global.apiPayload.code.status.SuccessStatus;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -84,6 +86,30 @@ public ApiResponse<ClothesResponseDTO.UpdateResponse> updateClothes(
         return ApiResponse.onSuccess(response);
     }
 
+    @GetMapping("/filter")
+    @Operation(summary = "옷 목록 필터링 조회 API", description = """
+            카테고리, 스타일, 가격대, 위치를 기준으로 옷 목록을 동적 필터링여 조회합니다.
+            - `page`는 0부터 시작합니다.
+            - `FilterClothesRequest` DTO는 쿼리 파라미터로 전달됩니다. (주소창에 직접 입력하거나, JS에서 URLSearchParams로 전송)
+            """)
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Bad Request, 잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "Unauthorized, 유효하지 않은 토큰", content = @Content(schema = @Schema(implementation = ApiResponse.class)))
+    })
+    public ApiResponse<ClothesResponseDTO.ClothesPageDTO> getFilteredClothes(
+            @RequestHeader(value = "Authorization") String authorization,
+            @Valid @ModelAttribute ClothesRequestDTO.FilterClothesRequest request,
+            @RequestParam(name = "page") @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") Integer page
+    ) {
+        // 1. 필터링된 옷 목록 조회
+        Page<Clothes> clothesPage = clothesQueryService.getFilteredClothes(request, page);
+
+        // 2. 응답 DTO로 변환
+        return  ApiResponse.onSuccess(ClothesConverter.toClothesPageDTO(clothesPage));
+    }
+
+
     @GetMapping("/search")
     @Operation(summary = "판매 옷 일반 검색 API", description = """
             키워드 검색을 통해 판매 옷 정보를 가져오는 API입니다. (존재하지 않는 키워드인 경우 빈 리스트로 응답)
@@ -97,7 +123,7 @@ public ApiResponse<ClothesResponseDTO.UpdateResponse> updateClothes(
             - `totalElements`: 전체 아이템 수입니다.
             - `isFirst`: 현재 페이지가 첫 페이지인지 여부입니다. (true/false)
             - `isLast`: 현재 페이지가 마지막 페이지인지 여부입니다. (true/false)
-            """)
+            """, tags = {"Search"})
     @ApiResponses({
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "Bad Request, 잘못된 요청 형식", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@@ -128,7 +154,7 @@ public ApiResponse<ClothesResponseDTO.ClothesPageDTO> searchClothes(
             - `totalElements`: 전체 아이템 수입니다.
             - `isFirst`: 현재 페이지가 첫 페이지인지 여부입니다. (true/false)
             - `isLast`: 현재 페이지가 마지막 페이지인지 여부입니다. (true/false)
-            """)
+            """, tags = {"Search"})
     @ApiResponses({
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "OK, 성공"),
             @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "401", description = "Unauthorized, 유효하지 않은 토큰", content = @Content(schema = @Schema(implementation = ApiResponse.class))),
@@ -168,4 +194,69 @@ public ApiResponse<List<ClothesResponseDTO.MapMarkerDTO>> getMapMarkers() {
         List<ClothesResponseDTO.MapMarkerDTO> result = clothesQueryService.getMapMarkers();
         return ApiResponse.of(SuccessStatus._OK, result);
     }
+
+    @GetMapping("/{clothesId}")
+    @Operation(
+            summary = "옷 상세 페이지 조회 API",
+            description = """
+                    상품 ID로 상세 정보를 조회합니다.
+                    - **기능:** 조회수 1 증가, 상품 정보, 판매자 정보, 이미지 리스트 반환
+                    - **상태값:** `status` (SELLING, MATCHED, SOLD_OUT)에 따라 버튼 활성화 여부를 결정하세요.
+                    """
+    )
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공 (상세 정보 반환)", content = @Content(schema = @Schema(implementation = ClothesResponseDTO.ClothesDetailDTO.class))),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 상품 (CLOTHES4004)", content = @Content(schema = @Schema(implementation = ApiResponse.class)))
+    })
+    public ApiResponse<ClothesResponseDTO.ClothesDetailDTO> getClothesDetail(
+            @RequestHeader(value = "Authorization") String authorization,
+            @Parameter(description = "조회할 상품 ID") @PathVariable Long clothesId
+    ) {
+
+        ClothesResponseDTO.ClothesDetailDTO result = clothesQueryService.getClothesDetail(clothesId, authorization);
+        return ApiResponse.of(SuccessStatus._OK, result);
+    }
+
+    // 옷장 넣기/빼기 API (토글)
+    @PostMapping("/{clothesId}/wear-room")
+    @Operation(summary = "옷장 넣기/빼기 (토글)", description = "상품을 내 옷장에 추가하거나 삭제합니다. (이미 있으면 삭제, 없으면 추가)" +
+            "is added = true로 오면 옷장에 추가된것임 false로 오면 옷장에서 빠진거")
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "성공"),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "존재하지 않는 상품/회원")
+    })
+    public ApiResponse<ClothesResponseDTO.ToggleWearRoomDTO> toggleCloset(
+            @RequestHeader(value = "Authorization") String authorization,
+            @Parameter(description = "상품 ID") @PathVariable Long clothesId
+    ){
+        ClothesResponseDTO.ToggleWearRoomDTO result = clothesCommandService.toggleWearRoom(authorization,clothesId);
+        return ApiResponse.of(SuccessStatus._OK, result);
+    }
+
+    @GetMapping("/wear-room")
+    @Operation(
+            summary = "내 옷장(찜 목록) 조회 API",
+            description = """
+                    내가 옷장에 담은(찜한) 상품 목록을 **담은 순서의 역순(최신순)**으로 조회합니다.
+                    """
+    )
+    @ApiResponses({
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(
+                    responseCode = "200",
+                    description = "성공 (옷장 리스트 반환)",
+                    content = @Content(schema = @Schema(implementation = ClothesResponseDTO.WearRoomListDTO.class))
+            ),
+            @io.swagger.v3.oas.annotations.responses.ApiResponse(
+                    responseCode = "401",
+                    description = "인증 실패 (로그인 필요)",
+                    content = @Content(schema = @Schema(implementation = ApiResponse.class))
+            )
+    })
+    public ApiResponse<ClothesResponseDTO.WearRoomListDTO> getMyWearRoom(
+            @RequestHeader(value = "Authorization") String authorization
+    ) {
+        ClothesResponseDTO.WearRoomListDTO result = clothesQueryService.getMyWearRoomList(authorization);
+
+        return ApiResponse.of(SuccessStatus._OK, result);
+    }
 }

src/main/java/fitfit/domain/clothes/converter/ClothesConverter.java

@@ -4,6 +4,8 @@
 import fitfit.domain.clothes.dto.ClothesRequestDTO;
 import fitfit.domain.clothes.dto.ClothesResponseDTO;
 import fitfit.domain.clothes.entity.Clothes;
+import fitfit.domain.clothes.entity.ClothesImage;
+import fitfit.domain.clothes.mapping.WearRoom;
 import fitfit.domain.member.entity.Member;
 import fitfit.global.enums.Style;
 import org.springframework.data.domain.Page;
@@ -54,12 +56,9 @@ public static ClothesResponseDTO.CreateClothesResponse toCreateClothesResponse(C
     // Clothes 엔티티를 ClothesPreviewDTO로 변환
     public static ClothesResponseDTO.ClothesPreviewDTO toClothesPreviewDTO(Clothes clothes) {
         return ClothesResponseDTO.ClothesPreviewDTO.builder()
-                .clothesId(clothes.getId())
+                .nickname(clothes.getSeller().getNickname())
                 .title(clothes.getTitle())
-                .style(clothes.getStyle().toString())
                 .price(clothes.getPrice())
-                .createdAt(clothes.getCreatedAt())
-                .isMatched(clothes.getIsMatched())
                 .build();
     }
 
@@ -115,4 +114,77 @@ public static List<ClothesResponseDTO.MapMarkerDTO> toMapMarkerDTOList(List<Clot
                 .map(ClothesConverter::toMapMarkerDTO)
                 .collect(Collectors.toList());
     }
+
+    public static ClothesResponseDTO.ClothesDetailDTO toClothesDetailDTO(Clothes clothes,Boolean isInWearRoom) {
+        Member seller = clothes.getSeller();
+
+        //상태 계산
+        String status = "SELLING";
+        if (Boolean.TRUE.equals(clothes.getIsSold())) status = "SOLD_OUT";
+        else if (Boolean.TRUE.equals(clothes.getIsMatched())) status = "MATCHED";
+
+        List<String> imageUrls = clothes.getImages().stream()
+                .map(ClothesImage::getImageUrl)
+                .toList();
+
+        return ClothesResponseDTO.ClothesDetailDTO.builder()
+                .clothesId(clothes.getId())
+                .createdAt(clothes.getCreatedAt())
+                .title(clothes.getTitle())
+                .price(clothes.getPrice().longValue())
+                .status(status)
+                .seeCount(clothes.getSeeCount())
+                .isInWearRoom(isInWearRoom)
+
+                //판매자
+                .sellerId(seller.getId())
+                .sellerNickname(seller.getNickname())
+                .sellerProfileUrl(seller.getProfileImgUrl())
+                .sellerCleanIndex(seller.getCleanIndex() != null ? seller.getCleanIndex() : 50)
+                // 이미지
+                .images(imageUrls)
+                // 상세
+                .comment(clothes.getComment())
+                .style(clothes.getStyle() != null ? clothes.getStyle().toString() : null)
+                .categoryName(clothes.getCategory().getName())
+                .address(clothes.getAddress())
+                .meetupAgreed(clothes.getMeetupAgreed())
+                .offerAgreed(clothes.getOfferAgreed())
+                // 사이즈
+                .totalLength(clothes.getTotalLength())
+                .chestWidth(clothes.getChestWidth())
+                .shoulderWidth(clothes.getShoulderWidth())
+                .footSize(clothes.getFootSize())
+                .waistMeasurement(clothes.getWaistMeasurement())
+                .thighMeasurement(clothes.getThighMeasurement())
+                .build();
+
+    }
+
+    public static ClothesResponseDTO.ToggleWearRoomDTO toToggleWearRoomDTO(Boolean isAdded) {
+        return ClothesResponseDTO.ToggleWearRoomDTO.builder()
+                .isAdded(isAdded).build();
+    }
+
+    // [옷장 목록 조회용] WearRoom 엔티티 -> ClosetItemDTO 변환
+    public static ClothesResponseDTO.WearRoomItemDTO toWearRoomItemDTO(WearRoom wearRoom) {
+        Clothes clothes = wearRoom.getClothes();
+        Member seller = clothes.getSeller();
+
+        // 1. 대표 이미지 추출 (0번째 사진)
+        String mainImageUrl = null;
+        if (clothes.getImages() != null && !clothes.getImages().isEmpty()) {
+            mainImageUrl = clothes.getImages().get(0).getImageUrl();
+        }
+
+        // 2. DTO 생성
+        return ClothesResponseDTO.WearRoomItemDTO.builder()
+                .clothesId(clothes.getId())
+                .imageUrl(mainImageUrl) // 대표 이미지
+                .sellerNickname(seller.getNickname())
+                .title(clothes.getTitle())
+                .price(clothes.getPrice().longValue()) // Long 변환
+                .createdAt(wearRoom.getCreatedAt()) // 찜한 날짜
+                .build();
+    }
 }

src/main/java/fitfit/domain/clothes/dto/ClothesRequestDTO.java

@@ -139,4 +139,24 @@ public static class DeleteRequest {
         @Schema(description = "옷 ID", example = "1")
         private Long clothesId;
     }
+
+    @Getter
+    @NoArgsConstructor
+    public static class FilterClothesRequest {
+        //카테고리
+        @Schema(description = "카테고리 ID (다중 선택 가능)", example = "1, 2, 5")
+        private List<Long> categoryIds;
+
+        //스타일
+        @Schema(description = "스타일 (다중 선택 가능)", example = "캐주얼, 스트릿")
+        private List<String> styles;
+
+        //가격
+        @Schema (description = "가격대 코드 (다중 선택 가능)", example = "RANGE_10_20, RANGE_30_40")
+        private List<String> priceRangeCodes;
+
+        // 주소
+        @Schema(description = "주소 (다중 선택 가능)", example = "서울시 강남구, 서울시 마포구")
+        private List<String> addresses;
+    }
 }