Added count to user lookup

abpframework · May 19, 2020 · 48cf71c · 48cf71c
1 parent 5a79e7f
commit 48cf71c
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 5 deletions.
diff --git a/...olo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserLookupAppService.cs b/...olo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserLookupAppService.cs
@@ -13,5 +13,7 @@ public interface IIdentityUserLookupAppService : IApplicationService
         Task<UserData> FindByUserNameAsync(string userName);
 
         Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto input);
+
+        Task<long> GetCountAsync(UserLookupCountInputDto input);
     }
 }
diff --git a/.../src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/UserLookupCountInputDto.cs b/.../src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/UserLookupCountInputDto.cs
@@ -0,0 +1,7 @@
+namespace Volo.Abp.Identity
+{
+    public class UserLookupCountInputDto
+    {
+        public string Filter { get; set; }
+    }
+}
diff --git a/...src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/UserLookupSearchInputDto.cs b/...src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/UserLookupSearchInputDto.cs
@@ -2,10 +2,8 @@
 
 namespace Volo.Abp.Identity
 {
-    public class UserLookupSearchInputDto : PagedResultRequestDto, ISortedResultRequest
+    public class UserLookupSearchInputDto : PagedAndSortedResultRequestDto
     {
-        public string Sorting { get; set; }
-
         public string Filter { get; set; }
     }
 }
diff --git a/...ntity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserLookupAppService.cs b/...ntity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserLookupAppService.cs
@@ -55,5 +55,10 @@ public async Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto
                     .ToList()
             );
         }
+
+        public async Task<long> GetCountAsync(UserLookupCountInputDto input)
+        {
+            return await UserLookupServiceProvider.GetCountAsync(input.Filter);
+        }
     }
 }
diff --git a/...ntity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExternalUserLookupServiceProvider.cs b/...ntity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExternalUserLookupServiceProvider.cs
@@ -66,5 +66,12 @@ public virtual async Task<List<IUserData>> SearchAsync(
 
             return users.Select(u => u.ToAbpUserData()).ToList();
         }
+
+        public async Task<long> GetCountAsync(
+            string filter = null, 
+            CancellationToken cancellationToken = new CancellationToken())
+        {
+            return await UserRepository.GetCountAsync(filter, cancellationToken);
+        }
     }
 }
diff --git a/...Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientIdentityUserLookupService.cs b/...Volo.Abp.Identity.HttpApi.Client/Volo/Abp/Identity/HttpClientIdentityUserLookupService.cs
@@ -47,5 +47,18 @@ public async Task<List<IUserData>> SearchAsync(
 
             return result.Items.Cast<IUserData>().ToList();
         }
+
+        public async Task<long> GetCountAsync(
+            string filter = null, 
+            CancellationToken cancellationToken = new CancellationToken())
+        {
+            return await UserLookupAppService
+                .GetCountAsync(
+                    new UserLookupCountInputDto
+                    {
+                        Filter = filter
+                    }
+                );
+        }
     }
 }
diff --git a/.../identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserLookupController.cs b/.../identity/src/Volo.Abp.Identity.HttpApi/Volo/Abp/Identity/IdentityUserLookupController.cs
@@ -40,5 +40,12 @@ public Task<ListResultDto<UserData>> SearchAsync(UserLookupSearchInputDto input)
         {
             return LookupAppService.SearchAsync(input);
         }
+
+        [HttpGet]
+        [Route("count")]
+        public Task<long> GetCountAsync(UserLookupCountInputDto input)
+        {
+            return LookupAppService.GetCountAsync(input);
+        }
     }
 }
diff --git a/...sers/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/IExternalUserLookupServiceProvider.cs b/...sers/src/Volo.Abp.Users.Abstractions/Volo/Abp/Users/IExternalUserLookupServiceProvider.cs
@@ -17,5 +17,10 @@ Task<List<IUserData>> SearchAsync(
             int maxResultCount = int.MaxValue,
             int skipCount = 0,
             CancellationToken cancellationToken = default);
+
+        Task<long> GetCountAsync(
+            string filter = null,
+            CancellationToken cancellationToken = default
+        );
     }
 }
diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUserLookupService.cs b/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUserLookupService.cs
@@ -8,15 +8,25 @@ namespace Volo.Abp.Users
     public interface IUserLookupService<TUser>
         where TUser : class, IUser
     {
-        Task<TUser> FindByIdAsync(Guid id, CancellationToken cancellationToken = default);
+        Task<TUser> FindByIdAsync(
+            Guid id,
+            CancellationToken cancellationToken = default
+        );
 
-        Task<TUser> FindByUserNameAsync(string userName, CancellationToken cancellationToken = default);
+        Task<TUser> FindByUserNameAsync(
+            string userName,
+            CancellationToken cancellationToken = default
+        );
 
         Task<List<IUserData>> SearchAsync(
             string sorting = null,
             string filter = null,
             int maxResultCount = int.MaxValue,
             int skipCount = 0,
             CancellationToken cancellationToken = default);
+
+        Task<long> GetCountAsync(
+            string filter = null,
+            CancellationToken cancellationToken = default);
     }
 }
diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUserRepository.cs b/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/IUserRepository.cs
@@ -21,5 +21,9 @@ Task<List<TUser>> SearchAsync(
             string filter = null,
             CancellationToken cancellationToken = default
         );
+
+        Task<long> GetCountAsync(
+            string filter = null,
+            CancellationToken cancellationToken = default);
     }
 }
diff --git a/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/UserLookupService.cs b/modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/UserLookupService.cs
@@ -173,6 +173,26 @@ public async Task<List<IUserData>> SearchAsync(
                 .ToList();
         }
 
+        public async Task<long> GetCountAsync(
+            string filter = null, 
+            CancellationToken cancellationToken = default)
+        {
+            if (ExternalUserLookupServiceProvider != null)
+            {
+                return await ExternalUserLookupServiceProvider
+                    .GetCountAsync(
+                        filter,
+                        cancellationToken
+                    );
+            }
+
+            return await _userRepository
+                .GetCountAsync(
+                    filter,
+                    cancellationToken
+                );
+        }
+
         protected abstract TUser CreateUser(IUserData externalUser);
 
         private async Task WithNewUowAsync(Func<Task> func)

diff --git a/...ers.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs b/...ers.EntityFrameworkCore/Volo/Abp/Users/EntityFrameworkCore/EfCoreAbpUserRepositoryBase.cs
@@ -50,5 +50,21 @@ public async Task<List<TUser>> SearchAsync(
                 .PageBy(skipCount, maxResultCount)
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
+
+        public async Task<long> GetCountAsync(
+            string filter = null, 
+            CancellationToken cancellationToken = default)
+        {
+            return await DbSet
+                .WhereIf(
+                    !filter.IsNullOrWhiteSpace(),
+                    u =>
+                        u.UserName.Contains(filter) ||
+                        u.Email.Contains(filter) ||
+                        u.Name.Contains(filter) ||
+                        u.Surname.Contains(filter)
+                )
+                .CountAsync(GetCancellationToken(cancellationToken));
+        }
     }
 }
diff --git a/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs b/modules/users/src/Volo.Abp.Users.MongoDB/Volo/Abp/Users/MongoDB/MongoUserRepositoryBase.cs
@@ -52,5 +52,20 @@ public async Task<List<TUser>> SearchAsync(
                 .PageBy<TUser, IMongoQueryable<TUser>>(skipCount, maxResultCount)
                 .ToListAsync(GetCancellationToken(cancellationToken));
         }
+
+        public async Task<long> GetCountAsync(string filter = null, CancellationToken cancellationToken = default)
+        {
+            return await GetMongoQueryable()
+                .WhereIf<TUser, IMongoQueryable<TUser>>(
+                    !filter.IsNullOrWhiteSpace(),
+                    u =>
+                        u.UserName.Contains(filter) ||
+                        u.Email.Contains(filter) ||
+                        u.Name.Contains(filter) ||
+                        u.Surname.Contains(filter)
+                )
+                .As<IMongoQueryable<TUser>>()
+                .CountAsync(GetCancellationToken(cancellationToken));
+        }
     }
 }