Merge pull request #243 from MoneyMakersClub/develop

[DEPLOY] 최근 생성된, 모집 중인 클럽 보기 API 배포

Author: seohyun-lee

bookduck/src/main/java/com/mmc/bookduck/domain/club/controller/ClubController.java

@@ -40,6 +40,12 @@ public ResponseEntity<Long> createClub(@Valid @RequestBody ClubCreateRequestDto
                 .body(clubId);                  // body에 clubId 리턴
     }
 
+    @Operation(summary = "최근 모집 중인 클럽 보기", description = "최근 생성된, 모집 중인 클럽을 표시합니다.")
+    @GetMapping("/new")
+    public ResponseEntity<ClubSearchListResponseDto> findRecentActiveClubs(Pageable pageable) {
+        return ResponseEntity.ok(clubService.findRecentActiveClubs(pageable));
+    }
+
     @Operation(summary = "클럽 검색", description = "클럽명, 책 제목, 저자명으로 클럽을 검색합니다. 정렬 기준: 정확도순 > 가입인원순 > 최근생성순 > 곧종료순")
     @GetMapping("/search")
     public ResponseEntity<ClubSearchListResponseDto> searchClubs(

bookduck/src/main/java/com/mmc/bookduck/domain/club/dto/response/ClubSearchListResponseDto.java

@@ -8,7 +8,7 @@
 @Builder
 @Schema(description = "클럽 검색 목록 응답 DTO")
 public record ClubSearchListResponseDto(
-        @Schema(description = "검색된 클럽 목록") PaginatedResponseDto<ClubSearchResponseDto> clubs
+        @Schema(description = "클럽 목록") PaginatedResponseDto<ClubSearchResponseDto> clubs
 ) {
     public static ClubSearchListResponseDto from(Page<ClubSearchResponseDto> clubPage) {
         return ClubSearchListResponseDto.builder()

bookduck/src/main/java/com/mmc/bookduck/domain/club/dto/response/ClubSearchResponseDto.java

@@ -3,15 +3,11 @@
 import com.mmc.bookduck.domain.book.entity.BookInfo;
 import com.mmc.bookduck.domain.club.dto.common.ClubBookInfoDto;
 import com.mmc.bookduck.domain.club.entity.Club;
-import com.mmc.bookduck.domain.club.entity.ClubMember;
 import com.mmc.bookduck.domain.club.entity.ClubStatus;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 
-import java.awt.print.Book;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @Builder
 @Schema(description = "클럽 검색 응답 DTO")

bookduck/src/main/java/com/mmc/bookduck/domain/club/dto/response/ClubUpdateResponseDto.java

@@ -6,7 +6,6 @@
 import lombok.Builder;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Builder
 @Schema(description = "클럽 정보 수정 응답 DTO")

bookduck/src/main/java/com/mmc/bookduck/domain/club/repository/ClubRepository.java

@@ -35,6 +35,8 @@ Page<Club> searchClubs(@Param("keyword") String keyword,
                           Pageable pageable);
 
     @Query("SELECT c FROM Club c WHERE c.clubStatus = :status AND c.activeEndAt < :now")
-    List<Club> findByStatusAndActiveEndAtBefore(@Param("status") ClubStatus status,
-                                                @Param("now") LocalDateTime now);
+    List<Club> findByClubStatusAndActiveEndAtBefore(@Param("status") ClubStatus status,
+                                                    @Param("now") LocalDateTime now);
+
+    Page<Club> findByClubStatusOrderByCreatedTimeDesc(ClubStatus status, Pageable pageable);
 }

bookduck/src/main/java/com/mmc/bookduck/domain/club/service/ClubService.java

@@ -354,4 +354,17 @@ public LocalDateTime getLastReadAt(ClubMember clubMember) {
                 .map(ClubMemberReadStatus::getLastReadAt)
                 .orElse(LocalDateTime.MIN);
     }
+
+    @Transactional(readOnly = true)
+    public ClubSearchListResponseDto findRecentActiveClubs(Pageable pageable) {
+        Page<Club> clubPage = clubRepository.findByClubStatusOrderByCreatedTimeDesc(ClubStatus.ACTIVE, pageable);
+
+        Page<ClubSearchResponseDto> dtoPage = clubPage.map(club -> {
+            BookInfo bookInfo = club.getBookInfo();
+            int memberCount = Math.toIntExact(clubMemberService.countByClub(club));  // 현재 가입 인원 수
+            return ClubSearchResponseDto.from(club, bookInfo, memberCount);
+        });
+
+        return ClubSearchListResponseDto.from(dtoPage);
+    }
 }

bookduck/src/main/java/com/mmc/bookduck/global/schedule/ClubStatusScheduler.java

@@ -24,7 +24,7 @@ public class ClubStatusScheduler {
     @Transactional
     public void updateExpiredClubs() {
         try {
-            List<Club> expiredClubs = clubRepository.findByStatusAndActiveEndAtBefore(
+            List<Club> expiredClubs = clubRepository.findByClubStatusAndActiveEndAtBefore(
                     ClubStatus.ACTIVE, LocalDateTime.now());
             if (expiredClubs.isEmpty()) {
                 log.info("종료된 클럽 없음.");