From ee28d0794638ae0dcf4f6fdad6aa7f1cde26df2e Mon Sep 17 00:00:00 2001 From: rkdehdrbs7885-oss Date: Thu, 13 Aug 2026 20:21:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=B0=A9=EC=96=B4=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80=20(#233)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/res/NotificationListResponseDTO.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java b/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java index a0ccb3fd..0db5789a 100644 --- a/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java +++ b/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java @@ -19,6 +19,16 @@ public record NotificationListResponseDTO ( ){ public static NotificationListResponseDTO of(Slice notificationSlice) { + if (notificationSlice == null || !notificationSlice.hasContent()) { + return new NotificationListResponseDTO( + java.util.Collections.emptyList(), + 0, + false, + true, + true + ); + } + List notificationDTOList = notificationSlice.getContent().stream() .map(notification -> { try { From fd58c851e328f8a28328ed1bb3436e1bf1fea638 Mon Sep 17 00:00:00 2001 From: rkdehdrbs7885-oss Date: Thu, 13 Aug 2026 20:29:47 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EC=BD=94=EB=93=9C=20=EB=A0=88?= =?UTF-8?q?=EB=B9=97=20=EC=88=98=EC=A0=95=20(#233)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/res/NotificationListResponseDTO.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java b/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java index 0db5789a..7ff62495 100644 --- a/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java +++ b/src/main/java/com/mr/domain/notification/dto/res/NotificationListResponseDTO.java @@ -1,6 +1,7 @@ package com.mr.domain.notification.dto.res; import com.mr.domain.notification.entity.Notification; +import com.mr.domain.notification.exception.NotificationErrorStatus; import com.mr.global.apipayload.exception.GeneralException; import com.mr.global.event.NotificationEvent; import lombok.extern.slf4j.Slf4j; @@ -19,13 +20,17 @@ public record NotificationListResponseDTO ( ){ public static NotificationListResponseDTO of(Slice notificationSlice) { - if (notificationSlice == null || !notificationSlice.hasContent()) { + if (notificationSlice == null) { + throw new GeneralException(NotificationErrorStatus.INVALID_NOTIFICATION_FORMAT); + } + + if (!notificationSlice.hasContent()) { return new NotificationListResponseDTO( java.util.Collections.emptyList(), 0, - false, - true, - true + notificationSlice.hasNext(), + notificationSlice.isFirst(), + notificationSlice.isLast() ); }