Merge pull request #87 from DorumDorum/fix/#86/그룹-채팅-멤버-퇴장추방-시-미읽음-카운트-집계-오류

ydking0911 · web-flow · commit 37dbf0b45932 · 2026-04-02T13:58:36.000+09:00
[FIX] 그룹 채팅 퇴장/강퇴 unread 집계 보정 및 테스트 안정화
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -33,6 +33,11 @@ jobs:
       - name: Setup Gradle cache
         uses: gradle/actions/setup-gradle@v4
 
+      - name: Ensure Docker is available (Testcontainers)
+        run: |
+          echo ">>> [CI] Checking Docker daemon..."
+          docker info
+
       - name: Run tests
         run: |
           echo ">>> [CI] Running tests..."
diff --git a/.gitignore b/.gitignore
@@ -52,4 +52,7 @@ pinpoint-agent/tools/
 .claude
 
 ### env ###
-.env
+.env
+
+# macOS artefacts
+.DS_Store
diff --git a/src/main/java/com/project/dorumdorum/domain/chat/application/dto/response/ChatMessageResponse.java b/src/main/java/com/project/dorumdorum/domain/chat/application/dto/response/ChatMessageResponse.java
@@ -9,5 +9,6 @@ public record ChatMessageResponse(
         String senderNickname,
         String content,
         String messageType,
-        LocalDateTime sentAt
+        LocalDateTime sentAt,
+        int unreadCount
 ) {}
diff --git a/src/main/java/com/project/dorumdorum/domain/chat/application/dto/response/ChatReadReceiptResponse.java b/src/main/java/com/project/dorumdorum/domain/chat/application/dto/response/ChatReadReceiptResponse.java
@@ -0,0 +1,9 @@
+package com.project.dorumdorum.domain.chat.application.dto.response;
+
+import java.time.LocalDateTime;
+
+public record ChatReadReceiptResponse(
+        String chatRoomNo,
+        String readerUserNo,
+        LocalDateTime readAt
+) {}
diff --git a/src/main/java/com/project/dorumdorum/domain/chat/application/event/RoommateKickedEventListener.java b/src/main/java/com/project/dorumdorum/domain/chat/application/event/RoommateKickedEventListener.java
@@ -3,6 +3,7 @@
 import com.project.dorumdorum.domain.chat.application.dto.response.ChatMessageResponse;
 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;
 import com.project.dorumdorum.domain.chat.domain.entity.MessageType;
 import com.project.dorumdorum.domain.chat.domain.service.ChatMessageService;
 import com.project.dorumdorum.domain.chat.domain.service.ChatRoomMemberService;
@@ -17,6 +18,8 @@
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
 
+import java.time.LocalDateTime;
+
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -40,17 +43,20 @@ public class RoommateKickedEventListener {
     public void handle(RoommateKickedEvent event) {
         chatRoomService.findByRoomNo(event.roomNo()).ifPresent(chatRoom -> {
             if (chatRoomMemberService.isMember(chatRoom, event.kickedUserNo())) {
-                chatRoomMemberService.leave(
-                        chatRoomMemberService.findByChatRoomAndUserNo(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());
+                        "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt(), message.getUnreadCount());
                 broadcastSafely(chatRoom, response);
             }
         });
diff --git a/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/JoinChatRoomUseCase.java b/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/JoinChatRoomUseCase.java
@@ -68,7 +68,7 @@ public void handle(RoommateAcceptedEvent event) {
             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());
+                    "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt(), message.getUnreadCount());
             broadcastSafely(chatRoom, response);
         }
     }
diff --git a/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/LeaveChatRoomUseCase.java b/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/LeaveChatRoomUseCase.java
@@ -20,6 +20,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+
 import static com.project.dorumdorum.global.exception.code.status.ChatErrorStatus.HOST_CANNOT_LEAVE;
 
 @Service
@@ -61,6 +63,13 @@ private void leaveGroupChatRoom(ChatRoom chatRoom, ChatRoomMember member, String
             throw new RestApiException(HOST_CANNOT_LEAVE);
         }
 
+        if (memberCount > 1) {
+            LocalDateTime fromTime = member.getLastReadAt() != null
+                    ? member.getLastReadAt()
+                    : member.getJoinedAt();
+            chatMessageService.decreaseUnreadCount(chatRoom.getChatRoomNo(), fromTime, userNo);
+        }
+
         chatRoomMemberService.leave(member);
         roommateService.leaveRoom(userNo, chatRoom.getRoomNo());
         room.minusCurrentMate();
@@ -79,6 +88,13 @@ private void leaveDirectChatRoom(ChatRoom chatRoom, ChatRoomMember member, Strin
             throw new RestApiException(HOST_CANNOT_LEAVE);
         }
 
+        if (memberCount > 1) {
+            LocalDateTime fromTime = member.getLastReadAt() != null
+                    ? member.getLastReadAt()
+                    : member.getJoinedAt();
+            chatMessageService.decreaseUnreadCount(chatRoom.getChatRoomNo(), fromTime, userNo);
+        }
+
         chatRoomMemberService.leave(member);
 
         if (memberCount == 1) {
@@ -99,7 +115,7 @@ private void sendLeaveSystemMessage(ChatRoom chatRoom, String userNo) {
         ChatMessage message = chatMessageService.save(chatRoom, "SYSTEM", content, MessageType.SYSTEM, 0);
         ChatMessageResponse response = new ChatMessageResponse(
                 message.getMessageNo(), chatRoomNo,
-                "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt());
+                "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt(), message.getUnreadCount());
         messagingTemplate.convertAndSend("/topic/chat-room/" + chatRoomNo, response);
     }
 }
diff --git a/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/MarkChatRoomReadUseCase.java b/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/MarkChatRoomReadUseCase.java
@@ -1,10 +1,12 @@
 package com.project.dorumdorum.domain.chat.application.usecase;
 
+import com.project.dorumdorum.domain.chat.application.dto.response.ChatReadReceiptResponse;
 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 lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
@@ -15,6 +17,7 @@ public class MarkChatRoomReadUseCase {
 
     private final ChatRoomMemberService chatRoomMemberService;
     private final ChatMessageService chatMessageService;
+    private final SimpMessagingTemplate messagingTemplate;
 
     /**
      * 채팅방 읽음 처리
@@ -31,6 +34,12 @@ public void execute(String chatRoomNo, String userNo) {
                 : member.getJoinedAt();
 
         chatMessageService.decreaseUnreadCount(chatRoomNo, fromTime, userNo);
-        chatRoomMemberService.updateLastReadAt(member, LocalDateTime.now());
+        LocalDateTime readAt = LocalDateTime.now();
+        chatRoomMemberService.updateLastReadAt(member, readAt);
+
+        messagingTemplate.convertAndSend(
+                "/topic/chat-room/" + chatRoomNo + "/read",
+                new ChatReadReceiptResponse(chatRoomNo, userNo, readAt)
+        );
     }
 }
diff --git a/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/SendGroupChatMessageUseCase.java b/src/main/java/com/project/dorumdorum/domain/chat/application/usecase/SendGroupChatMessageUseCase.java
@@ -71,7 +71,8 @@ public void send(String chatRoomNo, String senderNo, String content) {
                 senderNickname,
                 content,
                 MessageType.TEXT.name(),
-                message.getCreatedAt()
+                message.getCreatedAt(),
+                message.getUnreadCount()
         );
         messagingTemplate.convertAndSend("/topic/chat-room/" + chatRoomNo, response);
 
diff --git a/src/main/java/com/project/dorumdorum/domain/roommate/domain/service/RoommateService.java b/src/main/java/com/project/dorumdorum/domain/roommate/domain/service/RoommateService.java
@@ -67,6 +67,7 @@ public void leaveRoom(String userNo, String roomNo) {
         Roommate roommate = roommateRepository.findByUserNoAndRoomNo(userNo, roomNo)
                 .orElseThrow(() -> new RestApiException(_NOT_FOUND));
         roommateRepository.delete(roommate);
+        roommateRepository.flush();
     }
 
     public List<MyRoommateResponse> findMyRoommates(String userNo) {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -1,4 +1,7 @@
 spring:
+  devtools:
+    restart:
+      enabled: false
   datasource:
     username: ${RDB_USERNAME:postgres}
     url: ${RDB_URL:jdbc:postgresql://localhost:5432/dorumdorum}
diff --git a/src/test/java/com/project/dorumdorum/domain/chat/integration/ChatRoomSchemaInitializationTest.java b/src/test/java/com/project/dorumdorum/domain/chat/integration/ChatRoomSchemaInitializationTest.java
@@ -2,6 +2,9 @@
 
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.messaging.FirebaseMessaging;
+import com.project.dorumdorum.testsupport.TestcontainersSupport;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +22,14 @@
 @DisplayName("ChatRoom schema 초기화 테스트")
 class ChatRoomSchemaInitializationTest {
 
+    @BeforeAll
+    static void requireDocker() {
+        Assumptions.assumeTrue(
+                TestcontainersSupport.requireDockerOrSkip("ChatRoomSchemaInitializationTest"),
+                "Docker is required for ChatRoomSchemaInitializationTest"
+        );
+    }
+
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
diff --git a/src/test/java/com/project/dorumdorum/domain/chat/integration/ChatTransactionAtomicityIntegrationTest.java b/src/test/java/com/project/dorumdorum/domain/chat/integration/ChatTransactionAtomicityIntegrationTest.java
@@ -19,18 +19,21 @@
 import com.project.dorumdorum.domain.user.domain.entity.Role;
 import com.project.dorumdorum.domain.user.domain.entity.User;
 import com.project.dorumdorum.domain.user.domain.service.UserService;
+import com.project.dorumdorum.testsupport.TestcontainersSupport;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.messaging.FirebaseMessaging;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ActiveProfiles;
 
 import java.time.LocalDateTime;
@@ -64,9 +67,17 @@
 @DisplayName("채팅 트랜잭션 원자성 통합 테스트 (BEFORE_COMMIT)")
 class ChatTransactionAtomicityIntegrationTest {
 
+    @BeforeAll
+    static void requireDocker() {
+        Assumptions.assumeTrue(
+                TestcontainersSupport.requireDockerOrSkip("ChatTransactionAtomicityIntegrationTest"),
+                "Docker is required for ChatTransactionAtomicityIntegrationTest"
+        );
+    }
+
     // ─── Firebase 목 (FileInputStream 오류 방지 — 테스트에서 FCM 사용 안 함) ──
-    @MockBean @SuppressWarnings("unused") private FirebaseApp firebaseApp;
-    @MockBean @SuppressWarnings("unused") private FirebaseMessaging firebaseMessaging;
+    @MockitoBean @SuppressWarnings("unused") private FirebaseApp firebaseApp;
+    @MockitoBean @SuppressWarnings("unused") private FirebaseMessaging firebaseMessaging;
 
     // ─── UseCase ──────────────────────────────────────────────────────────────
     @Autowired private KickRoommateUseCase kickRoommateUseCase;
@@ -78,12 +89,12 @@ class ChatTransactionAtomicityIntegrationTest {
     @Autowired private ChatRoomMemberRepository chatRoomMemberRepository;
 
     // ─── External Services (Mocking to isolate behavior) ─────────────────────
-    @MockBean private SimpMessagingTemplate messagingTemplate;
+    @MockitoBean private SimpMessagingTemplate messagingTemplate;
 
     // ─── SpyBean (특정 메서드만 실패 강제 또는 외부 의존 우회) ─────────────
-    @SpyBean private ChatRoomMemberService chatRoomMemberService;
-    @SpyBean private UserService userService;
-    @SpyBean private ChatMessageService chatMessageService;
+    @MockitoSpyBean private ChatRoomMemberService chatRoomMemberService;
+    @MockitoSpyBean private UserService userService;
+    @MockitoSpyBean private ChatMessageService chatMessageService;
 
     // ─── 테스트 픽스처 ────────────────────────────────────────────────────────
     private Room room;
diff --git a/src/test/java/com/project/dorumdorum/domain/chat/unit/usecase/LeaveChatRoomUseCaseTest.java b/src/test/java/com/project/dorumdorum/domain/chat/unit/usecase/LeaveChatRoomUseCaseTest.java
diff --git a/src/test/java/com/project/dorumdorum/domain/chat/unit/usecase/MarkChatRoomReadUseCaseTest.java b/src/test/java/com/project/dorumdorum/domain/chat/unit/usecase/MarkChatRoomReadUseCaseTest.java
diff --git a/src/test/java/com/project/dorumdorum/domain/chat/unit/usecase/RoommateKickedEventListenerTest.java b/src/test/java/com/project/dorumdorum/domain/chat/unit/usecase/RoommateKickedEventListenerTest.java
diff --git a/src/test/java/com/project/dorumdorum/testsupport/TestcontainersSupport.java b/src/test/java/com/project/dorumdorum/testsupport/TestcontainersSupport.java

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void handle(RoommateAcceptedEvent event) {`
`68`	`68`	`ChatMessage message = chatMessageService.save(chatRoom, "SYSTEM", content, MessageType.SYSTEM, 0);`
`69`	`69`	`ChatMessageResponse response = new ChatMessageResponse(`
`70`	`70`	`message.getMessageNo(), chatRoom.getChatRoomNo(),`
`71`		`- "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt());`
	`71`	`+ "SYSTEM", null, content, MessageType.SYSTEM.name(), message.getCreatedAt(), message.getUnreadCount());`
`72`	`72`	`broadcastSafely(chatRoom, response);`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ public void leaveRoom(String userNo, String roomNo) {`
`67`	`67`	`Roommate roommate = roommateRepository.findByUserNoAndRoomNo(userNo, roomNo)`
`68`	`68`	`.orElseThrow(() -> new RestApiException(_NOT_FOUND));`
`69`	`69`	`roommateRepository.delete(roommate);`
	`70`	`+ roommateRepository.flush();`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`public List<MyRoommateResponse> findMyRoommates(String userNo) {`