Fix tenant filtering for workflow definitions

- Fixed SetTenantIdFilter to use ITenantAccessor instead of capturing DbContext instance
- Fixed missing tenantAgnostic parameter in WorkflowDefinitionStore.FindManyAsync

Co-authored-by: sfmskywalker <938393+sfmskywalker@users.noreply.github.com>

Author: Copilot

src/modules/Elsa.Persistence.EFCore.Common/EntityHandlers/SetTenantIdFilter.cs

@@ -1,5 +1,6 @@
 using System.Linq.Expressions;
 using Elsa.Common.Entities;
+using Elsa.Common.Multitenancy;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 
@@ -8,7 +9,7 @@ namespace Elsa.Persistence.EFCore.EntityHandlers;
 /// <summary>
 /// Represents a class that applies a filter to set the TenantId for entities.
 /// </summary>
-public class SetTenantIdFilter : IEntityModelCreatingHandler
+public class SetTenantIdFilter(ITenantAccessor? tenantAccessor) : IEntityModelCreatingHandler
 {
     /// <inheritdoc />
     public void Handle(ElsaDbContextBase dbContext, ModelBuilder modelBuilder, IMutableEntityType entityType)
@@ -18,26 +19,32 @@ public void Handle(ElsaDbContextBase dbContext, ModelBuilder modelBuilder, IMuta
 
         modelBuilder
             .Entity(entityType.ClrType)
-            .HasQueryFilter(CreateTenantFilterExpression(dbContext, entityType.ClrType));
+            .HasQueryFilter(CreateTenantFilterExpression(entityType.ClrType));
     }
 
-    private LambdaExpression CreateTenantFilterExpression(ElsaDbContextBase dbContext, Type clrType)
+    private LambdaExpression CreateTenantFilterExpression(Type clrType)
     {
         var parameter = Expression.Parameter(clrType, "e");
 
-        // e => EF.Property<string>(e, "TenantId") == this.TenantId
+        // e => EF.Property<string>(e, "TenantId") == tenantAccessor.Tenant.Id
         var tenantIdProperty = Expression.Call(
             typeof(EF),
             nameof(EF.Property),
             [typeof(string)],
             parameter,
             Expression.Constant("TenantId"));
 
-        var tenantIdOnContext = Expression.Property(
-            Expression.Constant(dbContext),
-            nameof(ElsaDbContextBase.TenantId));
-
-        var body = Expression.Equal(tenantIdProperty, tenantIdOnContext);
+        // Build an expression that accesses tenantAccessor.Tenant.Id
+        // This will be evaluated at query time, not at model creation time
+        var tenantAccessorConstant = Expression.Constant(tenantAccessor, typeof(ITenantAccessor));
+        var tenantProperty = Expression.Property(tenantAccessorConstant, nameof(ITenantAccessor.Tenant));
+        var tenantIdOnAccessor = Expression.Condition(
+            Expression.Equal(tenantProperty, Expression.Constant(null, typeof(Tenant))),
+            Expression.Constant(null, typeof(string)),
+            Expression.Property(tenantProperty, nameof(Tenant.Id))
+        );
+
+        var body = Expression.Equal(tenantIdProperty, tenantIdOnAccessor);
 
         return Expression.Lambda(body, parameter);
     }

src/modules/Elsa.Persistence.EFCore/Modules/Management/WorkflowDefinitionStore.cs

@@ -45,7 +45,7 @@ public async Task<Page<WorkflowDefinition>> FindManyAsync(WorkflowDefinitionFilt
     /// <inheritdoc />
     public async Task<Page<WorkflowDefinition>> FindManyAsync<TOrderBy>(WorkflowDefinitionFilter filter, WorkflowDefinitionOrder<TOrderBy> order, PageArgs pageArgs, CancellationToken cancellationToken = default)
     {
-        var count = await store.QueryAsync(queryable => Filter(queryable, filter), cancellationToken).LongCount();
+        var count = await store.QueryAsync(queryable => Filter(queryable, filter), filter.TenantAgnostic, cancellationToken).LongCount();
         var results = await store.QueryAsync(queryable => Filter(queryable, filter).OrderBy(order).Paginate(pageArgs), OnLoadAsync, filter.TenantAgnostic, cancellationToken).ToList();
         return new(results, count);
     }