Merge remote-tracking branch 'origin/develop' into develop

catchroom · Feb 7, 2024 · c7f92ef · c7f92ef
2 parents 1374360 + b179a94
commit c7f92ef
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 43 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
@@ -14,6 +14,8 @@
 public class ChatRoomController {
     private final ChatRoomService chatRoomService;
 
+    //TODO 같은게 2개..? getChatRoomList에 모든 정보가 다 담기는데 왜??
+
     @GetMapping("/list")
     public List<ChatRoomListGetResponse> getChatRoomList(
         @RequestHeader("Authorization") String accessToken,
@@ -31,6 +33,4 @@ public ChatRoomListGetResponse getChatRoom(
         return chatRoomService.getChatRoomInfo(accessToken, roomId);
     }
 
-
-
 }
diff --git a/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java b/src/main/java/com/catchroom/chat/chatroom/service/ChatRoomService.java
@@ -32,36 +32,23 @@ public List<ChatRoomListGetResponse> getChatRoomListByHttp(Long userId, String a
         List<ChatRoomListGetResponse> chatRoomListGetResponseList = mainFeignClient.getChatRoomList(accessToken);
         chatRoomListGetResponseList.forEach(this::setListChatLastMessage);
         chatRoomRedisRepository.initChatRoomList(userId, chatRoomListGetResponseList);
-        chatRoomListGetResponseList = sortChatRoomListLatest(chatRoomListGetResponseList);
-        return chatRoomListGetResponseList;
+        return sortChatRoomListLatest(chatRoomListGetResponseList);
     }
 
-    public List<ChatRoomListGetResponse> getChatRoomListByUserId(Long userId) {
-        List<ChatRoomListGetResponse> chatRoomListGetResponseList = new ArrayList<>();
 
-        if (chatRoomRedisRepository.existChatRoomList(userId)) {
-            chatRoomListGetResponseList = chatRoomRedisRepository.getChatRoomList(userId);
-            chatRoomListGetResponseList.forEach(this::setListChatLastMessage);
-        }
-
-        return chatRoomListGetResponseList;
-    }
 
 
     public List<ChatRoomListGetResponse> getChatRoomList(Long userId, String accessToken) {
-        Long beforeTime = System.currentTimeMillis();
 
         List<ChatRoomListGetResponse> chatRoomListGetResponseList = null;
         if (chatRoomRedisRepository.existChatRoomList(userId)) {
             chatRoomListGetResponseList = chatRoomRedisRepository.getChatRoomList(userId);
 
-//            log.info("YES ChatRoom!!!!! time : {}", System.currentTimeMillis() - beforeTime);
 
         } else {
             // 채팅방이 레디스에 없으면 페인 사용해서 불러온다!
             chatRoomListGetResponseList = mainFeignClient.getChatRoomList(accessToken);
             chatRoomRedisRepository.initChatRoomList(userId, chatRoomListGetResponseList);
-//            log.info("NOT ChatRoom!!!!! time : {}", System.currentTimeMillis() - beforeTime);
         }
 
         chatRoomListGetResponseList.forEach(this::setListChatLastMessage);
@@ -74,25 +61,23 @@ public List<ChatRoomListGetResponse> getChatRoomList(Long userId, String accessT
      * 몽고 디비에서 마지막 메시지 가져와서 저장하는 로직
      * @param chatRoomListGetResponse
      */
-    private void setListChatLastMessage(ChatRoomListGetResponse chatRoomListGetResponse) {
+    public void setListChatLastMessage(ChatRoomListGetResponse chatRoomListGetResponse) {
 
         // 몽고 디비에서 마지막 메시지 가져와서 저장.
         String chatRoomNumber = chatRoomListGetResponse.getChatRoomNumber();
-
+        //TODO 레디스에 마지막 메세지가 없으면??
         if (chatRoomRedisRepository.getLastMessage(chatRoomNumber) != null) {
             chatRoomListGetResponse.updateChatMessageDto(
-                    chatRoomRedisRepository.getLastMessage(chatRoomNumber)
+                chatRoomRedisRepository.getLastMessage(chatRoomNumber)
             );
-            return;
-        }
-
-        ChatMessage chatMessage = chatMongoService.findLatestMessageByRoomId(chatRoomNumber);
-        if (chatMessage != null) {
-            chatRoomListGetResponse.updateChatMessageDto(
+        } else {
+            ChatMessage chatMessage = chatMongoService.findLatestMessageByRoomId(chatRoomNumber);
+            if (chatMessage != null) {
+                chatRoomListGetResponse.updateChatMessageDto(
                     ChatMessageDto.fromEntity(chatMessage)
-            );
+                );
+            }
         }
-
     }
 
     /**

diff --git a/...tchroom/chat/global/config/WebConfig.java → ...chroom/chat/global/config/CorsConfig.java b/...tchroom/chat/global/config/WebConfig.java → ...chroom/chat/global/config/CorsConfig.java
@@ -5,7 +5,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class WebConfig implements WebMvcConfigurer {
+public class CorsConfig implements WebMvcConfigurer {
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {

diff --git a/src/main/java/com/catchroom/chat/global/config/RedisConfig.java b/src/main/java/com/catchroom/chat/global/config/RedisConfig.java
@@ -20,6 +20,7 @@
 @Configuration
 public class RedisConfig {
 
+    // yml 파일 redis 설정 불러오기
     private final RedisProperties redisProperties;
     /**
      * 단일 Topic 사용을 위한 Bean 설정

diff --git a/src/main/java/com/catchroom/chat/message/service/ChatService.java b/src/main/java/com/catchroom/chat/message/service/ChatService.java
@@ -9,6 +9,7 @@
 import com.catchroom.chat.message.type.MessageType;
 import com.catchroom.chat.message.type.UserIdentity;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import lombok.RequiredArgsConstructor;
@@ -26,6 +27,7 @@ public class ChatService {
 
     /**
      * destination 정보에서 roomId 추출
+     * TODO 이거 필요??
      */
     public String getRoomId(String destination) {
         int lastIndex = destination.lastIndexOf('/');
@@ -44,35 +46,33 @@ public void sendChatMessage(ChatMessageDto chatMessage, String accessToken) {
         Long userId = chatMessage.getUserId();
         Long partnerId;
 
-        Long before = System.currentTimeMillis();
-
         // 1. 채팅방이 삭제되는 것이라면 delete 를 해준다.
         if (chatMessage.getType().equals(MessageType.DELETE)) {
             chatRoomService.deleteChatRoom(accessToken, chatMessage.getRoomId(), userId);
+            //TODO 레디스에서도 삭제 필요??
+            chatRoomRedisRepository.deleteChatRoom(userId,chatMessage.getRoomId());
         }
 
-        ChatRoomListGetResponse newChatRoomListResponse = null;
-        if (!chatRoomRedisRepository.existChatRoom(userId, chatMessage.getRoomId())) {
-            newChatRoomListResponse = chatRoomService.getChatRoomInfo(accessToken, chatMessage.getRoomId());
+        ChatRoomListGetResponse newChatRoomList = null;
+        if (chatRoomRedisRepository.existChatRoom(userId, chatMessage.getRoomId())) {
+            newChatRoomList = chatRoomRedisRepository.getChatRoom(userId, chatMessage.getRoomId());
         } else {
-            newChatRoomListResponse = chatRoomRedisRepository.getChatRoom(userId, chatMessage.getRoomId());
+            newChatRoomList = chatRoomService.getChatRoomInfo(accessToken, chatMessage.getRoomId());
         }
 
-        partnerId = getPartnerId(chatMessage, newChatRoomListResponse);
+        partnerId = getPartnerId(chatMessage, newChatRoomList);
 
         // 2. 채팅방 리스트에 새로운 채팅방 정보가 없다면, 넣어준다. 마지막 메시지도 같이 담는다. 상대방 레디스에도 업데이트 해준다.
-        setNewChatRoomInfo(chatMessage, newChatRoomListResponse);
+        setNewChatRoomInfo(chatMessage, newChatRoomList);
 
         // 3. 마지막 메시지들이 담긴 채팅방 리스트들을 가져온다. // 4. 파트너 채팅방 리스트도 가져온다. (파트너는 userId 로만)
         List<ChatRoomListGetResponse> chatRoomListGetResponseList = chatRoomService.getChatRoomList(userId, accessToken);
-        List<ChatRoomListGetResponse> partnerChatRoomGetResponseList = chatRoomService.getChatRoomListByUserId(partnerId);
-
+        List<ChatRoomListGetResponse> partnerChatRoomGetResponseList = getChatRoomListByUserId(partnerId);
 
         // 5. 마지막 메세지 기준으로 정렬 채팅방 리스트 정렬
         chatRoomListGetResponseList = chatRoomService.sortChatRoomListLatest(chatRoomListGetResponseList);
         partnerChatRoomGetResponseList = chatRoomService.sortChatRoomListLatest(partnerChatRoomGetResponseList);
 
-
         MessageSubDto messageSubDto = MessageSubDto.builder()
             .userId(userId)
             .partnerId(partnerId)
@@ -81,9 +81,6 @@ public void sendChatMessage(ChatMessageDto chatMessage, String accessToken) {
             .partnerList(partnerChatRoomGetResponseList)
             .build();
 
-        Long after = System.currentTimeMillis() - before;
-        log.info("message Time : {}", after);
-
         redisPublisher.publish(messageSubDto);
     }
 
@@ -107,7 +104,6 @@ private void setNewChatRoomInfo(ChatMessageDto chatMessage, ChatRoomListGetRespo
 
         newChatRoomListResponse.updateChatMessageDto(chatMessage);
 
-
         /** 상대방 채팅 리스트와 내 리스트 둘다 채팅방을 저장한다. */
 
         if (newChatRoomListResponse.getLoginUserIdentity().equals(UserIdentity.SELLER)) {
@@ -133,6 +129,21 @@ private void setNewChatRoomInfo(ChatMessageDto chatMessage, ChatRoomListGetRespo
 
     }
 
+    // redis에서 채팅방 리스트 불러오는 로직
+    private List<ChatRoomListGetResponse> getChatRoomListByUserId(Long userId) {
+        List<ChatRoomListGetResponse> chatRoomListGetResponseList = new ArrayList<>();
+
+        if (chatRoomRedisRepository.existChatRoomList(userId)) {
+            chatRoomListGetResponseList = chatRoomRedisRepository.getChatRoomList(userId);
+            for (ChatRoomListGetResponse chatRoomListGetResponse : chatRoomListGetResponseList) {
+                chatRoomService.setListChatLastMessage(chatRoomListGetResponse);
+            }
+        }
+
+
+        return chatRoomListGetResponseList;
+    }
+