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

fix(接口测试): 兼容导入的历史数据支持关系图保存 

--bug=1024603 --user=赵勇 [接口测试]场景中跨项目引用多个场景（多个项目）保存失败报500 https://www.tapd.cn/55049933/s/1352499

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2023-03-17 19:35:18 +08:00 committed by fit2-zhao
parent a47001f15a
commit 7ce815204d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api-test/backend/src/main/java/io/metersphere/service/scenario/ApiAutomationRelationshipEdgeService.java
View File

@ -1,6 +1,8 @@
package io.metersphere.service.scenario; package io.metersphere.service.scenario;
import io.metersphere.base.domain.ApiScenarioWithBLOBs; import io.metersphere.base.domain.ApiScenarioWithBLOBs;
import io.metersphere.commons.constants.ElementConstants;
import io.metersphere.commons.constants.MsHashTreeConstants;
import io.metersphere.commons.utils.JSONUtil; import io.metersphere.commons.utils.JSONUtil;
import io.metersphere.request.RelationshipEdgeRequest; import io.metersphere.request.RelationshipEdgeRequest;
import io.metersphere.service.RelationshipEdgeService; import io.metersphere.service.RelationshipEdgeService;
@ -39,7 +41,7 @@ public class ApiAutomationRelationshipEdgeService {
beforeReferenceRelationships.removeAll(referenceRelationships); beforeReferenceRelationships.removeAll(referenceRelationships);
// 删除多余的关系 // 删除多余的关系
if (CollectionUtils.isNotEmpty(beforeReferenceRelationships)) { if (CollectionUtils.isNotEmpty(beforeReferenceRelationships)) {
relationshipEdgeService.delete(scenarioWithBLOBs.getId(),beforeReferenceRelationships); relationshipEdgeService.delete(scenarioWithBLOBs.getId(), beforeReferenceRelationships);
} }
} }
@ -59,7 +61,7 @@ public class ApiAutomationRelationshipEdgeService {
// 深度解析对比，防止是复制的关系 // 深度解析对比，防止是复制的关系
JSONObject element = JSONUtil.parseObject(scenarioWithBLOBs.getScenarioDefinition()); JSONObject element = JSONUtil.parseObject(scenarioWithBLOBs.getScenarioDefinition());
// 历史数据处理 // 历史数据处理
this.relationships(element.getJSONArray("hashTree"), referenceRelationships); this.relationships(element.getJSONArray(ElementConstants.HASH_TREE), referenceRelationships);
} }
return referenceRelationships; return referenceRelationships;
} }
@ -73,13 +75,17 @@ public class ApiAutomationRelationshipEdgeService {
public static void relationships(JSONArray hashTree, List<String> referenceRelationships) { public static void relationships(JSONArray hashTree, List<String> referenceRelationships) {
for (int i = 0; i < hashTree.length(); i++) { for (int i = 0; i < hashTree.length(); i++) {
JSONObject element = hashTree.getJSONObject(i); JSONObject element = hashTree.getJSONObject(i);
if (element != null && StringUtils.equals(element.get("type").toString(), "scenario") && StringUtils.equals(element.get("referenced").toString(), "REF")) { if (element != null && element.has(ElementConstants.TYPE)
if (!referenceRelationships.contains(element.get("id").toString()) && element.get("id").toString().length() < 50) { && StringUtils.equals(element.optString(ElementConstants.TYPE), ElementConstants.SCENARIO)
referenceRelationships.add(element.get("id").toString()); && element.has(MsHashTreeConstants.REFERENCED)
&& StringUtils.equals(element.optString(MsHashTreeConstants.REFERENCED), MsHashTreeConstants.REF)) {
if (!referenceRelationships.contains(element.optString(MsHashTreeConstants.ID))
&& element.optString(MsHashTreeConstants.ID).length() < 50) {
referenceRelationships.add(element.optString(MsHashTreeConstants.ID));
} }
} else { } else {
if (element.has("hashTree")) { if (element.has(ElementConstants.HASH_TREE)) {
JSONArray elementJSONArray = element.getJSONArray("hashTree"); JSONArray elementJSONArray = element.getJSONArray(ElementConstants.HASH_TREE);
relationships(elementJSONArray, referenceRelationships); relationships(elementJSONArray, referenceRelationships);
} }
} }