From 69effd85875dfa559fb10f8df6a5ac2e8f9c25df Mon Sep 17 00:00:00 2001 From: sangrae Date: Fri, 30 Oct 2026 00:45:05 +0900 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20=EC=8B=A0=EC=B2=AD=ED=95=9C=20?= =?UTF-8?q?=ED=96=89=EC=82=AC=20=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kookmin/stream/common/PreviewResult.java | 14 ++++++++ .../EventApplicationRepository.java | 15 ++++++++ .../service/EventApplicationService.java | 11 ++++++ .../impl/EventApplicationServiceImpl.java | 14 ++++++++ .../service/impl/EventServiceImplTest.java | 10 ++++++ .../InMemoryEventApplicationRepository.java | 12 +++++++ .../event/EventApplicationJpaRepository.java | 34 +++++++++++++++++++ .../event/EventApplicationRepositoryImpl.java | 16 +++++++++ 8 files changed, 126 insertions(+) create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java new file mode 100644 index 000000000..6f9208523 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java @@ -0,0 +1,14 @@ +package kr.ac.kookmin.stream.common; + +import java.util.List; + +/** + * 앞의 몇 건과 전체 수. 홈처럼 "미리보기 N건 + 더보기"를 그리는 화면이 쓴다. + *

+ * 커서({@link CursorSliceResult})나 페이지({@link PageResult})와 달리 이어서 더 읽지 않는다. 전체를 돌려주고 + * 화면이 자르면 목록이 긴 회원의 홈에 이력 전체가 실리므로, 자르는 일을 조회가 맡고 전체 수를 함께 준다. + * + * @param items 미리보기 목록. 전체 수보다 적을 수 있다 + */ +public record PreviewResult(List items, long totalCount) { +} diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java index b0a5541e3..292eb6f61 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java @@ -1,10 +1,12 @@ package kr.ac.kookmin.stream.event.domain.event.repository; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Optional; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; +import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplication; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationAnswer; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationCursor; @@ -62,6 +64,19 @@ PageResult searchByEventId( PageOffset pageOffset ); + /** + * 회원이 신청한 행사 중 아직 지나지 않은 것을 행사 시작이 임박한 순으로 {@code limit}건까지 조회한다. + * 취소한 신청과 삭제된 행사는 뺀다. + * + * @param startOfToday 오늘 0시. 시작 시각이 아니라 날짜로 거른다 — 당일 행사는 이미 시작했어도 보여줘야 한다 + */ + List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit); + + /** + * {@link #findUpcomingAppliedEvents}와 같은 조건의 전체 수. 홈이 "N건 더보기"를 그릴 때 쓴다. + */ + long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday); + /** * 본인 신청 한 건을 조회한다. 남의 신청은 없는 것으로 보여야 하므로 회원 식별자를 조건에 함께 건다. */ diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java index ec734e508..f554b8c77 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java @@ -1,6 +1,8 @@ package kr.ac.kookmin.stream.event.domain.event.service; import kr.ac.kookmin.stream.common.CursorSliceResult; +import kr.ac.kookmin.stream.common.PreviewResult; +import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationCursor; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationDetail; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationForm; @@ -24,6 +26,15 @@ CursorSliceResult getMyApplications( int size ); + /** + * 회원이 신청한 행사 중 아직 열리지 않은 것을 행사 시작 임박순으로 {@code limit}건까지, 전체 수와 함께 조회한다. + *

+ * 홈이 "신청한 행사 · N건"과 미리보기 두 건을 그리는 데 쓴다. 신청 내역 화면이 쓰는 + * {@link #getMyApplications}는 신청 시각 최신순 커서 조회라 전체 수를 주지 않고, 행사일도 담지 않는다. + * 취소한 신청과 지난 행사는 빼고 행사 자체를 돌려준다 — 화면이 어떤 필드를 쓸지는 응답이 고른다. + */ + PreviewResult getUpcomingAppliedEvents(Long memberId, int limit); + EventApplicationDetail getMyApplication(Long applicationId, Long memberId); void cancelApplication(Long applicationId, Long memberId); diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java index 257d585ab..5ccb4e2d4 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java @@ -1,5 +1,6 @@ package kr.ac.kookmin.stream.event.domain.event.service.impl; +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -7,6 +8,7 @@ import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.BusinessException; import kr.ac.kookmin.stream.common.CursorSliceResult; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.common.OutboxWriter; import kr.ac.kookmin.stream.common.event.EventApplicationCanceled; import kr.ac.kookmin.stream.common.event.EventApplied; @@ -169,4 +171,16 @@ private List toAnswers(Long applicationId, EventApplyCom )) .toList(); } + + @Override + public PreviewResult getUpcomingAppliedEvents(Long memberId, int limit) { + // 당일 행사는 이미 시작했어도 "오늘"로 보여줘야 하므로 시작 시각이 아니라 날짜로 거른다. + // 목록과 전체 수가 같은 기준을 봐야 "2건 보여주는데 전체는 1건" 같은 어긋남이 생기지 않는다 + LocalDateTime startOfToday = LocalDate.now().atStartOfDay(); + + return new PreviewResult<>( + eventApplicationRepository.findUpcomingAppliedEvents(memberId, startOfToday, limit), + eventApplicationRepository.countUpcomingAppliedEvents(memberId, startOfToday) + ); + } } diff --git a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java index 02ad412ba..f0245450d 100644 --- a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java +++ b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java @@ -257,6 +257,16 @@ public List findSliceByMemberId( throw new UnsupportedOperationException(); } + @Override + public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { + throw new UnsupportedOperationException(); + } + + @Override + public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { + throw new UnsupportedOperationException(); + } + @Override public Optional findByIdAndMemberId( Long applicationId, Long memberId) { diff --git a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java index 28c47c193..d2a4a22f8 100644 --- a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java +++ b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java @@ -1,5 +1,6 @@ package kr.ac.kookmin.stream.event.domain.event.service.impl; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; @@ -8,6 +9,7 @@ import java.util.Optional; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; +import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplication; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationAnswer; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationCursor; @@ -113,6 +115,16 @@ public List findSliceByMemberId(Long memberId, EventApplicatio throw new UnsupportedOperationException(); } + @Override + public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { + throw new UnsupportedOperationException(); + } + + @Override + public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { + throw new UnsupportedOperationException(); + } + @Override public Optional findByIdAndMemberId(Long applicationId, Long memberId) { throw new UnsupportedOperationException(); diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java index b0fb92fb7..72f828c3d 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java @@ -75,6 +75,40 @@ List findSliceByMemberId( Pageable pageable ); + /** + * 회원이 신청한 행사 중 아직 지나지 않은 것. 행사와 신청은 FK로 묶여 있지 않아 식별자로 직접 잇는다. + * 홈 미리보기용이라 정렬은 행사 시작 임박순이고, 당일 행사가 빠지지 않도록 오늘 0시를 기준으로 거른다. + */ + @Query(""" + SELECT e FROM EventJpaEntity e, EventApplicationJpaEntity a + WHERE a.memberId = :memberId + AND a.eventId = e.id + AND a.status = :appliedStatus + AND e.isDeleted = false + AND e.eventStartAt >= :startOfToday + ORDER BY e.eventStartAt ASC, e.id ASC + """) + List findUpcomingAppliedEvents( + @Param("memberId") Long memberId, + @Param("appliedStatus") EventApplicationStatus appliedStatus, + @Param("startOfToday") LocalDateTime startOfToday, + Pageable pageable + ); + + @Query(""" + SELECT COUNT(e) FROM EventJpaEntity e, EventApplicationJpaEntity a + WHERE a.memberId = :memberId + AND a.eventId = e.id + AND a.status = :appliedStatus + AND e.isDeleted = false + AND e.eventStartAt >= :startOfToday + """) + long countUpcomingAppliedEvents( + @Param("memberId") Long memberId, + @Param("appliedStatus") EventApplicationStatus appliedStatus, + @Param("startOfToday") LocalDateTime startOfToday + ); + @Query(""" SELECT new kr.ac.kookmin.stream.db.event.EventApplicantCountProjection(a.eventId, COUNT(a)) FROM EventApplicationJpaEntity a diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java index 27c2a8efe..6f2807e44 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java @@ -1,11 +1,13 @@ package kr.ac.kookmin.stream.db.event; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; +import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplication; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationAnswer; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationCursor; @@ -109,6 +111,20 @@ public PageResult searchByEventId( ); } + @Override + public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { + return eventApplicationJpaRepository.findUpcomingAppliedEvents( + memberId, EventApplicationStatus.APPLIED, startOfToday, Pageable.ofSize(limit)).stream() + .map(EventJpaEntity::toDomain) + .toList(); + } + + @Override + public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { + return eventApplicationJpaRepository.countUpcomingAppliedEvents( + memberId, EventApplicationStatus.APPLIED, startOfToday); + } + @Override public Optional findByIdAndMemberId(Long applicationId, Long memberId) { return eventApplicationJpaRepository.findByIdAndMemberId(applicationId, memberId) From fd3d935a2a4c6495f3b519cfebb7e3fd34e089ed Mon Sep 17 00:00:00 2001 From: sangrae Date: Fri, 30 Oct 2026 00:59:57 +0900 Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=EB=8C=80=EC=97=AC=20=EC=A4=91?= =?UTF-8?q?=EC=9D=B8=20=EB=AC=BC=ED=92=88=20=EB=AF=B8=EB=A6=AC=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 반납 기한이 임박한 순으로 limit건과 전체 수를 함께 내려준다. 반납을 신청했어도 물건은 아직 회원에게 있으므로 대여 중으로 본다. 기존 isReturnRequired는 상태가 RENTAL일 것을 요구해 그대로 쓸 수 없어, 기한 계산 가능 여부만 보는 hasDueAt을 떼어내고 isReturnRequired가 그것을 쓰게 했다. 두 상태를 기존 조회로 각각 부르면 쿼리가 4개라 IN 조회를 추가했다. --- .../domain/rental/domain/RentalRecord.java | 14 ++++++++------ .../repository/RentalHistoryRepository.java | 4 ++++ .../rental/service/RentalHistoryService.java | 7 +++++++ .../service/impl/RentalHistoryServiceImpl.java | 18 ++++++++++++++++++ .../db/welfare/RentalHistoryJpaRepository.java | 4 ++++ .../welfare/RentalHistoryRepositoryImpl.java | 8 ++++++++ 6 files changed, 49 insertions(+), 6 deletions(-) diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/domain/RentalRecord.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/domain/RentalRecord.java index 530640c46..e98a5e463 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/domain/RentalRecord.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/domain/RentalRecord.java @@ -10,18 +10,20 @@ */ public record RentalRecord(RentalHistory history, Item item) { - /** - * 지금 반납해야 하는 대여인지. 대여 중이고, 대여 시각이 있고, 반납 정책이 있는 물품이어야 기한을 계산할 수 있다. - */ + /** 지금 반납해야 하는 대여인지. 반납을 신청한 대여는 빠진다. */ public boolean isReturnRequired() { - return history.getRentalStatus() == RentalStatus.RENTAL - && history.getRentAt() != null + return history.getRentalStatus() == RentalStatus.RENTAL && hasDueAt(); + } + + /** 반납 기한을 계산할 수 있는지. 상태는 보지 않아 반납 신청한 대여도 포함한다. */ + public boolean hasDueAt() { + return history.getRentAt() != null && item != null && item.getReturnPolicy() != null; } /** - * 반납 기한 시각. {@link #isReturnRequired()}가 true일 때만 계산할 수 있다. + * 반납 기한 시각. {@link #hasDueAt()}가 true일 때만 계산할 수 있다. */ public LocalDateTime dueAt() { return item.getReturnPolicy().dueAt(history.getRentAt()); diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/repository/RentalHistoryRepository.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/repository/RentalHistoryRepository.java index b3b9021f0..4e63e6e06 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/repository/RentalHistoryRepository.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/repository/RentalHistoryRepository.java @@ -1,5 +1,6 @@ package kr.ac.kookmin.stream.welfare.domain.rental.repository; +import java.util.Collection; import java.util.List; import java.util.Optional; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalHistory; @@ -14,6 +15,9 @@ public interface RentalHistoryRepository { */ List findAllByMemberId(Long memberId, RentalStatus status); + /** 회원의 대여 이력 중 해당 상태인 것들. */ + List findAllByMemberIdAndStatusIn(Long memberId, Collection statuses); + /** 모든 회원의 대여 이력 중 해당 상태인 것. 반납 알림 대상을 고를 때 쓴다. */ List findAllByStatus(RentalStatus status); diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java index a7cade1dd..602f4812a 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java @@ -2,6 +2,7 @@ import java.time.LocalDateTime; import java.util.List; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.welfare.domain.rental.domain.Item; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalHistory; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalRecord; @@ -22,6 +23,12 @@ public interface RentalHistoryService { */ List getReturnRequiredRentals(Long memberId); + /** + * 회원이 지금 빌려 간 물품을 반납 기한 임박순으로 {@code limit}건까지, 전체 수와 함께 조회한다. + * 반납을 신청했어도 물건은 손에 있으므로 포함한다. 반납 정책이 없는 대여는 기한을 계산할 수 없어 제외한다. + */ + PreviewResult getActiveRentals(Long memberId, int limit); + /** * 모든 회원의 반납해야 하는 대여를 조회한다. 반납 기한 임박·연체 알림 대상을 고를 때 쓴다. * 반납 정책이 없는 물품의 대여는 기한을 계산할 수 없어 제외한다. diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java index 4ad1e4b4b..29ec442c0 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java @@ -1,12 +1,15 @@ package kr.ac.kookmin.stream.welfare.domain.rental.service.impl; import java.time.LocalDateTime; +import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.BusinessException; import kr.ac.kookmin.stream.common.DateUtil; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.welfare.domain.rental.domain.Item; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalErrorCode; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalHistory; @@ -23,6 +26,9 @@ @RequiredArgsConstructor class RentalHistoryServiceImpl implements RentalHistoryService { + /** 물건이 아직 회원에게 있는 상태. */ + private static final Set ACTIVE_STATUSES = Set.of(RentalStatus.RENTAL, RentalStatus.RETURN_PENDING); + private final RentalHistoryRepository rentalHistoryRepository; private final ItemRepository itemRepository; @@ -44,6 +50,18 @@ public List getReturnRequiredRentals(Long memberId) { .toList(); } + @Override + public PreviewResult getActiveRentals(Long memberId, int limit) { + // 반납 기한은 물품 정책으로 계산하는 값이라 DB에서 정렬할 수 없다 + List active = toRecords( + rentalHistoryRepository.findAllByMemberIdAndStatusIn(memberId, ACTIVE_STATUSES)).stream() + .filter(RentalRecord::hasDueAt) + .sorted(Comparator.comparing(RentalRecord::dueAt)) + .toList(); + + return new PreviewResult<>(active.stream().limit(limit).toList(), active.size()); + } + // getReturnRequiredRentals와 같은 이유로 트랜잭션이 필요 없다 @Override public List getAllReturnRequiredRentals() { diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryJpaRepository.java index ebc150526..3a0a74a3e 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryJpaRepository.java @@ -1,5 +1,6 @@ package kr.ac.kookmin.stream.db.welfare; +import java.util.Collection; import java.util.List; import java.util.Optional; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalStatus; @@ -25,4 +26,7 @@ List findAllByMemberId( boolean existsByItemIdAndMemberIdAndRentalStatus(Long itemId, Long memberId, RentalStatus rentalStatus); Optional findByIdAndMemberIdAndRentalStatus(Long id, Long memberId, RentalStatus rentalStatus); + + List findAllByMemberIdAndRentalStatusIn( + Long memberId, Collection rentalStatuses); } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryRepositoryImpl.java index a75d5e091..5c760cec7 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/RentalHistoryRepositoryImpl.java @@ -1,5 +1,6 @@ package kr.ac.kookmin.stream.db.welfare; +import java.util.Collection; import java.util.List; import java.util.Optional; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalHistory; @@ -21,6 +22,13 @@ public List findAllByMemberId(Long memberId, RentalStatus status) .toList(); } + @Override + public List findAllByMemberIdAndStatusIn(Long memberId, Collection statuses) { + return rentalHistoryJpaRepository.findAllByMemberIdAndRentalStatusIn(memberId, statuses).stream() + .map(RentalHistoryJpaEntity::toDomain) + .toList(); + } + @Override public List findAllByStatus(RentalStatus status) { return rentalHistoryJpaRepository.findAllByRentalStatus(status).stream() From 39efe1b9cf85e5f3e6fb1a55c158a2be9de18dd8 Mon Sep 17 00:00:00 2001 From: sangrae Date: Fri, 30 Oct 2026 12:39:56 +0900 Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EC=9D=B4=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=ED=95=9C=20=EC=97=B4=EB=A6=B0=ED=94=BC?= =?UTF-8?q?=EB=93=9C=EB=B0=B1=20=EC=88=98=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 홈 화면이 쓸 집계다. 연도·회차를 가리지 않는 누적이며 삭제한 질문은 세지 않는다. created_by 인덱스는 두지 않는다. 열린피드백은 연 30건 이하로 몇 년 누적해도 수백 행이라 풀스캔이 버퍼풀 안에서 끝나고, 인덱스로 아끼는 양이 측정에 걸리지 않는다. --- .../domain/feedback/repository/FeedbackRepository.java | 3 +++ .../welfare/domain/feedback/service/FeedbackService.java | 3 +++ .../domain/feedback/service/impl/FeedbackServiceImpl.java | 5 +++++ .../ac/kookmin/stream/db/welfare/FeedbackJpaRepository.java | 2 ++ .../ac/kookmin/stream/db/welfare/FeedbackRepositoryImpl.java | 5 +++++ 5 files changed, 18 insertions(+) diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/repository/FeedbackRepository.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/repository/FeedbackRepository.java index a236f01ca..a242fc9ae 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/repository/FeedbackRepository.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/repository/FeedbackRepository.java @@ -28,6 +28,9 @@ public interface FeedbackRepository { PageResult searchByKeyword( int year, int round, String keyword, List memberIds, PageOffset pageOffset); + // 한 회원이 작성한 질문 수(연도·회차 무관) + long countByMemberId(Long memberId); + // 회차별 질문 수·답변 수 집계. year가 null이면 전체 연도. 질문이 없는 회차는 결과에 포함되지 않는다 List findCountsByYear(Integer year); diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java index c33ec77e1..edd946d47 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/FeedbackService.java @@ -18,6 +18,9 @@ public interface FeedbackService { // 회차는 현재 열려 있는 회차로 서버가 자동 배정한다 Feedback create(Long memberId, String question); + /** 회원이 작성한 질문 수. 연도·회차를 가리지 않는 누적이다. */ + long countByMemberId(Long memberId); + // 회차가 하나라도 존재했던 연도 목록(최신순) List getAvailableYears(); diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java index 454424d4d..f68191e08 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/feedback/service/impl/FeedbackServiceImpl.java @@ -49,6 +49,11 @@ public Feedback create(Long memberId, String question) { Feedback.create(openRound.getYear(), openRound.getRound(), question, memberId, now)); } + @Override + public long countByMemberId(Long memberId) { + return feedbackRepository.countByMemberId(memberId); + } + @Override public List getAvailableYears() { return feedbackRoundRepository.findDistinctYears(); diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackJpaRepository.java index afbad4608..21715ba87 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackJpaRepository.java @@ -61,6 +61,8 @@ Page searchByKeyword( Pageable pageable ); + long countByCreatedByAndIsDeletedFalse(Long createdBy); + // COUNT(f.answer)는 answer가 NULL인 행을 세지 않으므로 그대로 "답변이 작성된 수"가 된다. // 생성자 인자는 이름이 아니라 순서로 들어가므로 질문 수·답변 수 순서를 FeedbackCountProjection과 맞춘다 @Query(""" diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackRepositoryImpl.java index b431f148f..90d52f2c6 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/welfare/FeedbackRepositoryImpl.java @@ -36,6 +36,11 @@ public PageResult search(Integer year, Integer round, PageOffset pageO return toPageResult(result); } + @Override + public long countByMemberId(Long memberId) { + return feedbackJpaRepository.countByCreatedByAndIsDeletedFalse(memberId); + } + @Override public List findAllByYearAndRound(int year, int round) { return feedbackJpaRepository.findAllByYearAndRound(year, round).stream() From 6d36dff4850bb7f6cbc34096debf934da36d0a06 Mon Sep 17 00:00:00 2001 From: sangrae Date: Sat, 31 Oct 2026 16:46:47 +0900 Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=EC=8B=A0=EC=B2=AD=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EC=82=AC=EB=AC=BC=ED=95=A8=20=ED=9A=8C?= =?UTF-8?q?=EC=B0=A8=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 홈 신청 섹션이 쓸 조회다. 설정에 담긴 회차 식별자를 받아 지금 신청할 수 있는 것만 신청 마감 임박순으로 돌려준다. 기간 판정은 SQL로 옮기지 않고 LockerPeriod.isApplyOpen을 그대로 쓴다. 규칙이 두 곳에 생기면 어긋나고, 초 절삭과 사용 종료 검사도 따로 옮겨야 한다. 조회는 기존 findPublishedPeriodsByIds가 게시·미삭제를 이미 걸러 그대로 쓴다. --- .../event/domain/locker/service/LockerService.java | 8 ++++++++ .../locker/service/impl/LockerServiceImpl.java | 14 ++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/LockerService.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/LockerService.java index 6ca368a33..f6d548702 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/LockerService.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/LockerService.java @@ -1,15 +1,23 @@ package kr.ac.kookmin.stream.event.domain.locker.service; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import kr.ac.kookmin.stream.event.domain.locker.domain.Locker; +import kr.ac.kookmin.stream.event.domain.locker.domain.LockerPeriod; import kr.ac.kookmin.stream.event.domain.locker.domain.LockerSectionDetail; import kr.ac.kookmin.stream.event.domain.locker.domain.LockerSectionSummary; public interface LockerService { + /** + * 주어진 운영 회차 중 지금 신청할 수 있는 것을 신청 마감 임박순으로 조회한다. + * 미게시·삭제된 회차와 신청 기간이 아닌 회차는 빠진다. + */ + List getApplicablePeriods(Collection lockerPeriodIds); + /** * 운영 회차의 구역별 전체/선택 가능 사물함 수와 표시 상태를 조회한다. */ diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/impl/LockerServiceImpl.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/impl/LockerServiceImpl.java index d47246abd..8fdfc0e73 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/impl/LockerServiceImpl.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/locker/service/impl/LockerServiceImpl.java @@ -1,5 +1,8 @@ package kr.ac.kookmin.stream.event.domain.locker.service.impl; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Optional; @@ -8,6 +11,7 @@ import kr.ac.kookmin.stream.common.BusinessException; import kr.ac.kookmin.stream.event.domain.locker.domain.Locker; import kr.ac.kookmin.stream.event.domain.locker.domain.LockerErrorCode; +import kr.ac.kookmin.stream.event.domain.locker.domain.LockerPeriod; import kr.ac.kookmin.stream.event.domain.locker.domain.LockerSection; import kr.ac.kookmin.stream.event.domain.locker.domain.LockerSectionDetail; import kr.ac.kookmin.stream.event.domain.locker.domain.LockerSectionSummary; @@ -26,6 +30,16 @@ class LockerServiceImpl implements LockerService { private final LockerRepository lockerRepository; private final LockerApplicationRepository lockerApplicationRepository; + @Override + public List getApplicablePeriods(Collection lockerPeriodIds) { + // 신청과 같은 기준을 써야 하므로 기간 판정은 LockerPeriod의 계산을 그대로 쓴다 + LocalDateTime now = LocalDateTime.now(); + return lockerRepository.findPublishedPeriodsByIds(lockerPeriodIds).stream() + .filter(period -> period.isApplyOpen(now)) + .sorted(Comparator.comparing(LockerPeriod::getApplyEndAt).thenComparing(LockerPeriod::getId)) + .toList(); + } + @Override @Transactional(readOnly = true) public List getSections(Long lockerPeriodId) { From e65cd1c24a7923d6c624334dce7231188adcb082 Mon Sep 17 00:00:00 2001 From: sangrae Date: Sat, 31 Oct 2026 22:11:29 +0900 Subject: [PATCH 05/10] =?UTF-8?q?refactor:=20=ED=99=88=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B2=BD=EB=A1=9C=20=EB=A6=AC=EB=B7=B0=20=EC=A7=80?= =?UTF-8?q?=EC=A0=81=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - getUpcomingAppliedEvents에 readOnly 트랜잭션. 목록과 전체 수를 쿼리 둘로 읽는데 사이에 신청·취소가 커밋되면 "2건 보여주는데 전체는 1건"이 된다 - PreviewResult의 items를 content로. CursorSliceResult·PageResult와 맞추고 coding-style 2-4절 표에 미리보기 행을 더했다 - findPublishedPeriodsByIds에 빈 컬렉션 가드. 노출 설정이 비면 빈 목록이 들어온다 - 신청한 행사 JPQL을 콤마 조인에서 JOIN ... ON으로. MemberJpaRepository와 맞춘다 - PreviewResult import 위치 정정 --- .../java/kr/ac/kookmin/stream/common/PreviewResult.java | 4 ++-- .../event/service/impl/EventApplicationServiceImpl.java | 8 +++++--- docs/conventions/coding-style.md | 5 ++++- .../stream/db/event/EventApplicationJpaRepository.java | 8 ++++---- .../ac/kookmin/stream/db/event/LockerRepositoryImpl.java | 3 +++ 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java index 6f9208523..094422617 100644 --- a/core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/PreviewResult.java @@ -8,7 +8,7 @@ * 커서({@link CursorSliceResult})나 페이지({@link PageResult})와 달리 이어서 더 읽지 않는다. 전체를 돌려주고 * 화면이 자르면 목록이 긴 회원의 홈에 이력 전체가 실리므로, 자르는 일을 조회가 맡고 전체 수를 함께 준다. * - * @param items 미리보기 목록. 전체 수보다 적을 수 있다 + * @param content 미리보기 목록. 전체 수보다 적을 수 있다 */ -public record PreviewResult(List items, long totalCount) { +public record PreviewResult(List content, long totalCount) { } diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java index 5ccb4e2d4..944ac787f 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java @@ -8,8 +8,8 @@ import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.BusinessException; import kr.ac.kookmin.stream.common.CursorSliceResult; -import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.common.OutboxWriter; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.common.event.EventApplicationCanceled; import kr.ac.kookmin.stream.common.event.EventApplied; import kr.ac.kookmin.stream.event.domain.event.domain.Event; @@ -172,10 +172,12 @@ private List toAnswers(Long applicationId, EventApplyCom .toList(); } + // 목록과 전체 수를 쿼리 둘로 읽으므로 한 스냅샷으로 묶는다. 사이에 신청·취소가 커밋되면 + // "2건 보여주는데 전체는 1건"이 된다 @Override + @Transactional(readOnly = true) public PreviewResult getUpcomingAppliedEvents(Long memberId, int limit) { - // 당일 행사는 이미 시작했어도 "오늘"로 보여줘야 하므로 시작 시각이 아니라 날짜로 거른다. - // 목록과 전체 수가 같은 기준을 봐야 "2건 보여주는데 전체는 1건" 같은 어긋남이 생기지 않는다 + // 당일 행사는 이미 시작했어도 "오늘"로 보여줘야 하므로 시작 시각이 아니라 날짜로 거른다 LocalDateTime startOfToday = LocalDate.now().atStartOfDay(); return new PreviewResult<>( diff --git a/docs/conventions/coding-style.md b/docs/conventions/coding-style.md index 050df6e6a..10c3c7f55 100644 --- a/docs/conventions/coding-style.md +++ b/docs/conventions/coding-style.md @@ -135,14 +135,17 @@ public final class ApiResponse { | --- | --- | --- | | 커서/슬라이스 | 무한 스크롤 등 다음 페이지 여부 + 커서만 필요 | `CursorSliceResult` / `CursorSliceResponse` | | 오프셋 | 페이지 번호·전체 개수·전체 페이지 필요 | `PageResult` / `PageResponse` | +| 미리보기 | 홈처럼 앞의 몇 건과 전체 수만 필요하고 이어서 더 읽지 않음 | `PreviewResult` / `PreviewResponse` | -- 커서 기반 응답 필드는 항상 `content`/`hasNext`/`nextCursor`로 통일한다. +- 목록 필드명은 세 방식 모두 `content`로 통일한다. 커서 기반은 여기에 `hasNext`/`nextCursor`를 더한다. +- 미리보기는 자르는 일을 조회가 맡는다. 전체를 돌려주고 화면이 자르면 목록이 긴 회원의 홈에 이력 전체가 실린다. - `nextCursor`는 **클라이언트에게 불투명한 문자열**이다. 정렬 키가 여러 개인 keyset 커서를 담아야 하므로 도메인이 `{Domain}Cursor` record로 정렬 키와 그 문자열 표현(`format()`/`from(String)`)을 소유하고, Base64 URL-safe 인코딩은 웹 계층에서 `CursorCodec`(`api:common-api`)으로 처리한다. ```java // core:common public record CursorSliceResult(List content, boolean hasNext, String nextCursor) {} public record PageResult(List content, int page, int size, long totalCount, int totalPage) {} +public record PreviewResult(List content, long totalCount) {} ``` ### 2-5. JPA Entity diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java index 72f828c3d..9b3f3426e 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java @@ -80,9 +80,9 @@ List findSliceByMemberId( * 홈 미리보기용이라 정렬은 행사 시작 임박순이고, 당일 행사가 빠지지 않도록 오늘 0시를 기준으로 거른다. */ @Query(""" - SELECT e FROM EventJpaEntity e, EventApplicationJpaEntity a + SELECT e FROM EventJpaEntity e + JOIN EventApplicationJpaEntity a ON a.eventId = e.id WHERE a.memberId = :memberId - AND a.eventId = e.id AND a.status = :appliedStatus AND e.isDeleted = false AND e.eventStartAt >= :startOfToday @@ -96,9 +96,9 @@ List findUpcomingAppliedEvents( ); @Query(""" - SELECT COUNT(e) FROM EventJpaEntity e, EventApplicationJpaEntity a + SELECT COUNT(e) FROM EventJpaEntity e + JOIN EventApplicationJpaEntity a ON a.eventId = e.id WHERE a.memberId = :memberId - AND a.eventId = e.id AND a.status = :appliedStatus AND e.isDeleted = false AND e.eventStartAt >= :startOfToday diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/LockerRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/LockerRepositoryImpl.java index 073c7c215..3df136301 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/LockerRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/LockerRepositoryImpl.java @@ -80,6 +80,9 @@ public Optional findPublishedPeriodById(Long lockerPeriodId) { @Override public List findPublishedPeriodsByIds(Collection lockerPeriodIds) { + if (lockerPeriodIds.isEmpty()) { + return List.of(); + } return lockerPeriodJpaRepository.findAllByIdInAndIsPublishedTrueAndIsDeletedFalse(lockerPeriodIds).stream() .map(LockerPeriodJpaEntity::toDomain) .toList(); From 2924754bd0aa4de735201299e50ef24479941596 Mon Sep 17 00:00:00 2001 From: sangrae Date: Sat, 31 Oct 2026 22:51:34 +0900 Subject: [PATCH 06/10] =?UTF-8?q?fix:=20=EB=8C=80=EC=97=AC=20=EC=A4=91?= =?UTF-8?q?=EC=9D=B8=20=EB=AC=BC=ED=92=88=EC=97=90=20=EB=B0=98=EB=82=A9=20?= =?UTF-8?q?=ED=99=95=EC=9D=B8=20=EC=83=81=ED=83=9C=20=ED=8F=AC=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RETURN_CONFIRMED가 빠져 있었다. 운영진이 RETURNED로 최종 확인하기 전까지는 물건이 회원에게 있으므로 홈의 대여 중 목록에 떠야 한다. 지금 main에는 이 상태로 바꾸는 전이가 없어 동작은 그대로다. 전이는 #174(PR #181)가 더하고, 그 PR이 RentalStatus.isAwaitingReturn()으로 같은 분류를 enum에 올린다. 머지되면 이 상수를 그쪽으로 교체한다. --- .../domain/rental/service/impl/RentalHistoryServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java index 29ec442c0..1b09ce963 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java @@ -26,8 +26,9 @@ @RequiredArgsConstructor class RentalHistoryServiceImpl implements RentalHistoryService { - /** 물건이 아직 회원에게 있는 상태. */ - private static final Set ACTIVE_STATUSES = Set.of(RentalStatus.RENTAL, RentalStatus.RETURN_PENDING); + /** 운영진이 반납을 최종 확인(RETURNED)하기 전까지, 물건이 아직 회원에게 있는 상태. */ + private static final Set ACTIVE_STATUSES = + Set.of(RentalStatus.RENTAL, RentalStatus.RETURN_PENDING, RentalStatus.RETURN_CONFIRMED); private final RentalHistoryRepository rentalHistoryRepository; private final ItemRepository itemRepository; From 930413fd09f076993f058dcb5ef3f6cfa13ec7e3 Mon Sep 17 00:00:00 2001 From: sangrae Date: Tue, 3 Nov 2026 13:39:41 +0900 Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=EC=8B=A0=EC=B2=AD=ED=95=9C=20?= =?UTF-8?q?=ED=96=89=EC=82=AC=20=EC=A1=B0=ED=9A=8C=EA=B0=80=20=EC=A7=84?= =?UTF-8?q?=ED=96=89=20=EC=A4=91=EC=9D=B8=20=ED=96=89=EC=82=AC=EC=99=80=20?= =?UTF-8?q?=EC=A4=91=EB=B3=B5=20=EC=8B=A0=EC=B2=AD=EC=9D=84=20=EC=9E=98?= =?UTF-8?q?=EB=AA=BB=20=EB=8B=A4=EB=A3=A8=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventApplicationRepository.java | 6 ++-- .../service/EventApplicationService.java | 5 +-- .../event/EventApplicationJpaRepository.java | 36 ++++++++++++------- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java index 292eb6f61..51c752c42 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java @@ -65,10 +65,10 @@ PageResult searchByEventId( ); /** - * 회원이 신청한 행사 중 아직 지나지 않은 것을 행사 시작이 임박한 순으로 {@code limit}건까지 조회한다. - * 취소한 신청과 삭제된 행사는 뺀다. + * 회원이 신청한 행사 중 아직 끝나지 않은 것을 행사 시작이 임박한 순으로 {@code limit}건까지 조회한다. + * 취소한 신청과 삭제된 행사는 뺀다. 여러 날에 걸친 행사는 마지막 날까지 남는다. * - * @param startOfToday 오늘 0시. 시작 시각이 아니라 날짜로 거른다 — 당일 행사는 이미 시작했어도 보여줘야 한다 + * @param startOfToday 오늘 0시. 종료 일시를 시각이 아니라 날짜로 견준다 — 오늘 끝나는 행사도 보여줘야 한다 */ List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit); diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java index f554b8c77..69b40cb09 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java @@ -27,11 +27,12 @@ CursorSliceResult getMyApplications( ); /** - * 회원이 신청한 행사 중 아직 열리지 않은 것을 행사 시작 임박순으로 {@code limit}건까지, 전체 수와 함께 조회한다. + * 회원이 신청한 행사 중 아직 끝나지 않은 것을 행사 시작 임박순으로 {@code limit}건까지, 전체 수와 함께 조회한다. *

* 홈이 "신청한 행사 · N건"과 미리보기 두 건을 그리는 데 쓴다. 신청 내역 화면이 쓰는 * {@link #getMyApplications}는 신청 시각 최신순 커서 조회라 전체 수를 주지 않고, 행사일도 담지 않는다. - * 취소한 신청과 지난 행사는 빼고 행사 자체를 돌려준다 — 화면이 어떤 필드를 쓸지는 응답이 고른다. + * 취소한 신청과 끝난 행사는 빼고 행사 자체를 돌려준다 — 화면이 어떤 필드를 쓸지는 응답이 고른다. 진행 중인 + * 행사는 남으므로 "아직 열리지 않은 것"이 아니다. */ PreviewResult getUpcomingAppliedEvents(Long memberId, int limit); diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java index 9b3f3426e..12305d78b 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java @@ -76,16 +76,26 @@ List findSliceByMemberId( ); /** - * 회원이 신청한 행사 중 아직 지나지 않은 것. 행사와 신청은 FK로 묶여 있지 않아 식별자로 직접 잇는다. - * 홈 미리보기용이라 정렬은 행사 시작 임박순이고, 당일 행사가 빠지지 않도록 오늘 0시를 기준으로 거른다. + * 회원이 신청한 행사 중 아직 끝나지 않은 것. 행사와 신청은 FK로 묶여 있지 않아 식별자로 직접 잇는다. + * 홈 미리보기용이라 정렬은 행사 시작 임박순이다. + *

+ * 신청을 JOIN하지 않고 {@code EXISTS}로 거른다. (행사, 회원) 유니크가 없어 유효 신청이 두 건 생길 수 있는데, + * JOIN이면 같은 행사가 신청 수만큼 복제된다. 신청했는지만 알면 되므로 존재 여부로 본다. + *

+ * 종료 일시로 거르므로 여러 날에 걸친 행사는 마지막 날까지 남는다. {@code event_end_at}이 NULL인 기존 행은 + * 시작 일시로 대신한다. + * + * @param startOfToday 오늘 0시. 시각이 아니라 날짜로 거른다 — 오늘 끝나는 행사는 이미 지났어도 보여줘야 한다 */ @Query(""" SELECT e FROM EventJpaEntity e - JOIN EventApplicationJpaEntity a ON a.eventId = e.id - WHERE a.memberId = :memberId - AND a.status = :appliedStatus - AND e.isDeleted = false - AND e.eventStartAt >= :startOfToday + WHERE e.isDeleted = false + AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday + AND EXISTS ( + SELECT a.id FROM EventApplicationJpaEntity a + WHERE a.eventId = e.id + AND a.memberId = :memberId + AND a.status = :appliedStatus) ORDER BY e.eventStartAt ASC, e.id ASC """) List findUpcomingAppliedEvents( @@ -97,11 +107,13 @@ List findUpcomingAppliedEvents( @Query(""" SELECT COUNT(e) FROM EventJpaEntity e - JOIN EventApplicationJpaEntity a ON a.eventId = e.id - WHERE a.memberId = :memberId - AND a.status = :appliedStatus - AND e.isDeleted = false - AND e.eventStartAt >= :startOfToday + WHERE e.isDeleted = false + AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday + AND EXISTS ( + SELECT a.id FROM EventApplicationJpaEntity a + WHERE a.eventId = e.id + AND a.memberId = :memberId + AND a.status = :appliedStatus) """) long countUpcomingAppliedEvents( @Param("memberId") Long memberId, From 936e9a52d3267d5993f965cb902e706a27cba702 Mon Sep 17 00:00:00 2001 From: sangrae Date: Tue, 3 Nov 2026 13:39:41 +0900 Subject: [PATCH 08/10] =?UTF-8?q?fix:=20=EB=8C=80=EC=97=AC=20=EC=A4=91=20?= =?UTF-8?q?=EB=AC=BC=ED=92=88=20=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0?= =?UTF-8?q?=EC=97=90=20=EA=B8=B0=ED=95=9C=20=EB=8F=99=EC=9D=BC=20=EC=8B=9C?= =?UTF-8?q?=20=EC=A0=95=EB=A0=AC=20=EA=B8=B0=EC=A4=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/rental/service/RentalHistoryService.java | 5 +++-- .../rental/service/impl/RentalHistoryServiceImpl.java | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java index 70d38845d..00359fd7a 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/RentalHistoryService.java @@ -24,8 +24,9 @@ public interface RentalHistoryService { List getReturnRequiredRentals(Long memberId); /** - * 회원이 지금 빌려 간 물품을 반납 기한 임박순으로 {@code limit}건까지, 전체 수와 함께 조회한다. - * 반납을 신청했어도 물건은 손에 있으므로 포함한다. 반납 정책이 없는 대여는 기한을 계산할 수 없어 제외한다. + * 회원이 지금 빌려 간 물품을 반납 기한 임박순(같으면 식별자 오름차순)으로 {@code limit}건까지, 전체 수와 함께 + * 조회한다. 기한이 지난 대여가 가장 앞에 온다. 반납을 신청했어도 물건은 손에 있으므로 포함한다. + * 반납 정책이 없는 대여는 기한을 계산할 수 없어 제외한다. */ PreviewResult getActiveRentals(Long memberId, int limit); diff --git a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java index a74689dfb..2e67f01fa 100644 --- a/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java +++ b/core/domain/welfare/src/main/java/kr/ac/kookmin/stream/welfare/domain/rental/service/impl/RentalHistoryServiceImpl.java @@ -42,11 +42,14 @@ public List getReturnRequiredRentals(Long memberId) { @Override public PreviewResult getActiveRentals(Long memberId, int limit) { - // 반납 기한은 물품 정책으로 계산하는 값이라 DB에서 정렬할 수 없다 + // 반납 기한은 물품 정책으로 계산하는 값이라 DB에서 정렬할 수 없다. 기한 오름차순이면 기한이 지난 대여가 + // 먼저 오고 그 뒤는 남은 시간이 적은 순이다. 기한이 같을 때는 식별자로 순서를 고정한다 — 조회 쿼리에 + // 정렬이 없어, 두지 않으면 미리보기에 무엇이 실릴지가 DB가 준 순서에 달린다 List active = toRecords(rentalHistoryRepository .findAllByMemberIdAndStatusIn(memberId, RentalStatus.awaitingReturnStatuses())).stream() .filter(RentalRecord::isReturnRequired) - .sorted(Comparator.comparing(RentalRecord::dueAt)) + .sorted(Comparator.comparing(RentalRecord::dueAt) + .thenComparing(rentalRecord -> rentalRecord.history().getId())) .toList(); return new PreviewResult<>(active.stream().limit(limit).toList(), active.size()); From c4d671eda9669a5a3afb9e5ef165866dc4cee48f Mon Sep 17 00:00:00 2001 From: sangrae Date: Tue, 3 Nov 2026 13:53:36 +0900 Subject: [PATCH 09/10] =?UTF-8?q?refactor:=20=EC=8B=A0=EC=B2=AD=ED=95=9C?= =?UTF-8?q?=20=ED=96=89=EC=82=AC=20=EC=A1=B0=ED=9A=8C=EB=A5=BC=20=ED=96=89?= =?UTF-8?q?=EC=82=AC=20=EC=A0=80=EC=9E=A5=EC=86=8C=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventApplicationRepository.java | 15 ------ .../event/repository/EventRepository.java | 16 +++++++ .../impl/EventApplicationServiceImpl.java | 4 +- .../InMemoryEventApplicationRepository.java | 12 ----- .../service/impl/InMemoryEventRepository.java | 10 ++++ .../event/EventApplicationJpaRepository.java | 46 ------------------- .../event/EventApplicationRepositoryImpl.java | 16 ------- .../stream/db/event/EventJpaRepository.java | 46 +++++++++++++++++++ .../stream/db/event/EventRepositoryImpl.java | 14 ++++++ 9 files changed, 88 insertions(+), 91 deletions(-) diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java index 51c752c42..b0a5541e3 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventApplicationRepository.java @@ -1,12 +1,10 @@ package kr.ac.kookmin.stream.event.domain.event.repository; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Optional; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; -import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplication; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationAnswer; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationCursor; @@ -64,19 +62,6 @@ PageResult searchByEventId( PageOffset pageOffset ); - /** - * 회원이 신청한 행사 중 아직 끝나지 않은 것을 행사 시작이 임박한 순으로 {@code limit}건까지 조회한다. - * 취소한 신청과 삭제된 행사는 뺀다. 여러 날에 걸친 행사는 마지막 날까지 남는다. - * - * @param startOfToday 오늘 0시. 종료 일시를 시각이 아니라 날짜로 견준다 — 오늘 끝나는 행사도 보여줘야 한다 - */ - List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit); - - /** - * {@link #findUpcomingAppliedEvents}와 같은 조건의 전체 수. 홈이 "N건 더보기"를 그릴 때 쓴다. - */ - long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday); - /** * 본인 신청 한 건을 조회한다. 남의 신청은 없는 것으로 보여야 하므로 회원 식별자를 조건에 함께 건다. */ diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java index f828a448b..c045272ff 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java @@ -70,6 +70,22 @@ List findPublishedSlice( LocalDateTime now ); + /** + * 회원이 신청한 행사 중 아직 끝나지 않은 것을 행사 시작이 임박한 순으로 {@code limit}건까지 조회한다. + * 취소한 신청과 삭제된 행사는 뺀다. 여러 날에 걸친 행사는 마지막 날까지 남는다. + *

+ * 거르는 조건에 회원과 신청 상태가 들어가지만 돌려주는 것은 행사다. 신청 조건으로 행사를 좁히는 조회는 + * {@link #findPublishedSlice}의 정원 판정처럼 이 저장소가 맡는다. + * + * @param startOfToday 오늘 0시. 종료 일시를 시각이 아니라 날짜로 견준다 — 오늘 끝나는 행사도 보여줘야 한다 + */ + List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit); + + /** + * {@link #findUpcomingAppliedEvents}와 같은 조건의 전체 수. 홈이 "N건 더보기"를 그릴 때 쓴다. + */ + long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday); + /** * 게시되고 삭제되지 않은 행사 중 시작 일시가 {@code [from, to)}인 행사. 행사 전날 알림 대상을 고를 때 쓴다. */ diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java index 944ac787f..a6ed6c24f 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java @@ -181,8 +181,8 @@ public PreviewResult getUpcomingAppliedEvents(Long memberId, int limit) { LocalDateTime startOfToday = LocalDate.now().atStartOfDay(); return new PreviewResult<>( - eventApplicationRepository.findUpcomingAppliedEvents(memberId, startOfToday, limit), - eventApplicationRepository.countUpcomingAppliedEvents(memberId, startOfToday) + eventRepository.findUpcomingAppliedEvents(memberId, startOfToday, limit), + eventRepository.countUpcomingAppliedEvents(memberId, startOfToday) ); } } diff --git a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java index d2a4a22f8..28c47c193 100644 --- a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java +++ b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventApplicationRepository.java @@ -1,6 +1,5 @@ package kr.ac.kookmin.stream.event.domain.event.service.impl; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; @@ -9,7 +8,6 @@ import java.util.Optional; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; -import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplication; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationAnswer; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationCursor; @@ -115,16 +113,6 @@ public List findSliceByMemberId(Long memberId, EventApplicatio throw new UnsupportedOperationException(); } - @Override - public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { - throw new UnsupportedOperationException(); - } - - @Override - public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { - throw new UnsupportedOperationException(); - } - @Override public Optional findByIdAndMemberId(Long applicationId, Long memberId) { throw new UnsupportedOperationException(); diff --git a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java index 7f53b2c83..4420fe0db 100644 --- a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java +++ b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java @@ -87,6 +87,16 @@ public List findAllByIds(List eventIds) { throw new UnsupportedOperationException(); } + @Override + public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { + throw new UnsupportedOperationException(); + } + + @Override + public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { + throw new UnsupportedOperationException(); + } + @Override public Optional findPublishedById(Long id) { throw new UnsupportedOperationException(); diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java index 12305d78b..b0fb92fb7 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationJpaRepository.java @@ -75,52 +75,6 @@ List findSliceByMemberId( Pageable pageable ); - /** - * 회원이 신청한 행사 중 아직 끝나지 않은 것. 행사와 신청은 FK로 묶여 있지 않아 식별자로 직접 잇는다. - * 홈 미리보기용이라 정렬은 행사 시작 임박순이다. - *

- * 신청을 JOIN하지 않고 {@code EXISTS}로 거른다. (행사, 회원) 유니크가 없어 유효 신청이 두 건 생길 수 있는데, - * JOIN이면 같은 행사가 신청 수만큼 복제된다. 신청했는지만 알면 되므로 존재 여부로 본다. - *

- * 종료 일시로 거르므로 여러 날에 걸친 행사는 마지막 날까지 남는다. {@code event_end_at}이 NULL인 기존 행은 - * 시작 일시로 대신한다. - * - * @param startOfToday 오늘 0시. 시각이 아니라 날짜로 거른다 — 오늘 끝나는 행사는 이미 지났어도 보여줘야 한다 - */ - @Query(""" - SELECT e FROM EventJpaEntity e - WHERE e.isDeleted = false - AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday - AND EXISTS ( - SELECT a.id FROM EventApplicationJpaEntity a - WHERE a.eventId = e.id - AND a.memberId = :memberId - AND a.status = :appliedStatus) - ORDER BY e.eventStartAt ASC, e.id ASC - """) - List findUpcomingAppliedEvents( - @Param("memberId") Long memberId, - @Param("appliedStatus") EventApplicationStatus appliedStatus, - @Param("startOfToday") LocalDateTime startOfToday, - Pageable pageable - ); - - @Query(""" - SELECT COUNT(e) FROM EventJpaEntity e - WHERE e.isDeleted = false - AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday - AND EXISTS ( - SELECT a.id FROM EventApplicationJpaEntity a - WHERE a.eventId = e.id - AND a.memberId = :memberId - AND a.status = :appliedStatus) - """) - long countUpcomingAppliedEvents( - @Param("memberId") Long memberId, - @Param("appliedStatus") EventApplicationStatus appliedStatus, - @Param("startOfToday") LocalDateTime startOfToday - ); - @Query(""" SELECT new kr.ac.kookmin.stream.db.event.EventApplicantCountProjection(a.eventId, COUNT(a)) FROM EventApplicationJpaEntity a diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java index 6f2807e44..27c2a8efe 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventApplicationRepositoryImpl.java @@ -1,13 +1,11 @@ package kr.ac.kookmin.stream.db.event; -import java.time.LocalDateTime; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; -import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplication; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationAnswer; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationCursor; @@ -111,20 +109,6 @@ public PageResult searchByEventId( ); } - @Override - public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { - return eventApplicationJpaRepository.findUpcomingAppliedEvents( - memberId, EventApplicationStatus.APPLIED, startOfToday, Pageable.ofSize(limit)).stream() - .map(EventJpaEntity::toDomain) - .toList(); - } - - @Override - public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { - return eventApplicationJpaRepository.countUpcomingAppliedEvents( - memberId, EventApplicationStatus.APPLIED, startOfToday); - } - @Override public Optional findByIdAndMemberId(Long applicationId, Long memberId) { return eventApplicationJpaRepository.findByIdAndMemberId(applicationId, memberId) diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java index 5d6da6b60..06bf8460f 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java @@ -105,4 +105,50 @@ List findPublishedSlice( AND e.applyEndAt < :to """) List findPublishedApplyEndingBetween(@Param("from") LocalDateTime from, @Param("to") LocalDateTime to); + + /** + * 회원이 신청한 행사 중 아직 끝나지 않은 것. 행사와 신청은 FK로 묶여 있지 않아 식별자로 직접 잇는다. + * 홈 미리보기용이라 정렬은 행사 시작 임박순이다. + *

+ * 신청을 JOIN하지 않고 {@code EXISTS}로 거른다. (행사, 회원) 유니크가 없어 유효 신청이 두 건 생길 수 있는데, + * JOIN이면 같은 행사가 신청 수만큼 복제된다. 신청했는지만 알면 되므로 존재 여부로 본다. + *

+ * 종료 일시로 거르므로 여러 날에 걸친 행사는 마지막 날까지 남는다. {@code event_end_at}이 NULL인 기존 행은 + * 시작 일시로 대신한다. + * + * @param startOfToday 오늘 0시. 시각이 아니라 날짜로 거른다 — 오늘 끝나는 행사는 이미 지났어도 보여줘야 한다 + */ + @Query(""" + SELECT e FROM EventJpaEntity e + WHERE e.isDeleted = false + AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday + AND EXISTS ( + SELECT a.id FROM EventApplicationJpaEntity a + WHERE a.eventId = e.id + AND a.memberId = :memberId + AND a.status = :appliedStatus) + ORDER BY e.eventStartAt ASC, e.id ASC + """) + List findUpcomingAppliedEvents( + @Param("memberId") Long memberId, + @Param("appliedStatus") EventApplicationStatus appliedStatus, + @Param("startOfToday") LocalDateTime startOfToday, + Pageable pageable + ); + + @Query(""" + SELECT COUNT(e) FROM EventJpaEntity e + WHERE e.isDeleted = false + AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday + AND EXISTS ( + SELECT a.id FROM EventApplicationJpaEntity a + WHERE a.eventId = e.id + AND a.memberId = :memberId + AND a.status = :appliedStatus) + """) + long countUpcomingAppliedEvents( + @Param("memberId") Long memberId, + @Param("appliedStatus") EventApplicationStatus appliedStatus, + @Param("startOfToday") LocalDateTime startOfToday + ); } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java index 13014d498..9124e3559 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java @@ -115,6 +115,20 @@ public List findPublishedSlice( ).stream().map(EventJpaEntity::toDomain).toList(); } + @Override + public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { + return eventJpaRepository.findUpcomingAppliedEvents( + memberId, EventApplicationStatus.APPLIED, startOfToday, Pageable.ofSize(limit)).stream() + .map(EventJpaEntity::toDomain) + .toList(); + } + + @Override + public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { + return eventJpaRepository.countUpcomingAppliedEvents( + memberId, EventApplicationStatus.APPLIED, startOfToday); + } + @Override public List findPublishedStartingBetween(LocalDateTime from, LocalDateTime to) { return eventJpaRepository.findPublishedStartingBetween(from, to).stream().map(EventJpaEntity::toDomain).toList(); From 0519ac72e20fa1b588905ae6b03681a5d6b1a2f4 Mon Sep 17 00:00:00 2001 From: sangrae Date: Tue, 3 Nov 2026 15:41:32 +0900 Subject: [PATCH 10/10] =?UTF-8?q?refactor:=20=EC=8B=A0=EC=B2=AD=ED=95=9C?= =?UTF-8?q?=20=ED=96=89=EC=82=AC=20=EC=A1=B0=ED=9A=8C=EB=A5=BC=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=C2=B7=EC=A0=84=EC=B2=B4=20=EC=88=98=20=ED=95=9C=20?= =?UTF-8?q?=EB=B2=88=EC=97=90=20=EC=9D=BD=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/repository/EventRepository.java | 10 ++-- .../impl/EventApplicationServiceImpl.java | 12 +---- .../service/impl/EventServiceImplTest.java | 9 ++-- .../service/impl/InMemoryEventRepository.java | 8 +-- .../stream/db/event/EventJpaRepository.java | 52 +++++++++---------- .../stream/db/event/EventRepositoryImpl.java | 19 ++++--- 6 files changed, 44 insertions(+), 66 deletions(-) diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java index c045272ff..bdf98694e 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/repository/EventRepository.java @@ -5,6 +5,7 @@ import java.util.Optional; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventCursor; import kr.ac.kookmin.stream.event.domain.event.domain.EventQuestion; @@ -77,14 +78,11 @@ List findPublishedSlice( * 거르는 조건에 회원과 신청 상태가 들어가지만 돌려주는 것은 행사다. 신청 조건으로 행사를 좁히는 조회는 * {@link #findPublishedSlice}의 정원 판정처럼 이 저장소가 맡는다. * + * 홈이 "N건 더보기"를 그려야 해서 앞의 {@code limit}건과 함께 전체 수를 준다. + * * @param startOfToday 오늘 0시. 종료 일시를 시각이 아니라 날짜로 견준다 — 오늘 끝나는 행사도 보여줘야 한다 */ - List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit); - - /** - * {@link #findUpcomingAppliedEvents}와 같은 조건의 전체 수. 홈이 "N건 더보기"를 그릴 때 쓴다. - */ - long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday); + PreviewResult findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit); /** * 게시되고 삭제되지 않은 행사 중 시작 일시가 {@code [from, to)}인 행사. 행사 전날 알림 대상을 고를 때 쓴다. diff --git a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java index a6ed6c24f..bf07efc37 100644 --- a/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java +++ b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventApplicationServiceImpl.java @@ -172,17 +172,9 @@ private List toAnswers(Long applicationId, EventApplyCom .toList(); } - // 목록과 전체 수를 쿼리 둘로 읽으므로 한 스냅샷으로 묶는다. 사이에 신청·취소가 커밋되면 - // "2건 보여주는데 전체는 1건"이 된다 @Override - @Transactional(readOnly = true) public PreviewResult getUpcomingAppliedEvents(Long memberId, int limit) { - // 당일 행사는 이미 시작했어도 "오늘"로 보여줘야 하므로 시작 시각이 아니라 날짜로 거른다 - LocalDateTime startOfToday = LocalDate.now().atStartOfDay(); - - return new PreviewResult<>( - eventRepository.findUpcomingAppliedEvents(memberId, startOfToday, limit), - eventRepository.countUpcomingAppliedEvents(memberId, startOfToday) - ); + // 오늘 끝나는 행사는 이미 지났어도 "오늘"로 보여줘야 하므로 시각이 아니라 날짜로 거른다 + return eventRepository.findUpcomingAppliedEvents(memberId, LocalDate.now().atStartOfDay(), limit); } } diff --git a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java index f0245450d..9381348e3 100644 --- a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java +++ b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/EventServiceImplTest.java @@ -12,6 +12,7 @@ import kr.ac.kookmin.stream.common.CursorSliceResult; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplication; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationAnswer; @@ -258,12 +259,8 @@ public List findSliceByMemberId( } @Override - public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { - throw new UnsupportedOperationException(); - } - - @Override - public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { + public PreviewResult findUpcomingAppliedEvents( + Long memberId, LocalDateTime startOfToday, int limit) { throw new UnsupportedOperationException(); } diff --git a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java index 4420fe0db..1be267178 100644 --- a/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java +++ b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java @@ -8,6 +8,7 @@ import java.util.Optional; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventCursor; import kr.ac.kookmin.stream.event.domain.event.domain.EventQuestion; @@ -88,12 +89,7 @@ public List findAllByIds(List eventIds) { } @Override - public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { - throw new UnsupportedOperationException(); - } - - @Override - public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { + public PreviewResult findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { throw new UnsupportedOperationException(); } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java index 06bf8460f..a02611906 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java @@ -118,37 +118,33 @@ List findPublishedSlice( * * @param startOfToday 오늘 0시. 시각이 아니라 날짜로 거른다 — 오늘 끝나는 행사는 이미 지났어도 보여줘야 한다 */ - @Query(""" - SELECT e FROM EventJpaEntity e - WHERE e.isDeleted = false - AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday - AND EXISTS ( - SELECT a.id FROM EventApplicationJpaEntity a - WHERE a.eventId = e.id - AND a.memberId = :memberId - AND a.status = :appliedStatus) - ORDER BY e.eventStartAt ASC, e.id ASC - """) - List findUpcomingAppliedEvents( + @Query( + value = """ + SELECT e FROM EventJpaEntity e + WHERE e.isDeleted = false + AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday + AND EXISTS ( + SELECT a.id FROM EventApplicationJpaEntity a + WHERE a.eventId = e.id + AND a.memberId = :memberId + AND a.status = :appliedStatus) + ORDER BY e.eventStartAt ASC, e.id ASC + """, + countQuery = """ + SELECT COUNT(e) FROM EventJpaEntity e + WHERE e.isDeleted = false + AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday + AND EXISTS ( + SELECT a.id FROM EventApplicationJpaEntity a + WHERE a.eventId = e.id + AND a.memberId = :memberId + AND a.status = :appliedStatus) + """ + ) + Page findUpcomingAppliedEvents( @Param("memberId") Long memberId, @Param("appliedStatus") EventApplicationStatus appliedStatus, @Param("startOfToday") LocalDateTime startOfToday, Pageable pageable ); - - @Query(""" - SELECT COUNT(e) FROM EventJpaEntity e - WHERE e.isDeleted = false - AND COALESCE(e.eventEndAt, e.eventStartAt) >= :startOfToday - AND EXISTS ( - SELECT a.id FROM EventApplicationJpaEntity a - WHERE a.eventId = e.id - AND a.memberId = :memberId - AND a.status = :appliedStatus) - """) - long countUpcomingAppliedEvents( - @Param("memberId") Long memberId, - @Param("appliedStatus") EventApplicationStatus appliedStatus, - @Param("startOfToday") LocalDateTime startOfToday - ); } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java index 9124e3559..556534ab0 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventRepositoryImpl.java @@ -5,6 +5,7 @@ import java.util.Optional; import kr.ac.kookmin.stream.common.PageOffset; import kr.ac.kookmin.stream.common.PageResult; +import kr.ac.kookmin.stream.common.PreviewResult; import kr.ac.kookmin.stream.db.common.LikePatterns; import kr.ac.kookmin.stream.event.domain.event.domain.Event; import kr.ac.kookmin.stream.event.domain.event.domain.EventApplicationStatus; @@ -116,17 +117,15 @@ public List findPublishedSlice( } @Override - public List findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { - return eventJpaRepository.findUpcomingAppliedEvents( - memberId, EventApplicationStatus.APPLIED, startOfToday, Pageable.ofSize(limit)).stream() - .map(EventJpaEntity::toDomain) - .toList(); - } + public PreviewResult findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) { + Page result = eventJpaRepository.findUpcomingAppliedEvents( + memberId, EventApplicationStatus.APPLIED, startOfToday, Pageable.ofSize(limit) + ); - @Override - public long countUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday) { - return eventJpaRepository.countUpcomingAppliedEvents( - memberId, EventApplicationStatus.APPLIED, startOfToday); + return new PreviewResult<>( + result.getContent().stream().map(EventJpaEntity::toDomain).toList(), + result.getTotalElements() + ); } @Override