From f171ce0cbacf9e1a1ab6d4357e2411f0d62a368a Mon Sep 17 00:00:00 2001 From: gain <163835628+leegain1@users.noreply.github.com> Date: Wed, 4 Nov 2026 22:27:40 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=EC=95=88=20=EC=9D=BD=EC=9D=80=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EC=A1=B4=EC=9E=AC=20=EC=97=AC=EB=B6=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/NotificationRepository.java | 6 ++++++ .../notification/service/AdminNotificationService.java | 2 ++ .../notification/service/NotificationService.java | 2 ++ .../service/impl/AdminNotificationServiceImpl.java | 5 +++++ .../service/impl/NotificationServiceImpl.java | 5 +++++ .../stream/db/member/NotificationJpaRepository.java | 4 ++++ .../stream/db/member/NotificationRepositoryImpl.java | 10 ++++++++++ 7 files changed, 34 insertions(+) diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRepository.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRepository.java index 0f36059c9..e25748c3d 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRepository.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/repository/NotificationRepository.java @@ -15,6 +15,12 @@ public interface NotificationRepository { /** 운영진 공용 알림함. member_id가 없는 행만 조회한다. */ CursorSliceResult findAdminSlice(NotificationCursor cursor, int size); + /** 회원 개인 알림 중 안 읽은 알림이 하나라도 있는지 본다. */ + boolean existsUnreadByMemberId(Long memberId); + + /** 운영진 공용 알림 중 안 읽은 알림이 하나라도 있는지 본다. */ + boolean existsAdminUnread(); + Optional findById(Long id); Notification save(Notification notification); diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/AdminNotificationService.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/AdminNotificationService.java index 586c0aa98..7257b9226 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/AdminNotificationService.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/AdminNotificationService.java @@ -9,4 +9,6 @@ public interface AdminNotificationService { CursorSliceResult getNotifications(NotificationCursor cursor, int size); void markRead(Long notificationId); + + boolean hasUnread(); } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/NotificationService.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/NotificationService.java index 756903431..3a02d50db 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/NotificationService.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/NotificationService.java @@ -8,4 +8,6 @@ public interface NotificationService { CursorSliceResult getNotifications(Long memberId, NotificationCursor cursor, int size); void markRead(Long memberId, Long notificationId); + + boolean hasUnread(Long memberId); } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/AdminNotificationServiceImpl.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/AdminNotificationServiceImpl.java index 3795ad46b..a97a9b054 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/AdminNotificationServiceImpl.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/AdminNotificationServiceImpl.java @@ -35,4 +35,9 @@ public void markRead(Long notificationId) { notification.markRead(); notificationRepository.save(notification); } + + @Override + public boolean hasUnread() { + return notificationRepository.existsAdminUnread(); + } } diff --git a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationServiceImpl.java b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationServiceImpl.java index 807fdc209..af45f643d 100644 --- a/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationServiceImpl.java +++ b/core/domain/member/src/main/java/kr/ac/kookmin/stream/member/domain/notification/service/impl/NotificationServiceImpl.java @@ -34,4 +34,9 @@ public void markRead(Long memberId, Long notificationId) { notification.markRead(); notificationRepository.save(notification); } + + @Override + public boolean hasUnread(Long memberId) { + return notificationRepository.existsUnreadByMemberId(memberId); + } } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationJpaRepository.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationJpaRepository.java index 4dc8d2bd5..84aaac3fa 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationJpaRepository.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationJpaRepository.java @@ -42,4 +42,8 @@ List findAdminSlice( @Param("cursorId") Long cursorId, Pageable pageable ); + + boolean existsByMemberIdAndReadFalse(Long memberId); + + boolean existsByMemberIdIsNullAndReadFalse(); } diff --git a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRepositoryImpl.java b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRepositoryImpl.java index 090e12587..04a4792a4 100644 --- a/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRepositoryImpl.java +++ b/infrastructure/db/src/main/java/kr/ac/kookmin/stream/db/member/NotificationRepositoryImpl.java @@ -48,6 +48,16 @@ public CursorSliceResult findAdminSlice(NotificationCursor cursor, entities, size, NotificationJpaEntity::toDomain, notification -> NotificationCursor.of(notification).format()); } + @Override + public boolean existsUnreadByMemberId(Long memberId) { + return notificationJpaRepository.existsByMemberIdAndReadFalse(memberId); + } + + @Override + public boolean existsAdminUnread() { + return notificationJpaRepository.existsByMemberIdIsNullAndReadFalse(); + } + @Override public Optional findById(Long id) { return notificationJpaRepository.findById(id).map(NotificationJpaEntity::toDomain); From 6536b5f6b10dd17e7c572c4b7f48975ab3b5c9a4 Mon Sep 17 00:00:00 2001 From: gain <163835628+leegain1@users.noreply.github.com> Date: Wed, 4 Nov 2026 22:28:09 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=ED=95=99=EC=83=9D=20=EC=95=B1=20?= =?UTF-8?q?=EC=95=88=20=EC=9D=BD=EC=9D=80=20=EC=95=8C=EB=A6=BC=20=EC=97=AC?= =?UTF-8?q?=EB=B6=80=20=EC=A1=B0=ED=9A=8C=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/app/core/notification/AppNotificationApi.java | 6 ++++++ .../app/core/notification/AppNotificationController.java | 8 ++++++++ .../notification/response/NotificationUnreadResponse.java | 8 ++++++++ 3 files changed, 22 insertions(+) create mode 100644 api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/response/NotificationUnreadResponse.java diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationApi.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationApi.java index 784f1025a..f2fe78350 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationApi.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationApi.java @@ -7,6 +7,7 @@ import kr.ac.kookmin.stream.api.app.core.notification.request.NotificationListParams; import kr.ac.kookmin.stream.api.app.core.notification.response.MemberNotificationSettingResponse; import kr.ac.kookmin.stream.api.app.core.notification.response.NotificationListItemResponse; +import kr.ac.kookmin.stream.api.app.core.notification.response.NotificationUnreadResponse; import kr.ac.kookmin.stream.api.common.dto.ApiResponse; import kr.ac.kookmin.stream.api.common.dto.CursorSliceResponse; import kr.ac.kookmin.stream.api.common.openapi.ApiErrorCode; @@ -36,6 +37,11 @@ ApiResponse> getNotifications( @ApiErrorCode(type = NotificationErrorCode.class, codes = {"NOTIFICATION_NOT_FOUND"}) ApiResponse markRead(AppApiUser apiUser, Long notificationId); + /** 안 읽은 알림 존재 여부. */ + @Operation(summary = "안 읽은 알림 여부 조회", + description = "내 알림 중 안 읽은 알림이 하나라도 있으면 hasUnread가 true다. 알림 아이콘의 점 표시에 쓴다.") + ApiResponse getUnread(AppApiUser apiUser); + /** 알림 설정 조회. */ @Operation(summary = "알림 설정 조회", description = """ diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationController.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationController.java index 5e99c1327..80a836fa1 100644 --- a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationController.java +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/AppNotificationController.java @@ -6,6 +6,7 @@ import kr.ac.kookmin.stream.api.app.core.notification.request.NotificationListParams; import kr.ac.kookmin.stream.api.app.core.notification.response.MemberNotificationSettingResponse; import kr.ac.kookmin.stream.api.app.core.notification.response.NotificationListItemResponse; +import kr.ac.kookmin.stream.api.app.core.notification.response.NotificationUnreadResponse; import kr.ac.kookmin.stream.api.common.dto.ApiResponse; import kr.ac.kookmin.stream.api.common.dto.CursorSliceResponse; import kr.ac.kookmin.stream.common.CursorSliceResult; @@ -49,6 +50,13 @@ public ApiResponse markRead(AppApiUser apiUser, @PathVariable Long notific return ApiResponse.success(); } + @Override + @GetMapping("/unread") + public ApiResponse getUnread(AppApiUser apiUser) { + boolean hasUnread = notificationService.hasUnread(apiUser.userId()); + return ApiResponse.success(new NotificationUnreadResponse(hasUnread)); + } + @Override @GetMapping("/settings") public ApiResponse getSetting(AppApiUser apiUser) { diff --git a/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/response/NotificationUnreadResponse.java b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/response/NotificationUnreadResponse.java new file mode 100644 index 000000000..83d1c5433 --- /dev/null +++ b/api/app-api/src/main/java/kr/ac/kookmin/stream/api/app/core/notification/response/NotificationUnreadResponse.java @@ -0,0 +1,8 @@ +package kr.ac.kookmin.stream.api.app.core.notification.response; + +/** + * @param hasUnread 내 알림 중 안 읽은 알림이 하나라도 있으면 true + */ +public record NotificationUnreadResponse( + boolean hasUnread +) {} From 78e1f464c702fb820f8a27d0cff2b89bc65fac1d Mon Sep 17 00:00:00 2001 From: gain <163835628+leegain1@users.noreply.github.com> Date: Wed, 4 Nov 2026 22:30:00 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=EC=9A=B4=EC=98=81=EC=A7=84=20?= =?UTF-8?q?=EA=B3=B5=EC=9A=A9=20=EC=95=88=20=EC=9D=BD=EC=9D=80=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=97=AC=EB=B6=80=20=EC=A1=B0=ED=9A=8C=20API=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/admin/core/notification/AdminNotificationApi.java | 6 ++++++ .../core/notification/AdminNotificationController.java | 8 ++++++++ .../response/AdminNotificationUnreadResponse.java | 8 ++++++++ 3 files changed, 22 insertions(+) create mode 100644 api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/response/AdminNotificationUnreadResponse.java diff --git a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationApi.java b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationApi.java index 2a9ef908b..47fab16ab 100644 --- a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationApi.java +++ b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationApi.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import kr.ac.kookmin.stream.api.admin.core.notification.request.AdminNotificationListParams; import kr.ac.kookmin.stream.api.admin.core.notification.response.AdminNotificationListItemResponse; +import kr.ac.kookmin.stream.api.admin.core.notification.response.AdminNotificationUnreadResponse; import kr.ac.kookmin.stream.api.common.dto.ApiResponse; import kr.ac.kookmin.stream.api.common.dto.CursorSliceResponse; import kr.ac.kookmin.stream.api.common.openapi.ApiErrorCode; @@ -32,4 +33,9 @@ ApiResponse> getNotificat description = "알림 한 건을 읽음으로 바꾼다. 운영진 전체가 공유하는 행이라 누가 처리해도 전체가 읽음으로 본다.") @ApiErrorCode(type = NotificationErrorCode.class, codes = {"NOTIFICATION_NOT_FOUND"}) ApiResponse markRead(Long notificationId); + + /** 운영진 공용 알림 중 안 읽은 알림 존재 여부. */ + @Operation(summary = "운영진 공용 안 읽은 알림 여부 조회", + description = "운영진 공용 알림 중 안 읽은 알림이 하나라도 있으면 hasUnread가 true다. 읽음 여부는 운영진 전체가 공유한다.") + ApiResponse getUnread(); } diff --git a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationController.java b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationController.java index db8ce446c..b18e005b7 100644 --- a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationController.java +++ b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/AdminNotificationController.java @@ -3,6 +3,7 @@ import jakarta.validation.Valid; import kr.ac.kookmin.stream.api.admin.core.notification.request.AdminNotificationListParams; import kr.ac.kookmin.stream.api.admin.core.notification.response.AdminNotificationListItemResponse; +import kr.ac.kookmin.stream.api.admin.core.notification.response.AdminNotificationUnreadResponse; import kr.ac.kookmin.stream.api.common.dto.ApiResponse; import kr.ac.kookmin.stream.api.common.dto.CursorSliceResponse; import kr.ac.kookmin.stream.common.CursorSliceResult; @@ -39,4 +40,11 @@ public ApiResponse markRead(@PathVariable Long notificationId) { adminNotificationService.markRead(notificationId); return ApiResponse.success(); } + + @Override + @GetMapping("/unread") + public ApiResponse getUnread() { + boolean hasUnread = adminNotificationService.hasUnread(); + return ApiResponse.success(new AdminNotificationUnreadResponse(hasUnread)); + } } diff --git a/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/response/AdminNotificationUnreadResponse.java b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/response/AdminNotificationUnreadResponse.java new file mode 100644 index 000000000..b619401aa --- /dev/null +++ b/api/admin-api/src/main/java/kr/ac/kookmin/stream/api/admin/core/notification/response/AdminNotificationUnreadResponse.java @@ -0,0 +1,8 @@ +package kr.ac.kookmin.stream.api.admin.core.notification.response; + +/** + * @param hasUnread 운영진 공용 알림 중 안 읽은 알림이 하나라도 있으면 true + */ +public record AdminNotificationUnreadResponse( + boolean hasUnread +) {} From bb466e237d5531ee620d79ed373b08037064ab3b Mon Sep 17 00:00:00 2001 From: gain <163835628+leegain1@users.noreply.github.com> Date: Thu, 5 Nov 2026 15:52:29 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=EC=9D=B4=EA=B4=80=EB=90=9C=20?= =?UTF-8?q?=EC=9A=B4=EC=98=81=EC=A7=84=20=EA=B3=B5=EC=9A=A9=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=EC=9D=84=20=EC=9D=BD=EC=9D=8C=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B0=94=EA=BF=94=20=EC=95=88=20=EC=9D=BD=EC=9D=80=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EC=97=AC=EB=B6=80=EA=B0=80=20=EA=B3=84=EC=86=8D=20?= =?UTF-8?q?true=EB=A1=9C=20=EB=82=A8=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V62__mark_legacy_admin_notifications_as_read.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 infrastructure/db/src/main/resources/db/migration/V62__mark_legacy_admin_notifications_as_read.sql diff --git a/infrastructure/db/src/main/resources/db/migration/V62__mark_legacy_admin_notifications_as_read.sql b/infrastructure/db/src/main/resources/db/migration/V62__mark_legacy_admin_notifications_as_read.sql new file mode 100644 index 000000000..ab1721242 --- /dev/null +++ b/infrastructure/db/src/main/resources/db/migration/V62__mark_legacy_admin_notifications_as_read.sql @@ -0,0 +1,8 @@ +-- 레거시(빌릴게)에서 이관한 운영진 공용 알림(member_id IS NULL)을 읽음으로 바꾼다. +-- 레거시는 운영진 알림을 읽음 처리한 적이 없어 이관 행이 모두 is_read = 0이다. 운영진 읽음 처리는 한 건씩만 할 수 있어서, +-- 그대로 두면 최근 알림을 다 읽어도 이관 행 때문에 운영진 안 읽은 알림 여부가 계속 true로 남는다. +-- 지금 서버가 만든 운영진 알림과 구분할 값이 없어 안 읽은 운영진 공용 행을 모두 바꾼다. 운영은 아직 배포 전이라 바뀌는 행은 이관 행뿐이다. +UPDATE notifications +SET is_read = 1 +WHERE member_id IS NULL + AND is_read = 0; From 503ca8e41cff1f1ccebdf18d1f8d29d403934ee3 Mon Sep 17 00:00:00 2001 From: gain <163835628+leegain1@users.noreply.github.com> Date: Thu, 5 Nov 2026 16:09:44 +0900 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=EB=A7=88=EC=9D=B4=EA=B7=B8?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EB=B2=88=ED=98=B8=EB=A5=BC=20mai?= =?UTF-8?q?n=20=EB=8B=A4=EC=9D=8C=EC=9D=B8=20V63=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._read.sql => V63__mark_legacy_admin_notifications_as_read.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename infrastructure/db/src/main/resources/db/migration/{V62__mark_legacy_admin_notifications_as_read.sql => V63__mark_legacy_admin_notifications_as_read.sql} (100%) diff --git a/infrastructure/db/src/main/resources/db/migration/V62__mark_legacy_admin_notifications_as_read.sql b/infrastructure/db/src/main/resources/db/migration/V63__mark_legacy_admin_notifications_as_read.sql similarity index 100% rename from infrastructure/db/src/main/resources/db/migration/V62__mark_legacy_admin_notifications_as_read.sql rename to infrastructure/db/src/main/resources/db/migration/V63__mark_legacy_admin_notifications_as_read.sql