Merge pull request #167 from o-ddong/refactor/campaign-service

o-ddong · web-flow · commit e72708b9ccdb · 2025-08-31T00:57:40.000+09:00
Refactor: campaign service
diff --git a/src/main/java/com/example/cherrydan/campaign/controller/BookmarkController.java b/src/main/java/com/example/cherrydan/campaign/controller/BookmarkController.java
@@ -1,6 +1,7 @@
 package com.example.cherrydan.campaign.controller;
 
 import com.example.cherrydan.campaign.dto.BookmarkDeleteDTO;
+import com.example.cherrydan.campaign.dto.BookmarkCancelDTO;
 import com.example.cherrydan.campaign.dto.BookmarkResponseDTO;
 import com.example.cherrydan.campaign.service.BookmarkService;
 import com.example.cherrydan.common.response.ApiResponse;
@@ -24,6 +25,7 @@
 import org.springframework.data.domain.PageRequest;
 import com.example.cherrydan.common.response.PageListResponseDTO;
 import com.example.cherrydan.campaign.dto.BookmarkSplitResponseDTO;
+import jakarta.validation.Valid;
 
 @Tag(name = "Bookmark", description = "캠페인 북마크(찜) 관련 API")
 @RestController
@@ -42,13 +44,13 @@ public ResponseEntity<ApiResponse<EmptyResponse>> addBookmark(
         return ResponseEntity.ok(ApiResponse.success("북마크 추가 성공"));
     }
 
-    @Operation(summary = "북마크 취소", description = "캠페인 북마크(찜)를 취소합니다. (is_active=0)")
-    @PatchMapping("/{campaignId}/bookmark")
+    @Operation(summary = "북마크 취소", description = "여러 캠페인 북마크(찜)를 한 번에 취소합니다. (is_active=0)")
+    @PatchMapping("/bookmark")
     public ResponseEntity<ApiResponse<EmptyResponse>> cancelBookmark(
-            @Parameter(description = "캠페인 ID", required = true) @PathVariable Long campaignId,
+            @Parameter(description = "북마크 취소 요청", required = true) @Valid @RequestBody BookmarkCancelDTO request,
             @Parameter(hidden = true) @AuthenticationPrincipal UserDetailsImpl currentUser
     ) {
-        bookmarkService.cancelBookmark(currentUser.getId(), campaignId);
+        bookmarkService.cancelBookmarks(currentUser.getId(), request);
         return ResponseEntity.ok(ApiResponse.success("북마크 취소 성공"));
     }
 
@@ -81,7 +83,7 @@ public ResponseEntity<ApiResponse<PageListResponseDTO<BookmarkResponseDTO>>> get
     @Operation(summary = "북마크 완전 삭제", description = "캠페인 북마크(찜) 정보를 완전히 삭제합니다.")
     @DeleteMapping("/bookmark")
     public ResponseEntity<ApiResponse<EmptyResponse>> deleteBookmark(
-            @RequestBody BookmarkDeleteDTO request,
+            @Parameter(description = "북마크 삭제 요청", required = true) @Valid @RequestBody BookmarkDeleteDTO request,
             @Parameter(hidden = true) @AuthenticationPrincipal UserDetailsImpl currentUser
     ) {
         bookmarkService.deleteBookmark(currentUser.getId(), request);
diff --git a/src/main/java/com/example/cherrydan/campaign/controller/CampaignStatusController.java b/src/main/java/com/example/cherrydan/campaign/controller/CampaignStatusController.java
@@ -3,7 +3,6 @@
 import com.example.cherrydan.campaign.dto.CampaignStatusRequestDTO;
 import com.example.cherrydan.campaign.dto.CampaignStatusResponseDTO;
 import com.example.cherrydan.campaign.dto.CampaignStatusListResponseDTO;
-import com.example.cherrydan.campaign.dto.CampaignStatusPopupResponseDTO;
 import com.example.cherrydan.campaign.dto.CampaignStatusCountResponseDTO;
 import com.example.cherrydan.campaign.domain.CampaignStatusType;
 import com.example.cherrydan.common.response.EmptyResponse;
@@ -27,6 +26,8 @@
 import com.example.cherrydan.common.exception.ErrorMessage;
 import com.example.cherrydan.campaign.dto.CampaignStatusBatchRequestDTO;
 import com.example.cherrydan.campaign.dto.CampaignStatusDeleteRequestDTO;
+import com.example.cherrydan.campaign.dto.CampaignStatusPopupByTypeResponseDTO;
+import io.swagger.v3.oas.annotations.Parameter;
 
 import java.util.List;
 
@@ -78,7 +79,7 @@ public ResponseEntity<ApiResponse<CampaignStatusResponseDTO>> createOrRecoverSta
     @Operation(summary = "내 체험단 상태 변경", description = "배치로 여러 캠페인 상태 변경")
     @PatchMapping
     public ResponseEntity<ApiResponse<List<CampaignStatusResponseDTO>>> updateStatus(
-        @RequestBody CampaignStatusBatchRequestDTO requestDTO,
+        @Valid @RequestBody CampaignStatusBatchRequestDTO requestDTO,
         @AuthenticationPrincipal UserDetailsImpl currentUser
     ) {
         List<CampaignStatusResponseDTO> results = campaignStatusService.updateStatusBatch(requestDTO, currentUser.getId());
@@ -95,12 +96,21 @@ public ResponseEntity<ApiResponse<EmptyResponse>> deleteStatus(
         return ResponseEntity.ok(ApiResponse.success("체험단 상태 삭제 성공"));
     }
 
-    @Operation(summary = "내 체험단 노출 팝업 조회", description = "지원한 공고/선정 결과/리뷰 작성 중 상태 중 기간이 지난 데이터만 최대 4개씩, 각 상태별 총 개수와 함께 반환")
+    @Operation(summary = "내 체험단 노출 팝업 조회", description = "지정된 상태의 기간이 지난 데이터만 최대 4개씩 반환")
     @GetMapping("/popup")
-    public ResponseEntity<ApiResponse<CampaignStatusPopupResponseDTO>> getPopupStatus(
-        @AuthenticationPrincipal UserDetailsImpl currentUser
+    public ResponseEntity<ApiResponse<CampaignStatusPopupByTypeResponseDTO>> getPopupStatus(
+            @Parameter(description = "상태 타입 (APPLY, SELECTED, REVIEWING, ENDED)", required = true) 
+            @RequestParam String status,
+            @AuthenticationPrincipal UserDetailsImpl currentUser
     ) {
-        CampaignStatusPopupResponseDTO result = campaignStatusService.getPopupStatusByUser(currentUser.getId());
-        return ResponseEntity.ok(ApiResponse.success(result));
+        CampaignStatusType statusType;
+        try {
+            statusType = CampaignStatusType.valueOf(status.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            throw new CampaignException(ErrorMessage.CAMPAIGN_STATUS_INVALID);
+        }
+        
+        CampaignStatusPopupByTypeResponseDTO result = campaignStatusService.getPopupStatusByType(currentUser.getId(), statusType);
+        return ResponseEntity.ok(ApiResponse.success("팝업 상태 조회 성공", result));
     }
 } 
diff --git a/src/main/java/com/example/cherrydan/campaign/dto/BookmarkCancelDTO.java b/src/main/java/com/example/cherrydan/campaign/dto/BookmarkCancelDTO.java
@@ -0,0 +1,18 @@
+package com.example.cherrydan.campaign.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import jakarta.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Getter
+@NoArgsConstructor
+@Schema(description = "북마크 취소 요청 DTO")
+public class BookmarkCancelDTO {
+    
+    @NotEmpty(message = "캠페인 ID 목록은 필수입니다.")
+    @Schema(description = "취소할 캠페인 ID 목록", example = "[1, 2, 3]", required = true)
+    private List<Long> campaignIds;
+}
diff --git a/src/main/java/com/example/cherrydan/campaign/dto/BookmarkDeleteDTO.java b/src/main/java/com/example/cherrydan/campaign/dto/BookmarkDeleteDTO.java
@@ -4,12 +4,16 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 
 
 @Getter
 @NoArgsConstructor
+@Schema(description = "북마크 삭제 요청 DTO")
 public class BookmarkDeleteDTO {
+
+    @NotEmpty(message = "캠페인 ID 목록은 필수입니다.")
     @Schema(description = "북마크 삭제 DTO ", example = "[1, 2, 3]")
     private List<Long> campaignIds;
 } 
diff --git a/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusBatchRequestDTO.java b/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusBatchRequestDTO.java
@@ -6,13 +6,16 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "캠페인 상태 배치 업데이트 요청")
 public class CampaignStatusBatchRequestDTO {
+
+    @NotEmpty(message = "캠페인 ID 목록은 필수입니다.")
     @Schema(description = "업데이트할 캠페인 ID 목록", example = "[1, 2, 3]", required = true)
     private List<Long> campaignIds;
     
diff --git a/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusDeleteRequestDTO.java b/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusDeleteRequestDTO.java
@@ -5,13 +5,16 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
+import jakarta.validation.constraints.NotEmpty;
 import java.util.List;
 
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
 @Schema(description = "캠페인 상태 배치 삭제 요청")
 public class CampaignStatusDeleteRequestDTO {
+
+    @NotEmpty(message = "캠페인 ID 목록은 필수입니다.")
     @Schema(description = "삭제할 캠페인 ID 목록", example = "[1, 2, 3]", required = true)
     private List<Long> campaignIds;
 }
diff --git a/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusPopupByTypeResponseDTO.java b/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusPopupByTypeResponseDTO.java
@@ -0,0 +1,21 @@
+package com.example.cherrydan.campaign.dto;
+
+import com.example.cherrydan.campaign.domain.CampaignStatusType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+import java.util.List;
+
+@Getter
+@Builder
+@Schema(description = "특정 상태의 내 체험단 팝업용 응답 DTO")
+public class CampaignStatusPopupByTypeResponseDTO {
+    @Schema(description = "상태 타입", example = "APPLY")
+    private CampaignStatusType statusType;
+    
+    @Schema(description = "총 개수", example = "4")
+    private long totalCount;
+    
+    @Schema(description = "팝업 아이템 리스트 (최대 4개)")
+    private List<CampaignStatusPopupItemDTO> items;
+}
diff --git a/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusPopupItemDTO.java b/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusPopupItemDTO.java
@@ -1,5 +1,7 @@
 package com.example.cherrydan.campaign.dto;
 
+import com.example.cherrydan.campaign.domain.CampaignStatus;
+
 import lombok.Builder;
 import lombok.Getter;
 
@@ -11,9 +13,8 @@ public class CampaignStatusPopupItemDTO {
     private String imageUrl;
     private String reviewerAnnouncementStatus;
     private String benefit;
-    private String statusLabel;
 
-    public static CampaignStatusPopupItemDTO fromEntity(com.example.cherrydan.campaign.domain.CampaignStatus status) {
+    public static CampaignStatusPopupItemDTO fromEntity(CampaignStatus status) {
         String reviewerAnnouncementStatus = null;
         switch (status.getStatus()) {
             case APPLY:
@@ -22,9 +23,6 @@ public static CampaignStatusPopupItemDTO fromEntity(com.example.cherrydan.campai
             case SELECTED:
                 reviewerAnnouncementStatus = CampaignStatusResponseDTO.getStatusMessage(status.getCampaign().getContentSubmissionEnd(), "selected");
                 break;
-            case NOT_SELECTED:
-                reviewerAnnouncementStatus = CampaignStatusResponseDTO.getStatusMessage(status.getCampaign().getContentSubmissionEnd(), "not_selected");
-                break;
             case REVIEWING:
                 reviewerAnnouncementStatus = CampaignStatusResponseDTO.getStatusMessage(status.getCampaign().getContentSubmissionEnd(), "reviewing");
                 break;
@@ -40,7 +38,6 @@ public static CampaignStatusPopupItemDTO fromEntity(com.example.cherrydan.campai
                 .imageUrl(status.getCampaign().getImageUrl())
                 .reviewerAnnouncementStatus(reviewerAnnouncementStatus)
                 .benefit(status.getCampaign().getBenefit())
-                .statusLabel(status.getStatus().getLabel())
                 .build();
     }
 } 
diff --git a/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusPopupResponseDTO.java b/src/main/java/com/example/cherrydan/campaign/dto/CampaignStatusPopupResponseDTO.java
diff --git a/src/main/java/com/example/cherrydan/campaign/repository/BookmarkRepository.java b/src/main/java/com/example/cherrydan/campaign/repository/BookmarkRepository.java
@@ -27,6 +27,11 @@ public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
     Page<Bookmark> findByUserIdAndIsActiveTrueAndCampaign_ApplyEndGreaterThanEqual(Long userId, LocalDate date, Pageable pageable);
     Page<Bookmark> findByUserIdAndIsActiveTrueAndCampaign_ApplyEndLessThan(Long userId, LocalDate date, Pageable pageable);
 
+    /**
+     * 특정 사용자의 여러 캠페인 ID에 대한 북마크를 조회
+     */
+    List<Bookmark> findByUserAndCampaignIdIn(User user, List<Long> campaignIds);
+
     /**
      * 특정 날짜에 마감되는 활성 캠페인의 북마크들을 조회 (페치 조인 포함)
      */
diff --git a/src/main/java/com/example/cherrydan/campaign/repository/CampaignStatusRepository.java b/src/main/java/com/example/cherrydan/campaign/repository/CampaignStatusRepository.java
@@ -61,4 +61,19 @@ void updateStatusOnlyBatch(@Param("user") User user, @Param("campaignIds") List<
     @Query("SELECT cs FROM CampaignStatus cs JOIN FETCH cs.campaign " +
            "WHERE cs.user = :user AND cs.campaign.id IN :campaignIds")
     List<CampaignStatus> findByUserAndCampaignIds(@Param("user") User user, @Param("campaignIds") List<Long> campaignIds);
+
+    @Query("SELECT cs FROM CampaignStatus cs JOIN cs.campaign c " +
+           "WHERE cs.user = :user AND cs.status = :status AND cs.isActive = true " +
+           "AND (" +
+           "  (:status = 0 AND c.reviewerAnnouncement IS NOT NULL AND c.reviewerAnnouncement <= :today) OR " +
+           "  (:status = 1 AND c.contentSubmissionEnd IS NOT NULL AND c.contentSubmissionEnd <= :today) OR " +
+           "  (:status = 3 AND c.contentSubmissionEnd IS NOT NULL AND c.contentSubmissionEnd <= :today) OR " +
+           "  (:status = 4 AND c.resultAnnouncement IS NOT NULL AND c.resultAnnouncement <= :today)" +
+           ") " +
+           "ORDER BY " +
+           "  CASE WHEN :status = 0 THEN c.reviewerAnnouncement END DESC, " +
+           "  CASE WHEN :status = 1 THEN c.contentSubmissionEnd END DESC, " +
+           "  CASE WHEN :status = 3 THEN c.contentSubmissionEnd END DESC, " +
+           "  CASE WHEN :status = 4 THEN c.resultAnnouncement END DESC")
+    List<CampaignStatus> findTop4ByUserAndStatusAndExpired(@Param("user") User user, @Param("status") CampaignStatusType status, @Param("today") LocalDate today);
 } 
diff --git a/src/main/java/com/example/cherrydan/campaign/service/BookmarkService.java b/src/main/java/com/example/cherrydan/campaign/service/BookmarkService.java
@@ -1,14 +1,15 @@
 package com.example.cherrydan.campaign.service;
 
 import com.example.cherrydan.campaign.dto.BookmarkDeleteDTO;
+import com.example.cherrydan.campaign.dto.BookmarkCancelDTO;
 import com.example.cherrydan.campaign.dto.BookmarkResponseDTO;
 import com.example.cherrydan.common.response.PageListResponseDTO;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
 
 public interface BookmarkService {
     void addBookmark(Long userId, Long campaignId);
-    void cancelBookmark(Long userId, Long campaignId);
+    void cancelBookmarks(Long userId, BookmarkCancelDTO request);
     PageListResponseDTO<BookmarkResponseDTO> getOpenBookmarks(Long userId, Pageable pageable);
     PageListResponseDTO<BookmarkResponseDTO> getClosedBookmarks(Long userId, Pageable pageable);
     void deleteBookmark(Long userId, BookmarkDeleteDTO request);
diff --git a/src/main/java/com/example/cherrydan/campaign/service/BookmarkServiceImpl.java b/src/main/java/com/example/cherrydan/campaign/service/BookmarkServiceImpl.java
@@ -27,6 +27,7 @@
 import java.time.LocalDate;
 import org.springframework.data.domain.PageImpl;
 import com.example.cherrydan.common.response.PageListResponseDTO;
+import com.example.cherrydan.campaign.dto.BookmarkCancelDTO;
 
 @Service
 @RequiredArgsConstructor
@@ -59,24 +60,28 @@ public void addBookmark(Long userId, Long campaignId) {
 
     @Override
     @Transactional
-    public void cancelBookmark(Long userId, Long campaignId) {
+    public void deleteBookmark(Long userId, BookmarkDeleteDTO request) {
         User user = userRepository.findActiveById(userId)
                 .orElseThrow(() -> new UserException(ErrorMessage.USER_NOT_FOUND));
-        Campaign campaign = campaignRepository.findById(campaignId)
-                .orElseThrow(() -> new BaseException(ErrorMessage.RESOURCE_NOT_FOUND));
-        Bookmark bookmark = bookmarkRepository.findByUserAndCampaign(user, campaign)
-                .orElseThrow(() -> new BaseException(ErrorMessage.RESOURCE_NOT_FOUND));
-        bookmark.setIsActive(false);
-        bookmarkRepository.save(bookmark);
+        
+        bookmarkRepository.deleteByUserAndCampaignIds(user, request.getCampaignIds());
     }
 
     @Override
     @Transactional
-    public void deleteBookmark(Long userId, BookmarkDeleteDTO request) {
+    public void cancelBookmarks(Long userId, BookmarkCancelDTO request) {
         User user = userRepository.findActiveById(userId)
                 .orElseThrow(() -> new UserException(ErrorMessage.USER_NOT_FOUND));
         
-        bookmarkRepository.deleteByUserAndCampaignIds(user, request.getCampaignIds());
+        try {
+            List<Bookmark> bookmarks = bookmarkRepository.findByUserAndCampaignIdIn(user, request.getCampaignIds());
+            for (Bookmark bookmark : bookmarks) {
+                bookmark.setIsActive(false);
+            }
+            bookmarkRepository.saveAll(bookmarks);
+        } catch (Exception e) {
+            throw new BaseException(ErrorMessage.RESOURCE_NOT_FOUND);
+        }
     }
 
     public PageListResponseDTO<BookmarkResponseDTO> getOpenBookmarks(Long userId, Pageable pageable) {
diff --git a/src/main/java/com/example/cherrydan/campaign/service/CampaignStatusService.java b/src/main/java/com/example/cherrydan/campaign/service/CampaignStatusService.java
@@ -11,7 +11,7 @@ public interface CampaignStatusService {
     CampaignStatusResponseDTO createOrRecoverStatus(CampaignStatusRequestDTO requestDTO, Long userId);
     List<CampaignStatusResponseDTO> updateStatusBatch(CampaignStatusBatchRequestDTO requestDTO, Long userId);
     void deleteStatusBatch(CampaignStatusDeleteRequestDTO requestDTO, Long userId);
-    CampaignStatusPopupResponseDTO getPopupStatusByUser(Long userId);
+    CampaignStatusPopupByTypeResponseDTO getPopupStatusByType(Long userId, CampaignStatusType statusType);
     PageListResponseDTO<CampaignStatusResponseDTO> getStatusesByType(Long userId, CampaignStatusType statusType, Pageable pageable);
     CampaignStatusCountResponseDTO getStatusCounts(Long userId);
 } 
diff --git a/src/main/java/com/example/cherrydan/campaign/service/CampaignStatusServiceImpl.java b/src/main/java/com/example/cherrydan/campaign/service/CampaignStatusServiceImpl.java
