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

fix(接口测试): 修复CASE执行未发消息问题

This commit is contained in:
fit2-zhao 2022-04-28 13:21:18 +08:00 committed by 刘瑞斌
parent adc19d2161
commit c7cdeaec88
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
View File

@ -85,6 +85,7 @@ public class ApiDefinitionExecResultService {
ApiDefinitionExecResult result = this.editResult(item, dto.getReportId(), dto.getConsole(), dto.getRunMode(), dto.getTestId(), null); ApiDefinitionExecResult result = this.editResult(item, dto.getReportId(), dto.getConsole(), dto.getRunMode(), dto.getTestId(), null);
if (result != null) { if (result != null) {
// 发送通知 // 发送通知
result.setResourceId(dto.getTestId());
sendNotice(result); sendNotice(result);
} }
//删除用例运行时存放在redis中的用户数据 //删除用例运行时存放在redis中的用户数据
@ -118,6 +119,7 @@ public class ApiDefinitionExecResultService {
if (result != null && !StringUtils.startsWithAny(dto.getRunMode(), "SCHEDULE")) { if (result != null && !StringUtils.startsWithAny(dto.getRunMode(), "SCHEDULE")) {
// 发送通知 // 发送通知
result.setResourceId(dto.getTestId());
sendNotice(result); sendNotice(result);
} }
//删除用例运行时存放在redis中的用户数据 //删除用例运行时存放在redis中的用户数据
@ -164,11 +166,11 @@ public class ApiDefinitionExecResultService {
} }
User user = null; User user = null;
Object userObject = redisTemplate.opsForValue().get(result.getId()); Object userObject = redisTemplate.opsForValue().get(result.getId());
if(userObject != null && userObject instanceof UserDTO){ if (userObject != null && userObject instanceof UserDTO) {
user = (UserDTO) userObject; user = (UserDTO) userObject;
} }
if(user == null){ if (user == null) {
if (SessionUtils.getUser() != null && StringUtils.equals(SessionUtils.getUser().getId(), result.getUserId())) { if (SessionUtils.getUser() != null && StringUtils.equals(SessionUtils.getUser().getId(), result.getUserId())) {
user = SessionUtils.getUser(); user = SessionUtils.getUser();
} else { } else {
@ -442,7 +444,7 @@ public class ApiDefinitionExecResultService {
RequestResultExpandDTO expandDTO = ResponseUtil.parseByRequestResult(item); RequestResultExpandDTO expandDTO = ResponseUtil.parseByRequestResult(item);
String status = item.isSuccess() ? ExecuteResult.success.name() : ExecuteResult.error.name(); String status = item.isSuccess() ? ExecuteResult.success.name() : ExecuteResult.error.name();
if (MapUtils.isNotEmpty(expandDTO.getAttachInfoMap())) { if (MapUtils.isNotEmpty(expandDTO.getAttachInfoMap())) {
if(StringUtils.isNotEmpty(expandDTO.getStatus())){ if (StringUtils.isNotEmpty(expandDTO.getStatus())) {
status = expandDTO.getStatus(); status = expandDTO.getStatus();
} }
saveResult.setContent(JSON.toJSONString(expandDTO)); saveResult.setContent(JSON.toJSONString(expandDTO));