verbos

Author: brunobritodev

src/Backend/Jp.Application/AutoMapper/ViewModelToDomainMappingProfile.cs

@@ -70,7 +70,6 @@ public ViewModelToDomainMappingProfile()
              * Identity Resource commands
              */
             CreateMap<IdentityResource, RegisterIdentityResourceCommand>().ConstructUsing(c => new RegisterIdentityResourceCommand(c));
-            CreateMap<IdentityResourceViewModel, UpdateIdentityResourceCommand>().ConstructUsing(c => new UpdateIdentityResourceCommand(c, c.OldName));
             CreateMap<RemoveIdentityResourceViewModel, RemoveIdentityResourceCommand>().ConstructUsing(c => new RemoveIdentityResourceCommand(c.Name));
 
             /*
@@ -91,7 +90,6 @@ public ViewModelToDomainMappingProfile()
              */
             CreateMap<RemoveRoleViewModel, RemoveRoleCommand>().ConstructUsing(c => new RemoveRoleCommand(c.Name));
             CreateMap<SaveRoleViewModel, SaveRoleCommand>().ConstructUsing(c => new SaveRoleCommand(c.Name));
-            CreateMap<UpdateRoleViewModel, UpdateRoleCommand>().ConstructUsing(c => new UpdateRoleCommand(c.Name, c.OldName));
             CreateMap<RemoveUserFromRoleViewModel, RemoveUserFromRoleCommand>().ConstructUsing(c => new RemoveUserFromRoleCommand(c.Role, c.Username));
 
         }

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

@@ -12,7 +12,7 @@ public interface IApiResourceAppService : IDisposable
         Task<IEnumerable<ApiResourceListViewModel>> GetApiResources();
         Task<ApiResource> GetDetails(string name);
         Task Save(ApiResource model);
-        Task Update(UpdateApiResourceViewModel model);
+        Task Update(string id, ApiResource model);
         Task Remove(RemoveApiResourceViewModel model);
         Task<IEnumerable<SecretViewModel>> GetSecrets(string name);
         Task RemoveSecret(RemoveApiSecretViewModel model);

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

@@ -11,7 +11,7 @@ public interface IIdentityResourceAppService : IDisposable
         Task<IEnumerable<IdentityResourceListView>> GetIdentityResources();
         Task<IdentityResource> GetDetails(string name);
         Task Save(IdentityResource model);
-        Task Update(IdentityResource model);
+        Task Update(string resource, IdentityResource model);
         Task Remove(RemoveIdentityResourceViewModel model);
     }
 }

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

@@ -1,19 +1,17 @@
-using System;
+using Jp.Application.ViewModels.RoleViewModels;
+using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
-using Jp.Application.ViewModels;
-using Jp.Application.ViewModels.RoleViewModels;
 
 namespace Jp.Application.Interfaces
 {
-    public interface IRoleManagerAppService: IDisposable
+    public interface IRoleManagerAppService : IDisposable
     {
         Task<IEnumerable<RoleViewModel>> GetAllRoles();
         Task Remove(RemoveRoleViewModel model);
         Task<RoleViewModel> GetDetails(string name);
         Task Save(SaveRoleViewModel model);
-        Task Update(UpdateRoleViewModel model);
+        Task Update(string id, UpdateRoleViewModel model);
         Task RemoveUserFromRole(RemoveUserFromRoleViewModel model);
     }
 }

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

@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Jp.Application.EventSourcedNormalizers;
+using Jp.Application.EventSourcedNormalizers;
 using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.RoleViewModels;
 using Jp.Application.ViewModels.UserViewModels;
 using Jp.Domain.Core.ViewModels;
-using Jp.Domain.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Jp.Application.Interfaces
 {
@@ -19,7 +18,7 @@ public interface IUserManageAppService : IDisposable
         Task RemoveAccount(RemoveAccountViewModel model);
         Task<bool> HasPassword(Guid userId);
         Task<IEnumerable<EventHistoryData>> GetHistoryLogs(string username);
-        
+
         Task<UserViewModel> GetUserDetails(string username);
         Task<UserViewModel> GetUserAsync(Guid value);
         Task UpdateUser(UserViewModel model);
@@ -32,7 +31,7 @@ public interface IUserManageAppService : IDisposable
         Task SaveRole(SaveUserRoleViewModel model);
         Task<IEnumerable<UserLoginViewModel>> GetLogins(string userName);
         Task RemoveLogin(RemoveUserLoginViewModel model);
-        Task<IEnumerable<UserListViewModel>> GetUsersInRole(string[] role);
+        Task<IEnumerable<UserListViewModel>> GetUsersInRole(string role);
         Task ResetPassword(AdminChangePasswordViewodel model);
         Task<ListOfUsersViewModel> GetUsers(PagingViewModel page);
     }

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

@@ -56,9 +56,9 @@ public Task Save(ApiResource model)
             return Bus.SendCommand(command);
         }
 
-        public Task Update(UpdateApiResourceViewModel model)
+        public Task Update(string id, ApiResource model)
         {
-            var command = _mapper.Map<UpdateApiResourceCommand>(model);
+            var command = new UpdateApiResourceCommand(model, id);
             return Bus.SendCommand(command);
 
         }

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

@@ -7,6 +7,7 @@
 using Jp.Domain.Commands.Clients;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -41,10 +42,11 @@ public ClientAppService(IMapper mapper,
             _clientClaimRepository = clientClaimRepository;
         }
 
-        public Task<IEnumerable<ClientListViewModel>> GetClients()
+        public async Task<IEnumerable<ClientListViewModel>> GetClients()
         {
-            var resultado = _mapper.Map<IEnumerable<ClientListViewModel>>(_clientRepository.GetAll().AsEnumerable().Select(a => a.ToModel()).OrderBy(a => a.ClientName).ToList());
-            return Task.FromResult(resultado);
+            var clients = await _clientRepository.GetAll().OrderBy(a => a.ClientName).ToListAsync();
+            var resultado = _mapper.Map<IEnumerable<ClientListViewModel>>(clients.Select(a => a.ToModel()));
+            return resultado;
         }
 
         public async Task<Client> GetClientDetails(string clientId)

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

@@ -1,16 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using IdentityServer4.EntityFramework.Mappers;
 using IdentityServer4.Models;
 using Jp.Application.Interfaces;
-using Jp.Application.ViewModels;
 using Jp.Application.ViewModels.IdentityResourceViewModels;
 using Jp.Domain.Commands.IdentityResource;
 using Jp.Domain.Core.Bus;
 using Jp.Domain.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Jp.Application.Services
 {
@@ -51,9 +50,9 @@ public Task Save(IdentityResource model)
             return Bus.SendCommand(command);
         }
 
-        public Task Update(IdentityResource model)
+        public Task Update(string resource, IdentityResource model)
         {
-            var command = _mapper.Map<UpdateIdentityResourceCommand>(model);
+            var command = new UpdateIdentityResourceCommand(model, resource);
             return Bus.SendCommand(command);
         }
 

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

@@ -57,9 +57,9 @@ public Task Save(SaveRoleViewModel model)
             return Bus.SendCommand(command);
         }
 
-        public Task Update(UpdateRoleViewModel model)
+        public Task Update(string id, UpdateRoleViewModel model)
         {
-            var command = _mapper.Map<UpdateRoleCommand>(model);
+            var command = new UpdateRoleCommand(model.Name , id);
             return Bus.SendCommand(command);
         }
 

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

@@ -157,7 +157,7 @@ public Task RemoveLogin(RemoveUserLoginViewModel model)
             return Bus.SendCommand(registerCommand);
         }
 
-        public async Task<IEnumerable<UserListViewModel>> GetUsersInRole(string[] role)
+        public async Task<IEnumerable<UserListViewModel>> GetUsersInRole(string role)
         {
             return _mapper.Map<IEnumerable<UserListViewModel>>(await _userService.GetUserFromRole(role));
         }