From d6d01072adeda46cd88e3776a132c4cbeb6b5ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=A4=80?= Date: Fri, 9 Sep 2022 00:31:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=95=8C=EB=A6=BC=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ExpoNotificationServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java b/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java index 0bbb5bd7..f4a6897a 100644 --- a/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java +++ b/src/main/java/com/ceos/bankids/service/ExpoNotificationServiceImpl.java @@ -49,25 +49,27 @@ public NotificationListDTO readNotificationList(User user, Long lastId) { List notificationDTOS = byUserIdOrderByIdDesc.stream() .map(NotificationDTO::new) .collect(Collectors.toList()); - NotificationDTO lastNotification = notificationDTOS.get(notificationDTOS.size() - 1); - Long lastNotificationId = lastNotification.getId(); if (notificationDTOS.size() == 11L) { + NotificationDTO lastNotification = notificationDTOS.get( + notificationDTOS.size() - 1); + Long lastNotificationId = lastNotification.getId(); notificationDTOS.remove(10); return new NotificationListDTO(lastNotificationId, false, notificationDTOS); } else if (notificationDTOS.size() < 11L) { - return new NotificationListDTO(lastNotificationId, true, notificationDTOS); + return new NotificationListDTO(null, true, notificationDTOS); } } List notificationDTOList = notificationRepository.findByIdLessThanEqualAndUserIdOrderByIdDesc( lastId, user.getId(), pageRequest).stream() .map(NotificationDTO::new).collect(Collectors.toList()); - NotificationDTO lastNotification = notificationDTOList.get(notificationDTOList.size() - 1); - Long last = lastNotification.getId(); if (notificationDTOList.size() == 11L) { + NotificationDTO lastNotification = notificationDTOList.get( + notificationDTOList.size() - 1); + Long last = lastNotification.getId(); notificationDTOList.remove(10); return new NotificationListDTO(last, false, notificationDTOList); } else { - return new NotificationListDTO(last, true, notificationDTOList); + return new NotificationListDTO(null, true, notificationDTOList); } }