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

fix(接口测试):解决url不重复api_module树生成异常问题 

--bug=1024415 --user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001024415
This commit is contained in:
guoyuqi 2023-03-28 17:40:46 +08:00 committed by fit2-zhao
parent a68ca40dc0
commit 1a7cd30872
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionImportUtilService.java
View File

@ -386,7 +386,7 @@ public class ApiDefinitionImportUtilService {
ApiTestImportRequest request = apiImportParamDto.getRequest(); ApiTestImportRequest request = apiImportParamDto.getRequest();
List<ApiDefinitionWithBLOBs> optionData = apiImportParamDto.getOptionData(); List<ApiDefinitionWithBLOBs> optionData = apiImportParamDto.getOptionData();
ApiModuleDTO chooseModule = apiImportParamDto.getChooseModule(); ApiModuleDTO chooseModule = apiImportParamDto.getChooseModule();
Map<String, String> idPathMap = apiImportParamDto.getIdPathMap(); Map<String, String> moduleIdPathMap = apiImportParamDto.getIdPathMap();
Boolean fullCoverage = apiImportParamDto.getFullCoverage(); Boolean fullCoverage = apiImportParamDto.getFullCoverage();
List<ApiDefinitionWithBLOBs> toUpdateList = apiImportParamDto.getToUpdateList(); List<ApiDefinitionWithBLOBs> toUpdateList = apiImportParamDto.getToUpdateList();
List<ApiTestCaseWithBLOBs> optionDataCases = apiImportParamDto.getOptionDataCases(); List<ApiTestCaseWithBLOBs> optionDataCases = apiImportParamDto.getOptionDataCases();
@ -413,7 +413,7 @@ public class ApiDefinitionImportUtilService {
if (chooseModule != null) { if (chooseModule != null) {
//如果有选中的模块，则在选中的模块下过滤 过滤规则是 选择的模块路径+名称+method+path //如果有选中的模块，则在选中的模块下过滤 过滤规则是 选择的模块路径+名称+method+path
String chooseModuleParentId = getChooseModuleParentId(chooseModule); String chooseModuleParentId = getChooseModuleParentId(chooseModule);
String chooseModulePath = getChooseModulePath(idPathMap, chooseModule, chooseModuleParentId); String chooseModulePath = getChooseModulePath(moduleIdPathMap, chooseModule, chooseModuleParentId);
//这样的过滤规则下可能存在重复接口，如果是覆盖模块，需要按照去重规则再次去重，否则就加上接口原有的模块 //这样的过滤规则下可能存在重复接口，如果是覆盖模块，需要按照去重规则再次去重，否则就加上接口原有的模块
if (fullCoverage) { if (fullCoverage) {
removeHttpChooseModuleRepeat(optionData, chooseModulePath); removeHttpChooseModuleRepeat(optionData, chooseModulePath);
@ -829,7 +829,7 @@ public class ApiDefinitionImportUtilService {
ApiTestImportRequest request = apiImportParamDto.getRequest(); ApiTestImportRequest request = apiImportParamDto.getRequest();
List<ApiDefinitionWithBLOBs> optionData = apiImportParamDto.getOptionData(); List<ApiDefinitionWithBLOBs> optionData = apiImportParamDto.getOptionData();
ApiModuleDTO chooseModule = apiImportParamDto.getChooseModule(); ApiModuleDTO chooseModule = apiImportParamDto.getChooseModule();
Map<String, String> idPathMap = apiImportParamDto.getIdPathMap(); Map<String, String> moduleIdPathMap = apiImportParamDto.getIdPathMap();
Boolean fullCoverage = apiImportParamDto.getFullCoverage(); Boolean fullCoverage = apiImportParamDto.getFullCoverage();
List<ApiDefinitionWithBLOBs> toUpdateList = apiImportParamDto.getToUpdateList(); List<ApiDefinitionWithBLOBs> toUpdateList = apiImportParamDto.getToUpdateList();
List<ApiTestCaseWithBLOBs> optionDataCases = apiImportParamDto.getOptionDataCases(); List<ApiTestCaseWithBLOBs> optionDataCases = apiImportParamDto.getOptionDataCases();
@ -851,7 +851,7 @@ public class ApiDefinitionImportUtilService {
if (chooseModule != null) { if (chooseModule != null) {
String chooseModuleParentId = getChooseModuleParentId(chooseModule); String chooseModuleParentId = getChooseModuleParentId(chooseModule);
String chooseModulePath = getChooseModulePath(idPathMap, chooseModule, chooseModuleParentId); String chooseModulePath = getChooseModulePath(moduleIdPathMap, chooseModule, chooseModuleParentId);
if (fullCoverage) { if (fullCoverage) {
List<ApiDefinitionWithBLOBs> singleOptionData = new ArrayList<>(); List<ApiDefinitionWithBLOBs> singleOptionData = new ArrayList<>();
removeOtherChooseModuleRepeat(optionData, singleOptionData, chooseModulePath); removeOtherChooseModuleRepeat(optionData, singleOptionData, chooseModulePath);
@ -1090,7 +1090,10 @@ public class ApiDefinitionImportUtilService {
private void removeSameData(Map<String, List<ApiDefinitionWithBLOBs>> repeatDataMap, Map<String, ApiDefinitionWithBLOBs> methodPathMap, private void removeSameData(Map<String, List<ApiDefinitionWithBLOBs>> repeatDataMap, Map<String, ApiDefinitionWithBLOBs> methodPathMap,
List<ApiDefinitionWithBLOBs> optionData, Map<String, ApiModule> moduleMap, List<ApiDefinitionWithBLOBs> optionData, Map<String, ApiModule> moduleMap,
List<ApiTestCaseWithBLOBs> optionDataCases) { List<ApiTestCaseWithBLOBs> optionDataCases) {
Map<String, ApiModule> parentIdModuleMap = new HashMap<>();
for (ApiModule value : moduleMap.values()) {
parentIdModuleMap.put(value.getParentId(), value);
}
Map<String, List<ApiDefinitionWithBLOBs>> moduleOptionData = optionData.stream().collect(Collectors.groupingBy(ApiDefinition::getModulePath)); Map<String, List<ApiDefinitionWithBLOBs>> moduleOptionData = optionData.stream().collect(Collectors.groupingBy(ApiDefinition::getModulePath));
repeatDataMap.forEach((k, v) -> { repeatDataMap.forEach((k, v) -> {
ApiDefinitionWithBLOBs apiDefinitionWithBLOBs = methodPathMap.get(k); ApiDefinitionWithBLOBs apiDefinitionWithBLOBs = methodPathMap.get(k);
@ -1100,7 +1103,10 @@ public class ApiDefinitionImportUtilService {
String modulePath = apiDefinitionWithBLOBs.getModulePath(); String modulePath = apiDefinitionWithBLOBs.getModulePath();
List<ApiDefinitionWithBLOBs> moduleData = moduleOptionData.get(modulePath); List<ApiDefinitionWithBLOBs> moduleData = moduleOptionData.get(modulePath);
if (moduleData != null && moduleData.size() <= 1) { if (moduleData != null && moduleData.size() <= 1) {
moduleMap.remove(modulePath); ApiModule apiModule = moduleMap.get(modulePath);
if (parentIdModuleMap.get(apiModule.getId()) == null) {
moduleMap.remove(modulePath);
}
moduleData.remove(apiDefinitionWithBLOBs); moduleData.remove(apiDefinitionWithBLOBs);
} }
//不覆盖同一接口不做更新 注意原接口的update时间不变 //不覆盖同一接口不做更新 注意原接口的update时间不变