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

fix: 修复接口定义导入时case版本不一致的问题 

--bug=1009804 --user=刘瑞斌 【接口测试】ms格式的接口，不覆盖，导入后用例版本不是所选版本 https://www.tapd.cn/55049933/s/1095093
This commit is contained in:
CaptainB 2022-01-20 17:11:56 +08:00 committed by xiaomeinvG
parent 126da29186
commit b8edfe2532
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -712,6 +712,11 @@ public class ApiDefinitionService {
} }
batchMapper.insert(apiDefinition); batchMapper.insert(apiDefinition);
String requestStr = setImportHashTree(apiDefinition); String requestStr = setImportHashTree(apiDefinition);
// case 设置版本
cases.forEach(c -> {
c.setVersionId(apiDefinition.getVersionId());
});
reSetImportCasesApiId(cases, originId, apiDefinition.getId()); reSetImportCasesApiId(cases, originId, apiDefinition.getId());
reSetImportMocksApiId(mocks, originId, apiDefinition.getId(), apiDefinition.getNum()); reSetImportMocksApiId(mocks, originId, apiDefinition.getId(), apiDefinition.getNum());
apiDefinition.setRequest(requestStr); apiDefinition.setRequest(requestStr);
@ -759,6 +764,10 @@ public class ApiDefinitionService {
} else { } else {
apiDefinition.setVersionId(defaultVersion); apiDefinition.setVersionId(defaultVersion);
} }
// case 设置版本
cases.forEach(c -> {
c.setVersionId(apiDefinition.getVersionId());
});
apiDefinition.setOrder(getImportNextOrder(apiTestImportRequest.getProjectId())); apiDefinition.setOrder(getImportNextOrder(apiTestImportRequest.getProjectId()));
reSetImportCasesApiId(cases, originId, apiDefinition.getId()); reSetImportCasesApiId(cases, originId, apiDefinition.getId());
reSetImportMocksApiId(mocks, originId, apiDefinition.getId(), apiDefinition.getNum()); reSetImportMocksApiId(mocks, originId, apiDefinition.getId(), apiDefinition.getNum());
@ -798,7 +807,10 @@ public class ApiDefinitionService {
apiDefinition.setNum(existApi.getNum()); //id 不变 apiDefinition.setNum(existApi.getNum()); //id 不变
apiDefinition.setRefId(existApi.getRefId()); apiDefinition.setRefId(existApi.getRefId());
apiDefinition.setVersionId(apiTestImportRequest.getUpdateVersionId()); apiDefinition.setVersionId(apiTestImportRequest.getUpdateVersionId());
// case 设置版本
cases.forEach(c -> {
c.setVersionId(apiDefinition.getVersionId());
});
if (!StringUtils.equalsIgnoreCase(apiTestImportRequest.getPlatform(), ApiImportPlatform.Metersphere.name())) { if (!StringUtils.equalsIgnoreCase(apiTestImportRequest.getPlatform(), ApiImportPlatform.Metersphere.name())) {
apiDefinition.setTags(existApi.getTags()); // 其他格式 tag 不变，MS 格式替换 apiDefinition.setTags(existApi.getTags()); // 其他格式 tag 不变，MS 格式替换
} }