test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(用例管理): 修复用例管理评论返回的用户信息中有重复数据问题 

--bug=1037064 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001037064
This commit is contained in:
guoyuqi 2024-03-14 09:32:07 +08:00 committed by 刘瑞斌
parent 5881ebda78
commit cb5ba5992b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseCommentService.java
View File

@ -268,7 +268,7 @@ public class FunctionalCaseCommentService {
List<String> notifiers = Arrays.asList(functionalCaseComment.getNotifier().split(";"));
notifiers.forEach(t-> commentUserInfos.add(userMap.get(t)));
}
functionalCaseCommentDTO.setCommentUserInfos(commentUserInfos);
functionalCaseCommentDTO.setCommentUserInfos(commentUserInfos.stream().distinct().toList());
list.add(functionalCaseCommentDTO);
}

13
backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseCommentControllerTests.java
View File

@ -373,14 +373,14 @@ public class FunctionalCaseCommentControllerTests {
FunctionalCaseComment functionalCaseComment1 = getFunctionalCaseComment();
FunctionalCaseCommentRequest functionalCaseCommentRequest = new FunctionalCaseCommentRequest();
functionalCaseCommentRequest.setCaseId("xiaomeinvGTest");
functionalCaseCommentRequest.setNotifier("default-project-member-user-guo;default-project-member-user-guo-4;");
functionalCaseCommentRequest.setNotifier("default-project-member-user-guo;default-project-member-user-guo;default-project-member-user-guo-4;");
functionalCaseCommentRequest.setContent("评论你好哇");
functionalCaseCommentRequest.setEvent(NoticeConstants.Event.AT);
functionalCaseCommentRequest.setReplyUser("default-project-member-user-guo");
functionalCaseCommentRequest.setParentId(functionalCaseComment1.getId());
FunctionalCaseComment functionalCaseComment = getFunctionalCaseComment(functionalCaseCommentRequest,SAVE_URL);
Assertions.assertTrue(StringUtils.equals(functionalCaseComment.getCaseId(), "xiaomeinvGTest"));
Assertions.assertTrue(StringUtils.equals(functionalCaseComment.getNotifier(), "default-project-member-user-guo;default-project-member-user-guo-4;"));
Assertions.assertTrue(StringUtils.equals(functionalCaseComment.getNotifier(), "default-project-member-user-guo;default-project-member-user-guo;default-project-member-user-guo-4;"));
Assertions.assertTrue(StringUtils.equals(functionalCaseComment.getContent(), "评论你好哇"));
Assertions.assertTrue(StringUtils.isBlank(functionalCaseComment.getReplyUser()));
@ -399,6 +399,12 @@ public class FunctionalCaseCommentControllerTests {
ResultHolder resultHolder = JSON.parseObject(contentAsString, ResultHolder.class);
List<FunctionalCaseCommentDTO> list = JSON.parseArray(JSON.toJSONString(resultHolder.getData()), FunctionalCaseCommentDTO.class);
Assertions.assertTrue(CollectionUtils.isNotEmpty(list));
for (FunctionalCaseCommentDTO functionalCaseCommentDTO : list) {
if (StringUtils.equals("default-project-member-user-guo;default-project-member-user-guo;default-project-member-user-guo-4;", functionalCaseCommentDTO.getNotifier())) {
Assertions.assertEquals(2, functionalCaseCommentDTO.getCommentUserInfos().size());
break;
}
}
mvcResult = mockMvc.perform(MockMvcRequestBuilders.get(GET_URL + "xiaomeinvGTestTwo").header(SessionConstants.HEADER_TOKEN, sessionId)
.header(SessionConstants.CSRF_TOKEN, csrfToken)
.header(SessionConstants.CURRENT_PROJECT, projectId)
@ -427,9 +433,8 @@ public class FunctionalCaseCommentControllerTests {
@Order(19)
public void deleteCommentSuccess() throws Exception {
FunctionalCaseCommentExample functionalCaseCommentExample = new FunctionalCaseCommentExample();
functionalCaseCommentExample.createCriteria().andCaseIdEqualTo("xiaomeinvGTest").andNotifierEqualTo("default-project-member-user-guo;default-project-member-user-guo-4;");
functionalCaseCommentExample.createCriteria().andCaseIdEqualTo("xiaomeinvGTest").andNotifierEqualTo("default-project-member-user-guo;default-project-member-user-guo;default-project-member-user-guo-4;");
List<FunctionalCaseComment> functionalCaseComments = functionalCaseCommentMapper.selectByExample(functionalCaseCommentExample);
System.out.println(JSON.toJSONString(functionalCaseComments));
String id = functionalCaseComments.get(0).getId();
Assertions.assertFalse(functionalCaseComments.isEmpty());
delFunctionalCaseComment(id);