Merge pull request #4477 from iyilm4z/extract-mongo-db-repository-global-filters

MongoDbRepository.AddGlobalFilters extracted to a service

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/IMongoDbRepositoryFilterer.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using MongoDB.Driver;
+using Volo.Abp.Domain.Entities;
+
+namespace Volo.Abp.Domain.Repositories.MongoDB
+{
+    public interface IMongoDbRepositoryFilterer<TEntity> where TEntity : class, IEntity
+    {
+        void AddGlobalFilters(List<FilterDefinition<TEntity>> filters);
+    }
+
+    public interface IMongoDbRepositoryFilterer<TEntity, TKey> : IMongoDbRepositoryFilterer<TEntity> where TEntity : class, IEntity<TKey>
+    {
+        FilterDefinition<TEntity> CreateEntityFilter(TKey id, bool applyFilters = false);
+
+        FilterDefinition<TEntity> CreateEntityFilter(TEntity entity, bool withConcurrencyStamp = false, string concurrencyStamp = null);
+    }
+}

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepository.cs

@@ -14,7 +14,6 @@ using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.EventBus.Local;
 using Volo.Abp.Guids;
 using Volo.Abp.MongoDB;
-using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.Domain.Repositories.MongoDB
 {
@@ -331,6 +330,8 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
         where TMongoDbContext : IAbpMongoDbContext
         where TEntity : class, IEntity<TKey>
     {
+        public IMongoDbRepositoryFilterer<TEntity, TKey> RepositoryFilterer { get; set; }
+        
         public MongoDbRepository(IMongoDbContextProvider<TMongoDbContext> dbContextProvider)
             : base(dbContextProvider)
         {
@@ -358,7 +359,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
             CancellationToken cancellationToken = default)
         {
             return await Collection
-                .Find(CreateEntityFilter(id, true))
+                .Find(RepositoryFilterer.CreateEntityFilter(id, true))
                 .FirstOrDefaultAsync(GetCancellationToken(cancellationToken));
         }
 
@@ -372,49 +373,7 @@ namespace Volo.Abp.Domain.Repositories.MongoDB
 
         protected override FilterDefinition<TEntity> CreateEntityFilter(TEntity entity, bool withConcurrencyStamp = false, string concurrencyStamp = null)
         {
-            if (!withConcurrencyStamp || !(entity is IHasConcurrencyStamp entityWithConcurrencyStamp))
-            {
-                return Builders<TEntity>.Filter.Eq(e => e.Id, entity.Id);
-            }
-
-            if (concurrencyStamp == null)
-            {
-                concurrencyStamp = entityWithConcurrencyStamp.ConcurrencyStamp;
-            }
-
-            return Builders<TEntity>.Filter.And(
-                Builders<TEntity>.Filter.Eq(e => e.Id, entity.Id),
-                Builders<TEntity>.Filter.Eq(e => ((IHasConcurrencyStamp)e).ConcurrencyStamp, concurrencyStamp)
-            );
-        }
-
-        protected virtual FilterDefinition<TEntity> CreateEntityFilter(TKey id, bool applyFilters = false)
-        {
-            var filters = new List<FilterDefinition<TEntity>>
-            {
-                Builders<TEntity>.Filter.Eq(e => e.Id, id)
-            };
-
-            if (applyFilters)
-            {
-                AddGlobalFilters(filters);
-            }
-
-            return Builders<TEntity>.Filter.And(filters);
-        }
-
-        protected virtual void AddGlobalFilters(List<FilterDefinition<TEntity>> filters)
-        {
-            if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && DataFilter.IsEnabled<ISoftDelete>())
-            {
-                filters.Add(Builders<TEntity>.Filter.Eq(e => ((ISoftDelete)e).IsDeleted, false));
-            }
-
-            if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEntity)))
-            {
-                var tenantId = CurrentTenant.Id;
-                filters.Add(Builders<TEntity>.Filter.Eq(e => ((IMultiTenant)e).TenantId, tenantId));
-            }
+            return RepositoryFilterer.CreateEntityFilter(entity, withConcurrencyStamp, concurrencyStamp);
         }
     }
 }

framework/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/MongoDbRepositoryFilterer.cs

@@ -0,0 +1,79 @@
+using System.Collections.Generic;
+using MongoDB.Driver;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.Domain.Repositories.MongoDB
+{
+    public class MongoDbRepositoryFilterer<TEntity> : IMongoDbRepositoryFilterer<TEntity>
+        where TEntity : class, IEntity
+    {
+        protected IDataFilter DataFilter { get; }
+
+        protected ICurrentTenant CurrentTenant { get; }
+
+        public MongoDbRepositoryFilterer(IDataFilter dataFilter, ICurrentTenant currentTenant)
+        {
+            DataFilter = dataFilter;
+            CurrentTenant = currentTenant;
+        }
+
+        public virtual void AddGlobalFilters(List<FilterDefinition<TEntity>> filters)
+        {
+            if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)) && DataFilter.IsEnabled<ISoftDelete>())
+            {
+                filters.Add(Builders<TEntity>.Filter.Eq(e => ((ISoftDelete) e).IsDeleted, false));
+            }
+
+            if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEntity)))
+            {
+                var tenantId = CurrentTenant.Id;
+                filters.Add(Builders<TEntity>.Filter.Eq(e => ((IMultiTenant) e).TenantId, tenantId));
+            }
+        }
+    }
+
+    public class MongoDbRepositoryFilterer<TEntity, TKey> : MongoDbRepositoryFilterer<TEntity>,
+        IMongoDbRepositoryFilterer<TEntity, TKey>
+        where TEntity : class, IEntity<TKey>
+    {
+        public MongoDbRepositoryFilterer(IDataFilter dataFilter, ICurrentTenant currentTenant)
+            : base(dataFilter, currentTenant)
+        {
+        }
+
+        public FilterDefinition<TEntity> CreateEntityFilter(TKey id, bool applyFilters = false)
+        {
+            var filters = new List<FilterDefinition<TEntity>>
+            {
+                Builders<TEntity>.Filter.Eq(e => e.Id, id)
+            };
+
+            if (applyFilters)
+            {
+                AddGlobalFilters(filters);
+            }
+
+            return Builders<TEntity>.Filter.And(filters);
+        }
+
+        public FilterDefinition<TEntity> CreateEntityFilter(TEntity entity, bool withConcurrencyStamp = false, string concurrencyStamp = null)
+        {
+            if (!withConcurrencyStamp || !(entity is IHasConcurrencyStamp entityWithConcurrencyStamp))
+            {
+                return Builders<TEntity>.Filter.Eq(e => e.Id, entity.Id);
+            }
+
+            if (concurrencyStamp == null)
+            {
+                concurrencyStamp = entityWithConcurrencyStamp.ConcurrencyStamp;
+            }
+
+            return Builders<TEntity>.Filter.And(
+                Builders<TEntity>.Filter.Eq(e => e.Id, entity.Id),
+                Builders<TEntity>.Filter.Eq(e => ((IHasConcurrencyStamp) e).ConcurrencyStamp, concurrencyStamp)
+            );
+        }
+    }
+}

framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/AbpMongoDbModule.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Volo.Abp.Domain;
+using Volo.Abp.Domain.Repositories.MongoDB;
 using Volo.Abp.Modularity;
 using Volo.Abp.Uow.MongoDB;
 
@@ -14,6 +15,16 @@ namespace Volo.Abp.MongoDB
                 typeof(IMongoDbContextProvider<>),
                 typeof(UnitOfWorkMongoDbContextProvider<>)
             );
+            
+            context.Services.TryAddTransient(
+                typeof(IMongoDbRepositoryFilterer<>),
+                typeof(MongoDbRepositoryFilterer<>)
+            );
+            
+            context.Services.TryAddTransient(
+                typeof(IMongoDbRepositoryFilterer<,>),
+                typeof(MongoDbRepositoryFilterer<,>)
+            );
         }
     }
 }