Merge pull request #61 from catchroom/develop

Feat : 채팅내역불러오기 Paging 순서 변경
catchroom · Jan 25, 2024 · b4008fa · b4008fa
2 parents 973cdf2 + 824bd85
commit b4008fa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/catchroom/chat/message/service/ChatMongoService.java b/src/main/java/com/catchroom/chat/message/service/ChatMongoService.java
@@ -4,6 +4,9 @@
 import com.catchroom.chat.message.entity.ChatMessage;
 import com.catchroom.chat.message.repository.ChatMessageRepository;
 import com.catchroom.chat.message.type.MessageType;
+
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
@@ -50,7 +53,7 @@ public List<ChatMessageDto> findAll(String roomId,Integer pageNumber) {
 
 
     private Page<ChatMessage> findByRoomIdWithPaging(String roomId, int page, int size) {
-        Pageable pageable = PageRequest.of(page,size, Sort.by(Sort.Direction.ASC,"time"));
+        Pageable pageable = PageRequest.of(page,size,Sort.by(Sort.Direction.DESC,"time"));
 
         Query query = new Query()
             .with(pageable)
@@ -60,6 +63,7 @@ private Page<ChatMessage> findByRoomIdWithPaging(String roomId, int page, int si
         query.addCriteria(Criteria.where("roomId").is(roomId));
 
         List<ChatMessage> filteredChatMessage = mongoTemplate.find(query, ChatMessage.class, "chat");
+        Collections.sort(filteredChatMessage, Comparator.comparing(ChatMessage::getTime));
         return PageableExecutionUtils.getPage(
             filteredChatMessage,
             pageable,