Skip to content

Commit

Permalink
fix: result set data
Browse files Browse the repository at this point in the history
  • Loading branch information
@MichaelDeSteven
MichaelDeSteven committed Jul 28, 2022
1 parent a263e86 commit 40011b9
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 17 deletions.
42 changes: 28 additions & 14 deletions .../main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ protected Result createDagDefine(User loginUser,
int insertResult = processService.saveTaskRelation(loginUser, processDefinition.getProjectCode(), processDefinition.getCode(),
insertVersion, taskRelationList, taskDefinitionLogs, Boolean.TRUE);
if (insertResult == Constants.EXIT_CODE_SUCCESS) {
putMsg(result, Status.SUCCESS, processDefinition);
putMsg(result, Status.SUCCESS);
result.setData(processDefinition);
} else {
putMsg(result, Status.CREATE_PROCESS_TASK_RELATION_ERROR);
throw new ServiceException(Status.CREATE_PROCESS_TASK_RELATION_ERROR);
Expand Down Expand Up @@ -407,7 +408,8 @@ public Result queryProcessDefinitionList(User loginUser, long projectCode) {
}
List<ProcessDefinition> resourceList = processDefinitionMapper.queryAllDefinitionList(projectCode);
List<DagData> dagDataList = resourceList.stream().map(processService::genDagData).collect(Collectors.toList());
putMsg(result, Status.SUCCESS, dagDataList);
putMsg(result, Status.SUCCESS);
result.setData(dagDataList);
return result;
}

Expand Down Expand Up @@ -437,7 +439,8 @@ public Result queryProcessDefinitionSimpleList(User loginUser, long projectCode)
processDefinitionNode.put("projectCode", processDefinition.getProjectCode());
arrayNode.add(processDefinitionNode);
}
putMsg(result, Status.SUCCESS, arrayNode);
putMsg(result, Status.SUCCESS);
result.setData(arrayNode);
return result;
}

Expand Down Expand Up @@ -511,7 +514,8 @@ public Result queryProcessDefinitionByCode(User loginUser, long projectCode, lon
processDefinition.setTenantCode(tenant.getTenantCode());
}
DagData dagData = processService.genDagData(processDefinition);
putMsg(result, Status.SUCCESS, dagData);
putMsg(result, Status.SUCCESS);
result.setData(dagData);
}
return result;
}
Expand Down Expand Up @@ -539,7 +543,8 @@ public Result queryProcessDefinitionByName(User loginUser, long projectCode, Str
putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, name);
} else {
DagData dagData = processService.genDagData(processDefinition);
putMsg(result, Status.SUCCESS, dagData);
putMsg(result, Status.SUCCESS);
result.setData(dagData);
}
return result;
}
Expand Down Expand Up @@ -702,14 +707,16 @@ protected Result updateDagDefine(User loginUser,
int insertResult = processService.saveTaskRelation(loginUser, processDefinition.getProjectCode(),
processDefinition.getCode(), insertVersion, taskRelationList, taskDefinitionLogs, Boolean.TRUE);
if (insertResult == Constants.EXIT_CODE_SUCCESS) {
putMsg(result, Status.SUCCESS, processDefinition);
putMsg(result, Status.SUCCESS);
result.setData(processDefinition);
} else {
putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR);
throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR);
}
saveOtherRelation(loginUser, processDefinition, result, otherParamsJson);
} else {
putMsg(result, Status.SUCCESS, processDefinition);
putMsg(result, Status.SUCCESS);
result.setData(processDefinition);
}
return result;
}
Expand Down Expand Up @@ -1438,7 +1445,8 @@ public Result getTaskNodeListByDefinitionCode(User loginUser, long projectCode,
return result;
}
DagData dagData = processService.genDagData(processDefinition);
putMsg(result, Status.SUCCESS, dagData.getTaskDefinitionList());
putMsg(result, Status.SUCCESS);
result.setData(dagData.getTaskDefinitionList());

return result;
}
Expand Down Expand Up @@ -1485,7 +1493,8 @@ public Result getNodeListMapByDefinitionCodes(User loginUser, long projectCode,
taskNodeMap.put(processDefinition.getCode(), dagData.getTaskDefinitionList());
}

putMsg(result, Status.SUCCESS, taskNodeMap);
putMsg(result, Status.SUCCESS);
result.setData(taskNodeMap);

return result;

Expand All @@ -1509,7 +1518,8 @@ public Result queryAllProcessDefinitionByProjectCode(User loginUser, long projec
}
List<ProcessDefinition> processDefinitions = processDefinitionMapper.queryAllDefinitionList(projectCode);
List<DagData> dagDataList = processDefinitions.stream().map(processService::genDagData).collect(Collectors.toList());
putMsg(result, Status.SUCCESS, dagDataList);
putMsg(result, Status.SUCCESS);
result.setData(dagDataList);
return result;
}

Expand All @@ -1523,7 +1533,8 @@ public Result queryAllProcessDefinitionByProjectCode(User loginUser, long projec
public Result queryProcessDefinitionListByProjectCode(long projectCode) {
Result result = new Result();
List<DependentSimplifyDefinition> processDefinitions = processDefinitionMapper.queryDefinitionListByProjectCodeAndProcessDefinitionCodes(projectCode, null);
putMsg(result, Status.SUCCESS, processDefinitions);
putMsg(result, Status.SUCCESS);
result.setData(processDefinitions);
return result;
}

Expand Down Expand Up @@ -1559,7 +1570,8 @@ public Result queryTaskDefinitionListByProcessDefinitionCode(long projectCode, L
taskDefinitionList.add(dependentSimplifyDefinition);
}

putMsg(result, Status.SUCCESS, taskDefinitionList);
putMsg(result, Status.SUCCESS);
result.setData(taskDefinitionList);
return result;
}

Expand Down Expand Up @@ -1682,7 +1694,8 @@ public Result viewTree(User loginUser, long projectCode, long code, Integer limi
waitingRunningNodeMap.clear();
}
}
putMsg(result, Status.SUCCESS, parentTreeViewDto);
putMsg(result, Status.SUCCESS);
result.setData(parentTreeViewDto);
return result;
}

Expand Down Expand Up @@ -2104,7 +2117,8 @@ protected Result createEmptyDagDefine(User loginUser, ProcessDefinition processD
putMsg(result, Status.CREATE_PROCESS_DEFINITION_ERROR);
throw new ServiceException(Status.CREATE_PROCESS_DEFINITION_ERROR);
}
putMsg(result, Status.SUCCESS, processDefinition);
putMsg(result, Status.SUCCESS);
result.setData(processDefinition);
return result;
}

Expand Down
9 changes: 6 additions & 3 deletions ...test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ public void testCreateProcessDefinition() {
int timeout = 0;
String tenantCode = "root";
Result result = new Result();
putMsg(result, Status.SUCCESS, 1);
putMsg(result, Status.SUCCESS);
result.setData(1);

Mockito.when(processDefinitionService.createProcessDefinition(user, projectCode, name, description, globalParams,
locations, timeout, tenantCode, relationJson, taskDefinitionJson, "", ProcessExecutionTypeEnum.PARALLEL)).thenReturn(result);
Expand Down Expand Up @@ -190,7 +191,8 @@ public void testQueryProcessDefinitionByCode() {
processDefinition.setName(name);

Result result = new Result();
putMsg(result, Status.SUCCESS, processDefinition);
putMsg(result, Status.SUCCESS);
result.setData(processDefinition);

Mockito.when(processDefinitionService.queryProcessDefinitionByCode(user, projectCode, code)).thenReturn(result);
Result response = processDefinitionController.queryProcessDefinitionByCode(user, projectCode, code);
Expand Down Expand Up @@ -234,7 +236,8 @@ public void testQueryProcessDefinitionList() {
List<ProcessDefinition> resourceList = getDefinitionList();

Result result = new Result();
putMsg(result, Status.SUCCESS, resourceList);
putMsg(result, Status.SUCCESS);
result.setData(resourceList);

Mockito.when(processDefinitionService.queryProcessDefinitionList(user, projectCode)).thenReturn(result);
Result response = processDefinitionController.queryProcessDefinitionList(user, projectCode);
Expand Down

0 comments on commit 40011b9

Please sign in to comment.