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

fix(测试跟踪): 修复实时报告查询接口用例资源池的方式 

--bug=1024555 --user=宋天阳 【测试跟踪】计划中只有接口用例-执行计划选择k8s资源池-查看临时报告-资源池仍显示LOCAL
https://www.tapd.cn/55049933/s/1353978
This commit is contained in:
song-tianyang 2023-03-21 19:00:06 +08:00 committed by fit2-zhao
parent b006467060
commit 8efafd39e8
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
View File

@ -32,13 +32,13 @@ import io.metersphere.environment.service.BaseEnvironmentService;
import io.metersphere.i18n.Translator;
import io.metersphere.plugin.core.MsTestElement;
import io.metersphere.service.definition.ApiDefinitionService;
import jakarta.annotation.Resource;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@ -485,9 +485,18 @@ public class ApiScenarioEnvService {
String projectName = this.selectNameById(projectId);
List<String> envNameList = apiTestEnvironmentService.selectNameByIds(envIdList);
if (CollectionUtils.isNotEmpty(envNameList) && StringUtils.isNotEmpty(projectName)) {
returnMap.put(projectName, new ArrayList<>() {{
this.addAll(envNameList);
}});
//考虑到存在不同工作空间下有相同名称的项目，这里还是要检查一下项目名称是否已被记录
if (returnMap.containsKey(projectName)) {
envNameList.forEach(envName -> {
if (!returnMap.get(projectName).contains(envName)) {
returnMap.get(projectName).add(envName);
}
});
} else {
returnMap.put(projectName, new ArrayList<>() {{
this.addAll(envNameList);
}});
}
}
}
}
@ -569,7 +578,7 @@ public class ApiScenarioEnvService {
String envId = entry.getValue();
String projectName = this.selectNameById(projectId);
String envName = apiTestEnvironmentService.selectNameById(envId);
if (StringUtils.isNoneEmpty(projectName, envName)) {
if (StringUtils.isNoneEmpty(projectName, envName) && this.isProjectEnvMapNotContainsEnv(returnMap, projectName, envName)) {
returnMap.put(projectName, new ArrayList<>() {{
this.add(envName);
}});
@ -581,6 +590,15 @@ public class ApiScenarioEnvService {
return returnMap;
}
private boolean isProjectEnvMapNotContainsEnv(LinkedHashMap<String, List<String>> returnMap, String projectName, String envName) {
if (MapUtils.isNotEmpty(returnMap)) {
if (returnMap.containsKey(projectName) && CollectionUtils.isNotEmpty(returnMap.get(projectName)) && returnMap.get(projectName).contains(envName)) {
return false;
}
}
return true;
}
public String selectNameById(String projectId) {
Project project = projectMapper.selectByPrimaryKey(projectId);
if (project == null) {

13
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanReportService.java
View File

@ -1218,7 +1218,18 @@ public class TestPlanReportService {
String envName = apiTestEnvironmentService.selectNameById(envId);
envNameList.add(envName);
}
projectEnvMap.put(projectName, envNameList);
//考虑到存在不同工作空间下有相同名称的项目，这里还是要检查一下项目名称是否已被记录
if (projectEnvMap.containsKey(projectName)) {
envNameList.forEach(envName -> {
if (!projectEnvMap.get(projectName).contains(envName)) {
projectEnvMap.get(projectName).add(envName);
}
});
} else {
projectEnvMap.put(projectName, new ArrayList<>() {{
this.addAll(envNameList);
}});
}
}
}
if (MapUtils.isNotEmpty(projectEnvMap)) {