[Refactor] 저장한 책, 참여중인 방의 책 조회시 커서기반 무한스크롤 추가/ [모임 홈] 진행중인 방 조회시 페이지기반 무한스크롤을 커서기반으로 수정

src/main/java/konkuk/thip/book/adapter/in/web/BookQueryController.java

@@ -94,10 +94,12 @@ public BaseResponse<BookRecruitingRoomsResponse> showRecruitingRoomsWithBook(
     @GetMapping("/books/selectable-list")
     public BaseResponse<BookSelectableListResponse> showSelectableBookList(
             @Parameter(description = "저장한 책 또는 참여 중인 모임의 책을 구분하는 필드 (SAVED : 저장한 책 / JOINING : 모임 방의 책)", example = "SAVED") @RequestParam final String type,
-            @Parameter(hidden = true) @UserId final Long userId
-    ) {
+            @Parameter(hidden = true) @UserId final Long userId,
+            @Parameter(description = "커서 (첫번째 요청시 : null, 다음 요청시 : 이전 요청에서 반환받은 nextCursor 값)")
+            @RequestParam(required = false) final String cursor)
+    {
         return BaseResponse.ok(
-                BookSelectableListResponse.of(bookSelectableListUseCase.getSelectableBookList(BookSelectableType.from(type), userId))
+                bookSelectableListUseCase.getSelectableBookList(BookSelectableType.from(type), userId, cursor)
         );
     }
 
@@ -106,8 +108,11 @@ public BaseResponse<BookSelectableListResponse> showSelectableBookList(
             description = "사용자가 저장한 책을 조회 합니다."
     )
     @GetMapping("/books/saved")
-    public BaseResponse<BookShowSavedListResponse> showSavedBookList(@Parameter(hidden = true) @UserId final Long userId) {
-        return BaseResponse.ok(BookShowSavedListResponse.of(bookShowSavedListUseCase.getSavedBookList(userId)));
+    public BaseResponse<BookShowSavedListResponse> showSavedBookList(
+            @Parameter(hidden = true) @UserId final Long userId,
+            @Parameter(description = "커서 (첫번째 요청시 : null, 다음 요청시 : 이전 요청에서 반환받은 nextCursor 값)")
+            @RequestParam(required = false) final String cursor) {
+        return BaseResponse.ok(bookShowSavedListUseCase.getSavedBookList(userId, cursor));
     }
 
 }

src/main/java/konkuk/thip/book/adapter/in/web/response/BookSelectableListResponse.java

@@ -1,13 +1,22 @@
 package konkuk.thip.book.adapter.in.web.response;
 
-import konkuk.thip.book.application.port.in.dto.BookSelectableResult;
-
 import java.util.List;
 
 public record BookSelectableListResponse(
-        List<BookSelectableResult> bookList
+        List<BookSelectableDto> bookList,
+        String nextCursor,
+        boolean isLast
 ) {
-    public static BookSelectableListResponse of(List<BookSelectableResult> bookSelectableResults) {
-        return new BookSelectableListResponse(bookSelectableResults);
+    public record BookSelectableDto(
+            Long bookId,
+            String bookTitle,
+            String authorName,
+            String publisher,
+            String bookImageUrl,
+            String isbn
+    ) {}
+
+    public static BookSelectableListResponse of(List<BookSelectableDto> bookList, String nextCursor, boolean isLast) {
+        return new BookSelectableListResponse(bookList, nextCursor, isLast);
     }
 }

src/main/java/konkuk/thip/book/adapter/in/web/response/BookShowSavedListResponse.java

@@ -1,13 +1,23 @@
 package konkuk.thip.book.adapter.in.web.response;
 
-import konkuk.thip.book.application.port.in.dto.BookShowSavedInfoResult;
-
 import java.util.List;
 
 public record BookShowSavedListResponse(
-        List<BookShowSavedInfoResult> bookList
+        List<BookShowSavedDto> bookList,
+        String nextCursor,
+        boolean isLast
 ) {
-    public static BookShowSavedListResponse of(List<BookShowSavedInfoResult> bookSavedInfoResultList) {
-        return new BookShowSavedListResponse(bookSavedInfoResultList);
+    public record BookShowSavedDto(
+            Long bookId,
+            String bookTitle,
+            String authorName,
+            String publisher,
+            String bookImageUrl,
+            String isbn,
+            boolean isSaved
+    ) {
+    }
+    public static BookShowSavedListResponse of(List<BookShowSavedDto> bookList, String nextCursor, boolean isLast) {
+        return new BookShowSavedListResponse(bookList, nextCursor, isLast);
     }
 }

src/main/java/konkuk/thip/book/adapter/out/persistence/BookQueryPersistenceAdapter.java

@@ -4,18 +4,16 @@
 import konkuk.thip.book.adapter.out.persistence.repository.BookJpaRepository;
 import konkuk.thip.book.adapter.out.persistence.repository.SavedBookJpaRepository;
 import konkuk.thip.book.application.port.out.BookQueryPort;
-import konkuk.thip.book.domain.Book;
-import konkuk.thip.common.exception.EntityNotFoundException;
-import konkuk.thip.user.adapter.out.jpa.UserJpaEntity;
+import konkuk.thip.book.application.port.out.dto.BookQueryDto;
+import konkuk.thip.common.util.Cursor;
+import konkuk.thip.common.util.CursorBasedList;
 import konkuk.thip.user.adapter.out.persistence.repository.UserJpaRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
-
-import static konkuk.thip.common.exception.code.ErrorCode.USER_NOT_FOUND;
 
 @Repository
 @RequiredArgsConstructor
@@ -37,28 +35,38 @@ public boolean existsBookByIsbn(String isbn) {
     }
 
     @Override
-    public List<Book> findSavedBooksByUserId(Long userId) {
-        UserJpaEntity user = userJpaRepository.findById(userId)
-                .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
+    public CursorBasedList<BookQueryDto> findSavedBooksBySavedAt(Long userId, Cursor cursor) {
+        LocalDateTime lastSavedAt = cursor.isFirstRequest() ? null : cursor.getLocalDateTime(0);
+        int pageSize = cursor.getPageSize();
+
+        List<BookQueryDto> dtos = bookJpaRepository.findSavedBooksBySavedAt(userId, lastSavedAt, pageSize);
 
-        return bookJpaRepository.findSavedBooksByUserId(user.getUserId()).stream()
-                .map(bookMapper::toDomainEntity)
-                .collect(Collectors.toList());
+        return CursorBasedList.of(dtos, pageSize, dto -> {
+            Cursor nextCursor = new Cursor(List.of(dto.savedCreatedAt().toString()));
+            return nextCursor.toEncodedString();
+        });
     }
 
     @Override
-    public List<Book> findJoiningRoomsBooksByUserId(Long userId) {
-        UserJpaEntity user = userJpaRepository.findById(userId)
-                .orElseThrow(() -> new EntityNotFoundException(USER_NOT_FOUND));
+    public CursorBasedList<BookQueryDto> findJoiningRoomsBooksByRoomPercentage(Long userId, Cursor cursor) {
+        Double lastRoomPercentage = cursor.isFirstRequest() ? null : cursor.getDouble(0);
+        Long lastBookId = cursor.isFirstRequest() ? null : cursor.getLong(1);
+        int pageSize = cursor.getPageSize();
 
-        return bookJpaRepository.findJoiningRoomsBooksByUserId(user.getUserId())
-                .stream()
-                .map(bookMapper::toDomainEntity)
-                .collect(Collectors.toList());
+        List<BookQueryDto> dtos = bookJpaRepository.findJoiningRoomsBooksByRoomPercentage(userId, lastRoomPercentage, lastBookId, pageSize);
+
+        return CursorBasedList.of(dtos, pageSize, dto -> {
+            Cursor nextCursor = new Cursor(List.of(
+                    dto.roomPercentage().toString(), // 내림차순 필드, 정렬순서 1
+                    dto.bookId().toString() // 고유 ID, 중복 방지용
+            ));
+            return nextCursor.toEncodedString();
+        });
     }
 
     @Override
     public Set<Long> findUnusedBookIds() {
         return bookJpaRepository.findUnusedBookIds();
     }
+
 }

src/main/java/konkuk/thip/book/adapter/out/persistence/repository/BookJpaRepository.java

@@ -4,30 +4,12 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-public interface BookJpaRepository extends JpaRepository<BookJpaEntity, Long> {
+public interface BookJpaRepository extends JpaRepository<BookJpaEntity, Long>,BookQueryRepository {
     Optional<BookJpaEntity> findByIsbn(String isbn);
 
-    @Query("SELECT b FROM BookJpaEntity b " +
-            "JOIN SavedBookJpaEntity s ON s.bookJpaEntity.bookId = b.bookId " +
-            "WHERE s.userJpaEntity.userId = :userId " +
-            "GROUP BY b " +
-            "ORDER BY MAX(s.createdAt) DESC")
-    List<BookJpaEntity> findSavedBooksByUserId(Long userId);
-
-    @Query("SELECT b FROM BookJpaEntity b " +
-            "JOIN RoomJpaEntity r ON r.bookJpaEntity.bookId = b.bookId " +
-            "JOIN RoomParticipantJpaEntity rp ON rp.roomJpaEntity.roomId = r.roomId " +
-            "WHERE rp.userJpaEntity.userId = :userId " +
-            "  AND r.status = 'ACTIVE' " +
-            "  AND r.startDate <= CURRENT_TIMESTAMP " + // 진행 중인 방만 조회 (모집 중 / 만료된 방 x)
-            "GROUP BY b " +
-            "ORDER BY MAX(r.roomPercentage) DESC") // 방의 진행률이 높은 순서로 정렬
-    List<BookJpaEntity> findJoiningRoomsBooksByUserId(Long userId);
-
     boolean existsByIsbn(String isbn);
 
     // Room, Feed, SavedBook에 모두 참조되지 않은 책 ID만 찾는 쿼리

src/main/java/konkuk/thip/book/adapter/out/persistence/repository/BookQueryRepository.java

@@ -0,0 +1,12 @@
+package konkuk.thip.book.adapter.out.persistence.repository;
+
+import konkuk.thip.book.application.port.out.dto.BookQueryDto;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+public interface BookQueryRepository {
+    List<BookQueryDto> findSavedBooksBySavedAt(Long userId, LocalDateTime lastSavedAt, int pageSize);
+
+    List<BookQueryDto> findJoiningRoomsBooksByRoomPercentage(Long userId, Double lastRoomPercentage, Long lastBookId, int pageSize);
+}

src/main/java/konkuk/thip/book/adapter/out/persistence/repository/BookQueryRepositoryImpl.java

@@ -0,0 +1,117 @@
+package konkuk.thip.book.adapter.out.persistence.repository;
+
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.NumberExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import konkuk.thip.book.adapter.out.jpa.QBookJpaEntity;
+import konkuk.thip.book.adapter.out.jpa.QSavedBookJpaEntity;
+import konkuk.thip.book.application.port.out.dto.BookQueryDto;
+import konkuk.thip.book.application.port.out.dto.QBookQueryDto;
+import konkuk.thip.common.entity.StatusType;
+import konkuk.thip.room.adapter.out.jpa.QRoomJpaEntity;
+import konkuk.thip.room.adapter.out.jpa.QRoomParticipantJpaEntity;
+import konkuk.thip.user.adapter.out.jpa.QUserJpaEntity;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static konkuk.thip.common.entity.StatusType.ACTIVE;
+
+@Repository
+@RequiredArgsConstructor
+public class BookQueryRepositoryImpl implements BookQueryRepository {
+
+    private final JPAQueryFactory jpaQueryFactory;
+
+    private final QUserJpaEntity user = QUserJpaEntity.userJpaEntity;
+    private final QBookJpaEntity book = QBookJpaEntity.bookJpaEntity;
+    private final QSavedBookJpaEntity savedBook = QSavedBookJpaEntity.savedBookJpaEntity;
+
+    @Override
+    public List<BookQueryDto> findSavedBooksBySavedAt(Long userId, LocalDateTime savedAtCursor, int pageSize) {
+
+        // 검색 조건(where) 조립
+        // 유저가 저장한 책만: userId 조건
+        // 존재하는 유저만: ACTIVE
+        BooleanBuilder where = new BooleanBuilder();
+        where.and(savedBook.userJpaEntity.userId.eq(userId));
+        where.and(user.status.eq(ACTIVE));
+
+        if (savedAtCursor != null) {
+            where.and(savedBook.createdAt.lt(savedAtCursor)); // 커서 기준: 저장일 기준 최신순
+        }
+
+        return jpaQueryFactory
+                .select(new QBookQueryDto(
+                        book.bookId,
+                        book.title,
+                        book.authorName,
+                        book.publisher,
+                        book.imageUrl,
+                        book.isbn,
+                        savedBook.createdAt
+                ))
+                .from(savedBook)
+                .join(savedBook.userJpaEntity, user)
+                .join(savedBook.bookJpaEntity, book)
+                .where(where)
+                .orderBy(savedBook.createdAt.desc()) // 저장한 시간 최신순 (내림차순)
+                .limit(pageSize + 1)
+                .fetch();
+    }
+
+    @Override
+    public List<BookQueryDto> findJoiningRoomsBooksByRoomPercentage(Long userId, Double roomPercentageCursor, Long bookIdCursor, int pageSize) {
+
+        QRoomJpaEntity room = QRoomJpaEntity.roomJpaEntity;
+        QRoomParticipantJpaEntity participant = QRoomParticipantJpaEntity.roomParticipantJpaEntity;
+
+        NumberExpression<Double> maxRoomPercentage = Expressions.numberTemplate(Double.class, "max({0})", room.roomPercentage);
+
+        // 검색 조건(where) 조립
+        // 유저가 참여한 방만: userId 조건
+        // 존재하는 유저 방 관계만: ACTIVE, 존재하는 유저만: ACTIVE, 존재하는 방만: ACTIVE
+        // 활동 기간 중인 방만: startDate ≤ today ≤ endDate
+        BooleanBuilder where = new BooleanBuilder();
+        where.and(participant.userJpaEntity.userId.eq(userId));
+        where.and(participant.status.eq(ACTIVE));
+        where.and(user.status.eq(ACTIVE));
+        where.and(room.status.eq(StatusType.ACTIVE));
+        where.and(room.startDate.loe(LocalDate.now()));
+        where.and(room.endDate.goe(LocalDate.now()));
+
+        BooleanBuilder having = new BooleanBuilder();
+        if (roomPercentageCursor != null && bookIdCursor != null) {
+            having.and(
+                    maxRoomPercentage.lt(roomPercentageCursor)
+                            .or(maxRoomPercentage.eq(roomPercentageCursor).and(book.bookId.gt(bookIdCursor)))
+            );
+        }
+
+        return jpaQueryFactory
+                    .select(new QBookQueryDto(
+                            book.bookId,
+                            book.title,
+                            book.authorName,
+                            book.publisher,
+                            book.imageUrl,
+                            book.isbn,
+                            maxRoomPercentage
+                    ))
+                    .from(room)
+                    .join(participant).on(participant.roomJpaEntity.eq(room))
+                    .join(participant.userJpaEntity, user)
+                    .join(room.bookJpaEntity, book)
+                    .where(where)
+                    .groupBy(book.bookId)
+                    .having(having)  // 집계 함수 조건은 having 절에 넣기
+                    .orderBy(maxRoomPercentage.desc(), book.bookId.asc()) // 방 진행도 높은 순 (내림차순), 같으면 책 아이디 작은 순 (오름차순)
+                    .limit(pageSize + 1)
+                    .fetch();
+    }
+
+}

src/main/java/konkuk/thip/book/application/mapper/BookQueryMapper.java

@@ -1,8 +1,10 @@
 package konkuk.thip.book.application.mapper;
 
 import konkuk.thip.book.adapter.in.web.response.BookRecruitingRoomsResponse;
-import konkuk.thip.book.application.port.in.dto.BookSelectableResult;
-import konkuk.thip.book.application.port.in.dto.BookShowSavedInfoResult;
+import konkuk.thip.book.adapter.in.web.response.BookSelectableListResponse;
+import konkuk.thip.book.adapter.in.web.response.BookShowSavedListResponse;
+import konkuk.thip.book.application.port.in.dto.BookPinResult;
+import konkuk.thip.book.application.port.out.dto.BookQueryDto;
 import konkuk.thip.book.domain.Book;
 import konkuk.thip.common.util.DateUtil;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
@@ -27,25 +29,18 @@ public interface BookQueryMapper {
 
     List<BookRecruitingRoomsResponse.BookRecruitingRoomDto> toRecruitingRoomDtoList(List<RoomQueryDto> roomDtos);
 
-    @Mapping(target = "bookId", source = "book.id")
     @Mapping(target = "bookTitle", source = "book.title")
     @Mapping(target = "authorName", source = "book.authorName")
-    @Mapping(target = "publisher", source = "book.publisher")
     @Mapping(target = "bookImageUrl", source = "book.imageUrl")
     @Mapping(target = "isbn", source = "book.isbn")
-    BookSelectableResult toBookSelectableResult(Book book);
+    BookPinResult toBookPinResult(Book book);
 
-    List<BookSelectableResult> toBookSelectableResultList(List<Book> books);
+    @Mapping(target = "isSaved", constant = "true")
+    BookShowSavedListResponse.BookShowSavedDto toBookShowSavedDto(BookQueryDto dto);
 
+    List<BookShowSavedListResponse.BookShowSavedDto> toBookShowSavedListResponse(List<BookQueryDto> dtos);
 
-    @Mapping(target = "bookId", source = "book.id")
-    @Mapping(target = "bookTitle", source = "book.title")
-    @Mapping(target = "authorName", source = "book.authorName")
-    @Mapping(target = "publisher", source = "book.publisher")
-    @Mapping(target = "bookImageUrl", source = "book.imageUrl")
-    @Mapping(target = "isbn", source = "book.isbn")
-    @Mapping(target = "isSaved", constant = "true")
-    BookShowSavedInfoResult toBookShowSavedInfoResult(Book book);
+    BookSelectableListResponse.BookSelectableDto  toBookSelectableDto(BookQueryDto dto);
 
-    List<BookShowSavedInfoResult> toBookShowSavedInfoResultList(List<Book> savedBookList);
+    List<BookSelectableListResponse.BookSelectableDto> toBookSelectableListResponse(List<BookQueryDto> contents);
 }

src/main/java/konkuk/thip/book/application/port/in/BookSelectableListUseCase.java

@@ -1,10 +1,8 @@
 package konkuk.thip.book.application.port.in;
 
-import konkuk.thip.book.application.port.in.dto.BookSelectableResult;
+import konkuk.thip.book.adapter.in.web.response.BookSelectableListResponse;
 import konkuk.thip.book.application.port.in.dto.BookSelectableType;
 
-import java.util.List;
-
 public interface BookSelectableListUseCase {
-    List<BookSelectableResult> getSelectableBookList(BookSelectableType bookSelectableType, Long userId);
+    BookSelectableListResponse getSelectableBookList(BookSelectableType bookSelectableType, Long userId, String cursor);
 }

src/main/java/konkuk/thip/book/application/port/in/BookShowSavedListUseCase.java

@@ -1,9 +1,7 @@
 package konkuk.thip.book.application.port.in;
 
-import konkuk.thip.book.application.port.in.dto.BookShowSavedInfoResult;
-
-import java.util.List;
+import konkuk.thip.book.adapter.in.web.response.BookShowSavedListResponse;
 
 public interface BookShowSavedListUseCase {
-    List<BookShowSavedInfoResult> getSavedBookList(Long userId);
+    BookShowSavedListResponse getSavedBookList(Long userId, String cursor);
 }