test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-01 03:28:59 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

reactor(测试用例): 调整用例保存

Browse Source
This commit is contained in:
guoyuqi 2024-06-03 15:33:05 +08:00 committed by 刘瑞斌
parent adb9af742e
commit 5f769d7f3e
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/services/case-management/src/main/java/io/metersphere/functional/request/FunctionalCaseMinderEditRequest.java
View File

@ -5,13 +5,18 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List; import java.util.List;
/** /**
* @author guoyuqi * @author guoyuqi
*/ */
@Data @Data
public class FunctionalCaseMinderEditRequest{ public class FunctionalCaseMinderEditRequest implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{functional_case.project_id.not_blank}") @NotBlank(message = "{functional_case.project_id.not_blank}")

28
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java
View File

@ -401,6 +401,9 @@ public class FunctionalCaseMinderService {
private static void checkModules(FunctionalCaseModuleEditRequest functionalCaseModuleEditRequest, Map<String, List<FunctionalCaseModule>> parentModuleMap) { private static void checkModules(FunctionalCaseModuleEditRequest functionalCaseModuleEditRequest, Map<String, List<FunctionalCaseModule>> parentModuleMap) {
List<FunctionalCaseModule> functionalCaseModules = parentModuleMap.get(functionalCaseModuleEditRequest.getParentId()); List<FunctionalCaseModule> functionalCaseModules = parentModuleMap.get(functionalCaseModuleEditRequest.getParentId());
if (CollectionUtils.isEmpty(functionalCaseModules)) {
return;
}
List<FunctionalCaseModule> sameNameList = functionalCaseModules.stream().filter(t -> StringUtils.equalsIgnoreCase(t.getName(), functionalCaseModuleEditRequest.getName())).toList(); List<FunctionalCaseModule> sameNameList = functionalCaseModules.stream().filter(t -> StringUtils.equalsIgnoreCase(t.getName(), functionalCaseModuleEditRequest.getName())).toList();
if (CollectionUtils.isNotEmpty(sameNameList)) { if (CollectionUtils.isNotEmpty(sameNameList)) {
throw new MSException(Translator.get("node.name.repeat")); throw new MSException(Translator.get("node.name.repeat"));
@ -499,14 +502,20 @@ public class FunctionalCaseMinderService {
@NotNull @NotNull
private Map<String, List<FunctionalCaseModule>> getParentModuleMap(List<FunctionalCaseModuleEditRequest> addList) { private Map<String, List<FunctionalCaseModule>> getParentModuleMap(List<FunctionalCaseModuleEditRequest> addList) {
List<String> targetIds = addList.stream().map(FunctionalCaseModuleEditRequest::getTargetId).distinct().toList(); List<String> targetIds = addList.stream().filter(t->!StringUtils.equalsIgnoreCase(t.getMoveMode(), MoveTypeEnum.APPEND.name())).map(FunctionalCaseModuleEditRequest::getTargetId).distinct().toList();
List<String> parentIds = new ArrayList<>();
if (CollectionUtils.isNotEmpty(targetIds)) {
FunctionalCaseModuleExample functionalCaseModuleExample = new FunctionalCaseModuleExample();
functionalCaseModuleExample.createCriteria().andIdIn(targetIds);
List<FunctionalCaseModule> functionalCaseModules = functionalCaseModuleMapper.selectByExample(functionalCaseModuleExample);
parentIds = functionalCaseModules.stream().map(FunctionalCaseModule::getParentId).distinct().toList();
}
if (CollectionUtils.isEmpty(parentIds)) {
parentIds = addList.stream().map(FunctionalCaseModuleEditRequest::getParentId).distinct().toList();
}
FunctionalCaseModuleExample functionalCaseModuleExample = new FunctionalCaseModuleExample(); FunctionalCaseModuleExample functionalCaseModuleExample = new FunctionalCaseModuleExample();
functionalCaseModuleExample.createCriteria().andIdIn(targetIds);
List<FunctionalCaseModule> functionalCaseModules = functionalCaseModuleMapper.selectByExample(functionalCaseModuleExample);
List<String> parentIds = functionalCaseModules.stream().map(FunctionalCaseModule::getParentId).distinct().toList();
functionalCaseModuleExample = new FunctionalCaseModuleExample();
functionalCaseModuleExample.createCriteria().andParentIdIn(parentIds); functionalCaseModuleExample.createCriteria().andParentIdIn(parentIds);
functionalCaseModules = functionalCaseModuleMapper.selectByExample(functionalCaseModuleExample); List<FunctionalCaseModule> functionalCaseModules = functionalCaseModuleMapper.selectByExample(functionalCaseModuleExample);
return functionalCaseModules.stream().collect(Collectors.groupingBy(FunctionalCaseModule::getParentId)); return functionalCaseModules.stream().collect(Collectors.groupingBy(FunctionalCaseModule::getParentId));
} }
@ -581,6 +590,9 @@ public class FunctionalCaseMinderService {
@NotNull @NotNull
private Map<String, List<FunctionalCase>> getModuleCaseMap(List<FunctionalCaseChangeRequest> addList) { private Map<String, List<FunctionalCase>> getModuleCaseMap(List<FunctionalCaseChangeRequest> addList) {
List<String> list = addList.stream().map(FunctionalCaseChangeRequest::getTargetId).distinct().toList(); List<String> list = addList.stream().map(FunctionalCaseChangeRequest::getTargetId).distinct().toList();
if (CollectionUtils.isEmpty(list)) {
return new HashMap<>();
}
FunctionalCaseExample functionalCaseExample = new FunctionalCaseExample(); FunctionalCaseExample functionalCaseExample = new FunctionalCaseExample();
functionalCaseExample.createCriteria().andIdIn(list); functionalCaseExample.createCriteria().andIdIn(list);
List<FunctionalCase> functionalCases = functionalCaseMapper.selectByExample(functionalCaseExample); List<FunctionalCase> functionalCases = functionalCaseMapper.selectByExample(functionalCaseExample);
@ -619,6 +631,9 @@ public class FunctionalCaseMinderService {
private List<FunctionalCaseCustomField> updateCustomFields(FunctionalCaseChangeRequest functionalCaseChangeRequest, Map<String, List<FunctionalCaseCustomField>> caseCustomFieldMap, String caseId, FunctionalCaseCustomFieldMapper caseCustomFieldMapper) { private List<FunctionalCaseCustomField> updateCustomFields(FunctionalCaseChangeRequest functionalCaseChangeRequest, Map<String, List<FunctionalCaseCustomField>> caseCustomFieldMap, String caseId, FunctionalCaseCustomFieldMapper caseCustomFieldMapper) {
List<FunctionalCaseCustomField> total = new ArrayList<>(); List<FunctionalCaseCustomField> total = new ArrayList<>();
List<FunctionalCaseCustomField> functionalCaseCustomFields = caseCustomFieldMap.get(caseId); List<FunctionalCaseCustomField> functionalCaseCustomFields = caseCustomFieldMap.get(caseId);
if (CollectionUtils.isEmpty(functionalCaseCustomFields)) {
functionalCaseCustomFields = new ArrayList<>();
}
List<CaseCustomFieldDTO> customFields = functionalCaseChangeRequest.getCustomFields(); List<CaseCustomFieldDTO> customFields = functionalCaseChangeRequest.getCustomFields();
if (CollectionUtils.isNotEmpty(customFields)) { if (CollectionUtils.isNotEmpty(customFields)) {
customFields = customFields.stream().distinct().collect(Collectors.toList()); customFields = customFields.stream().distinct().collect(Collectors.toList());
@ -637,7 +652,6 @@ public class FunctionalCaseMinderService {
List<FunctionalCaseCustomField> functionalCaseCustomFields1 = saveCustomField(caseId, caseCustomFieldMapper, addFields); List<FunctionalCaseCustomField> functionalCaseCustomFields1 = saveCustomField(caseId, caseCustomFieldMapper, addFields);
total.addAll(functionalCaseCustomFields1); total.addAll(functionalCaseCustomFields1);
} }
;
if (CollectionUtils.isNotEmpty(updateFields)) { if (CollectionUtils.isNotEmpty(updateFields)) {
List<FunctionalCaseCustomField> functionalCaseCustomFields1 = updateField(updateFields, caseId, caseCustomFieldMapper); List<FunctionalCaseCustomField> functionalCaseCustomFields1 = updateField(updateFields, caseId, caseCustomFieldMapper);
total.addAll(functionalCaseCustomFields1); total.addAll(functionalCaseCustomFields1);