Merge pull request #35 from catchroom/develop

Fix : 메세지 리스트 최신순 정렬 로직 fix
catchroom · Jan 20, 2024 · 3a83f06 · 3a83f06
2 parents 8898371 + 003b543
commit 3a83f06
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/main/java/com/catchroom/chat/global/pubsub/RedisSubscriber.java b/src/main/java/com/catchroom/chat/global/pubsub/RedisSubscriber.java
@@ -48,8 +48,17 @@ public void sendRoomList(String publishMessage) {
             ChatMessageDto chatMessage = objectMapper.readValue(publishMessage, MessageSubDto.class).getChatMessageDto();
             List<ChatRoomListGetResponse> chatRoomListGetResponseList = objectMapper.readValue(publishMessage, MessageSubDto.class)
                 .getList();
-
-            Collections.sort(chatRoomListGetResponseList, new ChatRoomListGetResponseComparator());
+            Comparator<ChatRoomListGetResponse> comparator = new Comparator<ChatRoomListGetResponse>() {
+                @Override
+                public int compare(ChatRoomListGetResponse o1, ChatRoomListGetResponse o2) {
+                    if (o1.getChatMessageDto() != null && o2.getChatMessageDto() != null) {
+                        return LocalDateTime.parse(o1.getChatMessageDto().getTime()).withNano(0).compareTo(LocalDateTime.parse(o2.getChatMessageDto().getTime()).withNano(0));
+                    } else {
+                        return 0;
+                    }
+                }
+            };
+            Collections.sort(chatRoomListGetResponseList,comparator);
             // 로그인 유저 채팅방 리스트 최신화
             messagingTemplate.convertAndSend("/sub/chat/roomlist/" + chatMessage.getUserId(), chatRoomListGetResponseList);
         } catch (Exception e) {
@@ -59,12 +68,3 @@ public void sendRoomList(String publishMessage) {
 
 }
 
-class ChatRoomListGetResponseComparator implements Comparator<ChatRoomListGetResponse> {
-    @Override
-    public int compare(ChatRoomListGetResponse response1, ChatRoomListGetResponse response2) {
-        LocalDateTime time1 = LocalDateTime.parse(response1.getChatMessageDto().getTime());
-        LocalDateTime time2 = LocalDateTime.parse(response2.getChatMessageDto().getTime());
-        return time1.compareTo(time2);
-    }
-}
-