Fixed the issues after merge

src/modules/Elsa.MongoDB/Modules/Management/WorkflowDefinitionStore.cs

@@ -2,7 +2,6 @@
 using Elsa.Common.Models;
 using Elsa.Extensions;
 using Elsa.MongoDB.Common;
-using Elsa.MongoDB.Helpers;
 using Elsa.Workflows.Management.Contracts;
 using Elsa.Workflows.Management.Entities;
 using Elsa.Workflows.Management.Filters;
@@ -73,7 +72,7 @@ public async Task<Page<WorkflowDefinitionSummary>> FindSummariesAsync(WorkflowDe
  var queryable = Filter(collection.AsQueryable(), filter);
  var count = queryable.LongCount();
  queryable = (queryable.Paginate(pageArgs) as IMongoQueryable<WorkflowDefinition>)!;
- var documents = await queryable.Select(ExpressionHelpers.WorkflowDefinitionSummary).ToListAsync(cancellationToken);
+ var documents = await queryable.Select(x=> WorkflowDefinitionSummary.FromDefinition(x)).ToListAsync(cancellationToken);
 
  return Page.Of(documents, count);
  }
@@ -85,24 +84,24 @@ public async Task<Page<WorkflowDefinitionSummary>> FindSummariesAsync<TOrderBy>(
  var queryable = Order(Filter(collection.AsQueryable(), filter), order);
  var count = queryable.LongCount();
  var mongoQueryable = (queryable.Paginate(pageArgs) as IMongoQueryable<WorkflowDefinition>)!;
- var documents = await mongoQueryable.Select(ExpressionHelpers.WorkflowDefinitionSummary).ToListAsync(cancellationToken);
+ var documents = await mongoQueryable.Select(x=> WorkflowDefinitionSummary.FromDefinition(x)).ToListAsync(cancellationToken);
 
  return Page.Of(documents, count);
  }
 
  /// <inheritdoc />
  public async Task<IEnumerable<WorkflowDefinitionSummary>> FindSummariesAsync(WorkflowDefinitionFilter filter, CancellationToken cancellationToken = default) =>
- await _mongoStore.FindManyAsync(query => Filter(query, filter), ExpressionHelpers.WorkflowDefinitionSummary, cancellationToken).ToList().AsEnumerable();
+ await _mongoStore.FindManyAsync(query => Filter(query, filter), x => WorkflowDefinitionSummary.FromDefinition(x), cancellationToken).ToList().AsEnumerable();
 
  /// <inheritdoc />
  public async Task<IEnumerable<WorkflowDefinitionSummary>> FindSummariesAsync<TOrderBy>(WorkflowDefinitionFilter filter, WorkflowDefinitionOrder<TOrderBy> order, CancellationToken cancellationToken = default) =>
- await _mongoStore.FindManyAsync(query => Order(Filter(query, filter), order), ExpressionHelpers.WorkflowDefinitionSummary, cancellationToken).ToList().AsEnumerable();
+ await _mongoStore.FindManyAsync(query => Order(Filter(query, filter), order), x => WorkflowDefinitionSummary.FromDefinition(x), cancellationToken).ToList().AsEnumerable();
 
  /// <inheritdoc />
  public async Task<WorkflowDefinition?> FindLastVersionAsync(WorkflowDefinitionFilter filter, CancellationToken cancellationToken)
  {
  var order = new WorkflowDefinitionOrder<int>(x => x.Version, OrderDirection.Descending);
- return (await _mongoStore.FindAsync(queryable => Order(Filter(queryable, filter), order), cancellationToken));
+ return await _mongoStore.FindAsync(queryable => Order(Filter(queryable, filter), order), cancellationToken);
  }
 
  /// <inheritdoc />

src/modules/Elsa.MongoDB/Modules/Management/WorkflowInstanceStore.cs

@@ -1,9 +1,6 @@
 using Elsa.Common.Models;
 using Elsa.Extensions;
 using Elsa.MongoDB.Common;
-using Elsa.MongoDB.Extensions;
-using Elsa.MongoDB.Helpers;
-using Elsa.Workflows.Core.Contracts;
 using Elsa.Workflows.Management.Contracts;
 using Elsa.Workflows.Management.Entities;
 using Elsa.Workflows.Management.Filters;
@@ -61,7 +58,7 @@ public async Task<Page<WorkflowInstance>> FindManyAsync<TOrderBy>(WorkflowInstan
  public async Task<Page<WorkflowInstanceSummary>> SummarizeManyAsync(WorkflowInstanceFilter filter, PageArgs pageArgs, CancellationToken cancellationToken = default)
  {
  var count = await _mongoStore.CountAsync(query => Filter(query, filter), cancellationToken);
- var documents = await _mongoStore.FindManyAsync<WorkflowInstanceSummary>(query => Paginate(Filter(query, filter), pageArgs), ExpressionHelpers.WorkflowInstanceSummary, cancellationToken).ToList();
+ var documents = await _mongoStore.FindManyAsync<WorkflowInstanceSummary>(query => Paginate(Filter(query, filter), pageArgs), x => WorkflowInstanceSummary.FromInstance(x), cancellationToken).ToList();
  return Page.Of(documents, count);
  }
 
@@ -72,18 +69,18 @@ public async Task<Page<WorkflowInstanceSummary>> SummarizeManyAsync<TOrderBy>(Wo
  var queryable = Order(Filter(collection.AsQueryable(), filter), order);
  var count = queryable.LongCount();
  var mongoQueryable = (queryable.Paginate(pageArgs) as IMongoQueryable<WorkflowInstance>)!;
- var documents = await mongoQueryable.Select(ExpressionHelpers.WorkflowInstanceSummary).ToListAsync(cancellationToken);
+ var documents = await mongoQueryable.Select(x => WorkflowInstanceSummary.FromInstance(x)).ToListAsync(cancellationToken);
 
  return Page.Of(documents, count);
  }
 
  /// <inheritdoc />
  public async Task<IEnumerable<WorkflowInstanceSummary>> SummarizeManyAsync(WorkflowInstanceFilter filter, CancellationToken cancellationToken = default) =>
- await _mongoStore.FindManyAsync(query => Filter(query, filter), ExpressionHelpers.WorkflowInstanceSummary, cancellationToken).ToList().AsEnumerable();
+ await _mongoStore.FindManyAsync(query => Filter(query, filter), x => WorkflowInstanceSummary.FromInstance(x), cancellationToken).ToList().AsEnumerable();
 
  /// <inheritdoc />
  public async Task<IEnumerable<WorkflowInstanceSummary>> SummarizeManyAsync<TOrderBy>(WorkflowInstanceFilter filter, WorkflowInstanceOrder<TOrderBy> order, CancellationToken cancellationToken = default) =>
- await _mongoStore.FindManyAsync(query => Order(Filter(query, filter), order), ExpressionHelpers.WorkflowInstanceSummary, cancellationToken).ToList().AsEnumerable();
+ await _mongoStore.FindManyAsync(query => Order(Filter(query, filter), order), x => WorkflowInstanceSummary.FromInstance(x), cancellationToken).ToList().AsEnumerable();
 
  /// <inheritdoc />
  public async Task<int> DeleteAsync(WorkflowInstanceFilter filter, CancellationToken cancellationToken = default)

src/modules/Elsa.MongoDB/Modules/Runtime/DefaultWorkflowRuntimePersistenceFeature.cs

@@ -25,7 +25,7 @@ public override void Configure()
  {
  Module.Configure<WorkflowRuntimeFeature>(feature =>
  {
- feature.WorkflowTriggerStore = sp => sp.GetRequiredService<MongoTriggerStore>();
+ feature.TriggerStore = sp => sp.GetRequiredService<MongoTriggerStore>();
  feature.BookmarkStore = sp => sp.GetRequiredService<MongoBookmarkStore>();
  });
 

src/modules/Elsa.MongoDB/Modules/Runtime/WorkflowRuntimePersistenceFeature.cs

@@ -23,7 +23,7 @@ public override void Configure()
  {
  Module.Configure<WorkflowRuntimeFeature>(feature =>
  {
- feature.WorkflowTriggerStore = sp => sp.GetRequiredService<MongoTriggerStore>();
+ feature.TriggerStore = sp => sp.GetRequiredService<MongoTriggerStore>();
  feature.BookmarkStore = sp => sp.GetRequiredService<MongoBookmarkStore>();
  });
  }

src/modules/Elsa.MongoDB/Modules/Runtime/WorkflowStateStore.cs

@@ -1,6 +1,5 @@
 using Elsa.Common.Contracts;
 using Elsa.MongoDB.Common;
-using Elsa.Workflows.Core.Contracts;
 using Elsa.Workflows.Core.Models;
 using Elsa.Workflows.Core.State;
 using Elsa.Workflows.Runtime.Contracts;
@@ -44,7 +43,7 @@ public async ValueTask SaveAsync(string id, WorkflowState state, CancellationTok
  (await _mongoStore.FindAsync(x => x.Id == id, cancellationToken));
 
  /// <inheritdoc />
- public async ValueTask<int> CountAsync(CountRunningWorkflowsArgs args, CancellationToken cancellationToken = default)
+ public async ValueTask<long> CountAsync(CountRunningWorkflowsArgs args, CancellationToken cancellationToken = default)
  {
  var query = _mongoStore.GetCollection().AsQueryable().Where(x => x.Status == WorkflowStatus.Running);