Merge pull request #74 from catchroom/develop

Develop 배포

src/main/java/com/catchroom/chat/message/service/ChatService.java

@@ -47,20 +47,38 @@ public String getRoomId(String destination) {
      */
     public void sendChatMessage(ChatMessageDto chatMessage, String accessToken) {
 
-        chatRoomRedisRepository.setLastChatMessage(chatMessage.getRoomId(), chatMessage);
+        Long before = System.currentTimeMillis();
 
+        // 1. redis 에 채팅방이 없으면, 레디스에 리스트를 먼저 넣어준다.
+        initIfChatRoomAbsent(chatMessage, accessToken);
+
+        // 2. 새로운 채팅방 정보가 없다면, 넣어준다.
+        setNewChatRoomInfo(chatMessage, accessToken);
+
+        // 3. 채팅방에 마지막 메시지를 넣어준다.
+        setRedisChatMessage(chatMessage);
+
+        // 4. 채팅방이 삭제되는 것이라면 delete를 해준다.
         if (chatMessage.getType().equals(MessageType.DELETE)) {
+            chatRoomRedisRepository.deleteChatRoom(chatMessage.getUserId(), chatMessage.getRoomId());
             deleteChatRoom(accessToken, chatMessage.getRoomId());
         }
 
+        // 5. 채팅방 정보 업데이트
         List<ChatRoomListGetResponse> chatRoomListGetResponseList =
-            chatRoomService.getChatRoomList(chatMessage.getUserId(), accessToken, chatMessage.getType());
+            chatRoomRedisRepository.getChatRoomList(chatMessage.getUserId());
+
+        // 6. 마지막 메세지 기준으로 정렬
+        sortChatRoomListLatest(chatRoomListGetResponseList);
 
         MessageSubDto messageSubDto = MessageSubDto.builder()
             .chatMessageDto(chatMessage)
             .list(chatRoomListGetResponseList)
             .build();
 
+        Long after = System.currentTimeMillis() - before;
+        log.info("message Time : {}", after);
+
         redisPublisher.publish(messageSubDto);
     }
 
@@ -137,10 +155,12 @@ private void setLastMessage(List<ChatRoomListGetResponse> chatRoomListGetRespons
             String chatRoomNumber = chatRoomListGetResponse.getChatRoomNumber();
 
             if (chatRoomListGetResponse.getLastChatmessageDto() == null) {
-                ChatMessage lastChatMessageMongo = chatMessageRepository.findAllByRoomId(
-                        chatRoomNumber).get(0);
-                chatRoomListGetResponse.updateChatMessageDto(
-                        ChatMessageDto.fromEntity(lastChatMessageMongo));
+                if (chatMessageRepository.findAllByRoomId(chatRoomNumber) != null) {
+                    ChatMessage lastChatMessageMongo = chatMessageRepository.findAllByRoomId(
+                            chatRoomNumber).get(0);
+                    chatRoomListGetResponse.updateChatMessageDto(
+                            ChatMessageDto.fromEntity(lastChatMessageMongo));
+                }
             }
         }
 

src/test/java/com/catchroom/chat/message/service/ChatServiceTest.java

@@ -0,0 +1,33 @@
+package com.catchroom.chat.message.service;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.catchroom.chat.message.dto.ChatMessageDto;
+import com.catchroom.chat.message.type.MessageType;
+import java.time.LocalDateTime;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class ChatServiceTest {
+
+    @Autowired
+    ChatService chatService;
+
+    @Test
+    void 실행_성공_토큰_재작성_필수() {
+        String accessToken = "Bearer eyJhbGciOiJIUzUxMiJ9.eyJuYW1lIjoi6rmA7LKg7IiYIiwicGhvbmVOdW1iZXIiOiIwMTA4ODI1NDQ3MSIsIm5pY2tOYW1lIjoi7LKg7IiY7JmA7JiB7Z2sIiwiZW1haWwiOiJ0ZXN0OTI3QG5hdmVyLmNvbSIsImlzcyI6ImNhdGNocm9vbSIsImlhdCI6MTcwNjI2MDc3NSwiZXhwIjoxNzA2MjYyNTc0fQ.hd4zTCpvmTjVROOGOwnKumWMUjW-lKlDJhSML79Fc2MUEDzeXSZBYAznFV1tolhNdl2qrA1N8HgT1tchhKsx2A";
+        ChatMessageDto messageDto = ChatMessageDto.builder()
+                .type(MessageType.TALK)
+                .message("실행되니? 3탄")
+                .roomId("f5556003-1151-4d26-a3a8-346db5e622a3")
+                .userId(28L)
+                .time(LocalDateTime.now().toString())
+                .build();
+
+        chatService.sendChatMessage(messageDto, accessToken);
+
+    }
+}