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

fix(接口测试): 接口场景导入问题 

--bug=1026453 --user=宋昌昌 【接口测试】接口场景覆盖导入，场景没有变更，但是新建了版本，选不覆盖也新建版本了 https://www.tapd.cn/55049933/s/1375329
This commit is contained in:
song-cc-rock 2023-05-24 18:53:54 +08:00 committed by fit2-zhao
parent 78bafb772c
commit 0ae9928f21
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioModuleService.java
View File

@ -528,6 +528,12 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(t -> t.getName() + t.getModulePath()))), ArrayList::new)
);
if (!fullCoverage) {
//不覆盖, 系统场景存在则不导入
Map<String, ApiScenarioWithBLOBs> systemScenarios = repeatAllScenarioWithBLOBs.stream().collect(Collectors.toMap(ApiScenario::getName, scenario -> scenario));
optionData.removeIf(handleData -> systemScenarios.containsKey(handleData.getName()));
}
Map<String, ApiScenarioWithBLOBs> nameModuleMap = null;
Map<String, ApiScenarioWithBLOBs> repeatDataMap = null;
if (chooseModule != null) {
@ -555,7 +561,7 @@ public class ApiScenarioModuleService extends NodeTreeService<ApiScenarioModuleD
}
} else {
//不覆盖
removeRepeat(optionData, nameModuleMap, repeatDataMap, moduleMap, versionId);
removeRepeat(optionData, nameModuleMap, repeatDataMap, moduleMap, versionId);
}
if (!CollectionUtils.isEmpty(repeatApiScenarioWithBLOBs)) {