Merge pull request #33 from catchroom/develop

Develop
catchroom · Jan 19, 2024 · ba3bb92 · ba3bb92
2 parents d986af6 + 51c8c69
commit ba3bb92
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/src/main/java/com/catchroom/chat/chatroom/controller/ChatRoomController.java b/src/main/java/com/catchroom/chat/chatroom/controller/ChatRoomController.java
@@ -11,15 +11,13 @@
 @RequestMapping("/v1/chat/room")
 @RequiredArgsConstructor
 @CrossOrigin(origins = "https://localhost:3000", allowedHeaders = "*")
-@Slf4j
 public class ChatRoomController {
     private final ChatRoomService chatRoomService;
 
     @GetMapping("/list")
     public List<ChatRoomListGetResponse> getChatRoomList(
         @RequestHeader("Authorization") String accessToken
         ) {
-        log.error("accesstoken = " + accessToken);
         return chatRoomService.getChatRoomList(accessToken);
     }
 

diff --git a/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java b/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java
@@ -1,6 +1,7 @@
 package com.catchroom.chat.chatroom.service;
 
 import com.catchroom.chat.chatroom.dto.ChatRoomListGetResponse;
+import com.catchroom.chat.chatroom.entity.ChatRoom;
 import com.catchroom.chat.feign.client.MainFeignClient;
 import com.catchroom.chat.message.dto.ChatMessageDto;
 import com.catchroom.chat.message.entity.ChatMessage;
@@ -19,14 +20,24 @@ public class ChatRoomService {
 
 
     public List<ChatRoomListGetResponse> getChatRoomList(String accessToken) {
-        List<ChatRoomListGetResponse> chatRoomListGetResponseList = mainFeignClient.getChatRoomList(accessToken);
-        for (ChatRoomListGetResponse chatRoomListGetResponse : chatRoomListGetResponseList) {
-            chatRoomListGetResponse.updateChatMessageDto(chatRoomRepository.getLastMessage(chatRoomListGetResponse.getChatRoomNumber()));
-//            if (chatRoomRepository.getLastMessage(chatRoomListGetResponse.getChatRoomNumber()) == null) {
-//                ChatMessage lastChatMessage = chatMessageRepository.findAllByRoomId(chatRoomListGetResponse.getChatRoomNumber()).get(0);
-//                chatRoomListGetResponse.updateChatMessageDto(ChatMessageDto.fromEntity(lastChatMessage));
-//            }
+        List<ChatRoomListGetResponse> chatRoomList = mainFeignClient.getChatRoomList(accessToken);
+        for (ChatRoomListGetResponse chatRoomListGetResponse : chatRoomList) {
+            recallLastMessage(chatRoomListGetResponse);
+        }
+        return chatRoomList;
+    }
+
+    private void recallLastMessage(ChatRoomListGetResponse chatRoomListGetResponse) {
+        String chatRoomNumber = chatRoomListGetResponse.getChatRoomNumber();
+        //최신 메세지가 레디스에 있는 경우
+        if (chatRoomRepository.getLastMessage(chatRoomNumber) != null) {
+            chatRoomListGetResponse.updateChatMessageDto(chatRoomRepository.getLastMessage(chatRoomNumber));
+        }
+        //최신 메세지가 레디스에 없고 몽고디비에는 있는 경우
+        else if (chatRoomRepository.getLastMessage(chatRoomNumber) == null &&
+            !chatMessageRepository.findAllByRoomId(chatRoomNumber).isEmpty()) {
+            ChatMessage lastChatMessageMongo = chatMessageRepository.findAllByRoomId(chatRoomNumber).get(0);
+            chatRoomListGetResponse.updateChatMessageDto(ChatMessageDto.fromEntity(lastChatMessageMongo));
         }
-        return chatRoomListGetResponseList;
     }
 }