Set CompleteTime to WorkflowInstance when terminating workflow.

divotchenko.gg · divotchenko.gg · commit 106283b64987 · 2021-03-26T09:55:06.000+03:00
diff --git a/src/WorkflowCore/Models/WorkflowInstance.cs b/src/WorkflowCore/Models/WorkflowInstance.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace WorkflowCore.Models
@@ -36,11 +35,11 @@ public bool IsBranchComplete(string parentId)
         }
     }
 
-    public enum WorkflowStatus 
+    public enum WorkflowStatus
     { 
-        Runnable = 0, 
-        Suspended = 1, 
-        Complete = 2, 
-        Terminated = 3 
+        Runnable = 0,
+        Suspended = 1,
+        Complete = 2,
+        Terminated = 3,
     }
 }
diff --git a/src/WorkflowCore/Services/ErrorHandlers/TerminateHandler.cs b/src/WorkflowCore/Services/ErrorHandlers/TerminateHandler.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Text;
+
 using WorkflowCore.Interface;
 using WorkflowCore.Models;
 using WorkflowCore.Models.LifeCycleEvents;
@@ -10,21 +10,23 @@ namespace WorkflowCore.Services.ErrorHandlers
     public class TerminateHandler : IWorkflowErrorHandler
     {
         private readonly ILifeCycleEventPublisher _eventPublisher;
-        private readonly IDateTimeProvider _datetimeProvider;
+        private readonly IDateTimeProvider _dateTimeProvider;
         public WorkflowErrorHandling Type => WorkflowErrorHandling.Terminate;
 
-        public TerminateHandler(ILifeCycleEventPublisher eventPublisher, IDateTimeProvider datetimeProvider)
+        public TerminateHandler(ILifeCycleEventPublisher eventPublisher, IDateTimeProvider dateTimeProvider)
         {
             _eventPublisher = eventPublisher;
-            _datetimeProvider = datetimeProvider;
+            _dateTimeProvider = dateTimeProvider;
         }
 
         public void Handle(WorkflowInstance workflow, WorkflowDefinition def, ExecutionPointer pointer, WorkflowStep step, Exception exception, Queue<ExecutionPointer> bubbleUpQueue)
         {
             workflow.Status = WorkflowStatus.Terminated;
-            _eventPublisher.PublishNotification(new WorkflowTerminated()
+            workflow.CompleteTime = _dateTimeProvider.UtcNow;
+
+            _eventPublisher.PublishNotification(new WorkflowTerminated
             {
-                EventTimeUtc = _datetimeProvider.UtcNow,
+                EventTimeUtc = _dateTimeProvider.UtcNow,
                 Reference = workflow.Reference,
                 WorkflowInstanceId = workflow.Id,
                 WorkflowDefinitionId = workflow.WorkflowDefinitionId,
diff --git a/src/WorkflowCore/Services/WorkflowController.cs b/src/WorkflowCore/Services/WorkflowController.cs
@@ -1,8 +1,8 @@
 ﻿using System;
 using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using WorkflowCore.Exceptions;
@@ -47,10 +47,10 @@ public Task<string> StartWorkflow(string workflowId, int? version, object data =
             return StartWorkflow<object>(workflowId, version, data, reference);
         }
 
-        public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null)
+        public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference = null)
             where TData : class, new()
         {
-            return StartWorkflow<TData>(workflowId, null, data, reference);
+            return StartWorkflow(workflowId, null, data, reference);
         }
 
         public async Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)
@@ -204,7 +204,10 @@ public async Task<bool> TerminateWorkflow(string workflowId)
             try
             {
                 var wf = await _persistenceStore.GetWorkflowInstance(workflowId);
+
                 wf.Status = WorkflowStatus.Terminated;
+                wf.CompleteTime = _dateTimeProvider.UtcNow;
+
                 await _persistenceStore.PersistWorkflow(wf);
                 await _queueProvider.QueueWork(workflowId, QueueType.Index);
                 await _eventHub.PublishNotification(new WorkflowTerminated()
@@ -226,16 +229,16 @@ await _eventHub.PublishNotification(new WorkflowTerminated()
         public void RegisterWorkflow<TWorkflow>()
             where TWorkflow : IWorkflow
         {
-            TWorkflow wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);
+            var wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);
             _registry.RegisterWorkflow(wf);
         }
 
         public void RegisterWorkflow<TWorkflow, TData>()
             where TWorkflow : IWorkflow<TData>
             where TData : new()
         {
-            TWorkflow wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);
-            _registry.RegisterWorkflow<TData>(wf);
+            var wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);
+            _registry.RegisterWorkflow(wf);
         }
     }
 }
diff --git a/src/WorkflowCore/Services/WorkflowExecutor.cs b/src/WorkflowCore/Services/WorkflowExecutor.cs
@@ -1,9 +1,10 @@
-﻿using Microsoft.Extensions.Logging;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using WorkflowCore.Interface;
 using WorkflowCore.Models;
@@ -62,7 +63,7 @@ public async Task<WorkflowExecutorResult> Execute(WorkflowInstance workflow, Can
                 {
                     _logger.LogError("Unable to find step {0} in workflow definition", pointer.StepId);
                     pointer.SleepUntil = _datetimeProvider.UtcNow.Add(_options.ErrorRetryInterval);
-                    wfResult.Errors.Add(new ExecutionError()
+                    wfResult.Errors.Add(new ExecutionError
                     {
                         WorkflowId = workflow.Id,
                         ExecutionPointerId = pointer.Id,
@@ -82,7 +83,7 @@ public async Task<WorkflowExecutorResult> Execute(WorkflowInstance workflow, Can
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Workflow {0} raised error on step {1} Message: {2}", workflow.Id, pointer.StepId, ex.Message);
-                    wfResult.Errors.Add(new ExecutionError()
+                    wfResult.Errors.Add(new ExecutionError
                     {
                         WorkflowId = workflow.Id,
                         ExecutionPointerId = pointer.Id,
@@ -116,7 +117,7 @@ private bool InitializeStep(WorkflowInstance workflow, WorkflowStep step, Workfl
             if (pointer.Status != PointerStatus.Running)
             {
                 pointer.Status = PointerStatus.Running;
-                _publisher.PublishNotification(new StepStarted()
+                _publisher.PublishNotification(new StepStarted
                 {
                     EventTimeUtc = _datetimeProvider.UtcNow,
                     Reference = workflow.Reference,
@@ -159,12 +160,12 @@ private async Task ExecuteStep(WorkflowInstance workflow, WorkflowStep step, Exe
                 {
                     _logger.LogError("Unable to construct step body {0}", step.BodyType.ToString());
                     pointer.SleepUntil = _datetimeProvider.UtcNow.Add(_options.ErrorRetryInterval);
-                    wfResult.Errors.Add(new ExecutionError()
+                    wfResult.Errors.Add(new ExecutionError
                     {
                         WorkflowId = workflow.Id,
                         ExecutionPointerId = pointer.Id,
                         ErrorTime = _datetimeProvider.UtcNow,
-                        Message = $"Unable to construct step body {step.BodyType.ToString()}"
+                        Message = $"Unable to construct step body {step.BodyType}"
                     });
                     return;
                 }
@@ -253,7 +254,7 @@ private async Task DetermineNextExecutionTime(WorkflowInstance workflow, Workflo
                 await middlewareRunner.RunPostMiddleware(workflow, def);
             }
 
-            _publisher.PublishNotification(new WorkflowCompleted()
+            _publisher.PublishNotification(new WorkflowCompleted
             {
                 EventTimeUtc = _datetimeProvider.UtcNow,
                 Reference = workflow.Reference,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using System.Linq;`
`4`	`3`
`5`	`4`	`namespace WorkflowCore.Models`
`@@ -36,11 +35,11 @@ public bool IsBranchComplete(string parentId)`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`
`39`		`- public enum WorkflowStatus`
	`38`	`+ public enum WorkflowStatus`
`40`	`39`	`{`
`41`		`- Runnable = 0,`
`42`		`- Suspended = 1,`
`43`		`- Complete = 2,`
`44`		`- Terminated = 3`
	`40`	`+ Runnable = 0,`
	`41`	`+ Suspended = 1,`
	`42`	`+ Complete = 2,`
	`43`	`+ Terminated = 3,`
`45`	`44`	`}`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`		`-using System.Reflection;`
`4`	`3`	`using System.Threading;`
`5`	`4`	`using System.Threading.Tasks;`
	`5`	`+`
`6`	`6`	`using Microsoft.Extensions.DependencyInjection;`
`7`	`7`	`using Microsoft.Extensions.Logging;`
`8`	`8`	`using WorkflowCore.Exceptions;`
`@@ -47,10 +47,10 @@ public Task<string> StartWorkflow(string workflowId, int? version, object data =`
`47`	`47`	`return StartWorkflow<object>(workflowId, version, data, reference);`
`48`	`48`	`}`
`49`	`49`
`50`		`- public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference=null)`
	`50`	`+ public Task<string> StartWorkflow<TData>(string workflowId, TData data = null, string reference = null)`
`51`	`51`	`where TData : class, new()`
`52`	`52`	`{`
`53`		`- return StartWorkflow<TData>(workflowId, null, data, reference);`
	`53`	`+ return StartWorkflow(workflowId, null, data, reference);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public async Task<string> StartWorkflow<TData>(string workflowId, int? version, TData data = null, string reference=null)`
`@@ -204,7 +204,10 @@ public async Task<bool> TerminateWorkflow(string workflowId)`
`204`	`204`	`try`
`205`	`205`	`{`
`206`	`206`	`var wf = await _persistenceStore.GetWorkflowInstance(workflowId);`
	`207`	`+`
`207`	`208`	`wf.Status = WorkflowStatus.Terminated;`
	`209`	`+ wf.CompleteTime = _dateTimeProvider.UtcNow;`
	`210`	`+`
`208`	`211`	`await _persistenceStore.PersistWorkflow(wf);`
`209`	`212`	`await _queueProvider.QueueWork(workflowId, QueueType.Index);`
`210`	`213`	`await _eventHub.PublishNotification(new WorkflowTerminated()`
`@@ -226,16 +229,16 @@ await _eventHub.PublishNotification(new WorkflowTerminated()`
`226`	`229`	`public void RegisterWorkflow<TWorkflow>()`
`227`	`230`	`where TWorkflow : IWorkflow`
`228`	`231`	`{`
`229`		`- TWorkflow wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);`
	`232`	`+ var wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);`
`230`	`233`	`_registry.RegisterWorkflow(wf);`
`231`	`234`	`}`
`232`	`235`
`233`	`236`	`public void RegisterWorkflow<TWorkflow, TData>()`
`234`	`237`	`where TWorkflow : IWorkflow<TData>`
`235`	`238`	`where TData : new()`
`236`	`239`	`{`
`237`		`- TWorkflow wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);`
`238`		`- _registry.RegisterWorkflow<TData>(wf);`
	`240`	`+ var wf = ActivatorUtilities.CreateInstance<TWorkflow>(_serviceProvider);`
	`241`	`+ _registry.RegisterWorkflow(wf);`
`239`	`242`	`}`
`240`	`243`	`}`
`241`	`244`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`		`-using Microsoft.Extensions.Logging;`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`	`using System.Linq;`
`5`	`4`	`using System.Threading;`
`6`	`5`	`using System.Threading.Tasks;`
	`6`	`+`
	`7`	`+using Microsoft.Extensions.Logging;`
`7`	`8`	`using Microsoft.Extensions.DependencyInjection;`
`8`	`9`	`using WorkflowCore.Interface;`
`9`	`10`	`using WorkflowCore.Models;`
`@@ -62,7 +63,7 @@ public async Task<WorkflowExecutorResult> Execute(WorkflowInstance workflow, Can`
`62`	`63`	`{`
`63`	`64`	`_logger.LogError("Unable to find step {0} in workflow definition", pointer.StepId);`
`64`	`65`	`pointer.SleepUntil = _datetimeProvider.UtcNow.Add(_options.ErrorRetryInterval);`
`65`		`- wfResult.Errors.Add(new ExecutionError()`
	`66`	`+ wfResult.Errors.Add(new ExecutionError`
`66`	`67`	`{`
`67`	`68`	`WorkflowId = workflow.Id,`
`68`	`69`	`ExecutionPointerId = pointer.Id,`
`@@ -82,7 +83,7 @@ public async Task<WorkflowExecutorResult> Execute(WorkflowInstance workflow, Can`
`82`	`83`	`catch (Exception ex)`
`83`	`84`	`{`
`84`	`85`	`_logger.LogError(ex, "Workflow {0} raised error on step {1} Message: {2}", workflow.Id, pointer.StepId, ex.Message);`
`85`		`- wfResult.Errors.Add(new ExecutionError()`
	`86`	`+ wfResult.Errors.Add(new ExecutionError`
`86`	`87`	`{`
`87`	`88`	`WorkflowId = workflow.Id,`
`88`	`89`	`ExecutionPointerId = pointer.Id,`
`@@ -116,7 +117,7 @@ private bool InitializeStep(WorkflowInstance workflow, WorkflowStep step, Workfl`
`116`	`117`	`if (pointer.Status != PointerStatus.Running)`
`117`	`118`	`{`
`118`	`119`	`pointer.Status = PointerStatus.Running;`
`119`		`- _publisher.PublishNotification(new StepStarted()`
	`120`	`+ _publisher.PublishNotification(new StepStarted`
`120`	`121`	`{`
`121`	`122`	`EventTimeUtc = _datetimeProvider.UtcNow,`
`122`	`123`	`Reference = workflow.Reference,`
`@@ -159,12 +160,12 @@ private async Task ExecuteStep(WorkflowInstance workflow, WorkflowStep step, Exe`
`159`	`160`	`{`
`160`	`161`	`_logger.LogError("Unable to construct step body {0}", step.BodyType.ToString());`
`161`	`162`	`pointer.SleepUntil = _datetimeProvider.UtcNow.Add(_options.ErrorRetryInterval);`
`162`		`- wfResult.Errors.Add(new ExecutionError()`
	`163`	`+ wfResult.Errors.Add(new ExecutionError`
`163`	`164`	`{`
`164`	`165`	`WorkflowId = workflow.Id,`
`165`	`166`	`ExecutionPointerId = pointer.Id,`
`166`	`167`	`ErrorTime = _datetimeProvider.UtcNow,`
`167`		`- Message = $"Unable to construct step body {step.BodyType.ToString()}"`
	`168`	`+ Message = $"Unable to construct step body {step.BodyType}"`
`168`	`169`	`});`
`169`	`170`	`return;`
`170`	`171`	`}`
`@@ -253,7 +254,7 @@ private async Task DetermineNextExecutionTime(WorkflowInstance workflow, Workflo`
`253`	`254`	`await middlewareRunner.RunPostMiddleware(workflow, def);`
`254`	`255`	`}`
`255`	`256`
`256`		`- _publisher.PublishNotification(new WorkflowCompleted()`
	`257`	`+ _publisher.PublishNotification(new WorkflowCompleted`
`257`	`258`	`{`
`258`	`259`	`EventTimeUtc = _datetimeProvider.UtcNow,`
`259`	`260`	`Reference = workflow.Reference,`