If step (danielgerlag#34)

* if step
* Sequence step
* skip step
* when step
* outcome switch
* tests

Author: danielgerlag

WorkflowCore.sln

@@ -78,6 +78,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Sample09", "sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkflowCore.Sample10", "src\samples\WorkflowCore.Sample10\WorkflowCore.Sample10.csproj", "{5E792455-4C4C-460F-849E-50A5DCED454D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowCore.Sample11", "src\samples\WorkflowCore.Sample11\WorkflowCore.Sample11.csproj", "{58D0480F-D05D-4348-86D9-B0A7255700E6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowCore.Sample12", "src\samples\WorkflowCore.Sample12\WorkflowCore.Sample12.csproj", "{BB776411-D279-419F-8697-5C6F52BCD5CD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowCore.Tests.Sqlite", "test\WorkflowCore.Tests.Sqlite\WorkflowCore.Tests.Sqlite.csproj", "{F9F8F9CD-01D9-468B-856D-6A87F0762A01}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -204,6 +210,18 @@ Global
 		{5E792455-4C4C-460F-849E-50A5DCED454D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E792455-4C4C-460F-849E-50A5DCED454D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E792455-4C4C-460F-849E-50A5DCED454D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58D0480F-D05D-4348-86D9-B0A7255700E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58D0480F-D05D-4348-86D9-B0A7255700E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58D0480F-D05D-4348-86D9-B0A7255700E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58D0480F-D05D-4348-86D9-B0A7255700E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB776411-D279-419F-8697-5C6F52BCD5CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB776411-D279-419F-8697-5C6F52BCD5CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB776411-D279-419F-8697-5C6F52BCD5CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB776411-D279-419F-8697-5C6F52BCD5CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9F8F9CD-01D9-468B-856D-6A87F0762A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9F8F9CD-01D9-468B-856D-6A87F0762A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9F8F9CD-01D9-468B-856D-6A87F0762A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9F8F9CD-01D9-468B-856D-6A87F0762A01}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -242,5 +260,8 @@ Global
 		{FBF8D151-A3BF-4EB3-8F80-D71618696362} = {6803696C-B19A-4B27-9193-082A02B6F205}
 		{50E1AFAC-0B58-43A8-8F03-3A63AAC681FA} = {5080DB09-CBE8-4C45-9957-C3BB7651755E}
 		{5E792455-4C4C-460F-849E-50A5DCED454D} = {5080DB09-CBE8-4C45-9957-C3BB7651755E}
+		{58D0480F-D05D-4348-86D9-B0A7255700E6} = {5080DB09-CBE8-4C45-9957-C3BB7651755E}
+		{BB776411-D279-419F-8697-5C6F52BCD5CD} = {5080DB09-CBE8-4C45-9957-C3BB7651755E}
+		{F9F8F9CD-01D9-468B-856D-6A87F0762A01} = {E6CEAD8D-F565-471E-A0DC-676F54EAEDEB}
 	EndGlobalSection
 EndGlobal

src/WorkflowCore/Interface/IContainerStepBuilder.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WorkflowCore.Interface
+{
+    public interface IContainerStepBuilder<TData, TStepBody, TReturnStep>
+        where TStepBody : IStepBody
+        where TReturnStep : IStepBody
+    {
+        IStepBuilder<TData, TReturnStep> Do(Action<IWorkflowBuilder<TData>> builder);
+    }
+}

src/WorkflowCore/Interface/IParentStepBuilder.cs

@@ -3,6 +3,7 @@
 using System.Linq.Expressions;
 using WorkflowCore.Interface;
 using WorkflowCore.Models;
+using WorkflowCore.Primitives;
 
 namespace WorkflowCore.Interface
 {
@@ -49,6 +50,7 @@ public interface IStepBuilder<TData, TStepBody>
         /// </summary>
         /// <param name="outcomeValue"></param>
         /// <returns></returns>
+        [Obsolete]
         IStepOutcomeBuilder<TData> When(object outcomeValue, string label = null);
 
         /// <summary>
@@ -87,8 +89,17 @@ public interface IStepBuilder<TData, TStepBody>
         /// <returns></returns>
         IStepBuilder<TData, TStepBody> EndWorkflow();
 
-        IParentStepBuilder<TData, Foreach> ForEach(Expression<Func<TData, IEnumerable>> collection);
+        IContainerStepBuilder<TData, Foreach, Foreach> ForEach(Expression<Func<TData, IEnumerable>> collection);
 
-        IParentStepBuilder<TData, While> While(Expression<Func<TData, bool>> condition);
+        IContainerStepBuilder<TData, While, While> While(Expression<Func<TData, bool>> condition);
+
+        IContainerStepBuilder<TData, If, If> If(Expression<Func<TData, bool>> condition);
+
+        /// <summary>
+        /// Configure an outcome for this step, then wire it to a sequence
+        /// </summary>
+        /// <param name="outcomeValue"></param>
+        /// <returns></returns>
+        IContainerStepBuilder<TData, When, OutcomeSwitch> When(Expression<Func<TData, object>> outcomeValue, string label = null);
     }
 }

src/WorkflowCore/Interface/IStepBuilder.cs

@@ -1,6 +1,7 @@
 using System;
 using WorkflowCore.Interface;
 using WorkflowCore.Models;
+using WorkflowCore.Primitives;
 
 namespace WorkflowCore.Interface
 {    

src/WorkflowCore/Interface/IStepOutcomeBuilder.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using WorkflowCore.Interface;
 using WorkflowCore.Models;
+using WorkflowCore.Primitives;
 
 namespace WorkflowCore.Interface
 {

src/WorkflowCore/Interface/IWorkflowBuilder.cs

@@ -41,5 +41,6 @@ public class ExecutionPointer
 
         public string PredecessorId { get; set; }
 
+        public object Outcome { get; set; }
     }
 }

src/WorkflowCore/Models/ControlStructures/ControlPersistenceData.cs renamed to src/WorkflowCore/Models/ControlPersistenceData.cs

@@ -1,17 +1,31 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 using WorkflowCore.Interface;
 
 namespace WorkflowCore.Models
 {
     public class StepOutcome
     {
-        public object Value { get; set; }
+        private Expression<Func<object, object>> _value;
+
+        public Expression<Func<object, object>> Value
+        {
+            set { _value = value; }
+        }
 
         public int NextStep { get; set; }
 
         public string Label { get; set; }
+
+        public object GetValue(object data)
+        {
+            if (_value == null)
+                return null;
+
+            return _value.Compile().Invoke(data);
+        }
     }
 }

src/WorkflowCore/Models/ExecutionPointer.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace WorkflowCore.Primitives
+{
+    public abstract class ContainerStepBody : StepBody
+    {       
+        protected bool IsBranchComplete(IEnumerable<ExecutionPointer> pointers, string rootId)
+        {
+            //TODO: move to own class
+            var root = pointers.First(x => x.Id == rootId);
+
+            if (root.EndTime == null)
+                return false;
+
+            var list = pointers.Where(x => x.PredecessorId == rootId).ToList();
+
+            bool result = true;
+
+            foreach (var item in list)
+                result = result && IsBranchComplete(pointers, item.Id);
+
+            return result;
+        }
+    }
+}

src/WorkflowCore/Models/StepOutcome.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Text;
 using WorkflowCore.Interface;
+using WorkflowCore.Models;
 
-namespace WorkflowCore.Models
+namespace WorkflowCore.Primitives
 {
     public class EndStep : WorkflowStep
     {

src/WorkflowCore/Primitives/ContainerStepBody.cs

@@ -5,10 +5,11 @@
 using System.Linq.Expressions;
 using System.Text;
 using WorkflowCore.Interface;
+using WorkflowCore.Models;
 
-namespace WorkflowCore.Models
+namespace WorkflowCore.Primitives
 {
-    public class Foreach : StepBody
+    public class Foreach : ContainerStepBody
     {
         public IEnumerable Collection { get; set; }                
 
@@ -34,24 +35,6 @@ public override ExecutionResult Run(IStepExecutionContext context)
             }
 
             return ExecutionResult.Persist(context.PersistenceData);
-        }
-
-        private bool IsBranchComplete(IEnumerable<ExecutionPointer> pointers, string rootId)
-        {
-            var root = pointers.First(x => x.Id == rootId);
-
-            if (root.EndTime == null)
-                return false;
-
-            var list = pointers.Where(x => x.PredecessorId == rootId).ToList();
-
-            bool result = true;
-
-            foreach (var item in list)
-                result = result && IsBranchComplete(pointers, item.Id);
-
-            return result;
-        }
-
+        }        
     }
 }

src/WorkflowCore/Models/ControlStructures/EndStep.cs renamed to src/WorkflowCore/Primitives/EndStep.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace WorkflowCore.Primitives
+{
+    public class If : ContainerStepBody
+    {
+        public bool ConditionResult { get; set; }                
+
+        public override ExecutionResult Run(IStepExecutionContext context)
+        {
+            if (context.PersistenceData == null)
+            {
+                if (ConditionResult)
+                    return ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                else
+                    return ExecutionResult.Next();
+            }
+
+            if ((context.PersistenceData is ControlPersistenceData) && ((context.PersistenceData as ControlPersistenceData).ChildrenActive))
+            { 
+                bool complete = true;
+                foreach (var childId in context.ExecutionPointer.Children)
+                    complete = complete && IsBranchComplete(context.Workflow.ExecutionPointers, childId);
+
+                if (complete)
+                    return ExecutionResult.Next();
+                else
+                    return ExecutionResult.Persist(context.PersistenceData);
+            }
+
+            throw new Exception("Corrupt persistence data");
+        }        
+    }
+}

src/WorkflowCore/Models/ControlStructures/Foreach.cs renamed to src/WorkflowCore/Primitives/Foreach.cs

@@ -4,8 +4,9 @@
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using WorkflowCore.Interface;
+using WorkflowCore.Models;
 
-namespace WorkflowCore.Models
+namespace WorkflowCore.Primitives
 {
     public class InlineStepBody : StepBody
     {

src/WorkflowCore/Primitives/If.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace WorkflowCore.Primitives
+{
+    public class OutcomeSwitch : ContainerStepBody
+    {
+        public override ExecutionResult Run(IStepExecutionContext context)
+        {
+            if (context.PersistenceData == null)
+            {
+                var result = ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+                result.OutcomeValue = GetPreviousOutcome(context);
+                return result;
+            }
+
+            if ((context.PersistenceData is ControlPersistenceData) && ((context.PersistenceData as ControlPersistenceData).ChildrenActive))
+            { 
+                bool complete = true;
+                foreach (var childId in context.ExecutionPointer.Children)
+                    complete = complete && IsBranchComplete(context.Workflow.ExecutionPointers, childId);
+
+                if (complete)
+                    return ExecutionResult.Next();
+                else
+                {
+                    var result = ExecutionResult.Persist(context.PersistenceData);
+                    result.OutcomeValue = GetPreviousOutcome(context);
+                    return result;
+                }
+            }
+
+            throw new Exception("Corrupt persistence data");
+        }
+
+        private object GetPreviousOutcome(IStepExecutionContext context)
+        {
+            var prevPointer = context.Workflow.ExecutionPointers.First(x => x.Id == context.ExecutionPointer.PredecessorId);
+            return prevPointer.Outcome;
+        }
+
+    }
+}

src/WorkflowCore/Models/InlineStepBody.cs renamed to src/WorkflowCore/Primitives/InlineStepBody.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Text;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace WorkflowCore.Primitives
+{
+    public class Sequence : ContainerStepBody
+    {
+        public override ExecutionResult Run(IStepExecutionContext context)
+        {
+            if (context.PersistenceData == null)
+                return ExecutionResult.Branch(new List<object>() { null }, new ControlPersistenceData() { ChildrenActive = true });
+
+            if ((context.PersistenceData is ControlPersistenceData) && ((context.PersistenceData as ControlPersistenceData).ChildrenActive))
+            { 
+                bool complete = true;
+                foreach (var childId in context.ExecutionPointer.Children)
+                    complete = complete && IsBranchComplete(context.Workflow.ExecutionPointers, childId);
+
+                if (complete)
+                    return ExecutionResult.Next();
+                else
+                    return ExecutionResult.Persist(context.PersistenceData);
+            }
+
+            throw new Exception("Corrupt persistence data");
+        }        
+    }
+}

src/WorkflowCore/Primitives/OutcomeSwitch.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Text;
 using WorkflowCore.Interface;
+using WorkflowCore.Models;
 
-namespace WorkflowCore.Models
+namespace WorkflowCore.Primitives
 {
     public class SubWorkflowStepBody : StepBody
     {