From 6ba896979a11f5af78f6bb6234b60b1c436e90c8 Mon Sep 17 00:00:00 2001 From: Admin Date: Fri, 26 Sep 2025 15:01:50 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20chat=20=EC=B1=84=ED=8C=85=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94=20=EC=B6=94=EA=B0=80=ED=95=B4=EC=84=9C=20?= =?UTF-8?q?=EC=A0=84=EB=8B=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/campick/server/api/chat/dto/ChatMessageResDto.java | 1 + .../com/campick/server/api/chat/service/ChatService.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) 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");