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

fix(测试跟踪): 缺陷关联用例统计了回收站用例 

--bug=1014485 --user=陈建星 【测试跟踪】缺陷管理页面用例数，删除后列表页和编辑页面没有同步删除 https://www.tapd.cn/55049933/s/1194698
This commit is contained in:
chenjianxing 2022-07-05 11:13:19 +08:00 committed by jianxing
parent 902e32b9ee
commit 879dcfae1a
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
View File

@ -859,6 +859,7 @@
<foreach collection="ids" item="id" separator="," open="(" close=")">
#{id}
</foreach>
and test_case.status != 'Trash'
</where>
</select>
<select id="selectRelateIdsByQuery" resultType="java.lang.String">

55
backend/src/main/java/io/metersphere/track/service/IssuesService.java
View File

@ -180,7 +180,7 @@ public class IssuesService {
issuesRequest.setWorkspaceId(project.getWorkspaceId());
issuesRequest.setProjectId(issuesWithBLOBs.getProjectId());
issuesRequest.setUserId(issuesWithBLOBs.getCreator());
if (StringUtils.equals(issuesWithBLOBs.getPlatform(),IssuesManagePlatform.Tapd.name() )) {
if (StringUtils.equals(issuesWithBLOBs.getPlatform(), IssuesManagePlatform.Tapd.name())) {
TapdPlatform tapdPlatform = (TapdPlatform) IssueFactory.createPlatform(IssuesManagePlatform.Tapd.name(), issuesRequest);
List<String> tapdUsers = tapdPlatform.getTapdUsers(issuesWithBLOBs.getProjectId(), issuesWithBLOBs.getPlatformId());
issuesWithBLOBs.setTapdUsers(tapdUsers);
@ -366,7 +366,7 @@ public class IssuesService {
}
Set<String> caseIdSet = caseSetMap.get(item.getId());
if(caseIdSet==null){
if (caseIdSet == null) {
caseIdSet = new HashSet<>();
}
item.setCaseIds(new ArrayList<>(caseIdSet));
@ -407,7 +407,7 @@ public class IssuesService {
List<TestPlan> testPlans = testPlanService.getTestPlanByIds(resourceIds);
Map<String, String> planMap = new HashMap<>();
if(testPlans!=null){
if (testPlans != null) {
planMap = testPlans.stream()
.collect(Collectors.toMap(TestPlan::getId, TestPlan::getName));
}
@ -423,26 +423,39 @@ public class IssuesService {
private Map<String, Set<String>> getCaseSetMap(List<IssuesDao> issues) {
List<String> ids = issues.stream().map(Issues::getId).collect(Collectors.toList());
Map<String,Set<String>>map = new HashMap<>();
if(ids.size()==0){
return map;
Map<String, Set<String>> map = new HashMap<>();
if (ids.size() == 0) {
return map;
}
TestCaseIssuesExample example = new TestCaseIssuesExample();
example.createCriteria().andIssuesIdIn(ids);
example.createCriteria()
.andIssuesIdIn(ids);
List<TestCaseIssues> testCaseIssues = testCaseIssuesMapper.selectByExample(example);
testCaseIssues.forEach(i -> {
Set<String> caseIdSet = new HashSet<>();
if (i.getRefType().equals(IssueRefType.PLAN_FUNCTIONAL.name())) {
caseIdSet.add(i.getRefId());
} else {
caseIdSet.add(i.getResourceId());
}
if(map.get(i.getIssuesId())!=null){
map.get(i.getIssuesId()).addAll(caseIdSet);
}else{
map.put(i.getIssuesId(),caseIdSet);
}
});
List<String> caseIds = testCaseIssues.stream().map(x ->
x.getRefType().equals(IssueRefType.PLAN_FUNCTIONAL.name()) ? x.getRefId() : x.getResourceId())
.collect(Collectors.toList());
List<TestCaseDTO> notInTrashCase = testCaseService.getTestCaseByIds(caseIds);
if (CollectionUtils.isNotEmpty(notInTrashCase)) {
Set<String> notInTrashCaseSet = notInTrashCase.stream()
.map(TestCaseDTO::getId)
.collect(Collectors.toSet());
testCaseIssues.forEach(i -> {
Set<String> caseIdSet = new HashSet<>();
String caseId = i.getRefType().equals(IssueRefType.PLAN_FUNCTIONAL.name()) ? i.getRefId() : i.getResourceId();
if (notInTrashCaseSet.contains(caseId)) {
caseIdSet.add(caseId);
}
if (map.get(i.getIssuesId()) != null) {
map.get(i.getIssuesId()).addAll(caseIdSet);
} else {
map.put(i.getIssuesId(), caseIdSet);
}
});
}
return map;
}
@ -802,7 +815,7 @@ public class IssuesService {
return platform.getDemandList(projectId);
}
public List<IssuesDao> listByWorkspaceId(IssuesRequest request) {
public List<IssuesDao> listByWorkspaceId(IssuesRequest request) {
request.setOrders(ServiceUtils.getDefaultOrderByField(request.getOrders(), "create_time"));
return extIssuesMapper.getIssues(request);
}