Merge branch 'dev' of https://github.com/volosoft/abp into dev

modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs

@@ -33,7 +33,7 @@ namespace Volo.Abp.TenantManagement
 
         public async Task<PagedResultDto<TenantDto>> GetListAsync(GetTenantsInput input)
         {
-            var count = await TenantRepository.GetCountAsync();
+            var count = await TenantRepository.GetCountAsync(input.Filter);
             var list = await TenantRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter);
 
             return new PagedResultDto<TenantDto>(

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/ITenantRepository.cs

@@ -25,5 +25,9 @@ namespace Volo.Abp.TenantManagement
             string filter = null, 
             bool includeDetails = false,
             CancellationToken cancellationToken = default);
+
+        Task<long> GetCountAsync(
+            string filter = null, 
+            CancellationToken cancellationToken = default);
     }
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/EfCoreTenantRepository.cs

@@ -55,6 +55,16 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
 
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await this
+                .WhereIf(
+                    !filter.IsNullOrWhiteSpace(),
+                    u =>
+                        u.Name.Contains(filter)
+                ).CountAsync(cancellationToken: cancellationToken);
+        }
+
         public override IQueryable<Tenant> WithDetails()
         {
             return GetQueryable().IncludeDetails();

modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo/Abp/TenantManagement/MongoDb/MongoTenantRepository.cs

@@ -53,5 +53,15 @@ namespace Volo.Abp.TenantManagement.MongoDB
                 .PageBy<Tenant, IMongoQueryable<Tenant>>(skipCount, maxResultCount)
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
+
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await GetMongoQueryable()
+                .WhereIf<Tenant, IMongoQueryable<Tenant>>(
+                    !filter.IsNullOrWhiteSpace(),
+                    u =>
+                        u.Name.Contains(filter)
+                ).CountAsync(cancellationToken: cancellationToken);
+        }
     }
 }