SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Expose WorkflowExecutionContext to Workflow Context providers

Browse source
This commit is contained in:
Sipke Schoorstra 2020-11-24 19:54:16 +01:00
parent 5e8a602f61
commit d890c668cc
4 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/Elsa.Abstractions/Services/Models/IWorkflowBlueprint.cs
View file

@ -16,6 +16,7 @@ namespace Elsa.Services.Models
/// An optional context type around which this workflow revolves. For example, a document, a leave request or a job application.
/// </summary>
public WorkflowContextOptions? ContextOptions { get; set; }
public WorkflowPersistenceBehavior PersistenceBehavior { get; }
public bool DeleteCompletedInstances { get; }
}

10
src/core/Elsa.Abstractions/Services/Models/LoadWorkflowContext.cs
View file

@ -5,14 +5,14 @@ namespace Elsa.Services.Models
{
public class LoadWorkflowContext
{
public LoadWorkflowContext(IWorkflowBlueprint workflowBlueprint, WorkflowInstance workflowInstance)
public LoadWorkflowContext(WorkflowExecutionContext workflowExecutionContext)
{
WorkflowBlueprint = workflowBlueprint;
WorkflowInstance = workflowInstance;
WorkflowExecutionContext = workflowExecutionContext;
}
public IWorkflowBlueprint WorkflowBlueprint { get; }
public WorkflowInstance WorkflowInstance { get; }
public WorkflowExecutionContext WorkflowExecutionContext { get; }
public IWorkflowBlueprint WorkflowBlueprint => WorkflowExecutionContext.WorkflowBlueprint;
public WorkflowInstance WorkflowInstance => WorkflowExecutionContext.WorkflowInstance;
public Type ContextType => WorkflowBlueprint.ContextOptions!.ContextType;
public string ContextId => WorkflowInstance.ContextId!;

19
src/core/Elsa.Core/Services/WorkflowRunner.cs
View file

@ -156,8 +156,9 @@ namespace Elsa.Services
object? input = default,
CancellationToken cancellationToken = default)
{
var workflowContext = await LoadWorkflowContextAsync(workflowBlueprint, workflowInstance, WorkflowContextFidelity.Burst, false, cancellationToken);
var workflowExecutionContext = CreateWorkflowExecutionContext(workflowBlueprint, workflowInstance, input, workflowContext, _serviceProvider);
var workflowExecutionContext = CreateWorkflowExecutionContext(workflowBlueprint, workflowInstance, input, _serviceProvider);
workflowExecutionContext.WorkflowContext = await LoadWorkflowContextAsync(workflowExecutionContext, WorkflowContextFidelity.Burst, false, cancellationToken);
var activity = activityId != null ? workflowBlueprint.GetActivity(activityId) : default;
switch (workflowExecutionContext.Status)
@ -193,12 +194,15 @@ namespace Elsa.Services
return workflowExecutionContext.WorkflowInstance;
}
private async ValueTask<object?> LoadWorkflowContextAsync(IWorkflowBlueprint workflowBlueprint, WorkflowInstance workflowInstance, WorkflowContextFidelity fidelity, bool always, CancellationToken cancellationToken)
private async ValueTask<object?> LoadWorkflowContextAsync(WorkflowExecutionContext workflowExecutionContext, WorkflowContextFidelity fidelity, bool always, CancellationToken cancellationToken)
{
var workflowInstance = workflowExecutionContext.WorkflowInstance;
var workflowBlueprint = workflowExecutionContext.WorkflowBlueprint;
if (!always && (workflowInstance.ContextId == null || workflowBlueprint.ContextOptions == null || workflowBlueprint.ContextOptions.ContextFidelity != fidelity))
return null;
var context = new LoadWorkflowContext(workflowBlueprint, workflowInstance);
var context = new LoadWorkflowContext(workflowExecutionContext);
return await _workflowContextManager.LoadContext(context, cancellationToken);
}
@ -257,7 +261,6 @@ namespace Elsa.Services
using var scope = _serviceProvider.CreateScope();
var serviceProvider = scope.ServiceProvider;
var workflowBlueprint = workflowExecutionContext.WorkflowBlueprint;
var workflowInstance = workflowExecutionContext.WorkflowInstance;
while (workflowExecutionContext.HasScheduledActivities)
{
@ -266,7 +269,7 @@ namespace Elsa.Services
var activityBlueprint = workflowBlueprint.GetActivity(currentActivityId)!;
if (workflowBlueprint.ContextOptions?.ContextFidelity == WorkflowContextFidelity.Activity || activityBlueprint.LoadWorkflowContext)
workflowExecutionContext.WorkflowContext = await LoadWorkflowContextAsync(workflowBlueprint, workflowInstance, WorkflowContextFidelity.Activity, activityBlueprint.LoadWorkflowContext, cancellationToken);
workflowExecutionContext.WorkflowContext = await LoadWorkflowContextAsync(workflowExecutionContext, WorkflowContextFidelity.Activity, activityBlueprint.LoadWorkflowContext, cancellationToken);
var activityExecutionContext = new ActivityExecutionContext(workflowExecutionContext, serviceProvider, activityBlueprint, scheduledActivity.Input);
var activity = await activityBlueprint.CreateActivityAsync(activityExecutionContext, cancellationToken);
@ -297,7 +300,7 @@ namespace Elsa.Services
workflowExecutionContext.Complete();
}
private static WorkflowExecutionContext CreateWorkflowExecutionContext(IWorkflowBlueprint workflowBlueprint, WorkflowInstance workflowInstance, object? input, object? workflowContext, IServiceProvider serviceProvider) =>
new WorkflowExecutionContext(serviceProvider, workflowBlueprint, workflowInstance, input, workflowContext);
private static WorkflowExecutionContext CreateWorkflowExecutionContext(IWorkflowBlueprint workflowBlueprint, WorkflowInstance workflowInstance, object? input, IServiceProvider serviceProvider) =>
new WorkflowExecutionContext(serviceProvider, workflowBlueprint, workflowInstance, input);
}
}

9
src/core/Elsa.Core/Triggers/WorkflowSelector.cs
View file

@ -97,7 +97,8 @@ namespace Elsa.Triggers
Func<ITrigger, bool> evaluate)
{
var descriptors = dictionary.SelectMany(x => x.Value);
return from descriptor in descriptors
return
from descriptor in descriptors
let workflow = descriptor.WorkflowBlueprint
where workflow.IsPublished && workflow.IsEnabled
let workflowInstanceId = descriptor.WorkflowInstanceId
@ -119,7 +120,7 @@ namespace Elsa.Triggers
return descriptors
.GroupBy(x => x.WorkflowBlueprint.Id)
.ToDictionary(x => x.Key, x => (ICollection<TriggerDescriptor>)x.ToList());
.ToDictionary(x => x.Key, x => (ICollection<TriggerDescriptor>) x.ToList());
}
private async Task<IEnumerable<TriggerDescriptor>> BuildDescriptorsForAsync(IWorkflowBlueprint workflowBlueprint, CancellationToken cancellationToken)
@ -158,8 +159,8 @@ namespace Elsa.Triggers
{
var providers = _triggerProviders.ToList();
var descriptors = new List<TriggerDescriptor>();
var workflowContext = workflowBlueprint.ContextOptions != null ? await _workflowContextManager.LoadContext(new LoadWorkflowContext(workflowBlueprint, workflowInstance), cancellationToken) : default;
var workflowExecutionContext = new WorkflowExecutionContext(_serviceProvider, workflowBlueprint, workflowInstance, default, workflowContext);
var workflowExecutionContext = new WorkflowExecutionContext(_serviceProvider, workflowBlueprint, workflowInstance, default);
workflowExecutionContext.WorkflowContext = workflowBlueprint.ContextOptions != null ? await _workflowContextManager.LoadContext(new LoadWorkflowContext(workflowExecutionContext), cancellationToken) : default;
foreach (var blockingActivity in blockingActivities)
{