[FIX] 방 관리 기능 개선 및 버그 수정 (+ 채팅 refactor)

src/main/java/com/project/dorumdorum/domain/chat/application/dto/response/NotificationMessage.java

@@ -0,0 +1,15 @@
+package com.project.dorumdorum.domain.chat.application.dto.response;
+
+public record NotificationMessage(
+        NotificationType type,
+        String roomNo,
+        String chatRoomNo
+) {
+    public static NotificationMessage roomDeleted(String roomNo, String chatRoomNo) {
+        return new NotificationMessage(NotificationType.ROOM_DELETED, roomNo, chatRoomNo);
+    }
+
+    public static NotificationMessage kicked(String roomNo, String chatRoomNo) {
+        return new NotificationMessage(NotificationType.KICKED_FROM_ROOM, roomNo, chatRoomNo);
+    }
+}

src/main/java/com/project/dorumdorum/domain/chat/application/dto/response/NotificationType.java

@@ -0,0 +1,19 @@
+package com.project.dorumdorum.domain.chat.application.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum NotificationType {
+    ROOM_DELETED("ROOM_DELETED"),
+    KICKED_FROM_ROOM("KICKED_FROM_ROOM");
+
+    private final String value;
+
+    NotificationType(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+}

src/main/java/com/project/dorumdorum/domain/chat/application/event/ChatWebSocketNotificationEvent.java

@@ -0,0 +1,12 @@
+package com.project.dorumdorum.domain.chat.application.event;
+
+import java.util.List;
+
+public record ChatWebSocketNotificationEvent(
+        List<BroadcastTask> broadcasts,
+        List<UserNotifyTask> userNotifications
+) {
+    public record BroadcastTask(String chatRoomNo, Object payload) {}
+
+    public record UserNotifyTask(String userNo, Object payload) {}
+}

src/main/java/com/project/dorumdorum/domain/chat/application/event/ChatWebSocketNotificationEventListener.java

@@ -0,0 +1,24 @@
+package com.project.dorumdorum.domain.chat.application.event;
+
+import com.project.dorumdorum.domain.chat.infra.websocket.ChatWebSocketSendService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+public class ChatWebSocketNotificationEventListener {
+
+    private final ChatWebSocketSendService chatWebSocketSendService;
+
+    @Async("notificationExecutor")
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = false)
+    public void handle(ChatWebSocketNotificationEvent event) {
+        event.userNotifications().forEach(task ->
+                chatWebSocketSendService.notifyUser(task.userNo(), task.payload()));
+        event.broadcasts().forEach(task ->
+                chatWebSocketSendService.broadcast(task.chatRoomNo(), task.payload()));
+    }
+}

src/main/java/com/project/dorumdorum/domain/chat/application/event/RoomDeletedEventListener.java

@@ -0,0 +1,60 @@
+package com.project.dorumdorum.domain.chat.application.event;
+
+import com.project.dorumdorum.domain.chat.application.dto.response.NotificationMessage;
+import com.project.dorumdorum.domain.chat.domain.entity.ChatRoom;
+import com.project.dorumdorum.domain.chat.domain.entity.ChatRoomMember;
+import com.project.dorumdorum.domain.chat.domain.service.ChatMessageService;
+import com.project.dorumdorum.domain.chat.domain.service.ChatRoomMemberService;
+import com.project.dorumdorum.domain.chat.domain.service.ChatRoomService;
+import com.project.dorumdorum.domain.room.application.event.RoomDeletedEvent;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class RoomDeletedEventListener {
+
+    private final ChatRoomService chatRoomService;
+    private final ChatRoomMemberService chatRoomMemberService;
+    private final ChatMessageService chatMessageService;
+    private final ApplicationEventPublisher eventPublisher;
+
+    /**
+     * 방 삭제(RoomDeletedEvent) → GROUP·DIRECT 채팅방 전체 삭제 처리
+     * 발행: DeleteRoomUseCase (room 도메인 담당자)
+     *
+     * BEFORE_COMMIT: 부모 트랜잭션(DeleteRoomUseCase)에 참여하여 방 삭제 + 채팅방 삭제를 하나의 트랜잭션으로 처리.
+     * 채팅방 멤버 전원에게 /queue/notification으로 NotificationMessage 전달.
+     * /topic/chat-room/{chatRoomNo}는 ChatMessageResponse 전용 채널이므로 여기서 사용하지 않음.
+     */
+    @TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT)
+    public void handle(RoomDeletedEvent event) {
+        List<ChatRoom> chatRooms = chatRoomService.findAllByRoomNo(event.roomNo());
+        List<ChatWebSocketNotificationEvent.UserNotifyTask> userNotifications = new ArrayList<>();
+
+        for (ChatRoom chatRoom : chatRooms) {
+            NotificationMessage notification = NotificationMessage.roomDeleted(event.roomNo(), chatRoom.getChatRoomNo());
+
+            // 삭제 전 멤버 조회 → 전원에게 /queue/notification 개인 알림
+            List<ChatRoomMember> members = chatRoomMemberService.findByChatRoom(chatRoom);
+            for (ChatRoomMember member : members) {
+                userNotifications.add(new ChatWebSocketNotificationEvent.UserNotifyTask(
+                        member.getUserNo(), notification));
+            }
+
+            chatMessageService.deleteAllByChatRoom(chatRoom.getChatRoomNo());
+            chatRoomMemberService.deleteAllByChatRoom(chatRoom);
+            chatRoomService.deleteByChatRoomNo(chatRoom.getChatRoomNo());
+        }
+
+        if (!userNotifications.isEmpty()) {
+            eventPublisher.publishEvent(new ChatWebSocketNotificationEvent(List.of(), userNotifications));
+        }
+    }
+}

src/main/java/com/project/dorumdorum/domain/chat/application/event/RoommateKickedEventListener.java

@@ -1,6 +1,7 @@
 package com.project.dorumdorum.domain.chat.application.event;
 
 import com.project.dorumdorum.domain.chat.application.dto.response.ChatMessageResponse;
+import com.project.dorumdorum.domain.chat.application.dto.response.NotificationMessage;
 import com.project.dorumdorum.domain.chat.domain.entity.ChatMessage;
 import com.project.dorumdorum.domain.chat.domain.entity.ChatRoom;
 import com.project.dorumdorum.domain.chat.domain.entity.ChatRoomMember;
@@ -12,15 +13,14 @@
 import com.project.dorumdorum.domain.user.domain.entity.User;
 import com.project.dorumdorum.domain.user.domain.service.UserService;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
-@Slf4j
 @Component
 @RequiredArgsConstructor
 public class RoommateKickedEventListener {
@@ -29,44 +29,46 @@ public class RoommateKickedEventListener {
     private final ChatRoomMemberService chatRoomMemberService;
     private final ChatMessageService chatMessageService;
     private final UserService userService;
-    private final SimpMessagingTemplate messagingTemplate;
+    private final ApplicationEventPublisher eventPublisher;
 
     /**
      * 룸메이트 강퇴(RoommateKickedEvent) → 채팅방에서 퇴장 처리
      * 발행: KickRoommateUseCase (room 도메인 담당자)
      *
      * BEFORE_COMMIT: 부모 트랜잭션(KickRoommateUseCase)에 참여하여 방 강퇴 + 채팅방 퇴장을 하나의 트랜잭션으로 처리.
      * 채팅방 퇴장 실패 시 방 강퇴도 롤백되어 데이터 정합성 보장.
-     * WebSocket 브로드캐스트는 트랜잭션 외부 작업이므로 실패가 TX에 영향을 주지 않도록 독립 처리.
+     * WebSocket 알림 페이로드를 수집한 뒤 ChatWebSocketNotificationEvent로 발행 →
+     * AFTER_COMMIT에서 비동기 재처리(exponential backoff)로 전송.
      */
     @TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT)
     public void handle(RoommateKickedEvent event) {
-        chatRoomService.findByRoomNo(event.roomNo()).ifPresent(chatRoom -> {
-            if (chatRoomMemberService.isMember(chatRoom, event.kickedUserNo())) {
-                ChatRoomMember member = chatRoomMemberService.findByChatRoomAndUserNo(chatRoom, event.kickedUserNo());
-                LocalDateTime fromTime = member.getLastReadAt() != null
-                        ? member.getLastReadAt()
-                        : member.getJoinedAt();
-                chatMessageService.decreaseUnreadCount(chatRoom.getChatRoomNo(), fromTime, event.kickedUserNo());
-                chatRoomMemberService.leave(member);
-                User kicked = userService.findById(event.kickedUserNo());
-                String displayName = (kicked.getNickname() != null && !kicked.getNickname().isBlank())
-                        ? kicked.getNickname() : kicked.getName();
-                String content = displayName + "가 퇴장했습니다.";
-                ChatMessage message = chatMessageService.save(chatRoom, "SYSTEM", content, MessageType.SYSTEM, 0);
-                ChatMessageResponse response = new ChatMessageResponse(
-                        message.getMessageNo(), chatRoom.getChatRoomNo(),
-                        "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt(), message.getUnreadCount());
-                broadcastSafely(chatRoom, response);
-            }
-        });
+        chatRoomService.findByRoomNo(event.roomNo()).ifPresent(chatRoom ->
+                chatRoomMemberService.findOptionalByChatRoomAndUserNo(chatRoom, event.kickedUserNo())
+                        .ifPresent(member -> processKick(chatRoom, member, event))
+        );
     }
 
-    private void broadcastSafely(ChatRoom chatRoom, ChatMessageResponse response) {
-        try {
-            messagingTemplate.convertAndSend("/topic/chat-room/" + chatRoom.getChatRoomNo(), response);
-        } catch (Exception e) {
-            log.warn("[Chat] WebSocket 브로드캐스트 실패. chatRoomNo={}", chatRoom.getChatRoomNo(), e);
-        }
+    private void processKick(ChatRoom chatRoom, ChatRoomMember member, RoommateKickedEvent event) {
+        LocalDateTime fromTime = member.getLastReadAt() != null
+                ? member.getLastReadAt()
+                : member.getJoinedAt();
+        chatMessageService.decreaseUnreadCount(chatRoom.getChatRoomNo(), fromTime, event.kickedUserNo());
+        chatRoomMemberService.leave(member);
+
+        User kicked = userService.findById(event.kickedUserNo());
+        String displayName = (kicked.getNickname() != null && !kicked.getNickname().isBlank())
+                ? kicked.getNickname() : kicked.getName();
+        String content = displayName + "님이 퇴장했습니다.";
+        ChatMessage message = chatMessageService.save(chatRoom, "SYSTEM", content, MessageType.SYSTEM, 0);
+
+        ChatMessageResponse broadcastPayload = new ChatMessageResponse(
+                message.getMessageNo(), chatRoom.getChatRoomNo(),
+                "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt(), message.getUnreadCount());
+        NotificationMessage notificationPayload = NotificationMessage.kicked(event.roomNo(), chatRoom.getChatRoomNo());
+
+        eventPublisher.publishEvent(new ChatWebSocketNotificationEvent(
+                List.of(new ChatWebSocketNotificationEvent.BroadcastTask(chatRoom.getChatRoomNo(), broadcastPayload)),
+                List.of(new ChatWebSocketNotificationEvent.UserNotifyTask(event.kickedUserNo(), notificationPayload))
+        ));
     }
 }

src/main/java/com/project/dorumdorum/domain/chat/domain/entity/ChatRoom.java

@@ -16,7 +16,8 @@
 @Entity
 @Table(
         indexes = {
-                @Index(name = "idx_chat_room_last_message_at", columnList = "last_message_at")
+                @Index(name = "idx_chat_room_last_message_at", columnList = "last_message_at"),
+                @Index(name = "idx_chat_room_room_no", columnList = "room_no")
         }
 )
 @Getter

src/main/java/com/project/dorumdorum/domain/chat/domain/repository/ChatMessageRepository.java

@@ -10,7 +10,7 @@
 
 public interface ChatMessageRepository extends JpaRepository<ChatMessage, String>, ChatMessageQueryRepository {
 
-    @Modifying(clearAutomatically = true)
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("UPDATE ChatMessage m SET m.unreadCount = m.unreadCount - 1 " +
            "WHERE m.chatRoom.chatRoomNo = :chatRoomNo " +
            "AND m.createdAt > :fromTime " +

src/main/java/com/project/dorumdorum/domain/chat/domain/repository/ChatRoomMemberRepository.java

@@ -5,6 +5,7 @@
 import jakarta.persistence.LockModeType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -34,4 +35,8 @@ Optional<ChatRoomMember> findByChatRoomNoAndUserNoForUpdate(
     long countByChatRoom(ChatRoom chatRoom);
 
     boolean existsByChatRoom_ChatRoomNoAndUserNo(String chatRoomNo, String userNo);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("DELETE FROM ChatRoomMember m WHERE m.chatRoom = :chatRoom")
+    void deleteAllByChatRoom(@Param("chatRoom") ChatRoom chatRoom);
 }

src/main/java/com/project/dorumdorum/domain/chat/domain/repository/ChatRoomRepository.java

@@ -3,12 +3,17 @@
 import com.project.dorumdorum.domain.chat.domain.entity.ChatRoom;
 import com.project.dorumdorum.domain.chat.domain.entity.ChatRoomType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface ChatRoomRepository extends JpaRepository<ChatRoom, String>, ChatRoomQueryRepository {
 
     Optional<ChatRoom> findByRoomNoAndChatRoomType(String roomNo, ChatRoomType chatRoomType);
+    List<ChatRoom> findAllByRoomNo(String roomNo);
 
     boolean existsByRoomNo(String roomNo);
 
@@ -17,4 +22,8 @@ boolean existsByRoomNoAndChatRoomTypeAndApplicantUserNo(
 
     Optional<ChatRoom> findByRoomNoAndChatRoomTypeAndApplicantUserNo(
             String roomNo, ChatRoomType chatRoomType, String applicantUserNo);
+
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("DELETE FROM ChatRoom c WHERE c.chatRoomNo = :chatRoomNo")
+    void deleteByChatRoomNo(@Param("chatRoomNo") String chatRoomNo);
 }

src/main/java/com/project/dorumdorum/domain/chat/domain/service/ChatRoomMemberService.java

@@ -9,6 +9,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 import static com.project.dorumdorum.global.exception.code.status.ChatErrorStatus.*;
 
@@ -34,6 +35,10 @@ public ChatRoomMember findByChatRoomAndUserNo(ChatRoom chatRoom, String userNo)
                 .orElseThrow(() -> new RestApiException(CHAT_ROOM_MEMBER_NOT_FOUND));
     }
 
+    public Optional<ChatRoomMember> findOptionalByChatRoomAndUserNo(ChatRoom chatRoom, String userNo) {
+        return chatRoomMemberRepository.findByChatRoomAndUserNo(chatRoom, userNo);
+    }
+
     public ChatRoomMember findByChatRoomNoAndUserNoForUpdate(String chatRoomNo, String userNo) {
         return chatRoomMemberRepository.findByChatRoomNoAndUserNoForUpdate(chatRoomNo, userNo)
                 .orElseThrow(() -> new RestApiException(CHAT_ROOM_MEMBER_NOT_FOUND));
@@ -65,6 +70,10 @@ public void leave(ChatRoomMember member) {
         chatRoomMemberRepository.delete(member);
     }
 
+    public void deleteAllByChatRoom(ChatRoom chatRoom) {
+        chatRoomMemberRepository.deleteAllByChatRoom(chatRoom);
+    }
+
     public void updateLastReadAt(ChatRoomMember member, LocalDateTime readAt) {
         member.updateLastReadAt(readAt);
         chatRoomMemberRepository.save(member);

src/main/java/com/project/dorumdorum/domain/chat/domain/service/ChatRoomService.java

@@ -67,6 +67,14 @@ public void delete(ChatRoom chatRoom) {
         chatRoomRepository.delete(chatRoom);
     }
 
+    public void deleteByChatRoomNo(String chatRoomNo) {
+        chatRoomRepository.deleteByChatRoomNo(chatRoomNo);
+    }
+
+    public List<ChatRoom> findAllByRoomNo(String roomNo) {
+        return chatRoomRepository.findAllByRoomNo(roomNo);
+    }
+
     public List<ChatRoomSummary> findMyChatRooms(String userNo) {
         return chatRoomRepository.findMyChatRooms(userNo);
     }

src/main/java/com/project/dorumdorum/domain/chat/infra/websocket/ChatWebSocketSendService.java

@@ -0,0 +1,33 @@
+package com.project.dorumdorum.domain.chat.infra.websocket;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Recover;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ChatWebSocketSendService {
+
+    private final SimpMessagingTemplate messagingTemplate;
+
+    @Retryable(retryFor = Exception.class, maxAttempts = 3, backoff = @Backoff(delay = 1000, multiplier = 2))
+    public void broadcast(String chatRoomNo, Object payload) {
+        messagingTemplate.convertAndSend("/topic/chat-room/" + chatRoomNo, payload);
+    }
+
+    @Retryable(retryFor = Exception.class, maxAttempts = 3, backoff = @Backoff(delay = 1000, multiplier = 2))
+    public void notifyUser(String userNo, Object payload) {
+        messagingTemplate.convertAndSendToUser(userNo, "/queue/notification", payload);
+    }
+
+    // broadcast / notifyUser 모두 (String, Object) 시그니처이므로 단일 recover로 처리
+    @Recover
+    public void recoverSend(Exception e, String recipient, Object payload) {
+        log.warn("[Chat] WebSocket 알림 최종 실패. recipient={}", recipient, e);
+    }
+}

src/main/java/com/project/dorumdorum/domain/checklist/domain/repository/RoomRuleRepository.java

@@ -2,6 +2,7 @@
 
 import com.project.dorumdorum.domain.checklist.domain.entity.RoomRule;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -12,4 +13,7 @@ public interface RoomRuleRepository extends JpaRepository<RoomRule, String> {
     @Query("select rr from RoomRule rr where rr.room.roomNo = :roomNo")
     Optional<RoomRule> findByRoomNo(@Param("roomNo") String roomNo);
 
+    @Modifying(clearAutomatically = true, flushAutomatically = true)
+    @Query("DELETE FROM RoomRule rr WHERE rr.room.roomNo = :roomNo")
+    void deleteByRoomNo(@Param("roomNo") String roomNo);
 }