feat: use automapper on all controllers

CarlosPavajeau · Jul 12, 2021 · dba04a8 · dba04a8
1 parent ff75f57
commit dba04a8
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 19 deletions.
diff --git a/src/Armory.Api/Controllers/ArmoryUsers/ArmoryUsersController.cs b/src/Armory.Api/Controllers/ArmoryUsers/ArmoryUsersController.cs
@@ -12,6 +12,7 @@
 using Armory.Users.Application.ResetPassword;
 using Armory.Users.Application.SearchAllRoles;
 using Armory.Users.Domain;
+using AutoMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -25,11 +26,13 @@ public class ArmoryUsersController : ControllerBase
     {
         private readonly ICommandBus _commandBus;
         private readonly IQueryBus _queryBus;
+        private readonly IMapper _mapper;
 
-        public ArmoryUsersController(ICommandBus commandBus, IQueryBus queryBus)
+        public ArmoryUsersController(ICommandBus commandBus, IQueryBus queryBus, IMapper mapper)
         {
             _commandBus = commandBus;
             _queryBus = queryBus;
+            _mapper = mapper;
         }
 
         private IActionResult IdentityErrors(IEnumerable<IdentityError> errors)
@@ -66,8 +69,8 @@ public async Task<IActionResult> ResetPassword(string usernameOrEmail, [FromBody
         {
             try
             {
-                await _commandBus.Dispatch(
-                    new ResetPasswordCommand(usernameOrEmail, request.Token, request.NewPassword));
+                var command = _mapper.Map<ResetPasswordCommand>(request);
+                await _commandBus.Dispatch(command);
             }
             catch (FormatException)
             {
@@ -92,8 +95,8 @@ public async Task<IActionResult> ChangePassword(string usernameOrEmail,
         {
             try
             {
-                await _commandBus.Dispatch(new ChangePasswordCommand(usernameOrEmail, request.OldPassword,
-                    request.NewPassword));
+                var command = _mapper.Map<ChangePasswordCommand>(request);
+                await _commandBus.Dispatch(command);
             }
             catch (ArmoryUserNotFound)
             {

diff --git a/src/Armory.Api/Controllers/People/PeopleController.cs b/src/Armory.Api/Controllers/People/PeopleController.cs
@@ -14,6 +14,7 @@
 using Armory.Shared.Domain.Bus.Command;
 using Armory.Shared.Domain.Bus.Query;
 using Armory.Users.Domain;
+using AutoMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -28,11 +29,13 @@ public class PeopleController : ControllerBase
     {
         private readonly ICommandBus _commandBus;
         private readonly IQueryBus _queryBus;
+        private readonly IMapper _mapper;
 
-        public PeopleController(ICommandBus commandBus, IQueryBus queryBus)
+        public PeopleController(ICommandBus commandBus, IQueryBus queryBus, IMapper mapper)
         {
             _commandBus = commandBus;
             _queryBus = queryBus;
+            _mapper = mapper;
         }
 
         private IActionResult IdentityErrors(IEnumerable<IdentityError> errors)
@@ -50,8 +53,8 @@ public async Task<IActionResult> RegisterPerson([FromBody] CreatePersonRequest r
         {
             try
             {
-                await _commandBus.Dispatch(new CreatePersonCommand(request.Id, request.FirstName, request.SecondName,
-                    request.LastName, request.SecondLastName, request.Email, request.PhoneNumber, request.RoleName));
+                var command = _mapper.Map<CreatePersonCommand>(request);
+                await _commandBus.Dispatch(command);
             }
             catch (DbUpdateException)
             {
@@ -125,8 +128,8 @@ public async Task<IActionResult> UpdatePerson(string id, [FromBody] UpdatePerson
         {
             try
             {
-                await _commandBus.Dispatch(new UpdatePersonCommand(id, request.FirstName, request.SecondName,
-                    request.LastName, request.SecondLastName));
+                var command = _mapper.Map<UpdatePersonCommand>(request);
+                await _commandBus.Dispatch(command);
             }
             catch (PersonNotFound)
             {

diff --git a/src/Armory.Api/Controllers/People/Requests/UpdatePersonRequest.cs b/src/Armory.Api/Controllers/People/Requests/UpdatePersonRequest.cs
@@ -1,10 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace Armory.Api.Controllers.People.Requests
 {
     public class UpdatePersonRequest
     {
+        [Required(ErrorMessage = "La identificación de la persona es requerida.")]
+        [MaxLength(10, ErrorMessage = "La identificación de la persona no debe tener más de 10 caracteres.")]
+        public string Id { get; set; }
+
+        [Required(ErrorMessage = "El primer nombre de la persona es requerido.")]
+        [MaxLength(50, ErrorMessage = "El primer nombre de la persona no debe tener más de 50 caracteres.")]
         public string FirstName { get; set; }
+
+        [MaxLength(50, ErrorMessage = "El segundo nombre de la persona no debe tener más de 50 caracteres.")]
         public string SecondName { get; set; }
+
+        [Required(ErrorMessage = "El primer apellido de la persona es requerido.")]
+        [MaxLength(50, ErrorMessage = "El primer aoellido de la persona no debe tener más de 50 caracteres.")]
         public string LastName { get; set; }
+
+        [MaxLength(50, ErrorMessage = "El segundo apellido de la persona no debe tener más de 50 caracteres.")]
         public string SecondLastName { get; set; }
     }
 }
diff --git a/src/Armory.Api/Controllers/Squadron/SquadronsController.cs b/src/Armory.Api/Controllers/Squadron/SquadronsController.cs
@@ -8,8 +8,10 @@
 using Armory.Squadrons.Application.Create;
 using Armory.Squadrons.Application.Find;
 using Armory.Squadrons.Application.SearchAll;
+using AutoMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 
 namespace Armory.Api.Controllers.Squadron
 {
@@ -20,24 +22,26 @@ public class SquadronsController : ControllerBase
     {
         private readonly ICommandBus _commandBus;
         private readonly IQueryBus _queryBus;
+        private readonly IMapper _mapper;
 
-        public SquadronsController(ICommandBus commandBus, IQueryBus queryBus)
+        public SquadronsController(ICommandBus commandBus, IQueryBus queryBus, IMapper mapper)
         {
             _commandBus = commandBus;
             _queryBus = queryBus;
+            _mapper = mapper;
         }
 
         [HttpPost]
         public async Task<IActionResult> RegisterSquadron([FromBody] CreateSquadronRequest request)
         {
             try
             {
-                await _commandBus.Dispatch(new CreateSquadronCommand(request.Code, request.Name, request.PersonId));
+                var command = _mapper.Map<CreateSquadronCommand>(request);
+                await _commandBus.Dispatch(command);
             }
-            catch (Exception e)
+            catch (DbUpdateException)
             {
-                Console.WriteLine(e);
-                throw;
+                return BadRequest();
             }
 
             return Ok();

diff --git a/src/Armory.Api/Controllers/Squads/SquadsController.cs b/src/Armory.Api/Controllers/Squads/SquadsController.cs
@@ -7,6 +7,7 @@
 using Armory.Squads.Application.Create;
 using Armory.Squads.Application.Find;
 using Armory.Squads.Application.SearchAll;
+using AutoMapper;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -20,20 +21,22 @@ public class SquadsController : ControllerBase
     {
         private readonly ICommandBus _commandBus;
         private readonly IQueryBus _queryBus;
+        private readonly IMapper _mapper;
 
-        public SquadsController(ICommandBus commandBus, IQueryBus queryBus)
+        public SquadsController(ICommandBus commandBus, IQueryBus queryBus, IMapper mapper)
         {
             _commandBus = commandBus;
             _queryBus = queryBus;
+            _mapper = mapper;
         }
 
         [HttpPost]
         public async Task<IActionResult> RegisterSquad([FromBody] CreateSquadRequest request)
         {
             try
             {
-                await _commandBus.Dispatch(new CreateSquadCommand(request.Code, request.Name, request.PersonId,
-                    request.SquadronCode));
+                var command = _mapper.Map<CreateSquadCommand>(request);
+                await _commandBus.Dispatch(command);
             }
             catch (DbUpdateException)
             {

diff --git a/src/Armory.Api/Profiles/ArmoryUsersProfile.cs b/src/Armory.Api/Profiles/ArmoryUsersProfile.cs
@@ -0,0 +1,16 @@
+using Armory.Api.Controllers.ArmoryUsers.Requests;
+using Armory.Users.Application.ChangePassword;
+using Armory.Users.Application.ResetPassword;
+using AutoMapper;
+
+namespace Armory.Api.Profiles
+{
+    public class ArmoryUsersProfile : Profile
+    {
+        public ArmoryUsersProfile()
+        {
+            CreateMap<ResetPasswordRequest, ResetPasswordCommand>();
+            CreateMap<ChangePasswordRequest, ChangePasswordCommand>();
+        }
+    }
+}
diff --git a/src/Armory.Api/Profiles/PeopleProfile.cs b/src/Armory.Api/Profiles/PeopleProfile.cs
@@ -0,0 +1,16 @@
+using Armory.Api.Controllers.People.Requests;
+using Armory.People.Application.Create;
+using Armory.People.Application.Update;
+using AutoMapper;
+
+namespace Armory.Api.Profiles
+{
+    public class PeopleProfile : Profile
+    {
+        public PeopleProfile()
+        {
+            CreateMap<CreatePersonRequest, CreatePersonCommand>();
+            CreateMap<UpdatePersonRequest, UpdatePersonCommand>();
+        }
+    }
+}
diff --git a/src/Armory.Api/Profiles/SquadronsProfile.cs b/src/Armory.Api/Profiles/SquadronsProfile.cs
@@ -0,0 +1,14 @@
+using Armory.Api.Controllers.Squadron.Requests;
+using Armory.Squadrons.Application.Create;
+using AutoMapper;
+
+namespace Armory.Api.Profiles
+{
+    public class SquadronsProfile : Profile
+    {
+        public SquadronsProfile()
+        {
+            CreateMap<CreateSquadronRequest, CreateSquadronCommand>();
+        }
+    }
+}
diff --git a/src/Armory.Api/Profiles/SquadsProfile.cs b/src/Armory.Api/Profiles/SquadsProfile.cs
@@ -0,0 +1,14 @@
+using Armory.Api.Controllers.Squads.Requests;
+using Armory.Squads.Application.Create;
+using AutoMapper;
+
+namespace Armory.Api.Profiles
+{
+    public class SquadsProfile : Profile
+    {
+        public SquadsProfile()
+        {
+            CreateMap<CreateSquadRequest, CreateSquadCommand>();
+        }
+    }
+}
diff --git a/test/Armory.Api.Test/Controllers/ArmoryUsers/ArmoryUsersControllerTest.cs b/test/Armory.Api.Test/Controllers/ArmoryUsers/ArmoryUsersControllerTest.cs
@@ -17,7 +17,7 @@ public class ArmoryUsersControllerTest : ApiTest
         [SetUp]
         public void SetUp()
         {
-            _controller = new ArmoryUsersController(CommandBus.Object, QueryBus.Object);
+            _controller = new ArmoryUsersController(CommandBus.Object, QueryBus.Object, null);
         }
 
         private void ShouldHaveForgottenPasswordQuery()