From e2684d400ea74ef0fe9ae5614cd49060a3f71be3 Mon Sep 17 00:00:00 2001 From: seungheonlee Date: Mon, 25 Aug 2025 01:29:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=82=98=EA=B0=80=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=80=20=EC=B1=84=ED=8C=85=EB=B0=A9=EB=A7=8C=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infrastructure/PrivateChatRoomJpaRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/mos/backend/privatechatrooms/infrastructure/PrivateChatRoomJpaRepository.java b/src/main/java/com/mos/backend/privatechatrooms/infrastructure/PrivateChatRoomJpaRepository.java index 3e2db10..460d3ad 100644 --- a/src/main/java/com/mos/backend/privatechatrooms/infrastructure/PrivateChatRoomJpaRepository.java +++ b/src/main/java/com/mos/backend/privatechatrooms/infrastructure/PrivateChatRoomJpaRepository.java @@ -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 findByUserAndStatusIsVisible(@Param("user") User user); } From 613b2fd238324ea18c0e7e9aea421fbd910b38bb Mon Sep 17 00:00:00 2001 From: seungheonlee Date: Mon, 25 Aug 2025 01:29:48 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EB=B0=9C=ED=96=89=20=EC=8B=9C=20=EC=82=AD=EC=A0=9C=EB=90=9C=20?= =?UTF-8?q?=EC=B1=84=ED=8C=85=20=EC=B0=B8=EA=B0=80=EC=9E=90=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EC=B7=A8=EC=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/PrivateChatMessageService.java | 5 +++-- .../privatechatroommember/entity/PrivateChatRoomMember.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mos/backend/privatechatmessages/application/PrivateChatMessageService.java b/src/main/java/com/mos/backend/privatechatmessages/application/PrivateChatMessageService.java index 38d89c3..9c3f439 100644 --- a/src/main/java/com/mos/backend/privatechatmessages/application/PrivateChatMessageService.java +++ b/src/main/java/com/mos/backend/privatechatmessages/application/PrivateChatMessageService.java @@ -49,9 +49,10 @@ public void publish(Long userId, Long privateChatRoomId, PrivateChatMessagePubli ); List 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); }); diff --git a/src/main/java/com/mos/backend/privatechatroommember/entity/PrivateChatRoomMember.java b/src/main/java/com/mos/backend/privatechatroommember/entity/PrivateChatRoomMember.java index 78d5e6e..a957e98 100644 --- a/src/main/java/com/mos/backend/privatechatroommember/entity/PrivateChatRoomMember.java +++ b/src/main/java/com/mos/backend/privatechatroommember/entity/PrivateChatRoomMember.java @@ -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; + } }