Merge pull request #1052 from lfbertucci/AddProceedOnCancelToDslDefinitionLoader

danielgerlag · web-flow · commit 2a7cd56d8831 · 2022-08-13T09:32:02.000-07:00
Add ProceedOnCancel to WorkflowCore.DSL definition loader
diff --git a/src/WorkflowCore.DSL/Models/v1/StepSourceV1.cs b/src/WorkflowCore.DSL/Models/v1/StepSourceV1.cs
@@ -7,7 +7,7 @@ namespace WorkflowCore.Models.DefinitionStorage.v1
     public class StepSourceV1
     {
         public string StepType { get; set; }
-        
+
         public string Id { get; set; }
 
         public string Name { get; set; }
@@ -29,8 +29,9 @@ public class StepSourceV1
         public ExpandoObject Inputs { get; set; } = new ExpandoObject();
 
         public Dictionary<string, string> Outputs { get; set; } = new Dictionary<string, string>();
-        
+
         public Dictionary<string, string> SelectNextStep { get; set; } = new Dictionary<string, string>();
 
+        public bool ProceedOnCancel { get; set; } = false;
     }
 }
diff --git a/src/WorkflowCore.DSL/Services/DefinitionLoader.cs b/src/WorkflowCore.DSL/Services/DefinitionLoader.cs
@@ -101,6 +101,7 @@ private WorkflowStepCollection ConvertSteps(ICollection<StepSourceV1> source, Ty
                 targetStep.ErrorBehavior = nextStep.ErrorBehavior;
                 targetStep.RetryInterval = nextStep.RetryInterval;
                 targetStep.ExternalId = $"{nextStep.Id}";
+                targetStep.ProceedOnCancel = nextStep.ProceedOnCancel;
 
                 AttachInputs(nextStep, dataType, stepType, targetStep);
                 AttachOutputs(nextStep, dataType, stepType, targetStep);
diff --git a/test/WorkflowCore.IntegrationTests/Scenarios/StoredJsonScenario.cs b/test/WorkflowCore.IntegrationTests/Scenarios/StoredJsonScenario.cs
@@ -31,6 +31,7 @@ public void should_execute_branch1()
             data.Counter6.Should().Be(1);
             data.Counter7.Should().Be(1);
             data.Counter8.Should().Be(0);
+            data.Counter10.Should().Be(1);
         }
 
         [Fact(DisplayName = "Execute branch 2")]
@@ -50,6 +51,7 @@ public void should_execute_branch2()
             data.Counter6.Should().Be(1);
             data.Counter7.Should().Be(0);
             data.Counter8.Should().Be(1);
+            data.Counter10.Should().Be(1);
         }
 
         [Fact]
@@ -64,7 +66,8 @@ public void should_execute_json_workflow_with_dynamic_data()
                 ["Counter3"] = 0,
                 ["Counter4"] = 0,
                 ["Counter5"] = 0,
-                ["Counter6"] = 0
+                ["Counter6"] = 0,
+                ["Counter10"] = 0
             };
 
             var workflowId = StartWorkflow(TestAssets.Utils.GetTestDefinitionDynamicJson(), initialData);
@@ -79,6 +82,7 @@ public void should_execute_json_workflow_with_dynamic_data()
             data["Counter4"].Should().Be(1);
             data["Counter5"].Should().Be(0);
             data["Counter6"].Should().Be(1);
+            data["Counter10"].Should().Be(1);
         }
     }
 }
diff --git a/test/WorkflowCore.IntegrationTests/Scenarios/StoredYamlScenario.cs b/test/WorkflowCore.IntegrationTests/Scenarios/StoredYamlScenario.cs
@@ -29,6 +29,7 @@ public void should_execute_yaml_workflow()
             data.Counter4.Should().Be(1);
             data.Counter5.Should().Be(0);
             data.Counter6.Should().Be(1);
+            data.Counter10.Should().Be(1);
         }
     }
 }
diff --git a/test/WorkflowCore.TestAssets/DataTypes/CounterBoard.cs b/test/WorkflowCore.TestAssets/DataTypes/CounterBoard.cs
@@ -13,6 +13,7 @@ public class CounterBoard
         public int Counter7 { get; set; }
         public int Counter8 { get; set; }
         public int Counter9 { get; set; }
+        public int Counter10 { get; set; }
         public bool Flag1 { get; set; }
         public bool Flag2 { get; set; }
         public bool Flag3 { get; set; }
diff --git a/test/WorkflowCore.TestAssets/stored-definition.json b/test/WorkflowCore.TestAssets/stored-definition.json
@@ -58,6 +58,26 @@
             "Inputs": { "Value": "data.Counter5" },
             "Outputs": { "Counter5": "step.Value" }
           }
+        ],
+        [
+          {
+            "Id": "Step3.3.1",
+            "StepType": "WorkflowCore.Primitives.WaitFor, WorkflowCore",
+            "NextStepId": "Step3.3.2",
+            "CancelCondition": "data.Flag2",
+            "ProceedOnCancel": true,
+            "Inputs": {
+              "EventName": "\"Event1\"",
+              "EventKey": "\"Key1\"",
+              "EffectiveDate": "DateTime.Now"
+            }
+          },
+          {
+            "Id": "Step3.3.2",
+            "StepType": "WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets",
+            "Inputs": { "Value": "data.Counter10" },
+            "Outputs": { "Counter10": "step.Value" }
+          }
         ]
       ]
     },
diff --git a/test/WorkflowCore.TestAssets/stored-definition.yaml b/test/WorkflowCore.TestAssets/stored-definition.yaml
@@ -50,6 +50,21 @@ Steps:
         Value: data.Counter5
       Outputs:
         Counter5: step.Value
+  - - Id: Step3.3.1
+      StepType: WorkflowCore.Primitives.WaitFor, WorkflowCore
+      NextStepId: Step3.3.2
+      CancelCondition: data.Flag2
+      ProceedOnCancel: true
+      Inputs:
+        EventName: '"Event1"'
+        EventKey: '"Key1"'
+        EffectiveDate: DateTime.Now
+    - Id: Step3.3.2
+      StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+      Inputs:
+        Value: data.Counter10
+      Outputs:
+        Counter10: step.Value
 - Id: Step4
   StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
   Inputs:
diff --git a/test/WorkflowCore.TestAssets/stored-dynamic-definition.json b/test/WorkflowCore.TestAssets/stored-dynamic-definition.json
@@ -57,6 +57,26 @@
             "Inputs": { "Value": "data[\"Counter5\"]" },
             "Outputs": { "Counter5": "step.Value" }
           }
+        ],
+        [
+          {
+            "Id": "Step3.3.1",
+            "StepType": "WorkflowCore.Primitives.WaitFor, WorkflowCore",
+            "NextStepId": "Step3.3.2",
+            "CancelCondition": "object.Equals(data[\"Flag2\"], true)",
+            "ProceedOnCancel": true,
+            "Inputs": {
+              "EventName": "\"Event1\"",
+              "EventKey": "\"Key1\"",
+              "EffectiveDate": "DateTime.Now"
+            }
+          },
+          {
+            "Id": "Step3.3.2",
+            "StepType": "WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets",
+            "Inputs": { "Value": "data[\"Counter10\"]" },
+            "Outputs": { "Counter10": "step.Value" }
+          }
         ]
       ]
     },
diff --git a/test/WorkflowCore.TestAssets/stored-dynamic-definition.yaml b/test/WorkflowCore.TestAssets/stored-dynamic-definition.yaml
@@ -50,6 +50,21 @@ Steps:
         Value: data.Counter5
       Outputs:
         Counter5: step.Value
+  - - Id: Step3.3.1
+      StepType: WorkflowCore.Primitives.WaitFor, WorkflowCore
+      NextStepId: Step3.3.2
+      CancelCondition: data.Flag2
+      ProceedOnCancel: true
+      Inputs:
+        EventName: '"Event1"'
+        EventKey: '"Key1"'
+        EffectiveDate: DateTime.Now
+    - Id: Step3.3.2
+      StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
+      Inputs:
+        Value: data.Counter10
+      Outputs:
+        Counter10: step.Value
 - Id: Step4
   StepType: WorkflowCore.TestAssets.Steps.Counter, WorkflowCore.TestAssets
   Inputs:

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace WorkflowCore.Models.DefinitionStorage.v1`
`7`	`7`	`public class StepSourceV1`
`8`	`8`	`{`
`9`	`9`	`public string StepType { get; set; }`
`10`		`-`
	`10`	`+`
`11`	`11`	`public string Id { get; set; }`
`12`	`12`
`13`	`13`	`public string Name { get; set; }`
`@@ -29,8 +29,9 @@ public class StepSourceV1`
`29`	`29`	`public ExpandoObject Inputs { get; set; } = new ExpandoObject();`
`30`	`30`
`31`	`31`	`public Dictionary<string, string> Outputs { get; set; } = new Dictionary<string, string>();`
`32`		`-`
	`32`	`+`
`33`	`33`	`public Dictionary<string, string> SelectNextStep { get; set; } = new Dictionary<string, string>();`
`34`	`34`
	`35`	`+ public bool ProceedOnCancel { get; set; } = false;`
`35`	`36`	`}`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public void should_execute_branch1()`
`31`	`31`	`data.Counter6.Should().Be(1);`
`32`	`32`	`data.Counter7.Should().Be(1);`
`33`	`33`	`data.Counter8.Should().Be(0);`
	`34`	`+ data.Counter10.Should().Be(1);`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`[Fact(DisplayName = "Execute branch 2")]`
`@@ -50,6 +51,7 @@ public void should_execute_branch2()`
`50`	`51`	`data.Counter6.Should().Be(1);`
`51`	`52`	`data.Counter7.Should().Be(0);`
`52`	`53`	`data.Counter8.Should().Be(1);`
	`54`	`+ data.Counter10.Should().Be(1);`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`[Fact]`
`@@ -64,7 +66,8 @@ public void should_execute_json_workflow_with_dynamic_data()`
`64`	`66`	`["Counter3"] = 0,`
`65`	`67`	`["Counter4"] = 0,`
`66`	`68`	`["Counter5"] = 0,`
`67`		`- ["Counter6"] = 0`
	`69`	`+ ["Counter6"] = 0,`
	`70`	`+ ["Counter10"] = 0`
`68`	`71`	`};`
`69`	`72`
`70`	`73`	`var workflowId = StartWorkflow(TestAssets.Utils.GetTestDefinitionDynamicJson(), initialData);`
`@@ -79,6 +82,7 @@ public void should_execute_json_workflow_with_dynamic_data()`
`79`	`82`	`data["Counter4"].Should().Be(1);`
`80`	`83`	`data["Counter5"].Should().Be(0);`
`81`	`84`	`data["Counter6"].Should().Be(1);`
	`85`	`+ data["Counter10"].Should().Be(1);`
`82`	`86`	`}`
`83`	`87`	`}`
`84`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public void should_execute_yaml_workflow()`
`29`	`29`	`data.Counter4.Should().Be(1);`
`30`	`30`	`data.Counter5.Should().Be(0);`
`31`	`31`	`data.Counter6.Should().Be(1);`
	`32`	`+ data.Counter10.Should().Be(1);`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`	`}`