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

feat(接口测试): 修复场景保存时引用到的url会被覆盖的问题 

修复场景保存时引用到的url会被覆盖的问题
This commit is contained in:
song-tianyang 2022-04-22 11:09:36 +08:00 committed by TIanyang
parent 806d12ab56
commit 6a118e3b94
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/main/java/io/metersphere/api/service/ApiScenarioReferenceIdService.java
View File

@ -102,7 +102,6 @@ public class ApiScenarioReferenceIdService {
public List<ApiScenarioReferenceId> getApiAndScenarioRelation(ApiScenarioWithBLOBs scenario) { public List<ApiScenarioReferenceId> getApiAndScenarioRelation(ApiScenarioWithBLOBs scenario) {
List<ApiScenarioReferenceId> returnList = new ArrayList<>(); List<ApiScenarioReferenceId> returnList = new ArrayList<>();
Map<String, ApiScenarioReferenceId> referenceIdMap = new HashMap<>();
if (StringUtils.isNotEmpty(scenario.getScenarioDefinition())) { if (StringUtils.isNotEmpty(scenario.getScenarioDefinition())) {
JSONObject jsonObject = JSONObject.parseObject(scenario.getScenarioDefinition(), Feature.DisableSpecialKeyDetect); JSONObject jsonObject = JSONObject.parseObject(scenario.getScenarioDefinition(), Feature.DisableSpecialKeyDetect);
if (!jsonObject.containsKey(MsHashTreeService.HASH_TREE)) { if (!jsonObject.containsKey(MsHashTreeService.HASH_TREE)) {
@ -136,16 +135,14 @@ public class ApiScenarioReferenceIdService {
saveItem.setCreateUserId(SessionUtils.getUserId()); saveItem.setCreateUserId(SessionUtils.getUserId());
saveItem.setUrl(url); saveItem.setUrl(url);
saveItem.setMethod(method); saveItem.setMethod(method);
referenceIdMap.put(item.getString(MsHashTreeService.ID), saveItem); returnList.add(saveItem);
} }
if (item.containsKey(MsHashTreeService.HASH_TREE)) { if (item.containsKey(MsHashTreeService.HASH_TREE)) {
referenceIdMap.putAll(this.deepElementRelation(scenario.getId(), item.getJSONArray(MsHashTreeService.HASH_TREE))); returnList.addAll(this.deepElementRelation(scenario.getId(), item.getJSONArray(MsHashTreeService.HASH_TREE)));
} }
} }
} }
if (MapUtils.isNotEmpty(referenceIdMap)) { if (CollectionUtils.isEmpty(returnList)) {
returnList.addAll(referenceIdMap.values());
} else {
ApiScenarioReferenceId saveItem = new ApiScenarioReferenceId(); ApiScenarioReferenceId saveItem = new ApiScenarioReferenceId();
saveItem.setId(UUID.randomUUID().toString()); saveItem.setId(UUID.randomUUID().toString());
saveItem.setApiScenarioId(scenario.getId()); saveItem.setApiScenarioId(scenario.getId());
@ -156,8 +153,8 @@ public class ApiScenarioReferenceIdService {
return returnList; return returnList;
} }
public Map<String, ApiScenarioReferenceId> deepElementRelation(String scenarioId, JSONArray hashTree) { public List<ApiScenarioReferenceId> deepElementRelation(String scenarioId, JSONArray hashTree) {
Map<String, ApiScenarioReferenceId> deepRelations = new HashMap<>(); List<ApiScenarioReferenceId> deepRelations = new LinkedList<>();
if (CollectionUtils.isNotEmpty(hashTree)) { if (CollectionUtils.isNotEmpty(hashTree)) {
for (int index = 0; index < hashTree.size(); index++) { for (int index = 0; index < hashTree.size(); index++) {
JSONObject item = hashTree.getJSONObject(index); JSONObject item = hashTree.getJSONObject(index);
@ -182,10 +179,10 @@ public class ApiScenarioReferenceIdService {
saveItem.setCreateUserId(SessionUtils.getUserId()); saveItem.setCreateUserId(SessionUtils.getUserId());
saveItem.setMethod(method); saveItem.setMethod(method);
saveItem.setUrl(url); saveItem.setUrl(url);
deepRelations.put(item.getString(MsHashTreeService.ID), saveItem); deepRelations.add(saveItem);
} }
if (item.containsKey(MsHashTreeService.HASH_TREE)) { if (item.containsKey(MsHashTreeService.HASH_TREE)) {
deepRelations.putAll(this.deepElementRelation(scenarioId, item.getJSONArray(MsHashTreeService.HASH_TREE))); deepRelations.addAll(this.deepElementRelation(scenarioId, item.getJSONArray(MsHashTreeService.HASH_TREE)));
} }
} }
} }