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

fix(接口测试): 场景导入refid为空 

--user=郭雨琦
This commit is contained in:
guoyuqi 2022-07-14 15:16:42 +08:00 committed by f2c-ci-robot[bot]
parent ec618b68db
commit bb4eafd718
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -614,9 +614,14 @@ public class ApiAutomationService {
if (scenario == null) { if (scenario == null) {
return; return;
} }
ApiScenarioRequest request = new ApiScenarioRequest(); List<String> scenarioIds = new ArrayList<>();
request.setRefId(scenario.getRefId()); if (StringUtils.isNotBlank(scenario.getRefId())) {
List<String> scenarioIds = extApiScenarioMapper.selectIdsByQuery(request); ApiScenarioRequest request = new ApiScenarioRequest();
request.setRefId(scenario.getRefId());
scenarioIds = extApiScenarioMapper.selectIdsByQuery(request);
} else {
scenarioIds.add(scenario.getId());
}
//将这些场景的定时任务删除掉 //将这些场景的定时任务删除掉
scenarioIds.forEach(scenarioId -> scheduleService.deleteByResourceId(scenarioId, ScheduleGroup.API_SCENARIO_TEST.name())); scenarioIds.forEach(scenarioId -> scheduleService.deleteByResourceId(scenarioId, ScheduleGroup.API_SCENARIO_TEST.name()));
ApiScenarioExampleWithOperation example = new ApiScenarioExampleWithOperation(); ApiScenarioExampleWithOperation example = new ApiScenarioExampleWithOperation();
@ -1254,6 +1259,9 @@ public class ApiAutomationService {
if (scenarioWithBLOBs.getNum() == null) { if (scenarioWithBLOBs.getNum() == null) {
scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId())); scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId()));
} }
if (scenarioWithBLOBs.getRefId() == null) {
scenarioWithBLOBs.setRefId(scenarioWithBLOBs.getId());
}
batchMapper.insert(scenarioWithBLOBs); batchMapper.insert(scenarioWithBLOBs);
apiScenarioReferenceIdService.saveApiAndScenarioRelation(scenarioWithBLOBs); apiScenarioReferenceIdService.saveApiAndScenarioRelation(scenarioWithBLOBs);
extApiScenarioMapper.clearLatestVersion(scenarioWithBLOBs.getRefId()); extApiScenarioMapper.clearLatestVersion(scenarioWithBLOBs.getRefId());
@ -1284,6 +1292,9 @@ public class ApiAutomationService {
if (scenarioWithBLOBs.getNum() == null) { if (scenarioWithBLOBs.getNum() == null) {
scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId())); scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId()));
} }
if (scenarioWithBLOBs.getRefId() == null) {
scenarioWithBLOBs.setRefId(scenarioWithBLOBs.getId());
}
batchMapper.insert(scenarioWithBLOBs); batchMapper.insert(scenarioWithBLOBs);
} else { } else {
ApiScenarioWithBLOBs existScenario = scenarioOp.get(); ApiScenarioWithBLOBs existScenario = scenarioOp.get();
@ -1298,6 +1309,9 @@ public class ApiAutomationService {
if (scenarioWithBLOBs.getNum() == null) { if (scenarioWithBLOBs.getNum() == null) {
scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId())); scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId()));
} }
if (scenarioWithBLOBs.getRefId() == null) {
scenarioWithBLOBs.setRefId(scenarioWithBLOBs.getId());
}
batchMapper.updateByPrimaryKeyWithBLOBs(scenarioWithBLOBs); batchMapper.updateByPrimaryKeyWithBLOBs(scenarioWithBLOBs);
} }
checkReferenceCase(scenarioWithBLOBs, apiTestCaseMapper, apiDefinitionMapper); checkReferenceCase(scenarioWithBLOBs, apiTestCaseMapper, apiDefinitionMapper);
@ -1378,6 +1392,9 @@ public class ApiAutomationService {
if (scenarioWithBLOBs.getNum() == null) { if (scenarioWithBLOBs.getNum() == null) {
scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId())); scenarioWithBLOBs.setNum(getNextNum(scenarioWithBLOBs.getProjectId()));
} }
if (scenarioWithBLOBs.getRefId() == null) {
scenarioWithBLOBs.setRefId(scenarioWithBLOBs.getId());
}
batchMapper.insert(scenarioWithBLOBs); batchMapper.insert(scenarioWithBLOBs);
// 存储依赖关系 // 存储依赖关系
ApiAutomationRelationshipEdgeService relationshipEdgeService = CommonBeanFactory.getBean(ApiAutomationRelationshipEdgeService.class); ApiAutomationRelationshipEdgeService relationshipEdgeService = CommonBeanFactory.getBean(ApiAutomationRelationshipEdgeService.class);