From 8dad5844ba7e6c5b07e36de4186264b7b01b659d Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Tue, 3 Nov 2026 23:12:01 +0900 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=EB=B9=8C=EB=A6=B4=EA=B2=8C=20?= =?UTF-8?q?=EB=A0=88=EA=B1=B0=EC=8B=9C=20=EC=95=8C=EB=A6=BC=EC=9A=A9=20?= =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=207=EA=B0=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 신청·취소·반납신청·승인·반려·반납승인·반납완료 사실을 나타낸다. 신청·반납신청은 학생 본인과 운영진 공용 알림 둘 다의 재료가 된다. --- .../stream/common/event/RentalApplicationCanceled.java | 6 ++++++ .../kr/ac/kookmin/stream/common/event/RentalApplied.java | 6 ++++++ .../kr/ac/kookmin/stream/common/event/RentalApproved.java | 4 ++++ .../kr/ac/kookmin/stream/common/event/RentalRejected.java | 4 ++++ .../ac/kookmin/stream/common/event/RentalReturnApplied.java | 6 ++++++ .../kookmin/stream/common/event/RentalReturnApproved.java | 4 ++++ .../kookmin/stream/common/event/RentalReturnCompleted.java | 4 ++++ 7 files changed, 34 insertions(+) create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplicationCanceled.java create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApplied.java create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalApproved.java create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalRejected.java create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApplied.java create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnApproved.java create mode 100644 core/common/src/main/java/kr/ac/kookmin/stream/common/event/RentalReturnCompleted.java 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 {} From 39769713ba33848cc92acd09e577341289ed270b Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Tue, 3 Nov 2026 23:12:10 +0900 Subject: [PATCH 02/11] =?UTF-8?q?feat:=20NotificationType=EC=97=90=20?= =?UTF-8?q?=EB=A0=88=EA=B1=B0=EC=8B=9C=209=EC=A2=85=20=EC=B6=94=EA=B0=80,?= =?UTF-8?q?=20=EB=94=94=EC=8A=A4=ED=8C=A8=EC=B2=98=C2=B7=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=EB=84=88=20=ED=99=95=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ADMIN_RENTAL_APPLY·ADMIN_RENTAL_CANCEL·ADMIN_RETURN_APPLY(운영진 공용)와 RENTAL_APPLY·RENTAL_APPROVED·RENTAL_REJECTED·RETURN_APPLY·RETURN_APPROVED· RETURN_COMPLETED(학생용)를 추가한다. NotificationDispatcher에 dispatchToAdmins(운영진 공용 단일 행)와 dispatchWithoutPush(푸시 없음, RETURN_COMPLETED용)를 추가했다. NotificationEventListener가 새 이벤트 7개를 받아 디스패처를 호출한다. ADMIN_* 알림에 필요한 이름·학번은 MemberService로 직접 조회한다. --- .../notification/domain/NotificationType.java | 13 ++++ .../service/impl/NotificationDispatcher.java | 37 +++++++++- .../impl/NotificationEventListener.java | 70 +++++++++++++++++++ 3 files changed, 117 insertions(+), 3 deletions(-) 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..9866e8a58 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/service/impl/NotificationDispatcher.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationDispatcher.java index 7a93f98d9..334d5bf00 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 @@ -54,6 +54,30 @@ 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))); + + List tokens = notificationRecipientRepository.findAllAdminPushTargets().stream() + .filter(target -> target.accepts(type.getCategory())) + .map(PushTarget::fcmToken) + .distinct() + .toList(); + if (!tokens.isEmpty()) { + PushSendResult result = pushNotificationClient.send(tokens, toPushMessage(type, formatValues, targetId)); + clearInvalidTokens(result.tokensWith(PushSendStatus.INVALID_TOKEN)); + } + } + + /** 지정한 회원에게 알림함에만 저장한다(푸시 없음). 급하게 확인할 내용이 아닌 알림에 쓴다. */ + 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,9 +88,7 @@ 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 tokens = pushTargets.stream() @@ -83,6 +105,15 @@ private void send( type, targetId, recipients.size(), 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) { Map data = Map.of( "type", type.name(), 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..fdc88d989 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())); + } } From aa5802f02ab0fc9aec53cb326adc6042258db3ab Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Tue, 3 Nov 2026 23:12:18 +0900 Subject: [PATCH 03/11] =?UTF-8?q?feat:=20=EC=9A=B4=EC=98=81=EC=A7=84=20?= =?UTF-8?q?=EC=A0=84=EC=9A=A9=20=ED=91=B8=EC=8B=9C=20=EB=8C=80=EC=83=81=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 findAllAdminPushTargets를 추가한다. role = ADMIN이고 탈퇴하지 않았고 토큰이 있는 회원만 골라내며, 기존 findAllPushTargets와 같은 모양이다. --- .../repository/NotificationRecipientRepository.java | 2 ++ .../kookmin/stream/db/member/MemberJpaRepository.java | 10 ++++++++++ .../db/member/NotificationRecipientRepositoryImpl.java | 5 +++++ 3 files changed, 17 insertions(+) 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/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 7502c8fe9..c72e219d8 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 @@ -51,6 +51,16 @@ OR m.studentId LIKE CONCAT('%', :keyword, '%') ESCAPE '!') """) 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()) { From c47fbe6fdcbcf2bb47c6ba618965b25991be9494 Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Tue, 3 Nov 2026 23:12:27 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=EC=8B=A0=EC=B2=AD=C2=B7=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=C2=B7=EB=B0=98=EB=82=A9=EC=8B=A0=EC=B2=AD=C2=B7?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=B3=80=EA=B2=BD=20=EC=8B=9C=EC=A0=90?= =?UTF-8?q?=EC=97=90=20=EC=95=8C=EB=A6=BC=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=9C=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RentalApplyUseCase(신청), RentalCancelUseCase(취소), RentalHistoryServiceImpl.requestReturn(반납 신청), 그리고 AdminRentalStatusUpdateUseCase(관리자 상태 변경) 네 곳에서 OutboxWriter로 이벤트를 기록한다. 상태 변경은 최종 상태(newStatus) 기준으로 승인·반려·반납승인·반납완료 중 하나만 기록한다. 소모품은 승인 즉시 RETURNED로 가므로(isConsumable 분기) "승인" 없이 "반납 완료"만 알린다. --- .../AdminRentalStatusUpdateUseCase.java | 24 +++++++++++++++++++ .../rental/usecase/RentalApplyUseCase.java | 9 ++++++- .../rental/usecase/RentalCancelUseCase.java | 8 ++++++- .../impl/RentalHistoryServiceImpl.java | 10 +++++++- 4 files changed, 48 insertions(+), 3 deletions(-) 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 1f8a1c7a5..aff966a65 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,6 +3,12 @@ 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.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.welfare.domain.rental.domain.Item; @@ -24,6 +30,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(() -> { @@ -32,6 +39,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; @@ -43,11 +51,27 @@ public AdminRentalHistoryResponse updateStatus(Long historyId, RentalStatus requ item = itemService.increaseStock(history.getItemId(), history.getRentedCount()); } + recordStatusChangeEvent(newStatus, history.getMemberId(), history.getId(), itemName); + Member renter = memberService.getMapByIds(List.of(history.getMemberId())).get(history.getMemberId()); return AdminRentalHistoryResponse.from(new RentalRecord(history, item), renter); }); } + // 레거시(빌릴게)에서 이관한 학생 알림. 소모품은 승인 즉시 RETURNED로 가므로(위 isConsumable) "승인" 없이 "반납 완료"만 간다 + private void recordStatusChangeEvent(RentalStatus newStatus, Long memberId, Long historyId, String itemName) { + DomainEvent event = switch (newStatus) { + 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); + } + } + private boolean shouldRestock(RentalStatus previousStatus, RentalStatus newStatus, Item item) { if (previousStatus.isFinished()) { return false; 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/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..d741d4949 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 @@ -6,6 +6,8 @@ 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.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; @@ -24,6 +26,7 @@ class RentalHistoryServiceImpl implements RentalHistoryService { private final RentalHistoryRepository rentalHistoryRepository; private final ItemRepository itemRepository; + private final OutboxWriter outboxWriter; // 회원의 대여 이력을 물품과 짝지어 반환한다. @Override @@ -52,7 +55,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 From 5a5115166b3a812422dda25fb844c6db5e48cc32 Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Tue, 3 Nov 2026 23:12:36 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=EC=9D=B4=EA=B4=80=EB=90=9C=20USE?= =?UTF-8?q?R=5F*=20=EC=95=8C=EB=A6=BC=20=ED=83=80=EC=9E=85=EC=9D=98=20?= =?UTF-8?q?=EC=A0=91=EB=91=90=EC=82=AC=EB=A5=BC=20=EC=83=88=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=EC=97=90=20=EB=A7=9E=EC=B6=B0=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NotificationType enum 상수 이름이 notifications.type에 그대로 저장되는데, 다른 상수는 전부 접두사가 없어서 이번 레거시 타입도 USER_ 없이 지었다. 이미 이관된 USER_* 행도 이 마이그레이션으로 같이 맞춘다. --- ...6__strip_user_prefix_from_legacy_notification_types.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 infrastructure/db/src/main/resources/db/migration/V36__strip_user_prefix_from_legacy_notification_types.sql diff --git a/infrastructure/db/src/main/resources/db/migration/V36__strip_user_prefix_from_legacy_notification_types.sql b/infrastructure/db/src/main/resources/db/migration/V36__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/V36__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_%'; From 8aba9a9dfba07bc29e5ec7aba83218e6222eacb5 Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Tue, 3 Nov 2026 23:19:23 +0900 Subject: [PATCH 06/11] =?UTF-8?q?refactor:=20=EC=A3=BC=EC=84=9D=EC=9D=98?= =?UTF-8?q?=20=EB=A0=88=EA=B1=B0=EC=8B=9C=20=EC=9D=B4=EA=B4=80=20=EC=84=A4?= =?UTF-8?q?=EB=AA=85=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 코드가 하는 일만 남기고, 어디서 왔는지에 대한 서술은 지운다. --- .../rental/usecase/AdminRentalStatusUpdateUseCase.java | 2 +- .../member/domain/notification/domain/NotificationType.java | 4 ++-- .../notification/service/impl/NotificationDispatcher.java | 2 +- .../notification/service/impl/NotificationEventListener.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) 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 aff966a65..cfb36eacf 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 @@ -58,7 +58,7 @@ public AdminRentalHistoryResponse updateStatus(Long historyId, RentalStatus requ }); } - // 레거시(빌릴게)에서 이관한 학생 알림. 소모품은 승인 즉시 RETURNED로 가므로(위 isConsumable) "승인" 없이 "반납 완료"만 간다 + // 소모품은 승인 즉시 RETURNED로 가므로(위 isConsumable) "승인" 없이 "반납 완료"만 간다 private void recordStatusChangeEvent(RentalStatus newStatus, Long memberId, Long historyId, String itemName) { DomainEvent event = switch (newStatus) { case CONFIRMED -> new RentalApproved(memberId, historyId, itemName); 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 9866e8a58..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,12 +35,12 @@ public enum NotificationType { RENTAL_DUE_SOON(NotificationCategory.BILLILGE, "반납까지 1시간 남았어요.", "늦지 않게 %s을(를) 반납해 주세요."), RENTAL_OVERDUE(NotificationCategory.BILLILGE, "반납 기한이 지났어요.", "학생회실에 방문해 %s을(를) 반납해 주세요."), - // 레거시(빌릴게)에서 이관한 관리자 공용 알림. 값: 이름, 학번, (APPLY만)대여 시각, 물품명 + // 운영진 공용 알림. 값: 이름, 학번, (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 대여 신청이 반려되었어요.", "자세한 사항은 소프트웨어융합대학 카카오톡에 문의해 주세요."), 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 334d5bf00..300d5df39 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 @@ -55,7 +55,7 @@ void dispatchToAll(NotificationType type, List formatValues, long target } /** - * 특정 회원이 아니라 운영진 전체가 공동으로 보는 알림 한 건을 만든다(레거시에서 이관한 관리자 공용 알림과 같은 모양). + * 특정 회원이 아니라 운영진 전체가 공동으로 보는 알림 한 건을 만든다. * 운영진 수만큼 행을 만들지 않고 {@code memberId}가 없는 행 하나만 저장하므로, 읽음 여부도 운영진 전체가 공유한다. */ void dispatchToAdmins(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 fdc88d989..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 @@ -113,7 +113,7 @@ public void on(RentalOverdue event) { NotificationType.RENTAL_OVERDUE, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); } - // 레거시(빌릴게)에서 이관한 알림. 신청은 본인과 운영진 모두에게 간다 + // 신청은 본인과 운영진 모두에게 간다 @EventListener public void on(RentalApplied event) { notificationDispatcher.dispatch( @@ -166,7 +166,7 @@ public void on(RentalReturnApproved event) { NotificationType.RETURN_APPROVED, List.of(event.itemName()), event.rentalHistoryId(), List.of(event.memberId())); } - // 급하게 확인할 내용이 아니라 알림함에만 남기고 푸시는 보내지 않는다(레거시와 동일) + // 급하게 확인할 내용이 아니라 알림함에만 남기고 푸시는 보내지 않는다 @EventListener public void on(RentalReturnCompleted event) { notificationDispatcher.dispatchWithoutPush( From 29fc7218f44a0d15ba6a4f2146637cca7cd486ce Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Wed, 4 Nov 2026 15:20:46 +0900 Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=EB=8C=80=EC=97=AC=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EC=95=8C=EB=A6=BC=20=EC=A4=91?= =?UTF-8?q?=EB=B3=B5=C2=B7=EC=86=8C=EB=AA=A8=ED=92=88=20=EC=8A=B9=EC=9D=B8?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=20=EB=88=84=EB=9D=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usecase/AdminRentalStatusUpdateUseCase.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 cfb36eacf..f32648a21 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 @@ -51,16 +51,19 @@ public AdminRentalHistoryResponse updateStatus(Long historyId, RentalStatus requ item = itemService.increaseStock(history.getItemId(), history.getRentedCount()); } - recordStatusChangeEvent(newStatus, history.getMemberId(), history.getId(), itemName); + 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); }); } - // 소모품은 승인 즉시 RETURNED로 가므로(위 isConsumable) "승인" 없이 "반납 완료"만 간다 - private void recordStatusChangeEvent(RentalStatus newStatus, Long memberId, Long historyId, String itemName) { - DomainEvent event = switch (newStatus) { + // 소모품은 승인 즉시 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); From d3087a1eef94625142a492651887e25a5c455691 Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Wed, 4 Nov 2026 15:20:52 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=EC=9A=B4=EC=98=81=EC=A7=84=20?= =?UTF-8?q?=EC=97=85=EB=AC=B4=20=EC=95=8C=EB=A6=BC=EC=9D=80=20=EA=B0=9C?= =?UTF-8?q?=EC=9D=B8=20=EC=95=8C=EB=A6=BC=20=EC=84=A4=EC=A0=95=EA=B3=BC=20?= =?UTF-8?q?=EB=AC=B4=EA=B4=80=ED=95=98=EA=B2=8C=20=EB=B0=9C=EC=86=A1,=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EB=A1=9C=EC=A7=81=20=EA=B3=B5=ED=86=B5?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/NotificationDispatcher.java | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) 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 300d5df39..a1f1af71f 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}의 트랜잭션으로 한꺼번에 반영하고, * 저장이 끝난 뒤 트랜잭션 밖에서 푸시를 보낸다. 알림함 저장이 실패하면 예외가 리스너까지 올라가 아웃박스가 다시 발행한다. @@ -60,16 +61,8 @@ void dispatchToAll(NotificationType type, List formatValues, long target */ void dispatchToAdmins(NotificationType type, List formatValues, long targetId) { notificationRepository.saveAll(List.of(Notification.create(null, type, formatValues, targetId))); - - List tokens = notificationRecipientRepository.findAllAdminPushTargets().stream() - .filter(target -> target.accepts(type.getCategory())) - .map(PushTarget::fcmToken) - .distinct() - .toList(); - if (!tokens.isEmpty()) { - PushSendResult result = pushNotificationClient.send(tokens, toPushMessage(type, formatValues, targetId)); - clearInvalidTokens(result.tokensWith(PushSendStatus.INVALID_TOKEN)); - } + // 운영진 업무 알림(신청/취소/반납신청 등)은 개인 알림 설정과 무관하게 전원에게 보낸다(레거시와 동일) + sendPush(type, formatValues, targetId, notificationRecipientRepository.findAllAdminPushTargets(), 1); } /** 지정한 회원에게 알림함에만 저장한다(푸시 없음). 급하게 확인할 내용이 아닌 알림에 쓴다. */ @@ -89,10 +82,21 @@ private void send( return; } 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(); @@ -102,7 +106,7 @@ 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) { From f957d336981b1d07e28acb36ee5450a7a1fde5d6 Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Wed, 4 Nov 2026 15:25:38 +0900 Subject: [PATCH 09/11] =?UTF-8?q?docs:=20=EC=A3=BC=EC=84=9D=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EB=A0=88?= =?UTF-8?q?=EA=B1=B0=EC=8B=9C=20=EC=96=B8=EA=B8=89=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notification/service/impl/NotificationDispatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a1f1af71f..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 @@ -61,7 +61,7 @@ void dispatchToAll(NotificationType type, List formatValues, long target */ 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); } From 84e683dc8f3bbb4ff1628a7f8c705e8b96b9a297 Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Thu, 5 Nov 2026 04:13:21 +0900 Subject: [PATCH 10/11] =?UTF-8?q?chore:=20Flyway=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - V36 → V52 strip_user_prefix_from_legacy_notification_types --- ... => V52__strip_user_prefix_from_legacy_notification_types.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename infrastructure/db/src/main/resources/db/migration/{V36__strip_user_prefix_from_legacy_notification_types.sql => V52__strip_user_prefix_from_legacy_notification_types.sql} (100%) diff --git a/infrastructure/db/src/main/resources/db/migration/V36__strip_user_prefix_from_legacy_notification_types.sql b/infrastructure/db/src/main/resources/db/migration/V52__strip_user_prefix_from_legacy_notification_types.sql similarity index 100% rename from infrastructure/db/src/main/resources/db/migration/V36__strip_user_prefix_from_legacy_notification_types.sql rename to infrastructure/db/src/main/resources/db/migration/V52__strip_user_prefix_from_legacy_notification_types.sql From ac795d199b680e7d60b6a05945b96f36fac6af8c Mon Sep 17 00:00:00 2001 From: jjunh33 Date: Thu, 5 Nov 2026 05:53:16 +0900 Subject: [PATCH 11/11] =?UTF-8?q?chore:=20Flyway=20=EB=A7=88=EC=9D=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - V52 → V59 strip_user_prefix_from_legacy_notification_types --- ... => V59__strip_user_prefix_from_legacy_notification_types.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename infrastructure/db/src/main/resources/db/migration/{V52__strip_user_prefix_from_legacy_notification_types.sql => V59__strip_user_prefix_from_legacy_notification_types.sql} (100%) diff --git a/infrastructure/db/src/main/resources/db/migration/V52__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 similarity index 100% rename from infrastructure/db/src/main/resources/db/migration/V52__strip_user_prefix_from_legacy_notification_types.sql rename to infrastructure/db/src/main/resources/db/migration/V59__strip_user_prefix_from_legacy_notification_types.sql