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 @@ -49,9 +49,10 @@ public void publish(Long userId, Long privateChatRoomId, PrivateChatMessagePubli
);

List<PrivateChatRoomMember> chatRoomMembers = privateChatRoomMemberService.findByPrivateChatRoom(privateChatRoom);
chatRoomMembers.forEach(member -> {
chatRoomMembers.forEach(privateChatRoomMember -> {
privateChatRoomMember.undeleteIfDeleted();
PrivateChatRoomInfoMessageDto privateChatRoomInfoMessageDto = PrivateChatRoomInfoMessageDto.of(
member.getUser().getId(), privateChatRoom.getId(), privateChatMessage.getMessage(), privateChatMessage.getCreatedAt()
privateChatRoomMember.getUser().getId(), privateChatRoom.getId(), privateChatMessage.getMessage(), privateChatMessage.getCreatedAt()
);
redisPublisher.publishPrivateChatRoomInfoMessage(privateChatRoomInfoMessageDto);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@ public static PrivateChatRoomMember of(PrivateChatRoom privateChatRoom, User use
public void updateLastEntryAt() {
this.lastEntryAt = LocalDateTime.now();
}

public void undeleteIfDeleted() {
this.deletedAt = null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ having count(distinct m.user) = 2
@Query("""
select m.privateChatRoom
from PrivateChatRoomMember m
where m.user = :user and m.privateChatRoom.status = 'VISIBLE'
where m.user = :user and m.privateChatRoom.status = 'VISIBLE' and m.deletedAt IS NULL
""")
List<PrivateChatRoom> findByUserAndStatusIsVisible(@Param("user") User user);
}