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

fix(测试跟踪): 创建缺陷操作日志数据有误 

--bug=1026282 --user=宋昌昌 【项目设置】缺陷管理-创建缺陷&编辑功能用例-关联缺陷-创建缺陷-操作日志标题和日志详情数据为空 https://www.tapd.cn/55049933/s/1372822
This commit is contained in:
song-cc-rock 2023-05-18 16:05:03 +08:00 committed by fit2-zhao
parent ac573f33b2
commit 34542c2579
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-track/backend/src/main/java/io/metersphere/controller/IssuesController.java
View File

@ -147,7 +147,7 @@ public class IssuesController {
@PostMapping("/batchDelete")
@RequiresPermissions(PermissionConstants.PROJECT_TRACK_ISSUE_READ_DELETE)
@MsAuditLog(module = OperLogModule.TRACK_BUG, type = OperLogConstants.DELETE, beforeEvent = "#msClass.getLogDetails(#request)", msClass = IssuesService.class)
@MsAuditLog(module = OperLogModule.TRACK_BUG, type = OperLogConstants.DELETE, msClass = IssuesService.class)
public void batchDelete(@RequestBody IssuesUpdateRequest request) {
issuesService.batchDelete(request);
}

42
test-track/backend/src/main/java/io/metersphere/service/IssuesService.java
View File

@ -65,6 +65,7 @@ import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
@ -747,6 +748,30 @@ public class IssuesService {
data.setFields(fields);
}
private String getCustomStatus(List<CustomFieldItemDTO> fields) {
List<CustomFieldItemDTO> customFields = fields.stream().filter(field -> StringUtils.equals(field.getName(), SystemCustomField.ISSUE_STATUS))
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(customFields)) {
return null;
}
return customFields.get(0).getValue().toString();
}
private void buildCustomFieldStr(IssuesWithBLOBs issues, List<CustomFieldItemDTO> fields) {
if (CollectionUtils.isEmpty(fields)) {
return;
}
List<Map<String, Object>> custemFieldMaps = new ArrayList<>();
fields.stream().filter(field -> ObjectUtils.isNotEmpty(field.getValue())
&& !StringUtils.equalsAnyIgnoreCase(field.getValue().toString(), StringUtils.EMPTY, "[]")).forEach(field -> {
Map<String, Object> custemFieldMap = new HashMap<>();
custemFieldMap.put("name", field.getName());
custemFieldMap.put("value", field.getValue());
custemFieldMaps.add(custemFieldMap);
});
issues.setCustomFields(JSON.toJSONString(custemFieldMaps));
}
private void buildCustomField(List<IssuesDao> data, Boolean isThirdTemplate, List<CustomFieldDao> customFields) {
if (CollectionUtils.isEmpty(data)) {
return;
@ -1234,6 +1259,7 @@ public class IssuesService {
public String getLogDetails(String id) {
IssuesWithBLOBs issuesWithBLOBs = issuesMapper.selectByPrimaryKey(id);
if (issuesWithBLOBs != null) {
issuesWithBLOBs.setStatus(StringUtils.equals(issuesWithBLOBs.getPlatform(), IssuesManagePlatform.Local.name()) ? issuesWithBLOBs.getStatus() : issuesWithBLOBs.getPlatformStatus());
List<DetailColumn> columns = ReflexObjectUtil.getColumns(issuesWithBLOBs, TestPlanReference.issuesColumns);
OperatingLogDetails details = new OperatingLogDetails(JSON.toJSONString(issuesWithBLOBs.getId()), issuesWithBLOBs.getProjectId(), issuesWithBLOBs.getTitle(), issuesWithBLOBs.getCreator(), columns);
return JSON.toJSONString(details);
@ -1242,10 +1268,18 @@ public class IssuesService {
}
public String getLogDetails(IssuesUpdateRequest issuesRequest) {
if (issuesRequest != null) {
issuesRequest.setCreator(SessionUtils.getUserId());
List<DetailColumn> columns = ReflexObjectUtil.getColumns(issuesRequest, TestPlanReference.issuesColumns);
OperatingLogDetails details = new OperatingLogDetails(null, issuesRequest.getProjectId(), issuesRequest.getTitle(), issuesRequest.getCreator(), columns);
IssuesWithBLOBs issuesWithBLOBs = issuesMapper.selectByPrimaryKey(issuesRequest.getId());
if (issuesWithBLOBs != null) {
if (!StringUtils.equals(issuesWithBLOBs.getPlatform(), IssuesManagePlatform.Local.name())) {
issuesWithBLOBs.setStatus(issuesWithBLOBs.getPlatformStatus());
}
String customStatus = getCustomStatus(issuesRequest.getRequestFields());
if (customStatus != null) {
issuesWithBLOBs.setStatus(customStatus);
}
buildCustomFieldStr(issuesWithBLOBs, issuesRequest.getRequestFields());
List<DetailColumn> columns = ReflexObjectUtil.getColumns(issuesWithBLOBs, TestPlanReference.issuesColumns);
OperatingLogDetails details = new OperatingLogDetails(null, issuesWithBLOBs.getProjectId(), issuesWithBLOBs.getTitle(), issuesWithBLOBs.getCreator(), columns);
return JSON.toJSONString(details);
}
return null;