Skip to content

[Fix-18132][API] Sync workflow definition version back after create/update #18133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SbloodyS merged 1 commit into from
Apr 3, 2026
+65 −0
Merged

[Fix-18132][API] Sync workflow definition version back after create/update #18133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowDefinitionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ protected Map<String, Object> createDagDefine(User loginUser,
log.info("Save workflow definition complete, workflowDefinitionCode:{}, workflowDefinitionVersion:{}.",
workflowDefinition.getCode(), insertVersion);
}
workflowDefinition.setVersion(insertVersion);
int insertResult = processService.saveTaskRelation(loginUser, workflowDefinition.getProjectCode(),
workflowDefinition.getCode(),
insertVersion, taskRelationList, taskDefinitionLogs, Boolean.TRUE);
Expand Down Expand Up @@ -822,6 +823,7 @@ protected Map<String, Object> updateDagDefine(User loginUser,
"Update workflow definition complete, workflowDefinitionCode:{}, workflowDefinitionVersion:{}.",
workflowDefinition.getCode(), insertVersion);
}
workflowDefinition.setVersion(insertVersion);

taskUsedInOtherTaskValid(workflowDefinition, taskRelationList);
int insertResult = processService.saveTaskRelation(loginUser, workflowDefinition.getProjectCode(),
Expand Down
63 changes: 63 additions & 0 deletions .../src/test/java/org/apache/dolphinscheduler/api/service/WorkflowDefinitionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doThrow;
Expand Down Expand Up @@ -78,6 +79,7 @@
import org.apache.dolphinscheduler.plugin.task.api.model.SwitchResultVo;
import org.apache.dolphinscheduler.plugin.task.api.parameters.ConditionsParameters;
import org.apache.dolphinscheduler.plugin.task.api.parameters.SwitchParameters;
import org.apache.dolphinscheduler.service.model.TaskNode;
import org.apache.dolphinscheduler.service.process.ProcessService;

import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -881,6 +883,55 @@ public void testUpdateWorkflowDefinition() {
}
}

@Test
public void testCreateWorkflowDefinitionShouldSyncVersionToResponse() {
Project project = getProject(projectCode);
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.hasProjectAndWritePerm(eq(user), eq(project), any(Map.class))).thenReturn(true);
when(workflowDefinitionMapper.verifyByDefineName(projectCode, name)).thenReturn(null);
when(processService.transformTask(anyList(), anyList())).thenReturn(getTaskNodeList());
when(processService.saveTaskDefine(eq(user), eq(projectCode), anyList(), eq(Boolean.TRUE))).thenReturn(1);
when(processService.saveWorkflowDefine(any(User.class), any(WorkflowDefinition.class), eq(Boolean.TRUE),
eq(Boolean.TRUE))).thenReturn(1);
when(processService.saveTaskRelation(eq(user), eq(projectCode), anyLong(), eq(1), anyList(), anyList(),
eq(Boolean.TRUE))).thenReturn(Constants.EXIT_CODE_SUCCESS);

Map<String, Object> result = workflowDefinitionService.createWorkflowDefinition(
user, projectCode, name, description, "[]", "[]", timeout,
taskRelationJson, taskDefinitionJson, null, WorkflowExecutionTypeEnum.PARALLEL);

Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
WorkflowDefinition workflowDefinition = (WorkflowDefinition) result.get(Constants.DATA_LIST);
Assertions.assertEquals(1, workflowDefinition.getVersion());
}

@Test
public void testUpdateWorkflowDefinitionShouldSyncVersionToResponse() {
Project project = getProject(projectCode);
WorkflowDefinition workflowDefinition = getWorkflowDefinition();
workflowDefinition.setName("origin-name");
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.hasProjectAndWritePerm(eq(user), eq(project), any(Map.class))).thenReturn(true);
when(processService.transformTask(anyList(), anyList())).thenReturn(getTaskNodeList());
when(workflowDefinitionMapper.queryByCode(processDefinitionCode)).thenReturn(workflowDefinition);
when(workflowDefinitionMapper.verifyByDefineName(projectCode, name)).thenReturn(null);
when(processService.saveTaskDefine(eq(user), eq(projectCode), anyList(), eq(Boolean.TRUE))).thenReturn(1);
when(processService.saveWorkflowDefine(any(User.class), any(WorkflowDefinition.class), eq(Boolean.TRUE),
eq(Boolean.TRUE))).thenReturn(2);
when(workflowTaskRelationMapper.queryByWorkflowDefinitionCode(processDefinitionCode))
.thenReturn(Collections.emptyList());
when(processService.saveTaskRelation(eq(user), eq(projectCode), eq(processDefinitionCode), eq(2), anyList(),
anyList(), eq(Boolean.TRUE))).thenReturn(Constants.EXIT_CODE_SUCCESS);

Map<String, Object> result = workflowDefinitionService.updateWorkflowDefinition(
user, projectCode, name, processDefinitionCode, description, "[]", "[]", timeout,
taskRelationJson, taskDefinitionJson, WorkflowExecutionTypeEnum.PARALLEL);

Assertions.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
WorkflowDefinition resultDefinition = (WorkflowDefinition) result.get(Constants.DATA_LIST);
Assertions.assertEquals(2, resultDefinition.getVersion());
}

@Test
public void testGetNewProcessName() {
String processName1 = "test_copy_" + DateUtils.getCurrentTimeStamp();
Expand Down Expand Up @@ -976,6 +1027,18 @@ private WorkflowTaskRelation getWorkflowTaskRelation(int id, int workflowDefinit
return workflowTaskRelation;
}

private List<TaskNode> getTaskNodeList() {
TaskNode firstTaskNode = new TaskNode();
firstTaskNode.setCode(123456789L);
firstTaskNode.setPreTasks(JSONUtils.toJsonString(Collections.emptyList()));

TaskNode secondTaskNode = new TaskNode();
secondTaskNode.setCode(123451234L);
secondTaskNode.setPreTasks(JSONUtils.toJsonString(Collections.singletonList(123456789L)));

return Arrays.asList(firstTaskNode, secondTaskNode);
}

/**
* get mock schedule
*
Expand Down
Loading