diff --git a/src/main/java/com/campick/server/api/chat/dto/ChatMessageResDto.java b/src/main/java/com/campick/server/api/chat/dto/ChatMessageResDto.java index 78c84b7..cffdddd 100644 --- a/src/main/java/com/campick/server/api/chat/dto/ChatMessageResDto.java +++ b/src/main/java/com/campick/server/api/chat/dto/ChatMessageResDto.java @@ -8,6 +8,7 @@ @Getter @Setter @ToString @AllArgsConstructor @Builder public class ChatMessageResDto { + private Long chatId; private String message; private Long senderId; private String sendAt; diff --git a/src/main/java/com/campick/server/api/chat/service/ChatService.java b/src/main/java/com/campick/server/api/chat/service/ChatService.java index fe5cc2d..710f960 100644 --- a/src/main/java/com/campick/server/api/chat/service/ChatService.java +++ b/src/main/java/com/campick/server/api/chat/service/ChatService.java @@ -195,13 +195,14 @@ public void handleChatMessage(WebSocketSession session, JsonNode data) { System.out.println(chatMessageReqDto); ChatMessage chatMessage = saveMessage(chatMessageReqDto); - ChatMessageResDto chatMessageResDto = convertToChatMessageResDto(chatMessage); + ChatMessageResDto chatMessageResDto = convertToChatMessageResDto(chatMessage, chatMessageReqDto.getChatId()); sendMessage(chatMessageReqDto.getChatId(), chatMessageResDto, session); } - private ChatMessageResDto convertToChatMessageResDto(ChatMessage chatMessage) { + private ChatMessageResDto convertToChatMessageResDto(ChatMessage chatMessage, Long chatRoomId) { return ChatMessageResDto.builder() .message(chatMessage.getMessage()) + .chatId(chatRoomId) .senderId(chatMessage.getMember().getId()) .sendAt(TimeUtil.getTimeAgo(chatMessage.getCreatedAt())) .isRead(chatMessage.getIsRead()) @@ -241,6 +242,7 @@ public void sendMessage(Long chatId, ChatMessageResDto message, WebSocketSession payload.put("senderId", message.getSenderId()); payload.put("sendAt", message.getSendAt()); payload.put("isRead", message.getIsRead()); + payload.put("chatId", message.getChatId()); Map wrapper = new HashMap<>(); wrapper.put("type", "chat_message");