[refactor] 펀딩 목록 카테고리 필터 추가, 커뮤니티 조회 시 작성자 이메일 포함 (#345)

rladbstn0 · web-flow · commit 4eec2f549c84 · 2025-10-14T14:02:23.000+09:00
diff --git a/src/main/java/com/back/domain/funding/controller/FundingCommunityController.java b/src/main/java/com/back/domain/funding/controller/FundingCommunityController.java
@@ -4,6 +4,7 @@
 import com.back.domain.funding.service.FundingCommunityService;
 import com.back.global.rsData.RsData;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
 import lombok.RequiredArgsConstructor;
@@ -16,6 +17,7 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/fundings")
+@Tag(name = "펀딩 커뮤니티", description = "펀딩 커뮤니티 API 컨트롤러")
 public class FundingCommunityController {
 
     private final FundingCommunityService fundingCommunityService;
diff --git a/src/main/java/com/back/domain/funding/controller/FundingController.java b/src/main/java/com/back/domain/funding/controller/FundingController.java
@@ -11,6 +11,8 @@
 import com.back.global.rsData.RsData;
 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.ExampleObject;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -34,8 +36,31 @@ public class FundingController {
 
     @PostMapping
     @PreAuthorize("hasAuthority('ROLE_ARTIST') or hasAuthority('ROLE_ADMIN') or hasAuthority('ROLE_ROOT')")
-    @Operation(summary = "펀딩 생성")
-    public ResponseEntity<RsData<FundingCreateResponse>> createFunding(
+    @Operation(summary = "펀딩 생성",
+            requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody(
+                    content = @Content(
+                            mediaType = "application/json",
+                            examples = {
+                                    @ExampleObject(
+                                            name = "기본 예시",
+                                            value = """
+                    {
+                      "title": "한정판 키링 펀딩",
+                      "description": "한정판 키링입니다.",
+                      "categoryId": 1,
+                      "imageUrl": "https://testImage.jpg",
+                      "targetAmount": 500000,
+                      "price": 30000,
+                      "stock": 200,
+                      "startDate": "2025-11-01 00:00:00",
+                      "endDate": "2025-12-15 23:59:59"
+                    }
+                    """
+                                    )
+                            }
+                    )
+            )
+    )    public ResponseEntity<RsData<FundingCreateResponse>> createFunding(
             @Valid @RequestBody FundingCreateRequest request,
             @AuthenticationPrincipal(expression = "username") String userEmail) {
 
@@ -56,7 +81,7 @@ public ResponseEntity<RsData<FundingDetailResponse>> getFunding(@PathVariable @P
     @GetMapping
     @Operation(summary = "펀딩 목록 조회")
     public ResponseEntity<RsData<Page<FundingCardDto>>> getFundingList(
-            @Parameter(description = "[필터링] 펀딩 상태 목록. 진행중(OPEN), 종료(CLOSED), 성공(SUCCESS), 실패(FAILED), 취소(CANCELED)",
+            @Parameter(description = "[필터링] 펀딩 상태 목록. 심사중(PENDING), 승인됨(APPROVED), 거절됨(REJECTED), 진행중(OPEN), 종료(CLOSED), 성공(SUCCESS), 실패(FAILED), 취소(CANCELED)",
                     example = "OPEN,CLOSED")
             @RequestParam(required = false) Set<FundingStatus> status,
 
@@ -68,6 +93,10 @@ public ResponseEntity<RsData<Page<FundingCardDto>>> getFundingList(
                     example = "키링")
             @RequestParam(required = false) String keyword,
 
+            @Parameter(description = "[필터링] 카테고리 ID (상위 카테고리)",
+                    example = "1")
+            @RequestParam(required = false) Long categoryId,
+
             @Parameter(description = "[필터링] 최소 가격 (원 단위)",
                     example = "10000")
             @RequestParam(required = false) Long minPrice,
@@ -85,7 +114,7 @@ public ResponseEntity<RsData<Page<FundingCardDto>>> getFundingList(
             @RequestParam(defaultValue = "12") int size
             ) {
         Page<FundingCardDto> fundingList = fundingService.getFundingList(
-                status, sortBy, keyword, minPrice, maxPrice, page, size
+                status, sortBy, keyword, categoryId, minPrice, maxPrice, page, size
         );
 
         RsData<Page<FundingCardDto>> body = RsData.of("200", "펀딩 목록 조회 성공", fundingList);
diff --git a/src/main/java/com/back/domain/funding/dto/response/FundingCardDto.java b/src/main/java/com/back/domain/funding/dto/response/FundingCardDto.java
@@ -8,6 +8,7 @@ public record FundingCardDto(
         String imageUrl,      // 썸네일 이미지
         String categoryName,  // 카테고리 이름
         String authorName,    // 작성자명
+        long price,           // 가격
         long targetAmount,    // 목표 금액
         long currentAmount,   // 현재 금액
         double progress,      // 달성률
@@ -20,6 +21,7 @@ public FundingCardDto(Funding funding, long currentAmount, double progress, int
                 funding.getImageUrl(),
                 funding.getCategory().getCategoryName(),
                 funding.getUser().getName(),
+                funding.getPrice(),
                 funding.getTargetAmount(),
                 currentAmount,
                 progress,
diff --git a/src/main/java/com/back/domain/funding/dto/response/FundingDetailResponse.java b/src/main/java/com/back/domain/funding/dto/response/FundingDetailResponse.java
@@ -87,13 +87,14 @@ public FundingNewsDto(FundingNews update) {
     public record FundingCommunityDto(
             Long id,
             String writerName,
+            String writerEmail,
             String profileImageUrl,
             String content,
             @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
             LocalDateTime createDate
     ) {
         public FundingCommunityDto(FundingCommunity community) {
-            this(community.getId(), community.getAuthor().getName(), community.getAuthor().getProfileImageUrl(), community.getContent(), community.getCreateDate());
+            this(community.getId(), community.getAuthor().getName(), community.getAuthor().getEmail(),  community.getAuthor().getProfileImageUrl(), community.getContent(), community.getCreateDate());
         }
     }
 }
diff --git a/src/main/java/com/back/domain/funding/repository/FundingCustomRepository.java b/src/main/java/com/back/domain/funding/repository/FundingCustomRepository.java
@@ -22,6 +22,7 @@ public interface FundingCustomRepository {
     Page<Funding> findByFilters(
             Set<FundingStatus> statuses,
             String keyword,
+            Long categoryId,
             Long minPrice,
             Long maxPrice,
             Pageable pageable
diff --git a/src/main/java/com/back/domain/funding/repository/FundingCustomRepositoryImpl.java b/src/main/java/com/back/domain/funding/repository/FundingCustomRepositoryImpl.java
@@ -27,6 +27,7 @@ public class FundingCustomRepositoryImpl implements FundingCustomRepository {
     public Page<Funding> findByFilters(
             Set<FundingStatus> statuses,
             String keyword,
+            Long categoryId,
             Long minPrice,
             Long maxPrice,
             Pageable pageable
@@ -41,7 +42,7 @@ public Page<Funding> findByFilters(
         funding.fetch("user", JoinType.LEFT);
 
         // WHERE 조건 생성
-        List<Predicate> predicates = buildPredicates(cb, funding, statuses, keyword, minPrice, maxPrice);
+        List<Predicate> predicates = buildPredicates(cb, funding, statuses, keyword, categoryId, minPrice, maxPrice);
         query.where(predicates.toArray(new Predicate[0]));
 
         // 정렬 적용
@@ -58,7 +59,7 @@ public Page<Funding> findByFilters(
         List<Funding> results = typedQuery.getResultList();
 
         // 카운트 쿼리 (페이징을 위한 전체 개수)
-        long total = countByFilters(cb, statuses, keyword, minPrice, maxPrice);
+        long total = countByFilters(cb, statuses, keyword, categoryId, minPrice, maxPrice);
 
         return new PageImpl<>(results, pageable, total);
     }
@@ -71,6 +72,7 @@ private List<Predicate> buildPredicates(
             Root<Funding> funding,
             Set<FundingStatus> statuses,
             String keyword,
+            Long categoryId,
             Long minPrice,
             Long maxPrice
     ) {
@@ -89,6 +91,10 @@ private List<Predicate> buildPredicates(
             ));
         }
 
+        if (categoryId != null) {
+            predicates.add(cb.equal(funding.get("category").get("id"), categoryId));
+        }
+
         // 가격 범위 필터 (Funding 엔티티의 price 필드 사용)
         if (minPrice != null) {
             predicates.add(cb.greaterThanOrEqualTo(funding.get("price"), minPrice));
@@ -126,14 +132,15 @@ private long countByFilters(
             CriteriaBuilder cb,
             Set<FundingStatus> statuses,
             String keyword,
+            Long categoryId,
             Long minPrice,
             Long maxPrice
     ) {
         CriteriaQuery<Long> countQuery = cb.createQuery(Long.class);
         Root<Funding> funding = countQuery.from(Funding.class);
 
         // WHERE 조건 동일하게 적용
-        List<Predicate> predicates = buildPredicates(cb, funding, statuses, keyword, minPrice, maxPrice);
+        List<Predicate> predicates = buildPredicates(cb, funding, statuses, keyword, categoryId, minPrice, maxPrice);
         countQuery.select(cb.count(funding));
         countQuery.where(predicates.toArray(new Predicate[0]));
 
diff --git a/src/main/java/com/back/domain/funding/service/FundingService.java b/src/main/java/com/back/domain/funding/service/FundingService.java
@@ -120,6 +120,7 @@ public Page<FundingCardDto> getFundingList(
             Set<FundingStatus> statuses,
             String sortBy,
             String keyword,
+            Long categoryId,
             Long minPrice,
             Long maxPrice,
             int page,
@@ -131,7 +132,7 @@ public Page<FundingCardDto> getFundingList(
 
         // Custom Repository 메서드 호출
         Page<Funding> fundingPage = fundingRepository.findByFilters(
-                statuses, keyword, minPrice, maxPrice, pageable
+                statuses, keyword, categoryId, minPrice, maxPrice, pageable
         );
 
         // DTO 변환

Original file line number	Diff line number	Diff line change
`@@ -87,13 +87,14 @@ public FundingNewsDto(FundingNews update) {`
`87`	`87`	`public record FundingCommunityDto(`
`88`	`88`	`Long id,`
`89`	`89`	`String writerName,`
	`90`	`+ String writerEmail,`
`90`	`91`	`String profileImageUrl,`
`91`	`92`	`String content,`
`92`	`93`	`@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")`
`93`	`94`	`LocalDateTime createDate`
`94`	`95`	`) {`
`95`	`96`	`public FundingCommunityDto(FundingCommunity community) {`
`96`		`- this(community.getId(), community.getAuthor().getName(), community.getAuthor().getProfileImageUrl(), community.getContent(), community.getCreateDate());`
	`97`	`+ this(community.getId(), community.getAuthor().getName(), community.getAuthor().getEmail(), community.getAuthor().getProfileImageUrl(), community.getContent(), community.getCreateDate());`
`97`	`98`	`}`
`98`	`99`	`}`
`99`	`100`	`}`