Merge pull request #210 from bankidz/dev

fix: 알림리스트 페이지네이션 오류 수정
bankidz · Sep 8, 2022 · 04ac65e · 04ac65e
2 parents c893848 + d6d0107
commit 04ac65e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git 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<NotificationDTO> 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<NotificationDTO> 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);
         }
     }