[hotfix] 방 검색 api 수정

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -75,7 +75,8 @@ public enum SwaggerResponseDescription {
     ))),
 
     ROOM_SEARCH(new LinkedHashSet<>(Set.of(
-                INVALID_ROOM_SEARCH_SORT
+            INVALID_ROOM_SEARCH_SORT,
+            CATEGORY_NOT_MATCH
     ))),
     ROOM_PASSWORD_CHECK(new LinkedHashSet<>(Set.of(
             ROOM_NOT_FOUND,

src/main/java/konkuk/thip/room/adapter/in/web/RoomQueryController.java

@@ -11,6 +11,7 @@
 import konkuk.thip.room.adapter.in.web.response.*;
 import konkuk.thip.room.application.port.in.*;
 import konkuk.thip.room.application.port.in.dto.RoomGetHomeJoinedListQuery;
+import konkuk.thip.room.application.port.in.dto.RoomSearchQuery;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,20 +33,23 @@ public class RoomQueryController {
     private final RoomGetDeadlinePopularUseCase roomGetDeadlinePopularUsecase;
 
     @Operation(
-            summary = "방 검색",
-            description = "키워드, 카테고리, 정렬 방식, 페이지 번호를 기준으로 방을 검색합니다. 아직 수정중입니다. 일단 request param 만 수정한 상태입니다."
+            summary = "모집중인 방 검색",
+            description = "검색어(= 방이름 or 첵제목), 카테고리 와 매핑되는 모집중인 방을 검색합니다. 공개/비공개 방 모두 검색 가능합니다."
     )
     @ExceptionDescription(ROOM_SEARCH)
     @GetMapping("/rooms/search")
-    public BaseResponse<RoomSearchResponse> searchRooms(
-            @Parameter(description = "검색 키워드 (책 이름 or 방 이름", example = "해리") @RequestParam(value = "keyword", required = false, defaultValue = "") final String keyword,
+    public BaseResponse<RoomSearchResponse> searchRecruitingRooms(
+            @Parameter(description = "검색 키워드 (책 이름 or 방 이름)", example = "해리") @RequestParam(value = "keyword", required = false, defaultValue = "") final String keyword,
             @Parameter(description = "모임방 카테고리", example = "문학") @RequestParam(value = "category", required = false, defaultValue = "") final String category,
             @Parameter(description = "정렬 방식 (마감 임박 : deadline, 신청 인원 : memberCount)", example = "deadline") @RequestParam("sort") final String sort,
             @Parameter(description = "사용자가 검색어 입력을 '확정'했는지 여부 (입력 중: false, 입력 확정: true)", example = "false") @RequestParam(name = "isFinalized") final boolean isFinalized,
-            @Parameter(description = "페이지 번호", example = "1") @RequestParam("page") final int page,
+            @Parameter(description = "커서 (첫번째 요청시 : null, 다음 요청시 : 이전 요청에서 반환받은 nextCursor 값)")
+            @RequestParam(value = "cursor", required = false) final String cursor,
             @Parameter(hidden = true) @UserId final Long userId
     ) {
-        return BaseResponse.ok(roomSearchUseCase.searchRoom(keyword, category, sort, page, isFinalized, userId));
+        return BaseResponse.ok(roomSearchUseCase.searchRecruitingRooms(
+                RoomSearchQuery.of(keyword, category, sort, isFinalized, cursor, userId)
+        ));
     }
 
     @Operation(

src/main/java/konkuk/thip/room/adapter/in/web/response/RoomGetHomeJoinedListResponse.java

@@ -6,7 +6,7 @@
 
 @Builder
 public record RoomGetHomeJoinedListResponse(
-        List<RoomSearchResult> roomList,
+        List<JoinedRoomInfo> roomList,
         String nickname,
         int page,       // 현재 페이지
         int size,       // 현재 페이지에 포함된 데이터 수
@@ -16,7 +16,7 @@ public record RoomGetHomeJoinedListResponse(
 
 
     @Builder
-    public record RoomSearchResult(
+    public record JoinedRoomInfo(
             Long roomId,
             String bookImageUrl,
             String roomTitle,

src/main/java/konkuk/thip/room/adapter/in/web/response/RoomSearchResponse.java

@@ -3,20 +3,18 @@
 import java.util.List;
 
 public record RoomSearchResponse(
-        List<RoomSearchResult> roomList,
-        int page,       // 현재 페이지
-        int size,       // 현재 페이지에 포함된 데이터 수
-        boolean last,
-        boolean first
+        List<RoomSearchDto> roomList,
+        String nextCursor,
+        boolean isLast
 ) {
 
-    public record RoomSearchResult(
+    public record RoomSearchDto(
             Long roomId,
             String bookImageUrl,
             String roomName,
             int memberCount,
             int recruitCount,
             String deadlineDate,
-            String category
+            boolean isPublic
     ) {}
 }

src/main/java/konkuk/thip/room/adapter/out/jpa/RoomJpaEntity.java

@@ -50,7 +50,7 @@ public class RoomJpaEntity extends BaseJpaEntity {
     private int memberCount = 1;
 
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "book_id")
+    @JoinColumn(name = "book_id", nullable = false)
     private BookJpaEntity bookJpaEntity;
 
     @ManyToOne(fetch = FetchType.LAZY)

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryPersistenceAdapter.java

@@ -6,8 +6,8 @@
 import konkuk.thip.common.util.CursorBasedList;
 import konkuk.thip.room.adapter.in.web.response.RoomGetHomeJoinedListResponse;
 import konkuk.thip.room.adapter.in.web.response.RoomRecruitingDetailViewResponse;
-import konkuk.thip.room.adapter.in.web.response.RoomSearchResponse;
-import konkuk.thip.room.adapter.out.persistence.function.RoomQueryFunction;
+import konkuk.thip.room.adapter.out.persistence.function.IntegerCursorRoomQueryFunction;
+import konkuk.thip.room.adapter.out.persistence.function.LocalDateCursorRoomQueryFunction;
 import konkuk.thip.room.adapter.out.persistence.repository.RoomJpaRepository;
 import konkuk.thip.room.adapter.out.persistence.repository.category.CategoryJpaRepository;
 import konkuk.thip.room.application.port.out.RoomQueryPort;
@@ -35,8 +35,36 @@ public int countRecruitingRoomsByBookAndStartDateAfter(String isbn, LocalDate cu
     }
 
     @Override
-    public Page<RoomSearchResponse.RoomSearchResult> searchRoom(String keyword, String category, Pageable pageable) {
-        return roomJpaRepository.searchRoom(keyword, category, pageable);
+    public CursorBasedList<RoomQueryDto> searchRecruitingRoomsByDeadline(String keyword, Cursor cursor) {
+        return findRoomsByDeadlineCursor(cursor, ((lastLocalDate, lastId, pageSize) ->
+                roomJpaRepository.findRecruitingRoomsOrderByStartDateAsc(keyword, lastLocalDate, lastId, pageSize)));
+    }
+
+    @Override
+    public CursorBasedList<RoomQueryDto> searchRecruitingRoomsWithCategoryByDeadline(String keyword, Category category, Cursor cursor) {
+        return findRoomsByDeadlineCursor(cursor, (lastLocalDate, lastId, pageSize) ->
+                roomJpaRepository.findRecruitingRoomsWithCategoryOrderByStartDateAsc(
+                        keyword, category.getValue(), lastLocalDate, lastId, pageSize
+                )
+        );
+    }
+
+    @Override
+    public CursorBasedList<RoomQueryDto> searchRecruitingRoomsByMemberCount(String keyword, Cursor cursor) {
+        return findRoomsByMemberCountCursor(cursor, (lastMemberCount, lastId, pageSize) ->
+                roomJpaRepository.findRecruitingRoomsOrderByMemberCountDesc(
+                        keyword, lastMemberCount, lastId, pageSize
+                )
+        );
+    }
+
+    @Override
+    public CursorBasedList<RoomQueryDto> searchRecruitingRoomsWithCategoryByMemberCount(String keyword, Category category, Cursor cursor) {
+        return findRoomsByMemberCountCursor(cursor, (lastMemberCount, lastId, pageSize) ->
+                roomJpaRepository.findRecruitingRoomsWithCategoryOrderByMemberCountDesc(
+                        keyword, category.getValue(), lastMemberCount, lastId, pageSize
+                )
+        );
     }
 
     @Override
@@ -46,51 +74,67 @@ public List<RoomRecruitingDetailViewResponse.RecommendRoom> findOtherRecruitingR
     }
 
     @Override
-    public Page<RoomGetHomeJoinedListResponse.RoomSearchResult> searchHomeJoinedRooms(Long userId, LocalDate date, Pageable pageable) {
+    public Page<RoomGetHomeJoinedListResponse.JoinedRoomInfo> searchHomeJoinedRooms(Long userId, LocalDate date, Pageable pageable) {
         return roomJpaRepository.searchHomeJoinedRooms(userId, date, pageable);
     }
 
     @Override
     public CursorBasedList<RoomQueryDto> findRecruitingRoomsUserParticipated(Long userId, Cursor cursor) {
-        return findRooms(cursor, (lastLocalDate, lastId, pageSize) ->
+        return findRoomsByDeadlineCursor(cursor, (lastLocalDate, lastId, pageSize) ->
                 roomJpaRepository.findRecruitingRoomsUserParticipated(userId, lastLocalDate, lastId, pageSize));
     }
 
     @Override
     public CursorBasedList<RoomQueryDto> findPlayingRoomsUserParticipated(Long userId, Cursor cursor) {
-        return findRooms(cursor, (lastLocalDate, lastId, pageSize) ->
+        return findRoomsByDeadlineCursor(cursor, (lastLocalDate, lastId, pageSize) ->
                 roomJpaRepository.findPlayingRoomsUserParticipated(userId, lastLocalDate, lastId, pageSize));
     }
 
     @Override
     public CursorBasedList<RoomQueryDto> findPlayingAndRecruitingRoomsUserParticipated(Long userId, Cursor cursor) {
-        return findRooms(cursor, (lastLocalDate, lastId, pageSize) ->
+        return findRoomsByDeadlineCursor(cursor, (lastLocalDate, lastId, pageSize) ->
                 roomJpaRepository.findPlayingAndRecruitingRoomsUserParticipated(userId, lastLocalDate, lastId, pageSize));
     }
 
     @Override
     public CursorBasedList<RoomQueryDto> findExpiredRoomsUserParticipated(Long userId, Cursor cursor) {
-        return findRooms(cursor, (lastLocalDate, lastId, pageSize) ->
+        return findRoomsByDeadlineCursor(cursor, (lastLocalDate, lastId, pageSize) ->
                 roomJpaRepository.findExpiredRoomsUserParticipated(userId, lastLocalDate, lastId, pageSize));
     }
 
     @Override
     public CursorBasedList<RoomQueryDto> findRoomsByIsbnOrderByDeadline(String isbn, Cursor cursor) {
-        return findRooms(cursor, (lastLocalDate, lastId, pageSize) ->
+        return findRoomsByDeadlineCursor(cursor, (lastLocalDate, lastId, pageSize) ->
                 roomJpaRepository.findRoomsByIsbnOrderByStartDateAsc(isbn, lastLocalDate, lastId, pageSize));
     }
 
-    private CursorBasedList<RoomQueryDto> findRooms(Cursor cursor, RoomQueryFunction queryFunction) {
+    private CursorBasedList<RoomQueryDto> findRoomsByDeadlineCursor(Cursor cursor, LocalDateCursorRoomQueryFunction queryFunction) {
         LocalDate lastLocalDate = cursor.isFirstRequest() ? null : cursor.getLocalDate(0);
         Long lastId = cursor.isFirstRequest() ? null : cursor.getLong(1);
         int pageSize = cursor.getPageSize();
 
         List<RoomQueryDto> dtos = queryFunction.apply(lastLocalDate, lastId, pageSize);
 
-        return CursorBasedList.of(dtos, pageSize, roomShowMineQueryDto -> {
+        return CursorBasedList.of(dtos, pageSize, dto -> {
+            Cursor nextCursor = new Cursor(List.of(
+                    dto.endDate().toString(),
+                    dto.roomId().toString()
+            ));
+            return nextCursor.toEncodedString();
+        });
+    }
+
+    private CursorBasedList<RoomQueryDto> findRoomsByMemberCountCursor(Cursor cursor, IntegerCursorRoomQueryFunction queryFunction) {
+        Integer lastInteger = cursor.isFirstRequest() ? null : cursor.getInteger(0);
+        Long lastId = cursor.isFirstRequest() ? null : cursor.getLong(1);
+        int pageSize = cursor.getPageSize();
+
+        List<RoomQueryDto> dtos = queryFunction.apply(lastInteger, lastId, pageSize);
+
+        return CursorBasedList.of(dtos, pageSize, dto -> {
             Cursor nextCursor = new Cursor(List.of(
-                    roomShowMineQueryDto.endDate().toString(),
-                    roomShowMineQueryDto.roomId().toString()
+                    String.valueOf(dto.memberCount()), // 인원수 커서
+                    dto.roomId().toString()
             ));
             return nextCursor.toEncodedString();
         });

src/main/java/konkuk/thip/room/adapter/out/persistence/function/IntegerCursorRoomQueryFunction.java

@@ -0,0 +1,10 @@
+package konkuk.thip.room.adapter.out.persistence.function;
+
+import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface IntegerCursorRoomQueryFunction {
+    List<RoomQueryDto> apply(Integer lastInteger, Long lastId, int pageSize);
+}

src/main/java/konkuk/thip/room/adapter/out/persistence/function/RoomQueryFunction.java → src/main/java/konkuk/thip/room/adapter/out/persistence/function/LocalDateCursorRoomQueryFunction.java

@@ -6,6 +6,6 @@
 import java.util.List;
 
 @FunctionalInterface
-public interface RoomQueryFunction {
+public interface LocalDateCursorRoomQueryFunction {
     List<RoomQueryDto> apply(LocalDate lastLocalDate, Long lastId, int pageSize);
 }

src/main/java/konkuk/thip/room/adapter/out/persistence/repository/RoomQueryRepository.java

@@ -2,7 +2,6 @@
 
 import konkuk.thip.room.adapter.in.web.response.RoomRecruitingDetailViewResponse;
 import konkuk.thip.room.adapter.in.web.response.RoomGetHomeJoinedListResponse;
-import konkuk.thip.room.adapter.in.web.response.RoomSearchResponse;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -13,11 +12,17 @@
 
 public interface RoomQueryRepository {
 
-    Page<RoomSearchResponse.RoomSearchResult> searchRoom(String keyword, String category, Pageable pageable);
+    /**
+     * 방 검색
+     */
+    List<RoomQueryDto> findRecruitingRoomsOrderByStartDateAsc(String keyword, LocalDate lastStartDate, Long roomId, int pageSize);
+    List<RoomQueryDto> findRecruitingRoomsWithCategoryOrderByStartDateAsc(String keyword, String categoryVal, LocalDate lastStartDate, Long roomId, int pageSize);
+    List<RoomQueryDto> findRecruitingRoomsOrderByMemberCountDesc(String keyword, Integer lastMemberCount, Long roomId, int pageSize);
+    List<RoomQueryDto> findRecruitingRoomsWithCategoryOrderByMemberCountDesc(String keyword, String categoryVal, Integer lastMemberCount, Long roomId, int pageSize);
 
     List<RoomRecruitingDetailViewResponse.RecommendRoom> findOtherRecruitingRoomsByCategoryOrderByStartDateAsc(Long roomId, String category, int count);
 
-    Page<RoomGetHomeJoinedListResponse.RoomSearchResult> searchHomeJoinedRooms(Long userId, LocalDate today, Pageable pageable);
+    Page<RoomGetHomeJoinedListResponse.JoinedRoomInfo> searchHomeJoinedRooms(Long userId, LocalDate today, Pageable pageable);
 
     List<RoomQueryDto> findRecruitingRoomsUserParticipated(Long userId, LocalDate dateCursor, Long roomIdCursor, int pageSize);