diff --git a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/rental/usecase/AdminRentalStatusUpdateUseCase.java b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/rental/usecase/AdminRentalStatusUpdateUseCase.java index ff153810e..e3f9d72eb 100644 --- a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/rental/usecase/AdminRentalStatusUpdateUseCase.java +++ b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/welfare/rental/usecase/AdminRentalStatusUpdateUseCase.java @@ -3,7 +3,13 @@ import java.util.List; import kr.ac.kookmin.stream.api.admin.welfare.rental.response.AdminRentalHistoryResponse; import kr.ac.kookmin.stream.common.LockExecutor; +import kr.ac.kookmin.stream.common.OutboxWriter; import kr.ac.kookmin.stream.common.Role; +import kr.ac.kookmin.stream.common.event.DomainEvent; +import kr.ac.kookmin.stream.common.event.RentalApproved; +import kr.ac.kookmin.stream.common.event.RentalRejected; +import kr.ac.kookmin.stream.common.event.RentalReturnApproved; +import kr.ac.kookmin.stream.common.event.RentalReturnCompleted; import kr.ac.kookmin.stream.member.domain.member.domain.Member; import kr.ac.kookmin.stream.member.domain.member.service.MemberService; import kr.ac.kookmin.stream.common.BusinessException; @@ -27,6 +33,7 @@ public class AdminRentalStatusUpdateUseCase { private final MemberService memberService; private final ItemService itemService; private final AdminRentalHistoryService adminRentalHistoryService; + private final OutboxWriter outboxWriter; public AdminRentalHistoryResponse updateStatus(Long historyId, RentalStatus requestedStatus, Long workerId) { return lockExecutor.executeOptimistic(() -> { @@ -35,6 +42,7 @@ public AdminRentalHistoryResponse updateStatus(Long historyId, RentalStatus requ RentalRecord current = adminRentalHistoryService.getById(historyId); RentalStatus previousStatus = current.history().getRentalStatus(); Item item = current.item(); + String itemName = item != null ? item.getName() : null; boolean isConsumable = requestedStatus == RentalStatus.CONFIRMED && item != null && item.getType() == ItemType.CONSUMABLE; @@ -52,6 +60,10 @@ public AdminRentalHistoryResponse updateStatus(Long historyId, RentalStatus requ item = itemService.decreaseStock(history.getItemId(), history.getRentedCount()); } + if (previousStatus != newStatus) { + recordStatusChangeEvent(requestedStatus, history.getMemberId(), history.getId(), itemName); + } + Member renter = memberService.getMapByIds(List.of(history.getMemberId())).get(history.getMemberId()); return AdminRentalHistoryResponse.from(new RentalRecord(history, item), renter); }); @@ -63,4 +75,19 @@ private void validateIsAdmin(Long workerId) { throw new BusinessException(RentalErrorCode.WORKER_NOT_ADMIN); } } + + // 소모품은 승인 즉시 RETURNED로 저장되지만(위 isConsumable), 학생에게는 "반납 완료"가 아니라 + // "승인" 알림을 보낸다. 그래서 저장된 newStatus가 아니라 admin이 실제로 요청한 requestedStatus로 알림 종류를 정한다 + private void recordStatusChangeEvent(RentalStatus requestedStatus, Long memberId, Long historyId, String itemName) { + DomainEvent event = switch (requestedStatus) { + case CONFIRMED -> new RentalApproved(memberId, historyId, itemName); + case REJECTED -> new RentalRejected(memberId, historyId, itemName); + case RETURN_CONFIRMED -> new RentalReturnApproved(memberId, historyId, itemName); + case RETURNED -> new RentalReturnCompleted(memberId, historyId, itemName); + default -> null; + }; + if (event != null) { + outboxWriter.record(event); + } + } } diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalApplyUseCase.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalApplyUseCase.java index aa07b04d2..c05b538b8 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalApplyUseCase.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalApplyUseCase.java @@ -4,11 +4,14 @@ import java.time.LocalDateTime; import kr.ac.kookmin.stream.common.BusinessException; import kr.ac.kookmin.stream.common.LockExecutor; +import kr.ac.kookmin.stream.common.OutboxWriter; +import kr.ac.kookmin.stream.common.event.RentalApplied; import kr.ac.kookmin.stream.internal.domain.config.service.AdminConfigValueService; import kr.ac.kookmin.stream.welfare.domain.fee.service.PayerService; import kr.ac.kookmin.stream.welfare.domain.rental.domain.Item; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalBlockPeriodConfigKeys; import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalErrorCode; +import kr.ac.kookmin.stream.welfare.domain.rental.domain.RentalHistory; import kr.ac.kookmin.stream.welfare.domain.rental.service.ItemService; import kr.ac.kookmin.stream.welfare.domain.rental.service.RentalHistoryService; import lombok.RequiredArgsConstructor; @@ -24,6 +27,7 @@ public class RentalApplyUseCase { private final ItemService itemService; private final RentalHistoryService rentalHistoryService; private final AdminConfigValueService adminConfigValueService; + private final OutboxWriter outboxWriter; public void apply(Long memberId, Long itemId, int count, int rentAtHour, int rentAtMinute, boolean ignoreDuplicate) { validateNotBlocked(); @@ -39,7 +43,10 @@ public void apply(Long memberId, Long itemId, int count, int rentAtHour, int ren LocalDateTime now = LocalDateTime.now(); LocalDateTime rentAt = LocalDate.now().atTime(rentAtHour, rentAtMinute); - rentalHistoryService.create(item, memberId, null, count, now, rentAt); + RentalHistory history = rentalHistoryService.create(item, memberId, null, count, now, rentAt); + + outboxWriter.record(new RentalApplied( + memberId, history.getId(), item.getName(), "%02d:%02d".formatted(rentAtHour, rentAtMinute))); }); } diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalCancelUseCase.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalCancelUseCase.java index 330a43855..15c4f6b70 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalCancelUseCase.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/welfare/rental/usecase/RentalCancelUseCase.java @@ -1,6 +1,9 @@ package kr.ac.kookmin.stream.api.app.welfare.rental.usecase; import kr.ac.kookmin.stream.common.LockExecutor; +import kr.ac.kookmin.stream.common.OutboxWriter; +import kr.ac.kookmin.stream.common.event.RentalApplicationCanceled; +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.service.ItemService; import kr.ac.kookmin.stream.welfare.domain.rental.service.RentalHistoryService; @@ -15,11 +18,14 @@ public class RentalCancelUseCase { private final LockExecutor lockExecutor; private final RentalHistoryService rentalHistoryService; private final ItemService itemService; + private final OutboxWriter outboxWriter; public void cancel(Long memberId, Long historyId) { lockExecutor.executeOptimistic(() -> { RentalHistory history = rentalHistoryService.cancel(memberId, historyId); - itemService.increaseStock(history.getItemId(), history.getRentedCount()); + Item item = itemService.increaseStock(history.getItemId(), history.getRentedCount()); + + outboxWriter.record(new RentalApplicationCanceled(memberId, history.getId(), item.getName())); }); } } diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplicationCanceled.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplicationCanceled.java new file mode 100644 index 000000000..ebe3b9d78 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplicationCanceled.java @@ -0,0 +1,6 @@ +package kr.ac.kookmin.stream.common.event; + +/** 회원이 자신의 대여 신청(승인 전)을 취소했다. 운영진 공용 알림에만 쓰인다. */ +public record RentalApplicationCanceled( + Long memberId, Long rentalHistoryId, String itemName +) implements DomainEvent {} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplied.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplied.java new file mode 100644 index 000000000..958a08b92 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplied.java @@ -0,0 +1,6 @@ +package kr.ac.kookmin.stream.common.event; + +/** 회원이 물품 대여를 신청했다. 물품명·대여 시각은 알림 문구에 쓰려고 신청 시점의 값을 싣는다. */ +public record RentalApplied( + Long memberId, Long rentalHistoryId, String itemName, String rentAtTime +) implements DomainEvent {} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApproved.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApproved.java new file mode 100644 index 000000000..d3d6a6690 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApproved.java @@ -0,0 +1,4 @@ +package kr.ac.kookmin.stream.common.event; + +/** 운영진이 대여 신청을 승인했다. */ +public record RentalApproved(Long memberId, Long rentalHistoryId, String itemName) implements DomainEvent {} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalRejected.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalRejected.java new file mode 100644 index 000000000..190ebe57f --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalRejected.java @@ -0,0 +1,4 @@ +package kr.ac.kookmin.stream.common.event; + +/** 운영진이 대여 신청을 반려했다. */ +public record RentalRejected(Long memberId, Long rentalHistoryId, String itemName) implements DomainEvent {} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApplied.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApplied.java new file mode 100644 index 000000000..12f62d221 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApplied.java @@ -0,0 +1,6 @@ +package kr.ac.kookmin.stream.common.event; + +/** 회원이 반납을 신청했다. */ +public record RentalReturnApplied( + Long memberId, Long rentalHistoryId, String itemName +) implements DomainEvent {} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApproved.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApproved.java new file mode 100644 index 000000000..38000b626 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApproved.java @@ -0,0 +1,4 @@ +package kr.ac.kookmin.stream.common.event; + +/** 운영진이 반납 신청을 승인했다. */ +public record RentalReturnApproved(Long memberId, Long rentalHistoryId, String itemName) implements DomainEvent {} diff --git a/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnCompleted.java b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnCompleted.java new file mode 100644 index 000000000..af6ebd1a6 --- /dev/null +++ b/core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnCompleted.java @@ -0,0 +1,4 @@ +package kr.ac.kookmin.stream.common.event; + +/** 반납이 완료됐다. 급하게 확인할 내용이 아니라 알림함에만 남기고 푸시는 보내지 않는다. */ +public record RentalReturnCompleted(Long memberId, Long rentalHistoryId, String itemName) implements DomainEvent {} diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/domain/NotificationType.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/domain/NotificationType.java index e10348c60..653e45031 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/domain/NotificationType.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/domain/NotificationType.java @@ -35,6 +35,19 @@ public enum NotificationType { RENTAL_DUE_SOON(NotificationCategory.BILLILGE, "반납까지 1시간 남았어요.", "늦지 않게 %s을(를) 반납해 주세요."), RENTAL_OVERDUE(NotificationCategory.BILLILGE, "반납 기한이 지났어요.", "학생회실에 방문해 %s을(를) 반납해 주세요."), + // 운영진 공용 알림. 값: 이름, 학번, (APPLY만)대여 시각, 물품명 + ADMIN_RENTAL_APPLY(NotificationCategory.BILLILGE, "%s(%s) 님이 %s에 %s 대여를 신청했어요.", null), + ADMIN_RENTAL_CANCEL(NotificationCategory.BILLILGE, "%s(%s) 님이 %s 대여 신청을 취소했어요.", null), + ADMIN_RETURN_APPLY(NotificationCategory.BILLILGE, "%s(%s) 님이 %s 반납을 신청했어요.", null), + + // 값: 물품명 + RENTAL_APPLY(NotificationCategory.BILLILGE, "%s 대여를 신청했어요!", "관리자가 처리할 때까지 잠시만 기다려 주세요."), + RENTAL_APPROVED(NotificationCategory.BILLILGE, "관리자가 %s 대여 신청을 승인했어요!", "대여 시각에 과방으로 오시면 물품을 빌릴 수 있어요."), + RENTAL_REJECTED(NotificationCategory.BILLILGE, "%s 대여 신청이 반려되었어요.", "자세한 사항은 소프트웨어융합대학 카카오톡에 문의해 주세요."), + RETURN_APPLY(NotificationCategory.BILLILGE, "%s 반납을 신청했어요!", "관리자가 처리할 때까지 잠시만 기다려 주세요."), + RETURN_APPROVED(NotificationCategory.BILLILGE, "관리자가 %s 반납 신청을 승인했어요!", "과방으로 오시면 물품을 반납할 수 있어요."), + RETURN_COMPLETED(NotificationCategory.BILLILGE, "%s 반납을 완료했어요.", null), + // 값: 없음 NOTICE_CREATED(NotificationCategory.NOTICE, "새로운 공지사항이 올라왔어요.", "자세한 내용을 확인해 주세요."); diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRecipientRepository.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRecipientRepository.java index 1872a99b9..c6a752563 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRecipientRepository.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRecipientRepository.java @@ -12,5 +12,7 @@ public interface NotificationRecipientRepository { List findAllActiveMemberIds(); List findPushTargets(Collection memberIds); List findAllPushTargets(); + /** 운영진(Role.ADMIN) 전체의 푸시 대상. 관리자 공용 알림을 보낼 때 쓴다. */ + List findAllAdminPushTargets(); int clearFcmTokens(Collection fcmTokens); } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationDispatcher.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationDispatcher.java index 7a93f98d9..aaa4add15 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationDispatcher.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationDispatcher.java @@ -21,6 +21,7 @@ /** * 알림 한 건을 수신자에게 보낸다. 알림함에는 수신자 전원에게 저장하고, 푸시는 그 카테고리를 켜 두고 토큰이 있는 회원에게만 보낸다. + * 운영진 업무 알림({@link #dispatchToAdmins})은 예외로, 개인 알림 설정과 무관하게 전원에게 보낸다. *

* 아웃박스 릴레이가 부르는 리스너에서 트랜잭션 없이 호출된다. 알림함 저장은 {@code saveAll}의 트랜잭션으로 한꺼번에 반영하고, * 저장이 끝난 뒤 트랜잭션 밖에서 푸시를 보낸다. 알림함 저장이 실패하면 예외가 리스너까지 올라가 아웃박스가 다시 발행한다. @@ -54,6 +55,22 @@ void dispatchToAll(NotificationType type, List formatValues, long target send(type, formatValues, targetId, recipients, pushTargets); } + /** + * 특정 회원이 아니라 운영진 전체가 공동으로 보는 알림 한 건을 만든다. + * 운영진 수만큼 행을 만들지 않고 {@code memberId}가 없는 행 하나만 저장하므로, 읽음 여부도 운영진 전체가 공유한다. + */ + void dispatchToAdmins(NotificationType type, List formatValues, long targetId) { + notificationRepository.saveAll(List.of(Notification.create(null, type, formatValues, targetId))); + // 운영진 업무 알림(신청/취소/반납신청 등)은 개인 알림 설정과 무관하게 전원에게 보낸다 + sendPush(type, formatValues, targetId, notificationRecipientRepository.findAllAdminPushTargets(), 1); + } + + /** 지정한 회원에게 알림함에만 저장한다(푸시 없음). 급하게 확인할 내용이 아닌 알림에 쓴다. */ + void dispatchWithoutPush(NotificationType type, List formatValues, long targetId, Collection memberIds) { + List recipients = List.copyOf(new LinkedHashSet<>(memberIds)); + saveNotifications(type, formatValues, targetId, recipients); + } + private void send( NotificationType type, List formatValues, @@ -64,13 +81,22 @@ private void send( if (recipients.isEmpty()) { return; } - notificationRepository.saveAll(recipients.stream() - .map(memberId -> Notification.create(memberId, type, formatValues, targetId)) - .toList()); + saveNotifications(type, formatValues, targetId, recipients); + List accepting = pushTargets.stream() + .filter(target -> target.accepts(type.getCategory())) + .toList(); + sendPush(type, formatValues, targetId, accepting, recipients.size()); + } - // 한 기기의 토큰이 여러 회원 행에 남아 있을 수 있어 토큰 단위로 중복을 지운다. 그대로 보내면 같은 기기에 여러 번 간다 + // 한 기기의 토큰이 여러 회원 행에 남아 있을 수 있어 토큰 단위로 중복을 지운다. 그대로 보내면 같은 기기에 여러 번 간다 + private void sendPush( + NotificationType type, + List formatValues, + long targetId, + List pushTargets, + int recipientCount + ) { List tokens = pushTargets.stream() - .filter(target -> target.accepts(type.getCategory())) .map(PushTarget::fcmToken) .distinct() .toList(); @@ -80,7 +106,16 @@ private void send( invalidTokenCount = clearInvalidTokens(result.tokensWith(PushSendStatus.INVALID_TOKEN)); } log.info("알림 발송: type={}, targetId={}, recipientCount={}, pushTokenCount={}, invalidTokenCount={}", - type, targetId, recipients.size(), tokens.size(), invalidTokenCount); + type, targetId, recipientCount, tokens.size(), invalidTokenCount); + } + + private void saveNotifications(NotificationType type, List formatValues, long targetId, List recipients) { + if (recipients.isEmpty()) { + return; + } + notificationRepository.saveAll(recipients.stream() + .map(memberId -> Notification.create(memberId, type, formatValues, targetId)) + .toList()); } private PushMessage toPushMessage(NotificationType type, List formatValues, long targetId) { diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationEventListener.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationEventListener.java index c08a6f72e..760fe7462 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationEventListener.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationEventListener.java @@ -11,8 +11,17 @@ import kr.ac.kookmin.stream.common.event.LockerAssignmentCanceled; import kr.ac.kookmin.stream.common.event.LockerUsageEndingSoon; import kr.ac.kookmin.stream.common.event.NoticeCreated; +import kr.ac.kookmin.stream.common.event.RentalApplicationCanceled; +import kr.ac.kookmin.stream.common.event.RentalApplied; +import kr.ac.kookmin.stream.common.event.RentalApproved; import kr.ac.kookmin.stream.common.event.RentalDueSoon; import kr.ac.kookmin.stream.common.event.RentalOverdue; +import kr.ac.kookmin.stream.common.event.RentalRejected; +import kr.ac.kookmin.stream.common.event.RentalReturnApplied; +import kr.ac.kookmin.stream.common.event.RentalReturnApproved; +import kr.ac.kookmin.stream.common.event.RentalReturnCompleted; +import kr.ac.kookmin.stream.member.domain.member.domain.Member; +import kr.ac.kookmin.stream.member.domain.member.service.MemberService; import kr.ac.kookmin.stream.member.domain.notification.domain.NotificationType; import lombok.RequiredArgsConstructor; import org.springframework.context.event.EventListener; @@ -27,6 +36,7 @@ class NotificationEventListener { private final NotificationDispatcher notificationDispatcher; + private final MemberService memberService; // 신청·취소 알림은 누르면 신청 내역 상세로 가야 하므로 행사가 아니라 신청 ID를 대상으로 준다 @EventListener @@ -102,4 +112,64 @@ public void on(RentalOverdue event) { notificationDispatcher.dispatch( NotificationType.RENTAL_OVERDUE, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); } + + // 신청은 본인과 운영진 모두에게 간다 + @EventListener + public void on(RentalApplied event) { + notificationDispatcher.dispatch( + NotificationType.RENTAL_APPLY, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); + + Member member = memberService.getById(event.memberId()); + notificationDispatcher.dispatchToAdmins( + NotificationType.ADMIN_RENTAL_APPLY, + List.of(member.getName(), member.getStudentId(), event.rentAtTime(), event.itemName()), + event.rentalHistoryId()); + } + + // 본인이 취소한 신청이라 본인에게는 알림이 가지 않는다. 운영진만 안다 + @EventListener + public void on(RentalApplicationCanceled event) { + Member member = memberService.getById(event.memberId()); + notificationDispatcher.dispatchToAdmins( + NotificationType.ADMIN_RENTAL_CANCEL, + List.of(member.getName(), member.getStudentId(), event.itemName()), + event.rentalHistoryId()); + } + + @EventListener + public void on(RentalReturnApplied event) { + notificationDispatcher.dispatch( + NotificationType.RETURN_APPLY, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); + + Member member = memberService.getById(event.memberId()); + notificationDispatcher.dispatchToAdmins( + NotificationType.ADMIN_RETURN_APPLY, + List.of(member.getName(), member.getStudentId(), event.itemName()), + event.rentalHistoryId()); + } + + @EventListener + public void on(RentalApproved event) { + notificationDispatcher.dispatch( + NotificationType.RENTAL_APPROVED, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); + } + + @EventListener + public void on(RentalRejected event) { + notificationDispatcher.dispatch( + NotificationType.RENTAL_REJECTED, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); + } + + @EventListener + public void on(RentalReturnApproved event) { + notificationDispatcher.dispatch( + NotificationType.RETURN_APPROVED, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); + } + + // 급하게 확인할 내용이 아니라 알림함에만 남기고 푸시는 보내지 않는다 + @EventListener + public void on(RentalReturnCompleted event) { + notificationDispatcher.dispatchWithoutPush( + NotificationType.RETURN_COMPLETED, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); + } } 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 2e67f01fa..e9d332ff6 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 @@ -7,7 +7,9 @@ import java.util.function.Function; import java.util.stream.Collectors; import kr.ac.kookmin.stream.common.BusinessException; +import kr.ac.kookmin.stream.common.OutboxWriter; import kr.ac.kookmin.stream.common.PreviewResult; +import kr.ac.kookmin.stream.common.event.RentalReturnApplied; 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; @@ -26,6 +28,7 @@ class RentalHistoryServiceImpl implements RentalHistoryService { private final RentalHistoryRepository rentalHistoryRepository; private final ItemRepository itemRepository; + private final OutboxWriter outboxWriter; // 회원의 대여 이력을 물품과 짝지어 반환한다. @Override @@ -69,7 +72,12 @@ public List getAllReturnRequiredRentals() { public RentalHistory requestReturn(Long memberId, Long historyId) { RentalHistory history = getOwnedByStatus(historyId, memberId, RentalStatus.RENTAL); history.requestReturn(); - return rentalHistoryRepository.save(history); + RentalHistory saved = rentalHistoryRepository.save(history); + + Item item = itemRepository.getById(saved.getItemId()); + outboxWriter.record(new RentalReturnApplied(memberId, saved.getId(), item.getName())); + + return saved; } @Override diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java index ac4165bc2..d9a83ed8c 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/MemberJpaRepository.java @@ -96,6 +96,16 @@ Page search( """) List findAllPushTargets(); + @Query(""" + SELECT new kr.ac.kookmin.stream.db.member.PushTargetProjection(m.id, m.fcmToken, s) + FROM MemberJpaEntity m + JOIN MemberNotificationSettingJpaEntity s ON s.memberId = m.id + WHERE m.isDeleted = false + AND m.fcmToken IS NOT NULL + AND m.role = kr.ac.kookmin.stream.common.Role.ADMIN + """) + List findAllAdminPushTargets(); + // 탈퇴 회원에게는 어차피 보내지 않으므로 is_deleted와 관계없이 지운다 @Modifying(clearAutomatically = true) @Query(""" diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRecipientRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRecipientRepositoryImpl.java index 46c8931ba..e5807d191 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRecipientRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRecipientRepositoryImpl.java @@ -31,6 +31,11 @@ public List findAllPushTargets() { return toPushTargets(memberJpaRepository.findAllPushTargets()); } + @Override + public List findAllAdminPushTargets() { + return toPushTargets(memberJpaRepository.findAllAdminPushTargets()); + } + @Override public int clearFcmTokens(Collection fcmTokens) { if (fcmTokens.isEmpty()) { diff --git a/infrastructure/db/src/main/resources/db/migration/V59__strip_user_prefix_from_legacy_notification_types.sql b/infrastructure/db/src/main/resources/db/migration/V59__strip_user_prefix_from_legacy_notification_types.sql new file mode 100644 index 000000000..9a9fa7310 --- /dev/null +++ b/infrastructure/db/src/main/resources/db/migration/V59__strip_user_prefix_from_legacy_notification_types.sql @@ -0,0 +1,7 @@ +-- 레거시(빌릴게)에서 이관한 notifications.type 값 중 회원 알림(USER_*)의 접두사를 뗀다. +-- NotificationType enum 상수 이름이 이 컬럼에 그대로 저장되는데, 다른 상수는 모두 접두사가 없어서 +-- (RENTAL_APPLY 등) 컨벤션에 맞춰 USER_만 지운다. 운영진 공용 알림(ADMIN_*)은 그대로 둔다. +-- 운영 DB는 이관 SQL로 이미 바뀌어 있어 다시 적용돼도 결과가 같다. +UPDATE notifications +SET type = REPLACE(type, 'USER_', '') +WHERE type LIKE 'USER_%';