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

Fix Entity activity services

Browse source
This commit is contained in:
Sipke Schoorstra 2021-10-08 21:23:10 +02:00
parent 0be13f5893
commit 49208b679e
4 changed files with 45 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/activities/Elsa.Activities.Entity/Bookmarks/EntityChangedBookmark.cs
View file

@ -2,34 +2,34 @@ using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Elsa.Services;
using Elsa.Services.Bookmarks;
namespace Elsa.Activities.Entity.Bookmarks
{
public class EntityChangedBookmark : IBookmark
{
public EntityChangedBookmark(string? entityName, EntityChangedAction? action, string? contextId)
public EntityChangedBookmark(string? entityName, EntityChangedAction? action)
{
EntityName = entityName;
Action = action;
ContextId = contextId;
}
public string? EntityName { get; }
public EntityChangedAction? Action { get; }
public string? ContextId { get; }
}
public class EntityChangedWorkflowTriggerProvider : BookmarkProvider<EntityChangedBookmark, EntityChanged>
{
public override async ValueTask<IEnumerable<BookmarkResult>> GetBookmarksAsync(BookmarkProviderContext<EntityChanged> context, CancellationToken cancellationToken) =>
new[]
{
Result(new EntityChangedBookmark(
await context.ReadActivityPropertyAsync(x => x.EntityName, cancellationToken),
await context.ReadActivityPropertyAsync(x => x.Action, cancellationToken),
context.ActivityExecutionContext.WorkflowExecutionContext.WorkflowInstance.ContextId
))
};
public override async ValueTask<IEnumerable<BookmarkResult>> GetBookmarksAsync(BookmarkProviderContext<EntityChanged> context, CancellationToken cancellationToken)
{
var entityName = await context.ReadActivityPropertyAsync(x => x.EntityName, cancellationToken);
var action = await context.ReadActivityPropertyAsync(x => x.Action, cancellationToken);
var bookmark = new EntityChangedBookmark(
entityName,
action
);
return new[] { Result(bookmark) };
}
}
}

37
src/activities/Elsa.Activities.Entity/Extensions/WorkflowRunnerExtensions.cs
View file

@ -4,16 +4,14 @@ using Elsa.Activities.Entity.Bookmarks;
using Elsa.Activities.Entity.Models;
using Elsa.Models;
using Elsa.Services;
using Elsa.Services.Models;
namespace Elsa.Activities.Entity.Extensions
{
public static class WorkflowRunnerExtensions
{
// TODO: Design multi-tenancy.
private const string? TenantId = default;
public static async Task TriggerEntityChangedWorkflowsAsync(
this IWorkflowDispatcher workflowDispatcher,
this IWorkflowLaunchpad workflowLaunchpad,
string entityId,
string entityName,
EntityChangedAction changedAction,
@ -21,16 +19,39 @@ namespace Elsa.Activities.Entity.Extensions
string? contextId = default,
CancellationToken cancellationToken = default)
{
const string activityType = nameof(EntityChanged);
var input = new EntityChangedContext(entityId, entityName, changedAction);
var query = QueryEntityChangedWorkflowsAsync(entityName, changedAction, correlationId, contextId);
await workflowLaunchpad.CollectAndExecuteWorkflowsAsync(query, new WorkflowInput(input), cancellationToken);
}
public static async Task DispatchEntityChangedWorkflowsAsync(
this IWorkflowLaunchpad workflowLaunchpad,
string entityId,
string entityName,
EntityChangedAction changedAction,
string? correlationId = default,
string? contextId = default,
CancellationToken cancellationToken = default)
{
var input = new EntityChangedContext(entityId, entityName, changedAction);
var query = QueryEntityChangedWorkflowsAsync(entityName, changedAction, correlationId, contextId);
await workflowLaunchpad.CollectAndExecuteWorkflowsAsync(query, new WorkflowInput(input), cancellationToken);
}
private static WorkflowsQuery QueryEntityChangedWorkflowsAsync(
string entityName,
EntityChangedAction changedAction,
string? correlationId = default,
string? contextId = default)
{
const string activityType = nameof(EntityChanged);
var bookmark = new EntityChangedBookmark(
entityName,
changedAction,
contextId
changedAction
);
await workflowDispatcher.DispatchAsync(new TriggerWorkflowsRequest(activityType, bookmark, new WorkflowInput(input), correlationId, default, contextId, TenantId), cancellationToken);
return new WorkflowsQuery(activityType, bookmark, correlationId, ContextId: contextId);
}
}
}

1
src/core/Elsa.Core/StartupTasks/IndexTriggers.cs
View file

@ -1,7 +1,6 @@
using System.Threading;
using System.Threading.Tasks;
using Elsa.Services;
using Elsa.Services.Triggers;
namespace Elsa.StartupTasks
{

6
src/samples/console/Elsa.Samples.EntityChanged/SomeRepository.cs
View file

@ -9,10 +9,10 @@ namespace Elsa.Samples.EntityChanged
{
public class SomeRepository
{
private readonly IWorkflowDispatcher _workflowRunner;
private readonly IWorkflowLaunchpad _workflowLaunchpad;
private readonly ICollection<Entity> _collection = new List<Entity>();
public SomeRepository(IWorkflowDispatcher workflowRunner) => _workflowRunner = workflowRunner;
public SomeRepository(IWorkflowLaunchpad workflowLaunchpad) => _workflowLaunchpad = workflowLaunchpad;
public Task AddAsync(Entity entity)
{
_collection.Add(entity);
@ -28,7 +28,7 @@ namespace Elsa.Samples.EntityChanged
public Task<Entity?> GetAsync(string id) => Task.FromResult(_collection.FirstOrDefault(x => x.Id == id));
private async Task TriggerWorkflowsAsync(Entity entity, EntityChangedAction changedAction) =>
await _workflowRunner.TriggerEntityChangedWorkflowsAsync(
await _workflowLaunchpad.TriggerEntityChangedWorkflowsAsync(
entity.Id,
entity.GetType().GetEntityName(),
changedAction,