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

fix(接口测试): 修复覆盖导入场景时数据更新的问题 

--bug=1048012 --user=宋天阳 【场景导入】-覆盖方式导入，目标项目中有相同名称的场景，导入后场景的创建时间更新为场景文件中的创建时间 https://www.tapd.cn/55049933/s/1597631
This commit is contained in:
Jianguo-Genius 2024-10-24 17:50:41 +08:00 committed by Craftsman
parent d9cec61f45
commit 0a92205f42
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiScenarioDataTransferService.java
View File

@ -1,6 +1,7 @@
package io.metersphere.api.service; package io.metersphere.api.service;
import io.metersphere.api.constants.ApiDefinitionStatus; import io.metersphere.api.constants.ApiDefinitionStatus;
import io.metersphere.api.constants.ApiScenarioStatus;
import io.metersphere.api.constants.ApiScenarioStepRefType; import io.metersphere.api.constants.ApiScenarioStepRefType;
import io.metersphere.api.constants.ApiScenarioStepType; import io.metersphere.api.constants.ApiScenarioStepType;
import io.metersphere.api.domain.*; import io.metersphere.api.domain.*;
@ -357,7 +358,8 @@ public class ApiScenarioDataTransferService {
//更新场景 //更新场景
list.forEach(request -> { list.forEach(request -> {
// 更新基础信息 // 更新基础信息
ApiScenario scenario = BeanUtils.copyBean(new ApiScenario(), request); ApiScenario scenario = new ApiScenario();
scenario.setId(request.getId());
scenario.setUpdateUser(operator); scenario.setUpdateUser(operator);
scenario.setUpdateTime(System.currentTimeMillis()); scenario.setUpdateTime(System.currentTimeMillis());
scenario.setStepTotal(CollectionUtils.isNotEmpty(request.getSteps()) ? request.getSteps().size() : 0); scenario.setStepTotal(CollectionUtils.isNotEmpty(request.getSteps()) ? request.getSteps().size() : 0);
@ -503,6 +505,7 @@ public class ApiScenarioDataTransferService {
scenario.setNum(apiScenarioService.getNextNum(targetProjectId)); scenario.setNum(apiScenarioService.getNextNum(targetProjectId));
scenario.setPos(getImportNextOrder(apiScenarioService::getNextOrder, currentApiScenarioOrder, targetProjectId)); scenario.setPos(getImportNextOrder(apiScenarioService::getNextOrder, currentApiScenarioOrder, targetProjectId));
scenario.setLatest(true); scenario.setLatest(true);
scenario.setStatus(ApiScenarioStatus.UNDERWAY.name());
scenario.setCreateUser(operator); scenario.setCreateUser(operator);
scenario.setUpdateUser(operator); scenario.setUpdateUser(operator);
scenario.setCreateTime(System.currentTimeMillis()); scenario.setCreateTime(System.currentTimeMillis());
@ -772,11 +775,15 @@ public class ApiScenarioDataTransferService {
Map<String, List<ApiScenarioImportDetail>> projectScenarioMap = new HashMap<>(); Map<String, List<ApiScenarioImportDetail>> projectScenarioMap = new HashMap<>();
// 对导入文件中的数据进行分组 // 对导入文件中的数据进行分组
{ {
Project project = projectMapper.selectByPrimaryKey(projectId);
for (Map.Entry<String, List<ApiDefinitionDetail>> entry : parseResult.getRelatedApiDefinitions().stream().collect(Collectors.groupingBy(ApiDefinitionDetail::getProjectId)).entrySet()) { for (Map.Entry<String, List<ApiDefinitionDetail>> entry : parseResult.getRelatedApiDefinitions().stream().collect(Collectors.groupingBy(ApiDefinitionDetail::getProjectId)).entrySet()) {
String targetProjectId = entry.getKey(); String targetProjectId = entry.getKey();
List<ApiDefinitionDetail> apiDefinitionDetails = entry.getValue(); List<ApiDefinitionDetail> apiDefinitionDetails = entry.getValue();
// 如果没有权限，需要在当前项目进行校验 // 如果没有权限，需要在当前项目进行校验
if (projectMapper.selectByPrimaryKey(targetProjectId) == null) { Project targetProject = projectMapper.selectByPrimaryKey(targetProjectId);
// 项目不存在或者项目和当前项目不在统一组织下，需要在当前项目进行校验。场景不能跨项目关联
if (targetProject == null || !StringUtils.equals(targetProject.getOrganizationId(), project.getOrganizationId())) {
targetProjectId = projectId; targetProjectId = projectId;
} else if (!permissionCheckService.userHasProjectPermission(operator, targetProjectId, PermissionConstants.PROJECT_API_DEFINITION_ADD)) { } else if (!permissionCheckService.userHasProjectPermission(operator, targetProjectId, PermissionConstants.PROJECT_API_DEFINITION_ADD)) {
targetProjectId = projectId; targetProjectId = projectId;