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

refactor(测试计划): 优化规划脑图临时节点的保存 

--bug=1044404 --user=宋昌昌 【测试计划】测试规划中新增接口和场景的测试集-关联功能用例时开启同步关联接口和场景时，测试集未更新 https://www.tapd.cn/55049933/s/1563934
This commit is contained in:
song-cc-rock 2024-08-16 11:12:14 +08:00 committed by Craftsman
parent 126d693caf
commit 5fe953a8d7
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanCollectionMinderEditDTO.java
View File

@ -21,6 +21,9 @@ public class TestPlanCollectionMinderEditDTO implements Serializable {
@Schema(description = "节点ID(新增的时候前端传UUid，更新的时候必填)") @Schema(description = "节点ID(新增的时候前端传UUid，更新的时候必填)")
private String id; private String id;
@Schema(description = "是否临时节点 {新增节点时, 传入true}")
private Boolean tempCollectionNode = false;
@Schema(description = "节点名称") @Schema(description = "节点名称")
@NotBlank(message = "{test_plan_collection.name.not_blank}") @NotBlank(message = "{test_plan_collection.name.not_blank}")
private String text; private String text;

49
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanCollectionMinderService.java
View File

@ -1,5 +1,6 @@
package io.metersphere.plan.service; package io.metersphere.plan.service;
import com.google.common.collect.Maps;
import io.metersphere.plan.domain.*; import io.metersphere.plan.domain.*;
import io.metersphere.plan.dto.*; import io.metersphere.plan.dto.*;
import io.metersphere.plan.dto.request.BaseCollectionAssociateRequest; import io.metersphere.plan.dto.request.BaseCollectionAssociateRequest;
@ -298,10 +299,12 @@ public class TestPlanCollectionMinderService {
Map<String, List<TestPlanCollection>> parentMap = getParentMap(request); Map<String, List<TestPlanCollection>> parentMap = getParentMap(request);
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
TestPlanCollectionMapper collectionMapper = sqlSession.getMapper(TestPlanCollectionMapper.class); TestPlanCollectionMapper collectionMapper = sqlSession.getMapper(TestPlanCollectionMapper.class);
// 临时的节点
Map<String, String> tempCollectionMap = Maps.newHashMapWithExpectedSize(8);
//新增 //新增
Map<String, List<String>> addTypeNameMap = dealAddList(request, userId, associateMap, parentMap, collectionMapper); Map<String, List<String>> addTypeNameMap = dealAddList(request, userId, associateMap, parentMap, collectionMapper, tempCollectionMap);
//更新 //更新
Map<String, List<String>> updateTypeNameMap = dealUpdateList(request, userId, associateMap, parentMap, collectionMapper); Map<String, List<String>> updateTypeNameMap = dealUpdateList(request, userId, associateMap, parentMap, collectionMapper, tempCollectionMap);
//检查同一类型名称重复 //检查同一类型名称重复
checkNameRepeat(updateTypeNameMap, addTypeNameMap); checkNameRepeat(updateTypeNameMap, addTypeNameMap);
sqlSession.flushStatements(); sqlSession.flushStatements();
@ -321,8 +324,9 @@ public class TestPlanCollectionMinderService {
}); });
} }
private Map<String, List<String>> dealUpdateList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap, Map<String, List<TestPlanCollection>> parentMap, TestPlanCollectionMapper collectionMapper) { private Map<String, List<String>> dealUpdateList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap,
List<TestPlanCollectionMinderEditDTO> updateList = request.getEditList().stream().filter(t -> StringUtils.isNotBlank(t.getId())).toList(); Map<String, List<TestPlanCollection>> parentMap, TestPlanCollectionMapper collectionMapper, Map<String, String> tempCollectionMap) {
List<TestPlanCollectionMinderEditDTO> updateList = request.getEditList().stream().filter(t -> !t.getTempCollectionNode() && StringUtils.isNotBlank(t.getId())).toList();
Map<String, List<String>> typeNamesMap = new HashMap<>(); Map<String, List<String>> typeNamesMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(updateList)) { if (CollectionUtils.isNotEmpty(updateList)) {
//处理删除 //处理删除
@ -331,7 +335,7 @@ public class TestPlanCollectionMinderService {
for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : updateList) { for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : updateList) {
TestPlanCollection testPlanCollection = updateCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper); TestPlanCollection testPlanCollection = updateCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper);
checkChangeDataRepeat(typeNamesMap, testPlanCollectionMinderEditDTO); checkChangeDataRepeat(typeNamesMap, testPlanCollectionMinderEditDTO);
setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection); setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection, tempCollectionMap);
} }
} }
return typeNamesMap; return typeNamesMap;
@ -348,14 +352,17 @@ public class TestPlanCollectionMinderService {
} }
} }
private Map<String, List<String>> dealAddList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap, Map<String, List<TestPlanCollection>> parentMap, TestPlanCollectionMapper collectionMapper) { private Map<String, List<String>> dealAddList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap,
Map<String, List<TestPlanCollection>> parentMap, TestPlanCollectionMapper collectionMapper, Map<String, String> tempCollectionMap) {
Map<String, List<String>> typeNamesMap = new HashMap<>(); Map<String, List<String>> typeNamesMap = new HashMap<>();
List<TestPlanCollectionMinderEditDTO> addList = request.getEditList().stream().filter(t -> StringUtils.isBlank(t.getId()) && t.getLevel() == 2).toList(); List<TestPlanCollectionMinderEditDTO> addList = request.getEditList().stream().filter(t -> t.getTempCollectionNode() && t.getLevel() == 2).collect(Collectors.toList());
// 接口/场景 可能存在临时节点, 排序后先入库处理
Collections.reverse(addList);
if (CollectionUtils.isNotEmpty(addList)) { if (CollectionUtils.isNotEmpty(addList)) {
for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : addList) { for (TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO : addList) {
TestPlanCollection testPlanCollection = addCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper); TestPlanCollection testPlanCollection = addCollection(request, userId, testPlanCollectionMinderEditDTO, parentMap, collectionMapper, tempCollectionMap);
checkChangeDataRepeat(typeNamesMap, testPlanCollectionMinderEditDTO); checkChangeDataRepeat(typeNamesMap, testPlanCollectionMinderEditDTO);
setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection); setAssociateMap(testPlanCollectionMinderEditDTO, associateMap, testPlanCollection, tempCollectionMap);
} }
} }
return typeNamesMap; return typeNamesMap;
@ -423,7 +430,8 @@ public class TestPlanCollectionMinderService {
} }
@NotNull @NotNull
private static TestPlanCollection addCollection(TestPlanCollectionMinderEditRequest request, String userId, TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO, Map<String, List<TestPlanCollection>> parentMap, TestPlanCollectionMapper collectionMapper) { private static TestPlanCollection addCollection(TestPlanCollectionMinderEditRequest request, String userId, TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO,
Map<String, List<TestPlanCollection>> parentMap, TestPlanCollectionMapper collectionMapper, Map<String, String> tempCollectionMap) {
List<TestPlanCollection> testPlanCollections = parentMap.get(testPlanCollectionMinderEditDTO.getType()); List<TestPlanCollection> testPlanCollections = parentMap.get(testPlanCollectionMinderEditDTO.getType());
TestPlanCollection parent = testPlanCollections.getFirst(); TestPlanCollection parent = testPlanCollections.getFirst();
TestPlanCollection testPlanCollection = new TestPlanCollection(); TestPlanCollection testPlanCollection = new TestPlanCollection();
@ -443,10 +451,15 @@ public class TestPlanCollectionMinderService {
testPlanCollection.setCreateTime(System.currentTimeMillis()); testPlanCollection.setCreateTime(System.currentTimeMillis());
testPlanCollection.setPos((testPlanCollectionMinderEditDTO.getNum() + 1) * 4096); testPlanCollection.setPos((testPlanCollectionMinderEditDTO.getNum() + 1) * 4096);
collectionMapper.insert(testPlanCollection); collectionMapper.insert(testPlanCollection);
// 维护新增临时节点 (接口/场景)
if (StringUtils.equalsAny(testPlanCollectionMinderEditDTO.getType(), CaseType.API_CASE.getKey(), CaseType.SCENARIO_CASE.getKey())) {
tempCollectionMap.put(testPlanCollectionMinderEditDTO.getId(), testPlanCollection.getId());
}
return testPlanCollection; return testPlanCollection;
} }
private static void setAssociateMap(TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO, Map<String, List<BaseCollectionAssociateRequest>> associateMap, TestPlanCollection testPlanCollection) { private static void setAssociateMap(TestPlanCollectionMinderEditDTO testPlanCollectionMinderEditDTO, Map<String, List<BaseCollectionAssociateRequest>> associateMap,
TestPlanCollection testPlanCollection, Map<String, String> tempCollectionMap) {
List<TestPlanCollectionAssociateDTO> associateDTOS = testPlanCollectionMinderEditDTO.getAssociateDTOS(); List<TestPlanCollectionAssociateDTO> associateDTOS = testPlanCollectionMinderEditDTO.getAssociateDTOS();
if (CollectionUtils.isEmpty(associateDTOS)) { if (CollectionUtils.isEmpty(associateDTOS)) {
return; return;
@ -456,17 +469,25 @@ public class TestPlanCollectionMinderService {
List<BaseCollectionAssociateRequest> baseCollectionAssociateRequests = associateMap.get(associateType); List<BaseCollectionAssociateRequest> baseCollectionAssociateRequests = associateMap.get(associateType);
if (baseCollectionAssociateRequests == null) { if (baseCollectionAssociateRequests == null) {
baseCollectionAssociateRequests = new ArrayList<>(); baseCollectionAssociateRequests = new ArrayList<>();
addAssociate(associateDTO, testPlanCollection, baseCollectionAssociateRequests, associateMap, associateType); addAssociate(associateDTO, testPlanCollection, baseCollectionAssociateRequests, associateMap, associateType, tempCollectionMap);
} else { } else {
addAssociate(associateDTO, testPlanCollection, baseCollectionAssociateRequests, associateMap, associateType); addAssociate(associateDTO, testPlanCollection, baseCollectionAssociateRequests, associateMap, associateType, tempCollectionMap);
} }
} }
} }
private static void addAssociate(TestPlanCollectionAssociateDTO associateDTO, TestPlanCollection testPlanCollection, List<BaseCollectionAssociateRequest> baseCollectionAssociateRequests, Map<String, List<BaseCollectionAssociateRequest>> associateMap, String associateType) { private static void addAssociate(TestPlanCollectionAssociateDTO associateDTO, TestPlanCollection testPlanCollection, List<BaseCollectionAssociateRequest> baseCollectionAssociateRequests,
Map<String, List<BaseCollectionAssociateRequest>> associateMap, String associateType, Map<String, String> tempCollectionMap) {
BaseCollectionAssociateRequest baseCollectionAssociateRequest = new BaseCollectionAssociateRequest(); BaseCollectionAssociateRequest baseCollectionAssociateRequest = new BaseCollectionAssociateRequest();
baseCollectionAssociateRequest.setCollectionId(testPlanCollection.getId()); baseCollectionAssociateRequest.setCollectionId(testPlanCollection.getId());
baseCollectionAssociateRequest.setModules(associateDTO); baseCollectionAssociateRequest.setModules(associateDTO);
// 临时 接口/场景 同步节点ID需要替换
if (tempCollectionMap.containsKey(associateDTO.getApiCaseCollectionId())) {
associateDTO.setApiCaseCollectionId(tempCollectionMap.get(associateDTO.getApiCaseCollectionId()));
}
if (tempCollectionMap.containsKey(associateDTO.getApiScenarioCollectionId())) {
associateDTO.setApiScenarioCollectionId(tempCollectionMap.get(associateDTO.getApiScenarioCollectionId()));
}
baseCollectionAssociateRequests.add(baseCollectionAssociateRequest); baseCollectionAssociateRequests.add(baseCollectionAssociateRequest);
associateMap.put(associateType, baseCollectionAssociateRequests); associateMap.put(associateType, baseCollectionAssociateRequests);
} }

4
backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanCollectionMinderControllerTests.java
View File

@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@ -157,7 +158,8 @@ public class TestPlanCollectionMinderControllerTests extends BaseTest {
editList = new ArrayList<>(); editList = new ArrayList<>();
editList.addAll(parentList); editList.addAll(parentList);
testPlanCollectionMinderEditDTO = new TestPlanCollectionMinderEditDTO(); testPlanCollectionMinderEditDTO = new TestPlanCollectionMinderEditDTO();
testPlanCollectionMinderEditDTO.setId(null); testPlanCollectionMinderEditDTO.setId(UUID.randomUUID().toString());
testPlanCollectionMinderEditDTO.setTempCollectionNode(true);
testPlanCollectionMinderEditDTO.setText("新建名称"); testPlanCollectionMinderEditDTO.setText("新建名称");
testPlanCollectionMinderEditDTO.setNum(500L); testPlanCollectionMinderEditDTO.setNum(500L);
testPlanCollectionMinderEditDTO.setLevel(2); testPlanCollectionMinderEditDTO.setLevel(2);