fix(im): 修复历史退群群未读和成员加载问题

- 已读上报使用会话末条消息编号兜底 - 历史退群群不再请求群成员列表 - 群聊 read 放开当前成员校验，保留可见性校验 - Vben 群详情补齐 joinStatus - 补充退群群已读边界测试

fix(im): 修复历史退群群未读和成员加载问题
- 已读上报使用会话末条消息编号兜底 - 历史退群群不再请求群成员列表 - 群聊 read 放开当前成员校验，保留可见性校验 - Vben 群详情补齐 joinStatus - 补充退群群已读边界测试
YunaiV
1 parent 4f9dc0e4
Showing 2 changed files with 37 additions and 23 deletions
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImpl.java
yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/message/ImGroupMessageServiceImplTest.java
@@ -262,9 +262,7 @@ public class ImGroupMessageServiceImpl implements ImGroupMessageService {
             throw exception(MESSAGE_GROUP_READ_DISABLED);
         }
         Assert.notNull(messageId, "已读消息编号不能为空");
-        // 1.1 校验用户在群中（权限校验）
-        groupMemberService.validateMemberInGroup(groupId, userId);
-        // 1.2 校验消息属于当前群，且对当前用户可见（按快照）
+        // 1. 校验消息属于当前群，且对当前用户可见（按快照）
         ImGroupMessageDO message = groupMessageMapper.selectById(messageId);
         if (message == null
                 || ObjUtil.notEqual(message.getGroupId(), groupId)
@@ -460,15 +460,17 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
     // ========== 群已读测试 ==========
     @Test
-    public void testReadMessages_notInGroup() {
-        // 准备：当前用户不在群中
-        when(groupMemberService.validateMemberInGroup(10L, 1L))
-                .thenThrow(new ServiceException(GROUP_MEMBER_NOT_IN_GROUP.getCode(), GROUP_MEMBER_NOT_IN_GROUP.getMsg()));
+    public void testReadMessages_messageInvisible() {
+        // 准备：消息不在用户接收快照内
+        when(groupMessageMapper.selectById(100L)).thenReturn(ImGroupMessageDO.builder()
+                .id(100L).groupId(10L).senderId(2L).receiverUserIds(List.of(2L))
+                .sendTime(LocalDateTime.now()).build());
-        // 调用并断言：越权校验
+        // 调用并断言
         ServiceException exception = assertThrows(ServiceException.class,
                 () -> groupMessageService.readGroupMessages(1L, 10L, 100L));
-        assertEquals(GROUP_MEMBER_NOT_IN_GROUP.getCode(), exception.getCode());
+        assertEquals(MESSAGE_NOT_IN_GROUP.getCode(), exception.getCode());
+        verify(conversationReadService, never()).updateConversationReadPosition(anyLong(), anyInt(), anyLong(), anyLong());
     }
     @Test
@@ -636,11 +638,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
             springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImGroupMessageServiceImpl.class)))
                     .thenReturn(groupMessageService);
-            // 准备：用户在群；已读位置从 5 前进到 100
-            ImGroupMemberDO member = ImGroupMemberDO.builder()
-                    .groupId(10L).userId(1L)
-                    .status(CommonStatusEnum.ENABLE.getStatus()).build();
-            when(groupMemberService.validateMemberInGroup(10L, 1L)).thenReturn(member);
+            // 准备：消息对用户可见；已读位置从 5 前进到 100
             when(groupMessageMapper.selectById(100L)).thenReturn(ImGroupMessageDO.builder()
                     .id(100L).groupId(10L).senderId(2L).receiverUserIds(List.of(1L))
                     .sendTime(LocalDateTime.now()).build());
@@ -657,6 +655,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
             // 断言：已读位置更新 + READ 事件
             verify(conversationReadService).updateConversationReadPosition(1L, ImConversationTypeEnum.GROUP.getType(), 10L, 100L);
             verify(imWebSocketService).sendNotificationAsync(eq(1L), anyInt(), anyInt(), any());
+            verify(groupMemberService, never()).validateMemberInGroup(10L, 1L);
         }
     }
@@ -715,10 +714,6 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
     @Test
     public void testReadGroupMessages_cursorAlreadyAhead() {
         // 准备：已读游标已 >= 目标，直接返回
-        ImGroupMemberDO member = ImGroupMemberDO.builder()
-                .groupId(10L).userId(1L)
-                .status(CommonStatusEnum.ENABLE.getStatus()).build();
-        when(groupMemberService.validateMemberInGroup(10L, 1L)).thenReturn(member);
         when(groupMessageMapper.selectById(100L)).thenReturn(ImGroupMessageDO.builder()
                 .id(100L).groupId(10L).senderId(2L).receiverUserIds(List.of(1L))
                 .sendTime(LocalDateTime.now()).build());
@@ -738,11 +733,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
     @Test
     public void testReadGroupMessages_messageNotInGroup() {
-        // 准备：用户在群，但 messageId 属于其它群
-        ImGroupMemberDO member = ImGroupMemberDO.builder()
-                .groupId(10L).userId(1L)
-                .status(CommonStatusEnum.ENABLE.getStatus()).build();
-        when(groupMemberService.validateMemberInGroup(10L, 1L)).thenReturn(member);
+        // 准备：messageId 属于其它群
         when(groupMessageMapper.selectById(100L)).thenReturn(ImGroupMessageDO.builder()
                 .id(100L).groupId(20L).senderId(2L).sendTime(LocalDateTime.now()).build());
@@ -753,6 +744,31 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
         verify(conversationReadService, never()).updateConversationReadPosition(anyLong(), anyInt(), anyLong(), anyLong());
     }
+    @Test
+    public void testReadGroupMessages_quitMemberVisibleMessage_success() {
+        try (MockedStatic<SpringUtil> springUtilMockedStatic = mockStatic(SpringUtil.class)) {
+            springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImGroupMessageServiceImpl.class)))
+                    .thenReturn(groupMessageService);
+
+            // 准备：历史消息的接收快照包含用户
+            when(groupMessageMapper.selectById(100L)).thenReturn(ImGroupMessageDO.builder()
+                    .id(100L).groupId(10L).senderId(2L).receiverUserIds(List.of(1L, 2L))
+                    .sendTime(LocalDateTime.now().minusMinutes(1)).build());
+            when(conversationReadService.getConversationReadMessageId(1L, ImConversationTypeEnum.GROUP.getType(), 10L))
+                    .thenReturn(0L);
+            when(conversationReadService.updateConversationReadPosition(1L, ImConversationTypeEnum.GROUP.getType(), 10L, 100L))
+                    .thenReturn(true);
+            when(groupMessageMapper.selectListByGroupIdAndPendingReceipt(10L, 0L, 100L)).thenReturn(List.of());
+
+            // 调用
+            groupMessageService.readGroupMessages(1L, 10L, 100L);
+
+            // 断言：不校验当前在群，直接推进已读位置
+            verify(groupMemberService, never()).validateMemberInGroup(10L, 1L);
+            verify(conversationReadService).updateConversationReadPosition(1L, ImConversationTypeEnum.GROUP.getType(), 10L, 100L);
+        }
+    }
+
     // ========== 回执：DONE 状态迁移 ==========
     @Test