Merge pull request #7 from catchroom/feature/fix-message

Feature/fix message

src/main/java/com/catchroom/chat/global/config/RedisConfig.java

@@ -15,12 +15,6 @@
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
-/**
- * 기존에는 신규 채팅방 생성 시 무조건 새로운 ChannelTopic을 생성하고 새로운 redisListener와 연동하여 작업.
- * 그러나 이방법은 불필요하게 자원을 낭비하는 단점이 존재함.
- * 그래서 ChannelTopic 과 redisListener 일원화 작업 진행으로 변경.
- * redisPublisher 삭제 => redisTemplate 대체
- */
 
 @RequiredArgsConstructor
 @Configuration

src/main/java/com/catchroom/chat/message/controller/ChatController.java

@@ -26,9 +26,9 @@ public class ChatController {
     @MessageMapping("/chat/message")
     public void message(ChatMessageDto message) {
         log.info("chatController Sender: {}", message.getSender());
-        chatMongoService.save(message);
-        message.setUserCount(chatRoomRepository.getUserCount(message.getRoomId()));
-        chatService.sendChatMessage(message);
+        ChatMessageDto chatMessageDto = chatMongoService.save(message);
+        message.setUserCount(chatRoomRepository.getUserCount(chatMessageDto.getRoomId()));
+        chatService.sendChatMessage(chatMessageDto);
 
     }
 

src/main/java/com/catchroom/chat/message/dto/ChatMessageDto.java

@@ -2,6 +2,7 @@
 
 import com.catchroom.chat.message.entity.ChatMessage;
 import com.catchroom.chat.message.type.MessageType;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -20,13 +21,15 @@ public class ChatMessageDto {
     private String roomId; // 방 번호
     private String sender; // 채팅을 보낸 사람
     private String message; // 메시지
+    private String time;
     private long userCount; // 채팅방 인원 수
 
     public static ChatMessageDto fromEntity(ChatMessage chatMessage) {
         return ChatMessageDto.builder()
                 .type(chatMessage.getType())
                 .sender(chatMessage.getSender())
                 .roomId(chatMessage.getRoomId())
+                .time(chatMessage.getTime())
                 .message(chatMessage.getMessage())
                 .build();
     }

src/main/java/com/catchroom/chat/message/entity/ChatMessage.java

@@ -14,9 +14,6 @@
 @Document(collection = "chat")
 public class ChatMessage {
 
-//    @Id
-//    private Long id;
-
     private MessageType type; // 메시지 타입
     private String roomId; // 방 번호
     private String sender; // 채팅을 보낸 사람

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

@@ -19,9 +19,10 @@ public class ChatMongoService {
 
     // 채팅 저장
     @Transactional
-    public void save(ChatMessageDto chatMessageDto) {
+    public ChatMessageDto save(ChatMessageDto chatMessageDto) {
         ChatMessage chatMessage = chatMessageRepository.save(ChatMessage.of(chatMessageDto));
         log.info("save success : {}", chatMessage.getMessage());
+        return ChatMessageDto.fromEntity(chatMessage);
     }
 
     // 채팅 불러오기

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

@@ -4,6 +4,7 @@
 import com.catchroom.chat.global.pubsub.RedisPublisher;
 import com.catchroom.chat.message.repository.ChatRoomRepository;
 import com.catchroom.chat.message.type.MessageType;
+import java.time.LocalDateTime;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -39,6 +40,7 @@ public void sendChatMessage(ChatMessageDto chatMessage) {
             chatMessage.setMessage(chatMessage.getSender() + "님이 방에서 나갔습니다.");
             chatMessage.setSender("[알림]");
         }
+
         redisPublisher.publish(chatMessage);
     }