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..094422617
--- /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 content 미리보기 목록. 전체 수보다 적을 수 있다
+ */
+public record PreviewResult(List content, long totalCount) {
+}
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..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;
@@ -70,6 +71,19 @@ List findPublishedSlice(
LocalDateTime now
);
+ /**
+ * 회원이 신청한 행사 중 아직 끝나지 않은 것을 행사 시작이 임박한 순으로 {@code limit}건까지 조회한다.
+ * 취소한 신청과 삭제된 행사는 뺀다. 여러 날에 걸친 행사는 마지막 날까지 남는다.
+ *
+ * 거르는 조건에 회원과 신청 상태가 들어가지만 돌려주는 것은 행사다. 신청 조건으로 행사를 좁히는 조회는
+ * {@link #findPublishedSlice}의 정원 판정처럼 이 저장소가 맡는다.
+ *
+ * 홈이 "N건 더보기"를 그려야 해서 앞의 {@code limit}건과 함께 전체 수를 준다.
+ *
+ * @param startOfToday 오늘 0시. 종료 일시를 시각이 아니라 날짜로 견준다 — 오늘 끝나는 행사도 보여줘야 한다
+ */
+ 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/EventApplicationService.java b/core/domain/event/src/main/java/kr/ac/kookmin/stream/event/domain/event/service/EventApplicationService.java
index ec734e508..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
@@ -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,16 @@ 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..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
@@ -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;
@@ -8,6 +9,7 @@
import kr.ac.kookmin.stream.common.BusinessException;
import kr.ac.kookmin.stream.common.CursorSliceResult;
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;
@@ -169,4 +171,10 @@ private List toAnswers(Long applicationId, EventApplyCom
))
.toList();
}
+
+ @Override
+ public PreviewResult getUpcomingAppliedEvents(Long memberId, int limit) {
+ // 오늘 끝나는 행사는 이미 지났어도 "오늘"로 보여줘야 하므로 시각이 아니라 날짜로 거른다
+ return eventRepository.findUpcomingAppliedEvents(memberId, LocalDate.now().atStartOfDay(), limit);
+ }
}
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 e21907b16..ac46eb818 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,5 +1,6 @@
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;
@@ -16,6 +17,12 @@ public interface LockerService {
*/
Optional getCurrentPeriod();
+ /**
+ * 주어진 운영 회차 중 지금 신청할 수 있는 것을 신청 마감 임박순으로 조회한다.
+ * 미게시·삭제된 회차와 신청 기간이 아닌 회차는 빠진다.
+ */
+ 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 1e6823cba..690a615bf 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,6 +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;
@@ -33,6 +35,16 @@ public Optional getCurrentPeriod() {
return lockerRepository.findCurrentPublishedPeriod(LocalDateTime.now());
}
+ @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) {
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..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;
@@ -257,6 +258,12 @@ public List findSliceByMemberId(
throw new UnsupportedOperationException();
}
+ @Override
+ public PreviewResult findUpcomingAppliedEvents(
+ Long memberId, LocalDateTime startOfToday, int limit) {
+ 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/InMemoryEventRepository.java b/core/domain/event/src/test/java/kr/ac/kookmin/stream/event/domain/event/service/impl/InMemoryEventRepository.java
index 7f53b2c83..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;
@@ -87,6 +88,11 @@ public List findAllByIds(List eventIds) {
throw new UnsupportedOperationException();
}
+ @Override
+ public PreviewResult findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public Optional findPublishedById(Long id) {
throw new UnsupportedOperationException();
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/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 7e7a70c87..1f96a60f7 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
@@ -17,6 +17,9 @@ public interface RentalHistoryRepository {
*/
List findAllByMemberId(Long memberId, RentalStatus status);
+ /** 회원의 대여 이력 중 주어진 상태들 중 하나인 것. */
+ List findAllByMemberIdAndStatusIn(Long memberId, Collection statuses);
+
/** 모든 회원의 대여 이력 중 주어진 상태들 중 하나인 것. 반납 알림 대상을 고를 때 쓴다. */
List findAllByStatusIn(Collection statuses);
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 1434bc805..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
@@ -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,13 @@ 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 4e9c06727..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
@@ -1,11 +1,13 @@
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.function.Function;
import java.util.stream.Collectors;
import kr.ac.kookmin.stream.common.BusinessException;
+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;
@@ -38,6 +40,21 @@ public List getReturnRequiredRentals(Long memberId) {
.toList();
}
+ @Override
+ public PreviewResult getActiveRentals(Long memberId, int limit) {
+ // 반납 기한은 물품 정책으로 계산하는 값이라 DB에서 정렬할 수 없다. 기한 오름차순이면 기한이 지난 대여가
+ // 먼저 오고 그 뒤는 남은 시간이 적은 순이다. 기한이 같을 때는 식별자로 순서를 고정한다 — 조회 쿼리에
+ // 정렬이 없어, 두지 않으면 미리보기에 무엇이 실릴지가 DB가 준 순서에 달린다
+ List active = toRecords(rentalHistoryRepository
+ .findAllByMemberIdAndStatusIn(memberId, RentalStatus.awaitingReturnStatuses())).stream()
+ .filter(RentalRecord::isReturnRequired)
+ .sorted(Comparator.comparing(RentalRecord::dueAt)
+ .thenComparing(rentalRecord -> rentalRecord.history().getId()))
+ .toList();
+
+ return new PreviewResult<>(active.stream().limit(limit).toList(), active.size());
+ }
+
// 반납 기한 임박·연체 알림 대상을 고를 때 쓴다.
@Override
public List getAllReturnRequiredRentals() {
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/EventJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/event/EventJpaRepository.java
index 5d6da6b60..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
@@ -105,4 +105,46 @@ 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(
+ 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
+ );
}
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..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;
@@ -115,6 +116,18 @@ public List findPublishedSlice(
).stream().map(EventJpaEntity::toDomain).toList();
}
+ @Override
+ public PreviewResult findUpcomingAppliedEvents(Long memberId, LocalDateTime startOfToday, int limit) {
+ Page result = eventJpaRepository.findUpcomingAppliedEvents(
+ memberId, EventApplicationStatus.APPLIED, startOfToday, Pageable.ofSize(limit)
+ );
+
+ return new PreviewResult<>(
+ result.getContent().stream().map(EventJpaEntity::toDomain).toList(),
+ result.getTotalElements()
+ );
+ }
+
@Override
public List findPublishedStartingBetween(LocalDateTime from, LocalDateTime to) {
return eventJpaRepository.findPublishedStartingBetween(from, to).stream().map(EventJpaEntity::toDomain).toList();
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 810d1349e..a1c486144 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
@@ -88,6 +88,9 @@ public Optional findCurrentPublishedPeriod(LocalDateTime at) {
@Override
public List findPublishedPeriodsByIds(Collection lockerPeriodIds) {
+ if (lockerPeriodIds.isEmpty()) {
+ return List.of();
+ }
return lockerPeriodJpaRepository.findAllByIdInAndIsPublishedTrueAndIsDeletedFalse(lockerPeriodIds).stream()
.map(LockerPeriodJpaEntity::toDomain)
.toList();
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()
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 feb236a03..044b62585 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
@@ -26,6 +26,9 @@ List findAllByMemberId(
boolean existsByItemIdAndMemberIdAndRentalStatusNotIn(Long itemId, Long memberId, Collection excludedStatuses);
+ List findAllByMemberIdAndRentalStatusIn(
+ Long memberId, Collection rentalStatuses);
+
boolean existsByItemIdAndRentalStatusNotIn(Long itemId, Collection excludedStatuses);
// 관리자 콘솔용 페이지 번호 조회. memberIds가 null이면 회원 필터를 안 건다.
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 d102c3f9b..2100992a3 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
@@ -26,6 +26,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 findAllByStatusIn(Collection statuses) {
return rentalHistoryJpaRepository.findAllByRentalStatusIn(statuses).stream()