Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@Getter @Setter @ToString
@AllArgsConstructor @Builder
public class ChatMessageResDto {
private Long chatId;
private String message;
private Long senderId;
private String sendAt;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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<String, Object> wrapper = new HashMap<>();
wrapper.put("type", "chat_message");
Expand Down