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

fix(测试跟踪): 修改用例的评审人之后，该评审人的评论任然影响评审结果

This commit is contained in:
chenjianxing 2023-02-14 14:55:37 +08:00 committed by jianxing
parent 137e267d2d
commit 7406042bb8
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-track/backend/src/main/java/io/metersphere/service/TestCaseReviewService.java
View File

@ -291,9 +291,9 @@ public class TestCaseReviewService {
editCaseRevieweFollow(testCaseReview); editCaseRevieweFollow(testCaseReview);
testCaseReview.setUpdateTime(System.currentTimeMillis()); testCaseReview.setUpdateTime(System.currentTimeMillis());
checkCaseReviewExist(testCaseReview); checkCaseReviewExist(testCaseReview);
TestCaseReview originReview = testCaseReviewMapper.selectByPrimaryKey(testCaseReview.getId());
testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview); testCaseReviewMapper.updateByPrimaryKeySelective(testCaseReview);
TestCaseReview originReview = testCaseReviewMapper.selectByPrimaryKey(testCaseReview.getId());
if (!StringUtils.equals(testCaseReview.getReviewPassRule(), originReview.getReviewPassRule())) { if (!StringUtils.equals(testCaseReview.getReviewPassRule(), originReview.getReviewPassRule())) {
// 如果通过标准发生变化，则重新计算用例的状态 // 如果通过标准发生变化，则重新计算用例的状态
testReviewTestCaseService.handlePassRuleChange(originReview.getReviewPassRule(), testCaseReview); testReviewTestCaseService.handlePassRuleChange(originReview.getReviewPassRule(), testCaseReview);

30
test-track/backend/src/main/java/io/metersphere/service/TestReviewTestCaseService.java
View File

@ -233,14 +233,15 @@ public class TestReviewTestCaseService {
String reviewPassRule = testCaseReviewService.getTestReview(testCaseReviewTestCase.getReviewId()) String reviewPassRule = testCaseReviewService.getTestReview(testCaseReviewTestCase.getReviewId())
.getReviewPassRule(); .getReviewPassRule();
List<String> users = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId());
Set<String> reviewerSet = users.stream().collect(Collectors.toSet());
comments = filterAgainComments(comments); comments = filterAgainComments(comments);
comments = distinctUserComment(comments); comments = distinctUserComment(comments, reviewerSet);
Map<String, String> userCommentMap = comments.stream() Map<String, String> userCommentMap = comments.stream()
.filter(item -> StringUtils.equalsAny(item.getStatus(), TestCaseReviewCommentStatus.Pass.name(), TestCaseReviewCommentStatus.UnPass.name())) .filter(item -> StringUtils.equalsAny(item.getStatus(), TestCaseReviewCommentStatus.Pass.name(), TestCaseReviewCommentStatus.UnPass.name()))
.collect(Collectors.toMap(TestCaseComment::getAuthor, TestCaseComment::getStatus)); .collect(Collectors.toMap(TestCaseComment::getAuthor, TestCaseComment::getStatus));
List<String> users = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId());
users = users.stream() users = users.stream()
.distinct() .distinct()
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -273,7 +274,11 @@ public class TestReviewTestCaseService {
String originStatus = originReviewTestCase.getStatus(); String originStatus = originReviewTestCase.getStatus();
String status = originStatus; String status = originStatus;
comments = distinctUserComment(comments); List<String> reviewers = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId());
Set<String> reviewerSet = reviewers.stream().collect(Collectors.toSet());
comments = distinctUserComment(comments, reviewerSet);
List<TestCaseCommentDTO> passComments = comments.stream() List<TestCaseCommentDTO> passComments = comments.stream()
.filter(comment -> StringUtils.equals(comment.getStatus(), TestCaseReviewCommentStatus.Pass.name())) .filter(comment -> StringUtils.equals(comment.getStatus(), TestCaseReviewCommentStatus.Pass.name()))
@ -283,7 +288,6 @@ public class TestReviewTestCaseService {
.filter(comment -> StringUtils.equals(comment.getStatus(), TestCaseReviewCommentStatus.UnPass.name())) .filter(comment -> StringUtils.equals(comment.getStatus(), TestCaseReviewCommentStatus.UnPass.name()))
.collect(Collectors.toList()); .collect(Collectors.toList());
List<String> users = testCaseReviewTestCaseUsersService.getUsersByCaseId(testCaseReviewTestCase.getCaseId());
if (StringUtils.equals(TestCaseReviewPassRule.ALL.name(), reviewPassRule)) { if (StringUtils.equals(TestCaseReviewPassRule.ALL.name(), reviewPassRule)) {
// 全部通过 // 全部通过
@ -292,9 +296,9 @@ public class TestReviewTestCaseService {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
// 评审人是否都通过了 // 评审人是否都通过了
if (users.stream() if (reviewers.stream()
.filter(user -> passUsers.contains(user)) .filter(user -> passUsers.contains(user))
.collect(Collectors.toList()).size() == users.size()) { .collect(Collectors.toList()).size() == reviewers.size()) {
// 如果所有人都通过了，则通过 // 如果所有人都通过了，则通过
status = TestCaseReviewCommentStatus.Pass.name(); status = TestCaseReviewCommentStatus.Pass.name();
} else { } else {
@ -346,11 +350,13 @@ public class TestReviewTestCaseService {
/** /**
* 只保留每个用户的最后一条有效评论 * 只保留每个用户的最后一条有效评论
* @param comments * @param comments
* @param reviewerSet
* @return * @return
*/ */
private List<TestCaseCommentDTO> distinctUserComment(List<TestCaseCommentDTO> comments) { private List<TestCaseCommentDTO> distinctUserComment(List<TestCaseCommentDTO> comments, Set<String> reviewerSet) {
// 只保留每个用户的最后一条有效评论 // 只保留每个用户的最后一条有效评论
Set<String> userSet = new HashSet<>(); Set<String> userSet = new HashSet<>();
comments = comments.stream().filter(item -> { comments = comments.stream().filter(item -> {
if (StringUtils.isBlank(item.getStatus()) || // 过滤没有状态的评论 if (StringUtils.isBlank(item.getStatus()) || // 过滤没有状态的评论
StringUtils.equalsAny(item.getStatus(), TestCaseReviewCommentStatus.RuleChange.name(), StringUtils.equalsAny(item.getStatus(), TestCaseReviewCommentStatus.RuleChange.name(),
@ -358,8 +364,12 @@ public class TestReviewTestCaseService {
userSet.contains(item.getAuthor())) { // 保留最新的一条评论 userSet.contains(item.getAuthor())) { // 保留最新的一条评论
return false; return false;
} }
userSet.add(item.getAuthor()); // 必须是评审人
return true; if (reviewerSet.contains(item.getAuthor())) {
userSet.add(item.getAuthor());
return true;
}
return false;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return comments; return comments;
} }