Refactor MongoDbStore to use EmptyToNull for TenantId assignments and add StringExtensions for null handling
This commit is contained in:
parent
d36630881f
commit
cd2d0efef5
|
|
@ -405,7 +405,7 @@ public class MongoDbStore<TDocument>(IMongoCollection<TDocument> collection, ITe
|
|||
if (typeof(Entity).IsAssignableFrom(typeof(TDocument)))
|
||||
{
|
||||
var tenant = tenantAccessor.Tenant;
|
||||
var tenantId = tenant?.Id;
|
||||
var tenantId = tenant?.Id.EmptyToNull();
|
||||
queryable = queryable.Where(x => (x as Entity)!.TenantId == tenantId);
|
||||
}
|
||||
|
||||
|
|
@ -418,7 +418,7 @@ public class MongoDbStore<TDocument>(IMongoCollection<TDocument> collection, ITe
|
|||
var tenantId = tenant?.Id;
|
||||
|
||||
if (document is Entity tenantDocument)
|
||||
tenantDocument.TenantId = tenantId;
|
||||
tenantDocument.TenantId = tenantId.EmptyToNull();
|
||||
}
|
||||
|
||||
private void ApplyTenantId(IEnumerable<TDocument> documents)
|
||||
|
|
@ -429,7 +429,7 @@ public class MongoDbStore<TDocument>(IMongoCollection<TDocument> collection, ITe
|
|||
foreach (var document in documents)
|
||||
{
|
||||
if (document is Entity tenantDocument)
|
||||
tenantDocument.TenantId = tenantId;
|
||||
tenantDocument.TenantId = tenantId.EmptyToNull();
|
||||
}
|
||||
}
|
||||
}
|
||||
6
src/modules/Elsa.MongoDb/Extensions/StringExtensions.cs
Normal file
6
src/modules/Elsa.MongoDb/Extensions/StringExtensions.cs
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
namespace Elsa.MongoDb.Extensions;
|
||||
|
||||
public static class StringExtensions
|
||||
{
|
||||
public static string? EmptyToNull(this string? value) => string.IsNullOrWhiteSpace(value) ? null : value;
|
||||
}
|
||||
Loading…
Reference in a new issue