Update MessageService.java

roundshoulder · Nov 24, 2022 · c762527 · c762527
1 parent ffaf69c
commit c762527
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/com/project/csletter/message/service/MessageService.java b/src/main/java/com/project/csletter/message/service/MessageService.java
@@ -129,12 +129,13 @@ public List<MessageListResponse> getMessageFeed(Long cursor, Pageable pageable,
                     f.setPrevCursor(messages.get(messages.size() - 1).getId());
                 }
             }
-
-
-
             f.setNextCursor(mainList.get(mainList.size()-1).getMessageId());
         });
 
+        if(!mainList.get(mainList.size() - 1).getHaveNextMessage()) {
+            mainList.forEach(f -> f.setNextCursor(null));
+        }
+
         return mainList;
     }