feat: use AutoMapper in Armory

Author: CarlosPavajeau

src/Armory/Armament/Ammunition/Application/Find/FindAmmunitionQueryHandler.cs

@@ -1,22 +1,25 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Armory.Shared.Domain.Bus.Query;
+using AutoMapper;
 
 namespace Armory.Armament.Ammunition.Application.Find
 {
     public class FindAmmunitionQueryHandler : IQueryHandler<FindAmmunitionQuery, AmmunitionResponse>
     {
+        private readonly IMapper _mapper;
         private readonly AmmunitionFinder _searcher;
 
-        public FindAmmunitionQueryHandler(AmmunitionFinder searcher)
+        public FindAmmunitionQueryHandler(AmmunitionFinder searcher, IMapper mapper)
         {
             _searcher = searcher;
+            _mapper = mapper;
         }
 
         public async Task<AmmunitionResponse> Handle(FindAmmunitionQuery request, CancellationToken cancellationToken)
         {
             var ammunition = await _searcher.Find(request.Code);
-            return ammunition == null ? null : AmmunitionResponse.FromAggregate(ammunition);
+            return ammunition == null ? null : _mapper.Map<AmmunitionResponse>(ammunition);
         }
     }
 }

src/Armory/Armament/Ammunition/Application/SearchAll/AmmunitionSearcher.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Armory.Armament.Ammunition.Domain;
 
@@ -14,10 +13,9 @@ public AmmunitionSearcher(IAmmunitionRepository repository)
             _repository = repository;
         }
 
-        public async Task<IEnumerable<AmmunitionResponse>> SearchAll()
+        public async Task<IEnumerable<Domain.Ammunition>> SearchAll()
         {
-            var ammunition = await _repository.SearchAll();
-            return ammunition.Select(AmmunitionResponse.FromAggregate);
+            return await _repository.SearchAll();
         }
     }
 }

src/Armory/Armament/Ammunition/Application/SearchAll/SearchAllAmmunitionQueryHandler.cs

@@ -2,23 +2,27 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Armory.Shared.Domain.Bus.Query;
+using AutoMapper;
 
 namespace Armory.Armament.Ammunition.Application.SearchAll
 {
     public class
         SearchAllAmmunitionQueryHandler : IQueryHandler<SearchAllAmmunitionQuery, IEnumerable<AmmunitionResponse>>
     {
+        private readonly IMapper _mapper;
         private readonly AmmunitionSearcher _searcher;
 
-        public SearchAllAmmunitionQueryHandler(AmmunitionSearcher searcher)
+        public SearchAllAmmunitionQueryHandler(AmmunitionSearcher searcher, IMapper mapper)
         {
             _searcher = searcher;
+            _mapper = mapper;
         }
 
         public async Task<IEnumerable<AmmunitionResponse>> Handle(SearchAllAmmunitionQuery request,
             CancellationToken cancellationToken)
         {
-            return await _searcher.SearchAll();
+            var ammunition = await _searcher.SearchAll();
+            return _mapper.Map<IEnumerable<AmmunitionResponse>>(ammunition);
         }
     }
 }

src/Armory/Armament/Equipments/Application/EquipmentResponse.cs

@@ -1,28 +1,11 @@
-using Armory.Armament.Equipments.Domain;
-
 namespace Armory.Armament.Equipments.Application
 {
     public class EquipmentResponse
     {
-        public EquipmentResponse(string code, string type, string model, string series, int quantityAvailable)
-        {
-            Code = code;
-            Type = type;
-            Model = model;
-            Series = series;
-            QuantityAvailable = quantityAvailable;
-        }
-
-        public string Code { get; }
-        public string Type { get; }
-        public string Model { get; }
-        public string Series { get; }
-        public int QuantityAvailable { get; }
-
-        public static EquipmentResponse FromAggregate(Equipment equipment)
-        {
-            return new EquipmentResponse(equipment.Code, equipment.Type, equipment.Model, equipment.Series,
-                equipment.QuantityAvailable);
-        }
+        public string Code { get; init; }
+        public string Type { get; init; }
+        public string Model { get; init; }
+        public string Series { get; init; }
+        public int QuantityAvailable { get; init; }
     }
 }

src/Armory/Armament/Equipments/Application/Find/FindEquipmentQueryHandler.cs

@@ -1,22 +1,25 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Armory.Shared.Domain.Bus.Query;
+using AutoMapper;
 
 namespace Armory.Armament.Equipments.Application.Find
 {
     public class FindEquipmentQueryHandler : IQueryHandler<FindEquipmentQuery, EquipmentResponse>
     {
+        private readonly IMapper _mapper;
         private readonly EquipmentFinder _searcher;
 
-        public FindEquipmentQueryHandler(EquipmentFinder searcher)
+        public FindEquipmentQueryHandler(EquipmentFinder searcher, IMapper mapper)
         {
             _searcher = searcher;
+            _mapper = mapper;
         }
 
         public async Task<EquipmentResponse> Handle(FindEquipmentQuery request, CancellationToken cancellationToken)
         {
             var equipment = await _searcher.Find(request.Code);
-            return equipment == null ? null : EquipmentResponse.FromAggregate(equipment);
+            return equipment == null ? null : _mapper.Map<EquipmentResponse>(equipment);
         }
     }
 }

src/Armory/Armament/Equipments/Application/SearchAll/AllEquipmentsSearcher.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Armory.Armament.Equipments.Domain;
 
@@ -14,10 +13,9 @@ public AllEquipmentsSearcher(IEquipmentsRepository repository)
             _repository = repository;
         }
 
-        public async Task<IEnumerable<EquipmentResponse>> SearchAll()
+        public async Task<IEnumerable<Equipment>> SearchAll()
         {
-            var equipment = await _repository.SearchAll();
-            return equipment.Select(EquipmentResponse.FromAggregate);
+            return await _repository.SearchAll();
         }
     }
 }

src/Armory/Armament/Equipments/Application/SearchAll/SearchAllEquipmentsQueryHandler.cs

@@ -2,23 +2,27 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Armory.Shared.Domain.Bus.Query;
+using AutoMapper;
 
 namespace Armory.Armament.Equipments.Application.SearchAll
 {
     public class
         SearchAllEquipmentsQueryHandler : IQueryHandler<SearchAllEquipmentsQuery, IEnumerable<EquipmentResponse>>
     {
+        private readonly IMapper _mapper;
         private readonly AllEquipmentsSearcher _searcher;
 
-        public SearchAllEquipmentsQueryHandler(AllEquipmentsSearcher searcher)
+        public SearchAllEquipmentsQueryHandler(AllEquipmentsSearcher searcher, IMapper mapper)
         {
             _searcher = searcher;
+            _mapper = mapper;
         }
 
         public async Task<IEnumerable<EquipmentResponse>> Handle(SearchAllEquipmentsQuery request,
             CancellationToken cancellationToken)
         {
-            return await _searcher.SearchAll();
+            var equipments = await _searcher.SearchAll();
+            return _mapper.Map<IEnumerable<EquipmentResponse>>(equipments);
         }
     }
 }

src/Armory/Armament/Explosives/Application/ExplosiveResponse.cs

@@ -1,34 +1,13 @@
-using Armory.Armament.Explosives.Domain;
-
 namespace Armory.Armament.Explosives.Application
 {
     public class ExplosiveResponse
     {
-        public ExplosiveResponse(string code, string type, string caliber, string mark, string lot, string series,
-            int quantityAvailable)
-        {
-            Code = code;
-            Type = type;
-            Caliber = caliber;
-            Mark = mark;
-            Lot = lot;
-            Series = series;
-            QuantityAvailable = quantityAvailable;
-        }
-
-        public string Code { get; }
-        public string Type { get; }
-        public string Caliber { get; }
-        public string Mark { get; }
-        public string Lot { get; }
-        public string Series { get; }
-        public int QuantityAvailable { get; }
-
-        public static ExplosiveResponse FromAggregate(Explosive explosive)
-        {
-            return new ExplosiveResponse(explosive.Code, explosive.Type, explosive.Caliber, explosive.Mark,
-                explosive.Lot,
-                explosive.Series, explosive.QuantityAvailable);
-        }
+        public string Code { get; init; }
+        public string Type { get; init; }
+        public string Caliber { get; init; }
+        public string Mark { get; init; }
+        public string Lot { get; init; }
+        public string Series { get; init; }
+        public int QuantityAvailable { get; init; }
     }
 }

src/Armory/Armament/Explosives/Application/Find/FindExplosiveQueryHandler.cs

@@ -1,22 +1,25 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Armory.Shared.Domain.Bus.Query;
+using AutoMapper;
 
 namespace Armory.Armament.Explosives.Application.Find
 {
     public class FindExplosiveQueryHandler : IQueryHandler<FindExplosiveQuery, ExplosiveResponse>
     {
         private readonly ExplosiveFinder _finder;
+        private readonly IMapper _mapper;
 
-        public FindExplosiveQueryHandler(ExplosiveFinder finder)
+        public FindExplosiveQueryHandler(ExplosiveFinder finder, IMapper mapper)
         {
             _finder = finder;
+            _mapper = mapper;
         }
 
         public async Task<ExplosiveResponse> Handle(FindExplosiveQuery request, CancellationToken cancellationToken)
         {
             var explosive = await _finder.Find(request.Code);
-            return explosive == null ? null : ExplosiveResponse.FromAggregate(explosive);
+            return explosive == null ? null : _mapper.Map<ExplosiveResponse>(explosive);
         }
     }
 }

src/Armory/Armament/Explosives/Application/SearchAll/AllExplosivesSearcher.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Armory.Armament.Explosives.Domain;
 
@@ -14,10 +13,9 @@ public AllExplosivesSearcher(IExplosivesRepository repository)
             _repository = repository;
         }
 
-        public async Task<IEnumerable<ExplosiveResponse>> SearchAll()
+        public async Task<IEnumerable<Explosive>> SearchAll()
         {
-            var explosives = await _repository.SearchAll();
-            return explosives.Select(ExplosiveResponse.FromAggregate);
+            return await _repository.SearchAll();
         }
     }
 }