Add new WorkflowMiddlewarePhase

Author: glucaci

src/WorkflowCore/Interface/IWorkflowMiddleware.cs

@@ -16,7 +16,12 @@ public enum WorkflowMiddlewarePhase
         /// <summary>
         /// The middleware should run after a workflow completes.
         /// </summary>
-        PostWorkflow
+        PostWorkflow,
+
+        /// <summary>
+        /// The middleware should run after each workflow execution.
+        /// </summary>
+        ExecuteWorkflow
     }
 
     /// <summary>

src/WorkflowCore/Interface/IWorkflowMiddlewareRunner.cs

@@ -4,7 +4,7 @@
 namespace WorkflowCore.Interface
 {
     /// <summary>
-    /// Runs workflow pre/post middleware.
+    /// Runs workflow pre/post and execute middleware.
     /// </summary>
     public interface IWorkflowMiddlewareRunner
     {
@@ -29,5 +29,16 @@ public interface IWorkflowMiddlewareRunner
         /// <param name="def">The <see cref="WorkflowDefinition"/> definition.</param>
         /// <returns>A task that will complete when all middleware has run.</returns>
         Task RunPostMiddleware(WorkflowInstance workflow, WorkflowDefinition def);
+
+        /// <summary>
+        /// Runs workflow-level middleware that is set to run at the
+        /// <see cref="WorkflowMiddlewarePhase.ExecuteWorkflow"/> phase. Middleware will be run in the
+        /// order in which they were registered with DI with middleware declared earlier starting earlier and
+        /// completing later.
+        /// </summary>
+        /// <param name="workflow">The <see cref="WorkflowInstance"/> to run for.</param>
+        /// <param name="def">The <see cref="WorkflowDefinition"/> definition.</param>
+        /// <returns>A task that will complete when all middleware has run.</returns>
+        Task RunExecuteMiddleware(WorkflowInstance workflow, WorkflowDefinition def);
     }
 }

src/WorkflowCore/Services/WorkflowExecutor.cs

@@ -96,12 +96,12 @@ public async Task<WorkflowExecutorResult> Execute(WorkflowInstance workflow, Can
                 _cancellationProcessor.ProcessCancellations(workflow, def, wfResult);
             }
             ProcessAfterExecutionIteration(workflow, def, wfResult);
-            DetermineNextExecutionTime(workflow, def);
+            await DetermineNextExecutionTime(workflow, def);
 
             using (var scope = _serviceProvider.CreateScope())
             {
                 var middlewareRunner = scope.ServiceProvider.GetRequiredService<IWorkflowMiddlewareRunner>();
-                await middlewareRunner.RunPostMiddleware(workflow, def);
+                await middlewareRunner.RunExecuteMiddleware(workflow, def);
             }
 
             return wfResult;
@@ -212,7 +212,7 @@ private void ProcessAfterExecutionIteration(WorkflowInstance workflow, WorkflowD
             }
         }
 
-        private void DetermineNextExecutionTime(WorkflowInstance workflow, WorkflowDefinition def)
+        private async Task DetermineNextExecutionTime(WorkflowInstance workflow, WorkflowDefinition def)
         {
             //TODO: move to own class
             workflow.NextExecution = null;
@@ -257,6 +257,12 @@ private void DetermineNextExecutionTime(WorkflowInstance workflow, WorkflowDefin
             workflow.Status = WorkflowStatus.Complete;
             workflow.CompleteTime = _datetimeProvider.UtcNow;
 
+            using (var scope = _serviceProvider.CreateScope())
+            {
+                var middlewareRunner = scope.ServiceProvider.GetRequiredService<IWorkflowMiddlewareRunner>();
+                await middlewareRunner.RunPostMiddleware(workflow, def);
+            }
+
             _publisher.PublishNotification(new WorkflowCompleted
             {
                 EventTimeUtc = _datetimeProvider.UtcNow,

src/WorkflowCore/Services/WorkflowMiddlewareRunner.cs

@@ -8,7 +8,7 @@
 
 namespace WorkflowCore.Services
 {
-    /// <inheritdoc />
+    /// <inheritdoc cref="IWorkflowMiddlewareRunner" />
     public class WorkflowMiddlewareRunner : IWorkflowMiddlewareRunner
     {
         private static readonly WorkflowDelegate NoopWorkflowDelegate = () => Task.CompletedTask;
@@ -17,23 +17,13 @@ public class WorkflowMiddlewareRunner : IWorkflowMiddlewareRunner
 
         public WorkflowMiddlewareRunner(
             IEnumerable<IWorkflowMiddleware> middleware,
-            IServiceProvider serviceProvider
-        )
+            IServiceProvider serviceProvider)
         {
             _middleware = middleware;
             _serviceProvider = serviceProvider;
         }
 
-
-        /// <summary>
-        /// Runs workflow-level middleware that is set to run at the
-        /// <see cref="WorkflowMiddlewarePhase.PreWorkflow"/> phase. Middleware will be run in the
-        /// order in which they were registered with DI with middleware declared earlier starting earlier and
-        /// completing later.
-        /// </summary>
-        /// <param name="workflow">The <see cref="WorkflowInstance"/> to run for.</param>
-        /// <param name="def">The <see cref="WorkflowDefinition"/> definition.</param>
-        /// <returns>A task that will complete when all middleware has run.</returns>
+        /// <inheritdoc cref="IWorkflowMiddlewareRunner.RunPreMiddleware"/>
         public async Task RunPreMiddleware(WorkflowInstance workflow, WorkflowDefinition def)
         {
             var preMiddleware = _middleware
@@ -43,15 +33,7 @@ public async Task RunPreMiddleware(WorkflowInstance workflow, WorkflowDefinition
             await RunWorkflowMiddleware(workflow, preMiddleware);
         }
 
-        /// <summary>
-        /// Runs workflow-level middleware that is set to run at the
-        /// <see cref="WorkflowMiddlewarePhase.PostWorkflow"/> phase. Middleware will be run in the
-        /// order in which they were registered with DI with middleware declared earlier starting earlier and
-        /// completing later.
-        /// </summary>
-        /// <param name="workflow">The <see cref="WorkflowInstance"/> to run for.</param>
-        /// <param name="def">The <see cref="WorkflowDefinition"/> definition.</param>
-        /// <returns>A task that will complete when all middleware has run.</returns>
+        /// <inheritdoc cref="IWorkflowMiddlewareRunner.RunPostMiddleware"/>
         public async Task RunPostMiddleware(WorkflowInstance workflow, WorkflowDefinition def)
         {
             var postMiddleware = _middleware
@@ -77,10 +59,15 @@ public async Task RunPostMiddleware(WorkflowInstance workflow, WorkflowDefinitio
             }
         }
 
+        /// <inheritdoc cref="IWorkflowMiddlewareRunner.RunExecuteMiddleware"/>
+        public Task RunExecuteMiddleware(WorkflowInstance workflow, WorkflowDefinition def)
+        {
+            throw new NotImplementedException();
+        }
+
         private static async Task RunWorkflowMiddleware(
             WorkflowInstance workflow,
-            IEnumerable<IWorkflowMiddleware> middlewareCollection
-        )
+            IEnumerable<IWorkflowMiddleware> middlewareCollection)
         {
             // Build the middleware chain
             var middlewareChain = middlewareCollection