Skip to content

[Refactor/#160] 공지 커서 목록 쿼리를 하나로 통합 #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjunh33 merged 2 commits into from
Oct 22, 2026
Merged

[Refactor/#160] 공지 커서 목록 쿼리를 하나로 통합 #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f747b5c
refactor: 공지 커서 목록 쿼리를 하나로 통합
jjunh33 Oct 22, 2026
5171540
chore: main 브랜치 병합 및 충돌 해결
jjunh33 Oct 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/NoticeJpaRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,23 @@ Page<NoticeJpaEntity> search(
Pageable pageable
);

@Query("""
SELECT n FROM NoticeJpaEntity n
WHERE n.isDeleted = false
AND (:category IS NULL OR n.category = :category)
ORDER BY n.pinned DESC, n.createdAt DESC, n.id DESC
""")
List<NoticeJpaEntity> findFirstSlice(@Param("category") NoticeCategory category, Pageable pageable);

// 커서가 없으면(cursorId가 null) 첫 페이지, 있으면 그 다음부터 조회한다. 커서의 세 값(pinned, createdAt, id)은 함께 넘긴다.
// 정렬이 pinned DESC, createdAt DESC, id DESC라 "다음"은 정렬상 뒤쪽이다. boolean은 0/1로 바꿔 비교한다
@Query("""
SELECT n FROM NoticeJpaEntity n
WHERE n.isDeleted = false
AND (:category IS NULL OR n.category = :category)
AND (
(CASE WHEN n.pinned = true THEN 1 ELSE 0 END) < (CASE WHEN :cursorPinned = true THEN 1 ELSE 0 END)
:cursorId IS NULL
OR (CASE WHEN n.pinned = true THEN 1 ELSE 0 END) < (CASE WHEN :cursorPinned = true THEN 1 ELSE 0 END)
OR (n.pinned = :cursorPinned AND n.createdAt < :cursorCreatedAt)
OR (n.pinned = :cursorPinned AND n.createdAt = :cursorCreatedAt AND n.id < :cursorId)
)
ORDER BY n.pinned DESC, n.createdAt DESC, n.id DESC
""")
List<NoticeJpaEntity> findNextSlice(
List<NoticeJpaEntity> findSlice(
@Param("category") NoticeCategory category,
@Param("cursorPinned") boolean cursorPinned,
@Param("cursorPinned") Boolean cursorPinned,
@Param("cursorCreatedAt") LocalDateTime cursorCreatedAt,
@Param("cursorId") Long cursorId,
Pageable pageable
Expand Down
10 changes: 7 additions & 3 deletions infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/NoticeRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ public class NoticeRepositoryImpl implements NoticeRepository {
@Override
public CursorSliceResult<Notice> findAll(NoticeCategory category, NoticeCursor cursor, int size) {
Pageable pageable = Pageable.ofSize(size + 1);
List<NoticeJpaEntity> entities = cursor == null
? noticeJpaRepository.findFirstSlice(category, pageable)
: noticeJpaRepository.findNextSlice(category, cursor.pinned(), cursor.createdAt(), cursor.id(), pageable);
List<NoticeJpaEntity> entities = noticeJpaRepository.findSlice(
category,
cursor == null ? null : cursor.pinned(),
cursor == null ? null : cursor.createdAt(),
cursor == null ? null : cursor.id(),
pageable
);

return CursorSliceResult.ofSlice(
entities, size, NoticeJpaEntity::toDomain, notice -> NoticeCursor.of(notice, category).format()
Expand Down