feat(explosives): new changes for explosives

* Remove the 'Code' property * Add relationship with fligths
CarlosPavajeau · Sep 28, 2021 · 4280f1a · 4280f1a
1 parent 3f1f7c6
commit 4280f1a
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 67 deletions.
diff --git a/src/Armory.Api/Controllers/Armament/Explosives/ExplosivesController.cs b/src/Armory.Api/Controllers/Armament/Explosives/ExplosivesController.cs
@@ -40,14 +40,14 @@ public async Task<IActionResult> RegisterExplosive([FromBody] CreateExplosiveReq
             }
             catch (DbUpdateException)
             {
-                var exists = await _mediator.Send(new CheckExplosiveExistsQuery(request.Code));
+                var exists = await _mediator.Send(new CheckExplosiveExistsQuery(request.Serial));
                 if (!exists)
                 {
                     throw;
                 }
 
                 ModelState.AddModelError("ExplosiveAlreadyRegistered",
-                    $"Ya existe un explosivo con el código '{request.Code}'");
+                    $"Ya existe un explosivo con el número de serie '{request.Serial}'");
                 return Conflict(new ValidationProblemDetails(ModelState));
             }
 

diff --git a/src/Armory.Api/Controllers/Armament/Explosives/Requests/CreateExplosiveRequest.cs b/src/Armory.Api/Controllers/Armament/Explosives/Requests/CreateExplosiveRequest.cs
@@ -4,9 +4,9 @@ namespace Armory.Api.Controllers.Armament.Explosives.Requests
 {
     public class CreateExplosiveRequest
     {
-        [Required(ErrorMessage = "El código del explosivo es requerido.")]
-        [MaxLength(50, ErrorMessage = "El código del referido no debe tener más de 50 caracteres.")]
-        public string Code { get; set; }
+        [Required(ErrorMessage = "El número de serie del explosivo es requerido.")]
+        [MaxLength(256, ErrorMessage = "El número de serie del explosivo no debe tener más de 256 caracteres.")]
+        public string Serial { get; set; }
 
         [Required(ErrorMessage = "El tipo de explosivo es requerido.")]
         [MaxLength(128, ErrorMessage = "El tipo de explosivo no debe tener más de 128 caracteres.")]
@@ -24,11 +24,11 @@ public class CreateExplosiveRequest
         [MaxLength(256, ErrorMessage = "El lote del explosivo no debe tener más de 256 caracteres.")]
         public string Lot { get; set; }
 
-        [Required(ErrorMessage = "El número de serie del explosivo es requerido.")]
-        [MaxLength(256, ErrorMessage = "El número de serie del explosivo no debe tener más de 256 caracteres.")]
-        public string Series { get; set; }
-
         [Required(ErrorMessage = "La cantidad disponible del explosivo es requerida.")]
         public int QuantityAvailable { get; set; }
+
+        [Required(ErrorMessage = "El código de la escuadrilla del arma es requerida.")]
+        [MaxLength(50, ErrorMessage = "El código de la escuadrilla no debe tener más de 50 caracteres.")]
+        public string FlightCode { get; set; }
     }
 }
diff --git a/src/Armory/Armament/Explosives/Application/CheckExists/ExplosiveExistsChecker.cs b/src/Armory/Armament/Explosives/Application/CheckExists/ExplosiveExistsChecker.cs
@@ -12,9 +12,9 @@ public ExplosiveExistsChecker(IExplosivesRepository repository)
             _repository = repository;
         }
 
-        public async Task<bool> Exists(string code)
+        public async Task<bool> Exists(string serial)
         {
-            return await _repository.Any(e => e.Code == code);
+            return await _repository.Any(e => e.Serial == serial);
         }
     }
 }
diff --git a/src/Armory/Armament/Explosives/Application/Create/CreateExplosiveCommand.cs b/src/Armory/Armament/Explosives/Application/Create/CreateExplosiveCommand.cs
@@ -4,24 +4,12 @@ namespace Armory.Armament.Explosives.Application.Create
 {
     public class CreateExplosiveCommand : Command
     {
-        public CreateExplosiveCommand(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 string Serial { get; init; }
+        public string Type { get; init; }
+        public string Caliber { get; init; }
+        public string Mark { get; init; }
+        public string Lot { get; init; }
+        public int QuantityAvailable { get; init; }
+        public string FlightCode { get; set; }
     }
 }
diff --git a/src/Armory/Armament/Explosives/Domain/Explosive.cs b/src/Armory/Armament/Explosives/Domain/Explosive.cs
@@ -1,32 +1,36 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Armory.Flights.Domain;
 using Armory.Formats.WarMaterialAndSpecialEquipmentAssignmentFormats.Domain;
 using Armory.Formats.WarMaterialDeliveryCertificateFormats.Domain;
 
 namespace Armory.Armament.Explosives.Domain
 {
     public class Explosive
     {
-        public Explosive(string code, string type, string caliber, string mark, string lot, string series,
+        public Explosive(string type, string caliber, string mark, string lot, string serial,
             int quantityAvailable)
         {
-            Code = code;
             Type = type;
             Caliber = caliber;
             Mark = mark;
             Lot = lot;
-            Series = series;
+            Serial = serial;
             QuantityAvailable = quantityAvailable;
         }
 
-        [Key] [MaxLength(50)] public string Code { get; set; }
+
+        [Key] [MaxLength(256)] public string Serial { get; set; }
         [Required] [MaxLength(128)] public string Type { get; set; }
         [Required] [MaxLength(256)] public string Caliber { get; set; }
         [Required] [MaxLength(256)] public string Mark { get; set; }
         [Required] [MaxLength(256)] public string Lot { get; set; }
-        [Required] [MaxLength(256)] public string Series { get; set; }
         [Required] public int QuantityAvailable { get; set; }
 
+        public string FlightCode { get; set; }
+        [ForeignKey("FlightCode")] public Flight Flight { get; set; }
+
         public ICollection<WarMaterialAndSpecialEquipmentAssignmentFormatExplosive>
             WarMaterialAndSpecialEquipmentAssignmentFormatExplosives { get; set; } =
             new HashSet<WarMaterialAndSpecialEquipmentAssignmentFormatExplosive>();
@@ -41,7 +45,7 @@ public void Update(string type, string caliber, string mark, string lot, string
             Caliber = caliber;
             Mark = mark;
             Lot = lot;
-            Series = series;
+            Serial = series;
             QuantityAvailable = quantityAvailable;
         }
     }

diff --git a/src/Armory/Armament/Explosives/Domain/IExplosivesRepository.cs b/src/Armory/Armament/Explosives/Domain/IExplosivesRepository.cs
@@ -8,8 +8,8 @@ namespace Armory.Armament.Explosives.Domain
     public interface IExplosivesRepository
     {
         Task Save(Explosive explosive);
-        Task<Explosive> Find(string code, bool noTracking);
-        Task<Explosive> Find(string code);
+        Task<Explosive> Find(string serial, bool noTracking);
+        Task<Explosive> Find(string serial);
         Task<IEnumerable<Explosive>> SearchAll(bool noTracking);
         Task<IEnumerable<Explosive>> SearchAll();
         Task<bool> Any(Expression<Func<Explosive, bool>> predicate);

diff --git a/src/Armory/Armament/Explosives/Infrastructure/Persistence/MySqlExplosivesRepository.cs b/src/Armory/Armament/Explosives/Infrastructure/Persistence/MySqlExplosivesRepository.cs
@@ -23,16 +23,16 @@ public async Task Save(Explosive explosive)
             await _context.SaveChangesAsync();
         }
 
-        public async Task<Explosive> Find(string code, bool noTracking)
+        public async Task<Explosive> Find(string serial, bool noTracking)
         {
             var query = noTracking ? _context.Explosives.AsNoTracking() : _context.Explosives.AsTracking();
 
-            return await query.FirstOrDefaultAsync(e => e.Code == code);
+            return await query.FirstOrDefaultAsync(e => e.Serial == serial);
         }
 
-        public async Task<Explosive> Find(string code)
+        public async Task<Explosive> Find(string serial)
         {
-            return await Find(code, true);
+            return await Find(serial, true);
         }
 
         public async Task<IEnumerable<Explosive>> SearchAll(bool noTracking)

diff --git a/src/Armory/Formats/Shared/Application/ExplosiveAndQuantity.cs b/src/Armory/Formats/Shared/Application/ExplosiveAndQuantity.cs
@@ -2,7 +2,7 @@
 {
     public class ExplosiveAndQuantity
     {
-        public string ExplosiveCode { get; init; }
+        public string ExplosiveSerial { get; init; }
         public int Quantity { get; init; }
     }
 }
diff --git a/.../Application/Create/CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommandHandler.cs b/.../Application/Create/CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommandHandler.cs
@@ -40,7 +40,7 @@ public async Task<int> Handle(CreateWarMaterialAndSpecialEquipmentAssignmentForm
                 request.Weapons,
                 request.Ammunition.ToDictionary(c => c.AmmunitionCode, c => c.Quantity),
                 request.Equipments.ToDictionary(c => c.EquipmentSeries, c => c.Quantity),
-                request.Explosives.ToDictionary(c => c.ExplosiveCode, c => c.Quantity));
+                request.Explosives.ToDictionary(c => c.ExplosiveSerial, c => c.Quantity));
 
             return format.Id;
         }

diff --git a/...ntFormats/Application/Generate/WarMaterialAndSpecialEquipmentAssignmentFormatGenerator.cs b/...ntFormats/Application/Generate/WarMaterialAndSpecialEquipmentAssignmentFormatGenerator.cs
@@ -228,7 +228,7 @@ private int MakeSpecialEquipmentAndExplosivesInfo(IXLWorksheet worksheet,
                 var explosive = format.Explosives.ElementAt(i);
                 var explosiveFormat =
                     format.WarMaterialAndSpecialEquipmentAssignmentFormatExplosives.First(x =>
-                        x.ExplosiveCode == explosive.Code);
+                        x.ExplosiveSerial == explosive.Serial);
 
                 _worksheetManager.SetRangeValues(worksheet.Range($"H{previousEnd + i}:M{previousEnd + i}"),
                     new List<string>
@@ -237,7 +237,7 @@ private int MakeSpecialEquipmentAndExplosivesInfo(IXLWorksheet worksheet,
                         explosive.Caliber,
                         explosive.Mark,
                         explosive.Lot,
-                        explosive.Series,
+                        explosive.Serial,
                         explosiveFormat.Quantity.ToString()
                     });
             }

diff --git a/...pecialEquipmentAssignmentFormats/Domain/WarMaterialAndSpecialEquipmentAssignmentFormat.cs b/...pecialEquipmentAssignmentFormats/Domain/WarMaterialAndSpecialEquipmentAssignmentFormat.cs
@@ -116,10 +116,10 @@ public static WarMaterialAndSpecialEquipmentAssignmentFormat Create(string code,
                     WarMaterialAndSpecialEquipmentAssignmentFormatEquipment.Create(format, equipmentSeries, quantity));
             }
 
-            foreach (var (explosiveCode, quantity) in explosives)
+            foreach (var (explosiveSerial, quantity) in explosives)
             {
                 format.WarMaterialAndSpecialEquipmentAssignmentFormatExplosives.Add(
-                    WarMaterialAndSpecialEquipmentAssignmentFormatExplosive.Create(format, explosiveCode, quantity));
+                    WarMaterialAndSpecialEquipmentAssignmentFormatExplosive.Create(format, explosiveSerial, quantity));
             }
 
             format.Record(

diff --git a/...ipmentAssignmentFormats/Domain/WarMaterialAndSpecialEquipmentAssignmentFormatExplosive.cs b/...ipmentAssignmentFormats/Domain/WarMaterialAndSpecialEquipmentAssignmentFormatExplosive.cs
@@ -6,10 +6,10 @@ namespace Armory.Formats.WarMaterialAndSpecialEquipmentAssignmentFormats.Domain
     public class WarMaterialAndSpecialEquipmentAssignmentFormatExplosive
     {
         public WarMaterialAndSpecialEquipmentAssignmentFormatExplosive(
-            WarMaterialAndSpecialEquipmentAssignmentFormat format, string explosiveCode, int quantity)
+            WarMaterialAndSpecialEquipmentAssignmentFormat format, string explosiveSerial, int quantity)
         {
             Format = format;
-            ExplosiveCode = explosiveCode;
+            ExplosiveSerial = explosiveSerial;
             Quantity = quantity;
         }
 
@@ -22,15 +22,15 @@ private WarMaterialAndSpecialEquipmentAssignmentFormatExplosive()
         [ForeignKey("WarMaterialAndSpecialEquipmentAssignmentFormatId")]
         public WarMaterialAndSpecialEquipmentAssignmentFormat Format { get; set; }
 
-        public string ExplosiveCode { get; set; }
-        [ForeignKey("ExplosiveCode")] public Explosive Explosive { get; set; }
+        public string ExplosiveSerial { get; set; }
+        [ForeignKey("ExplosiveSerial")] public Explosive Explosive { get; set; }
 
         public int Quantity { get; set; }
 
         public static WarMaterialAndSpecialEquipmentAssignmentFormatExplosive Create(
-            WarMaterialAndSpecialEquipmentAssignmentFormat format, string explosiveCode, int quantity)
+            WarMaterialAndSpecialEquipmentAssignmentFormat format, string explosiveSerial, int quantity)
         {
-            return new WarMaterialAndSpecialEquipmentAssignmentFormatExplosive(format, explosiveCode, quantity);
+            return new WarMaterialAndSpecialEquipmentAssignmentFormatExplosive(format, explosiveSerial, quantity);
         }
     }
 }
diff --git a/...ateFormats/Application/Create/CreateWarMaterialDeliveryCertificateFormatCommandHandler.cs b/...ateFormats/Application/Create/CreateWarMaterialDeliveryCertificateFormatCommandHandler.cs
@@ -32,7 +32,7 @@ public async Task<int> Handle(CreateWarMaterialDeliveryCertificateFormatCommand
                 request.Weapons,
                 request.Ammunition.ToDictionary(c => c.AmmunitionCode, c => c.Quantity),
                 request.Equipments.ToDictionary(c => c.EquipmentSeries, c => c.Quantity),
-                request.Explosives.ToDictionary(c => c.ExplosiveCode, c => c.Quantity));
+                request.Explosives.ToDictionary(c => c.ExplosiveSerial, c => c.Quantity));
 
             return format.Id;
         }

diff --git a/...yCertificateFormats/Application/Generate/WarMaterialDeliveryCertificateFormatGenerator.cs b/...yCertificateFormats/Application/Generate/WarMaterialDeliveryCertificateFormatGenerator.cs
@@ -202,7 +202,7 @@ private int MakeSpecialEquipmentAndExplosivesInfo(IXLWorksheet worksheet,
                 var explosive = format.Explosives.ElementAt(i);
                 var explosiveFormat =
                     format.WarMaterialDeliveryCertificateFormatExplosives.First(x =>
-                        x.ExplosiveCode == explosive.Code);
+                        x.ExplosiveSerial == explosive.Serial);
 
                 _worksheetManager.SetRangeValues(worksheet.Range($"H{previousEnd + i}:M{previousEnd + i}"),
                     new List<string>
@@ -211,7 +211,7 @@ private int MakeSpecialEquipmentAndExplosivesInfo(IXLWorksheet worksheet,
                         explosive.Caliber,
                         explosive.Mark,
                         explosive.Lot,
-                        explosive.Series,
+                        explosive.Serial,
                         explosiveFormat.Quantity.ToString()
                     });
             }

diff --git a/...mats/WarMaterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormat.cs b/...mats/WarMaterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormat.cs
@@ -101,10 +101,10 @@ public static WarMaterialDeliveryCertificateFormat Create(string code, DateTime
                     WarMaterialDeliveryCertificateFormatEquipment.Create(format, equipmentSeries, quantity));
             }
 
-            foreach (var (explosiveCode, quantity) in explosives)
+            foreach (var (explosiveSerial, quantity) in explosives)
             {
                 format.WarMaterialDeliveryCertificateFormatExplosives.Add(
-                    WarMaterialDeliveryCertificateFormatExplosive.Create(format, explosiveCode, quantity));
+                    WarMaterialDeliveryCertificateFormatExplosive.Create(format, explosiveSerial, quantity));
             }
 
             return format;

diff --git a/...aterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormatExplosive.cs b/...aterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormatExplosive.cs
@@ -6,10 +6,10 @@ namespace Armory.Formats.WarMaterialDeliveryCertificateFormats.Domain
     public class WarMaterialDeliveryCertificateFormatExplosive
     {
         public WarMaterialDeliveryCertificateFormatExplosive(WarMaterialDeliveryCertificateFormat format,
-            string explosiveCode, int quantity)
+            string explosiveSerial, int quantity)
         {
             Format = format;
-            ExplosiveCode = explosiveCode;
+            ExplosiveSerial = explosiveSerial;
             Quantity = quantity;
         }
 
@@ -22,15 +22,15 @@ private WarMaterialDeliveryCertificateFormatExplosive()
         [ForeignKey("WarMaterialDeliveryCertificateFormatId")]
         public WarMaterialDeliveryCertificateFormat Format { get; set; }
 
-        public string ExplosiveCode { get; set; }
-        [ForeignKey("ExplosiveCode")] public Explosive Explosive { get; set; }
+        public string ExplosiveSerial { get; set; }
+        [ForeignKey("ExplosiveSerial")] public Explosive Explosive { get; set; }
 
         public int Quantity { get; set; }
 
         public static WarMaterialDeliveryCertificateFormatExplosive Create(WarMaterialDeliveryCertificateFormat format,
-            string explosiveCode, int quantity)
+            string explosiveSerial, int quantity)
         {
-            return new WarMaterialDeliveryCertificateFormatExplosive(format, explosiveCode, quantity);
+            return new WarMaterialDeliveryCertificateFormatExplosive(format, explosiveSerial, quantity);
         }
     }
 }
diff --git a/...ityConfigurations/WarMaterialAndSpecialEquipmentAssignmentFormatExplosiveConfiguration.cs b/...ityConfigurations/WarMaterialAndSpecialEquipmentAssignmentFormatExplosiveConfiguration.cs
@@ -9,7 +9,8 @@ public class WarMaterialAndSpecialEquipmentAssignmentFormatExplosiveConfiguratio
     {
         public void Configure(EntityTypeBuilder<WarMaterialAndSpecialEquipmentAssignmentFormatExplosive> builder)
         {
-            builder.HasKey(f => new { f.WarMaterialAndSpecialEquipmentAssignmentFormatId, f.ExplosiveCode });
+            builder.HasKey(f => new
+                { f.WarMaterialAndSpecialEquipmentAssignmentFormatId, ExplosiveCode = f.ExplosiveSerial });
         }
     }
 }
diff --git a/...mework/EntityConfigurations/WarMaterialDeliveryCertificateFormatExplosiveConfiguration.cs b/...mework/EntityConfigurations/WarMaterialDeliveryCertificateFormatExplosiveConfiguration.cs
@@ -10,7 +10,7 @@ public class
     {
         public void Configure(EntityTypeBuilder<WarMaterialDeliveryCertificateFormatExplosive> builder)
         {
-            builder.HasKey(f => new { f.WarMaterialDeliveryCertificateFormatId, f.ExplosiveCode });
+            builder.HasKey(f => new { f.WarMaterialDeliveryCertificateFormatId, ExplosiveCode = f.ExplosiveSerial });
         }
     }
 }