fix(api): insert node that already exist (#3617)

Author: sguiheux

engine/api/workflow/dao_data_trigger.go

@@ -14,12 +14,14 @@ func insertNodeTriggerData(db gorp.SqlExecutor, w *sdk.Workflow, n *sdk.Node) er
 	for i := range n.Triggers {
 		t := &n.Triggers[i]
 		t.ID = 0
-		// Create child to get its ID
-		if err := insertNodeData(db, w, &t.ChildNode, false); err != nil {
-			return sdk.WrapError(err, "insertNodeTriggerData> Unable to insert destination node")
-		}
 
-		// Set ID
+		// Is child already exist
+		if t.ChildNode.ID == 0 {
+			// Create child to get its ID
+			if err := insertNodeData(db, w, &t.ChildNode, false); err != nil {
+				return sdk.WrapError(err, "Unable to insert destination node")
+			}
+		}
 		t.ChildNodeID = t.ChildNode.ID
 		t.ParentNodeID = n.ID
 

engine/api/workflow/dao_test.go

@@ -575,7 +575,6 @@ func TestUpdateSimpleWorkflowWithApplicationEnvPipelineParametersAndPayload(t *t
 		WorkflowData: &sdk.WorkflowData{
 			Node: sdk.Node{
 				Name: "node1",
-				Ref:  "node1",
 				Type: sdk.NodeTypePipeline,
 				Context: &sdk.NodeContext{
 					PipelineID:    pip.ID,
@@ -600,7 +599,6 @@ func TestUpdateSimpleWorkflowWithApplicationEnvPipelineParametersAndPayload(t *t
 					{
 						ChildNode: sdk.Node{
 							Name: "node2",
-							Ref:  "node2",
 							Context: &sdk.NodeContext{
 								PipelineID: pip3.ID,
 							},
@@ -623,9 +621,8 @@ func TestUpdateSimpleWorkflowWithApplicationEnvPipelineParametersAndPayload(t *t
 	t.Logf("Modifying workflow... with %d instead of %d", app2.ID, app.ID)
 
 	w1.Name = "test_2"
-	w1.Root.PipelineID = pip2.ID
-	w1.Root.Context.Application = &app2
-	w1.Root.Context.ApplicationID = app2.ID
+	w1.WorkflowData.Node.Context.PipelineID = pip2.ID
+	w1.WorkflowData.Node.Context.ApplicationID = app2.ID
 
 	test.NoError(t, workflow.Update(context.TODO(), db, cache, w1, w1old, proj, u))
 
@@ -634,8 +631,8 @@ func TestUpdateSimpleWorkflowWithApplicationEnvPipelineParametersAndPayload(t *t
 	test.NoError(t, err)
 
 	assert.Equal(t, w1.ID, w2.ID)
-	assert.Equal(t, app2.ID, w2.Root.Context.Application.ID)
-	assert.Equal(t, env.ID, w2.Root.Context.Environment.ID)
+	assert.Equal(t, app2.ID, w2.WorkflowData.Node.Context.ApplicationID)
+	assert.Equal(t, env.ID, w2.WorkflowData.Node.Context.EnvironmentID)
 
 	test.NoError(t, workflow.Delete(context.TODO(), db, cache, proj, w2))
 }

sdk/workflow.go

@@ -165,6 +165,10 @@ func (w *Workflow) ResetIDs() {
 			(&t.WorkflowDestNode).ResetIDs()
 		}
 	}
+
+	for _, n := range w.WorkflowData.Array() {
+		n.ID = 0
+	}
 }
 
 //Nodes returns nodes IDs excluding the root ID