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:
WangXu10 2024-01-29 18:59:13 +08:00 committed by 刘瑞斌
parent b09297024a
commit 1f04a8423f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -651,13 +651,14 @@ public class FunctionalCaseService {
List<FunctionalCaseAttachment> caseAttachments = attachmentMap.get(s); List<FunctionalCaseAttachment> caseAttachments = attachmentMap.get(s);
List<FileAssociation> fileAssociationList = fileAssociationMap.get(s); List<FileAssociation> fileAssociationList = fileAssociationMap.get(s);
List<FunctionalCaseCustomField> customFields = customFieldMap.get(s); List<FunctionalCaseCustomField> customFields = customFieldMap.get(s);
Long num = functionalCase.getNum();
Optional.ofNullable(functionalCase).ifPresent(functional -> { Optional.ofNullable(functionalCase).ifPresent(functional -> {
functional.setId(id); functional.setId(id);
functional.setRefId(id); functional.setRefId(id);
functional.setModuleId(request.getModuleId()); functional.setModuleId(request.getModuleId());
functional.setNum(getNextNum(request.getProjectId())); functional.setNum(getNextNum(request.getProjectId()));
functional.setName(getCopyName(functionalCase.getName())); functional.setName(getCopyName(functionalCase.getName(), num, functional.getNum()));
functional.setReviewStatus(FunctionalCaseReviewStatus.UN_REVIEWED.name()); functional.setReviewStatus(FunctionalCaseReviewStatus.UN_REVIEWED.name());
functional.setPos(nextOrder.get()); functional.setPos(nextOrder.get());
functional.setLastExecuteResult(FunctionalCaseExecuteResult.UN_EXECUTED.name()); functional.setLastExecuteResult(FunctionalCaseExecuteResult.UN_EXECUTED.name());
@ -697,12 +698,18 @@ public class FunctionalCaseService {
} }
} }
private String getCopyName(String name) { private String getCopyName(String name, long oldNum, long newNum) {
String copyName = "copy_" + name + "_" + UUID.randomUUID().toString().substring(0, 4); if (!StringUtils.startsWith(name, "copy_")) {
if (copyName.length() > 255) { name = "copy_" + name;
copyName = copyName.substring(0, 250) + copyName.substring(copyName.length() - 5);
} }
return copyName; if (name.length() > 250) {
name = name.substring(0, 200) + "...";
}
if (StringUtils.endsWith(name, "_" + oldNum)) {
name = StringUtils.substringBeforeLast(name, "_" + oldNum);
}
name = name + "_" + newNum;
return name;
} }