Included paging for Users and PersisedGrant

Ability to find Users by text

Author: brunobritodev

CHANGELOG.md

@@ -3,17 +3,18 @@
 * Now you can run through a docker! ❤️
     * Unfortunately you need to change hosts for it. Because Authority URL. I can't do anything to face it. It's security feature from OAuth2 to keep same Authority name for each Token.
 
+* Pagination for Users and Persisted Grants
 
-* Update of main Context, JpProject
-* Removed previous components from MySql.Migrations and Sql.Migrations. Unified in same project.
+* Update of main DbContext, JpProject
+* Removed previous components from MySql.IdentityServer and Sql.IdentityServer. Unifying them at same project.
 
 * Client Page:
     * Changed Claims button to be under Token - Following Docs from [IdentityServer4](https://identityserver4.readthedocs.io/en/latest/reference/client.html#token)
     * Included Device Flow options
 
 Updates:
 * @angular/cli to 7.3.6
-* @angular/core to 7.2.10 (ng update @angular/core, then it updated other dep's)|
+* @angular/core to 7.2.10 (ng update @angular/core, then updated other dep's by itself)|
     * @angular/language-service @ "7.2.10" (was "6.0.0")...
     * @angular/compiler-cli @ "7.2.10" (was "6.0.0")...
     * @angular/animations @ "7.2.10" (was "6.0.0")...

src/Backend/Jp.Application/Interfaces/IPersistedGrantAppService.cs

@@ -2,12 +2,13 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Jp.Application.ViewModels;
+using Jp.Domain.Core.ViewModels;
 
 namespace Jp.Application.Interfaces
 {
     public interface IPersistedGrantAppService: IDisposable
     {
-        Task<IEnumerable<PersistedGrantViewModel>> GetPersistedGrants();
+        Task<ListOfPersistedGrantViewModel> GetPersistedGrants(PagingViewModel paging);
         Task Remove(RemovePersistedGrantViewModel model);
     }
 }

src/Backend/Jp.Application/Interfaces/IUserManageAppService.cs

@@ -5,6 +5,7 @@
 using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.RoleViewModels;
 using Jp.Application.ViewModels.UserViewModels;
+using Jp.Domain.Core.ViewModels;
 using Jp.Domain.Models;
 
 namespace Jp.Application.Interfaces
@@ -18,7 +19,7 @@ public interface IUserManageAppService : IDisposable
         Task RemoveAccount(RemoveAccountViewModel model);
         Task<bool> HasPassword(Guid userId);
         Task<IEnumerable<EventHistoryData>> GetHistoryLogs(string username);
-        Task<IEnumerable<UserListViewModel>> GetUsers();
+        
         Task<UserViewModel> GetUserDetails(string username);
         Task<UserViewModel> GetUserAsync(Guid value);
         Task UpdateUser(UserViewModel model);
@@ -33,5 +34,6 @@ public interface IUserManageAppService : IDisposable
         Task RemoveLogin(RemoveUserLoginViewModel model);
         Task<IEnumerable<UserListViewModel>> GetUsersInRole(string[] role);
         Task ResetPassword(AdminChangePasswordViewodel model);
+        Task<ListOfUsersViewModel> GetUsers(PagingViewModel page);
     }
 }

src/Backend/Jp.Application/Services/PersistedGrantAppService.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Jp.Domain.Commands.PersistedGrant;
+using Jp.Domain.Core.ViewModels;
 
 namespace Jp.Application.Services
 {
@@ -32,11 +33,14 @@ public PersistedGrantAppService(IMapper mapper,
             _userService = userService;
         }
 
-        public async Task<IEnumerable<PersistedGrantViewModel>> GetPersistedGrants()
+        public async Task<ListOfPersistedGrantViewModel> GetPersistedGrants(PagingViewModel paging)
         {
-            var resultado = await _persistedGrantRepository.GetGrants();
+            var resultado = await _persistedGrantRepository.GetGrants(paging);
+            var total = await _persistedGrantRepository.Count();
             var subjects = await _userService.GetByIdAsync(resultado.Select(s => s.SubjectId).ToArray());
-            return resultado.Select(s => new PersistedGrantViewModel(s.Key, s.Type, s.SubjectId, s.ClientId, s.CreationTime, s.Expiration, s.Data, subjects.FirstOrDefault(f => f.Id.ToString().ToLower() == s.SubjectId.ToLower())?.Email, subjects.FirstOrDefault(f => f.Id.ToString().ToLower() == s.SubjectId.ToLower())?.Picture));
+
+            var grants = resultado.Select(s => new PersistedGrantViewModel(s.Key, s.Type, s.SubjectId, s.ClientId, s.CreationTime, s.Expiration, s.Data, subjects.FirstOrDefault(f => f.Id.ToString().ToLower() == s.SubjectId.ToLower())?.Email, subjects.FirstOrDefault(f => f.Id.ToString().ToLower() == s.SubjectId.ToLower())?.Picture));
+            return new ListOfPersistedGrantViewModel(grants, total);
         }
 
         public Task Remove(RemovePersistedGrantViewModel model)

src/Backend/Jp.Application/Services/UserManagerAppService.cs

@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Jp.Domain.Core.ViewModels;
 
 namespace Jp.Application.Services
 {
@@ -85,10 +86,11 @@ public async Task<IEnumerable<EventHistoryData>> GetHistoryLogs(string username)
             return _mapper.Map<IEnumerable<EventHistoryData>>(history);
         }
 
-        public async Task<IEnumerable<UserListViewModel>> GetUsers()
+        public async Task<ListOfUsersViewModel> GetUsers(PagingViewModel paging)
         {
-            var users = await _userService.GetUsers();
-            return _mapper.Map<IEnumerable<UserListViewModel>>(users);
+            var users = await _userService.GetUsers(paging);
+            var total = await _userService.Count(paging.Search);
+            return new ListOfUsersViewModel(_mapper.Map<IEnumerable<UserListViewModel>>(users), total);
         }
 
         public async Task<UserViewModel> GetUserDetails(string username)

src/Backend/Jp.Application/ViewModels/PersistedGrantViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using IdentityServer4.Models;
 using Jp.Domain.Interfaces;
 
@@ -78,4 +79,16 @@ public PersistedGrantViewModel(string key, string type, string subjectId, string
             Picture = picture;
         }
     }
+
+    public class ListOfPersistedGrantViewModel
+    {
+        public ListOfPersistedGrantViewModel(IEnumerable<PersistedGrantViewModel> persistedGrants,int total)
+        {
+            Total = total;
+            PersistedGrants = persistedGrants;
+        }
+
+        public int Total { get; set; }
+        public IEnumerable<PersistedGrantViewModel> PersistedGrants { get; set; }
+    }
 }

src/Backend/Jp.Application/ViewModels/UserViewModels/UserListViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace Jp.Application.ViewModels.UserViewModels
@@ -20,4 +21,17 @@ public class UserListViewModel
 
         public Guid? Id { get; set; }
     }
+
+    public class ListOfUsersViewModel
+    {
+        public ListOfUsersViewModel(IEnumerable<UserListViewModel> collection, int total) 
+        {
+            Total = total;
+            Users = collection;
+        }
+
+        public IEnumerable<UserListViewModel> Users { get; set; }
+
+        public int Total { get; set; }
+    }
 }

src/Backend/Jp.Domain.Core/ViewModels/PagingViewModel.cs

@@ -0,0 +1,16 @@
+namespace Jp.Domain.Core.ViewModels
+{
+    public class PagingViewModel
+    {
+        public PagingViewModel(int quantity = 10, int page = 1, string search = null)
+        {
+            Quantity = quantity;
+            Page = page;
+            Search = search;
+        }
+
+        public int Quantity { get; set; }
+        public int Page { get; set; }
+        public string Search { get; }
+    }
+}

src/Backend/Jp.Domain/Interfaces/IPersistedGrantRepository.cs

@@ -1,11 +1,13 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using IdentityServer4.EntityFramework.Entities;
+using Jp.Domain.Core.ViewModels;
 
 namespace Jp.Domain.Interfaces
 {
     public interface IPersistedGrantRepository : IRepository<PersistedGrant>
     {
-        Task<List<PersistedGrant>> GetGrants();
+        Task<List<PersistedGrant>> GetGrants(PagingViewModel paging);
+        Task<int> Count();
     }
 }

src/Backend/Jp.Domain/Interfaces/IUserService.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Jp.Domain.Core.ViewModels;
 
 namespace Jp.Domain.Interfaces
 {
@@ -26,7 +27,7 @@ public interface IUserService
         Task<bool> RemoveAccountAsync(RemoveAccountCommand request);
         Task<bool> HasPassword(Guid userId);
         Task<IEnumerable<User>> GetByIdAsync(params string[] id);
-        Task<IEnumerable<User>> GetUsers();
+        Task<IEnumerable<User>> GetUsers(PagingViewModel page);
         Task<User> FindByEmailAsync(string email);
         Task<User> FindByNameAsync(string username);
         Task<User> FindByProviderAsync(string provider, string providerUserId);
@@ -43,5 +44,6 @@ public interface IUserService
         Task<IEnumerable<User>> GetUserFromRole(string[] role);
         Task<bool> RemoveUserFromRole(string name, string username);
         Task<bool> ResetPasswordAsync(string username, string password);
+        Task<int> Count(string search);
     }
 }