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

refactor(接口测试): 接口管理模块接口定义简化代码，增加覆盖率

This commit is contained in:
lan-yonghui 2023-12-19 19:00:14 +08:00 committed by Craftsman
parent 6588fc130f
commit 1cf3517c8d
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
backend/services/api-test/src/main/java/io/metersphere/api/service/definition/ApiDefinitionService.java
View File

@ -659,41 +659,39 @@ public class ApiDefinitionService {
}
private void doRestore(List<String> apiIds, String userId, String projectId, boolean isBatch) {
if (CollectionUtils.isNotEmpty(apiIds)) {
// 记录恢复数据之前的原数据日志，单条通过注解记录日志
if(isBatch){
apiDefinitionLogService.batchRestoreLog(apiIds, userId, projectId);
}
extApiDefinitionMapper.batchRestoreById(apiIds, userId, projectId);
List<String> updateApiIds = new ArrayList<>();
apiIds.forEach(id -> {
// 恢复数据恢复最新标识
ApiDefinition apiDefinition = checkApiDefinition(id);
// 判断是否存在多个版本
List<ApiDefinitionVersionDTO> apiDefinitionVersions = extApiDefinitionMapper.getApiDefinitionByRefId(apiDefinition.getRefId());
if (CollectionUtils.isNotEmpty(apiDefinitionVersions) && apiDefinitionVersions.size() > 1) {
handleMultipleVersions(apiDefinition);
}
// 判断接口的模块 ID 是否存在，不存在修改模块 ID 为未规划模块 ID
if (!ModuleConstants.DEFAULT_NODE_ID.equals(apiDefinition.getModuleId()) &&
moduleNeedsUpdate(apiDefinition.getModuleId())) {
updateApiIds.add(apiDefinition.getId());
}
});
// 模块已删除，修改为未规划模块 ID
handleModule(updateApiIds);
// 恢复接口关联数据
recoverApiRelatedData(apiIds, userId, projectId);
// 记录恢复数据之前的原数据日志，单条通过注解记录日志
if(isBatch){
apiDefinitionLogService.batchRestoreLog(apiIds, userId, projectId);
}
extApiDefinitionMapper.batchRestoreById(apiIds, userId, projectId);
List<String> updateApiIds = new ArrayList<>();
apiIds.forEach(id -> {
// 恢复数据恢复最新标识
ApiDefinition apiDefinition = checkApiDefinition(id);
// 判断是否存在多个版本
List<ApiDefinitionVersionDTO> apiDefinitionVersions = extApiDefinitionMapper.getApiDefinitionByRefId(apiDefinition.getRefId());
if (CollectionUtils.isNotEmpty(apiDefinitionVersions) && apiDefinitionVersions.size() > 1) {
handleMultipleVersions(apiDefinition);
}
// 判断接口的模块 ID 是否存在，不存在修改模块 ID 为未规划模块 ID
if (!ModuleConstants.DEFAULT_NODE_ID.equals(apiDefinition.getModuleId()) && moduleNeedsUpdate(apiDefinition.getModuleId()) == null) {
updateApiIds.add(apiDefinition.getId());
}
});
// 模块已删除，修改为未规划模块 ID
handleModule(updateApiIds);
// 恢复接口关联数据
recoverApiRelatedData(apiIds, userId, projectId);
}
private boolean moduleNeedsUpdate(String moduleId) {
ApiDefinitionModule apiDefinitionModule = apiDefinitionModuleMapper.selectByPrimaryKey(moduleId);
return apiDefinitionModule == null || StringUtils.isBlank(apiDefinitionModule.getName());
private ApiDefinitionModule moduleNeedsUpdate(String moduleId) {
ApiDefinitionModule apiDefinitionModule;
apiDefinitionModule = apiDefinitionModuleMapper.selectByPrimaryKey(moduleId);
return apiDefinitionModule;
}
private void handleModule(List<String> updateApiIds) {
@ -840,8 +838,8 @@ public class ApiDefinitionService {
if(ApiDefinitionDocType.ALL.name().equals(request.getType())){
apiDefinitionDocDTO.setDocTitle(Translator.get(ALL_API));
} else {
ApiDefinitionModule apiDefinitionModule = apiDefinitionModuleMapper.selectByPrimaryKey(first.getModuleId());
if (apiDefinitionModule != null && StringUtils.isNotBlank(apiDefinitionModule.getName())) {
ApiDefinitionModule apiDefinitionModule = moduleNeedsUpdate(first.getModuleId());
if (apiDefinitionModule != null) {
apiDefinitionDocDTO.setDocTitle(apiDefinitionModule.getName());
} else {
apiDefinitionDocDTO.setDocTitle(Translator.get(UNPLANNED_API));