Skip to content

[Fix] 채팅창 입장 이후의 채팅 메시지가 보이도록 수정 #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yosong6729 merged 1 commit into from
Feb 9, 2025
Merged

[Fix] 채팅창 입장 이후의 채팅 메시지가 보이도록 수정 #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/main/java/com/manchui/domain/service/ChatMessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,13 @@ public Mono<ChatMessageSliceResponse> findChatList(CustomUserDetails customUserD

if (chatRoomUser.isEmpty()) {
// 채팅방 첫입장
chatRoomUserUpdatedAt = chatRoomUserRepository.save(new ChatRoomUser(user, chatRoom)).getUser().getUpdatedAt();
chatMessageRepository.save(new ChatMessage(roomId, ChatMessageType.ENTER, user.getName(), user.getName() + " 님이 입장 하셨습니다.", LocalDateTime.now())).block();
ChatRoomUser savedChatRoomUser = chatRoomUserRepository.save(new ChatRoomUser(user, chatRoom));
chatRoomUserRepository.flush();
chatRoomUserUpdatedAt = savedChatRoomUser.getUpdatedAt();

chatMessageRepository.save(new ChatMessage(roomId, ChatMessageType.ENTER, user.getName(), user.getName() + " 님이 입장 하셨습니다.", chatRoomUserUpdatedAt)).block();
rabbitTemplate.convertAndSend("chat.exchange", "room." + roomId, new ChatMessageResponse(
user.getName(), user.getName() + " 님이 입장 하셨습니다.", ChatMessageType.ENTER, LocalDateTime.now()));
user.getName(), user.getName() + " 님이 입장 하셨습니다.", ChatMessageType.ENTER, chatRoomUserUpdatedAt));
}else if(chatRoomUser.get().getDeletedAt() != null){
// 채팅방 재입장
chatRoomUser.get().restore();
Expand Down