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

fix(测试计划): 脑图关联用例重复问题 

--bug=1046647 --user=王旭 【测试计划】-脑图执行时，可以为用例重复关联相同的缺陷 https://www.tapd.cn/55049933/s/1584592
This commit is contained in:
WangXu10 2024-09-24 14:27:29 +08:00 committed by Craftsman
parent b54e2d4660
commit 14a6ec47b1
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanResourceService.java
View File

@ -164,6 +164,7 @@ public abstract class TestPlanResourceService extends TestPlanSortService {
/** /**
* 获取待关联的缺陷列表 * 获取待关联的缺陷列表
*
* @param request 请求参数 * @param request 请求参数
* @return 缺陷列表 * @return 缺陷列表
*/ */
@ -173,13 +174,16 @@ public abstract class TestPlanResourceService extends TestPlanSortService {
/** /**
* 用例关联缺陷(单条用例) * 用例关联缺陷(单条用例)
*
* @param request 请求参数 * @param request 请求参数
* @param userId 用户ID * @param userId 用户ID
* @param caseType 用例类型 * @param caseType 用例类型
*/ */
public void associateBug(TestPlanCaseAssociateBugRequest request, String userId, String caseType) { public void associateBug(TestPlanCaseAssociateBugRequest request, String userId, String caseType) {
List<String> ids = baseAssociateBugProvider.getSelectBugs(request, false); List<String> ids = baseAssociateBugProvider.getSelectBugs(request, false);
if (org.apache.commons.collections.CollectionUtils.isNotEmpty(ids)) { if (CollectionUtils.isNotEmpty(ids)) {
List<String> bugIds = getCaseBugIds(request);
ids.removeAll(bugIds);
SubListUtils.dealForSubList(ids, 100, subList -> { SubListUtils.dealForSubList(ids, 100, subList -> {
List<BugRelationCase> list = new ArrayList<>(); List<BugRelationCase> list = new ArrayList<>();
subList.forEach(id -> { subList.forEach(id -> {
@ -201,8 +205,17 @@ public abstract class TestPlanResourceService extends TestPlanSortService {
} }
} }
private List<String> getCaseBugIds(TestPlanCaseAssociateBugRequest request) {
BugRelationCaseExample example = new BugRelationCaseExample();
example.createCriteria().andTestPlanCaseIdEqualTo(request.getTestPlanCaseId()).andCaseIdEqualTo(request.getCaseId()).andTestPlanIdEqualTo(request.getTestPlanId());
List<BugRelationCase> bugRelationCases = bugRelationCaseMapper.selectByExample(example);
return bugRelationCases.stream().map(BugRelationCase::getBugId).toList();
}
/** /**
* 取消关联缺陷 * 取消关联缺陷
*
* @param id 关系ID * @param id 关系ID
*/ */
public void disassociateBug(String id) { public void disassociateBug(String id) {
@ -211,6 +224,7 @@ public abstract class TestPlanResourceService extends TestPlanSortService {
/** /**
* 取消关联缺陷日志 * 取消关联缺陷日志
*
* @param id 关系ID * @param id 关系ID
* @return 日志 * @return 日志
*/ */
@ -236,6 +250,7 @@ public abstract class TestPlanResourceService extends TestPlanSortService {
/** /**
* 查询(计划关联)用例关联的缺陷 * 查询(计划关联)用例关联的缺陷
*
* @param ids 关联用例关系ID集合 * @param ids 关联用例关系ID集合
* @param projectId 项目ID * @param projectId 项目ID
* @return 缺陷集合 * @return 缺陷集合

2
backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanCaseControllerTests.java
View File

@ -209,6 +209,8 @@ public class TestPlanCaseControllerTests extends BaseTest {
associateBugPageRequest.setPageSize(10); associateBugPageRequest.setPageSize(10);
associateBugPageRequest.setTestPlanCaseId("relate_case_1"); associateBugPageRequest.setTestPlanCaseId("relate_case_1");
this.requestPostWithOkAndReturn("/test-plan/functional/case/has/associate/bug/page", associateBugPageRequest); this.requestPostWithOkAndReturn("/test-plan/functional/case/has/associate/bug/page", associateBugPageRequest);
ids.add("bug_5");
this.requestPostWithOkAndReturn("/test-plan/functional/case/associate/bug", request);
} }