feat: add squads to formats

CarlosPavajeau · Sep 19, 2021 · 9dad946 · 9dad946
1 parent 3f738a2
commit 9dad946
Show file tree

Hide file tree

Showing 16 changed files with 1,960 additions and 11 deletions.
diff --git a/...rmats/AssignedWeaponMagazineFormats/Requests/CreateAssignedWeaponMagazineFormatRequest.cs b/...rmats/AssignedWeaponMagazineFormats/Requests/CreateAssignedWeaponMagazineFormatRequest.cs
@@ -7,6 +7,7 @@ public class CreateAssignedWeaponMagazineFormatRequest
     {
         public string Code { get; set; }
         public DateTime Validity { get; set; }
+        public string SquadCode { get; set; }
         public string FlightCode { get; set; }
         public string FireteamCode { get; set; }
         public Warehouse Warehouse { get; set; }

diff --git a/...AssignmentFormats/Requests/CreateWarMaterialAndSpecialEquipmentAssignmentFormatRequest.cs b/...AssignmentFormats/Requests/CreateWarMaterialAndSpecialEquipmentAssignmentFormatRequest.cs
@@ -12,6 +12,7 @@ public class CreateWarMaterialAndSpecialEquipmentAssignmentFormatRequest
         public string Place { get; set; }
         public DateTime Date { get; set; }
 
+        public string SquadCode { get; set; }
         public string FlightCode { get; set; }
         public string FireteamCode { get; set; }
         public string TroopId { get; set; }

diff --git a/...lDeliveryCertificateFormats/Requests/CreateWarMaterialDeliveryCertificateFormatRequest.cs b/...lDeliveryCertificateFormats/Requests/CreateWarMaterialDeliveryCertificateFormatRequest.cs
@@ -11,6 +11,7 @@ public class CreateWarMaterialDeliveryCertificateFormatRequest
         public string Place { get; set; }
         public DateTime Date { get; set; }
 
+        public string SquadCode { get; set; }
         public string FlightCode { get; set; }
         public string FireteamCode { get; set; }
         public string TroopId { get; set; }

diff --git a/...gnedWeaponMagazineFormats/Application/Create/CreateAssignedWeaponMagazineFormatCommand.cs b/...gnedWeaponMagazineFormats/Application/Create/CreateAssignedWeaponMagazineFormatCommand.cs
@@ -6,11 +6,13 @@ namespace Armory.Formats.AssignedWeaponMagazineFormats.Application.Create
 {
     public class CreateAssignedWeaponMagazineFormatCommand : Command<int>
     {
-        public CreateAssignedWeaponMagazineFormatCommand(string code, DateTime validity, string flightCode,
+        public CreateAssignedWeaponMagazineFormatCommand(string code, DateTime validity, string squadCode,
+            string flightCode,
             string fireteamCode, Warehouse warehouse, DateTime date, string comments)
         {
             Code = code;
             Validity = validity;
+            SquadCode = squadCode;
             FlightCode = flightCode;
             FireteamCode = fireteamCode;
             Warehouse = warehouse;
@@ -20,6 +22,7 @@ public CreateAssignedWeaponMagazineFormatCommand(string code, DateTime validity,
 
         public string Code { get; }
         public DateTime Validity { get; }
+        public string SquadCode { get; }
         public string FlightCode { get; }
         public string FireteamCode { get; }
         public Warehouse Warehouse { get; }

diff --git a/src/Armory/Formats/AssignedWeaponMagazineFormats/Domain/AssignedWeaponMagazineFormat.cs b/src/Armory/Formats/AssignedWeaponMagazineFormats/Domain/AssignedWeaponMagazineFormat.cs
@@ -6,16 +6,18 @@
 using Armory.Flights.Domain;
 using Armory.Formats.Shared.Domain;
 using Armory.Shared.Domain.Aggregate;
+using Armory.Squads.Domain;
 
 namespace Armory.Formats.AssignedWeaponMagazineFormats.Domain
 {
     public class AssignedWeaponMagazineFormat : AggregateRoot
     {
-        public AssignedWeaponMagazineFormat(string code, DateTime validity, string flightCode,
+        public AssignedWeaponMagazineFormat(string code, DateTime validity, string squadCode, string flightCode,
             string fireteamCode, Warehouse warehouse, DateTime date, string comments)
         {
             Code = code;
             Validity = validity;
+            SquadCode = squadCode;
             FlightCode = flightCode;
             FireteamCode = fireteamCode;
             Warehouse = warehouse;
@@ -28,6 +30,9 @@ public AssignedWeaponMagazineFormat(string code, DateTime validity, string fligh
         [Required] [MaxLength(50)] public string Code { get; set; }
         [DataType(DataType.Date)] public DateTime Validity { get; set; }
 
+        [Required] public string SquadCode { get; set; }
+        [ForeignKey("SquadCode")] public Squad Squad { get; set; }
+
         [Required] public string FlightCode { get; set; }
         [ForeignKey("FlightCode")] public Flight Flight { get; set; }
 

diff --git a/...Formats/Application/Create/CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommand.cs b/...Formats/Application/Create/CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommand.cs
@@ -9,13 +9,15 @@ namespace Armory.Formats.WarMaterialAndSpecialEquipmentAssignmentFormats.Applica
     public class CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommand : Command<int>
     {
         public CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommand(string code, DateTime validity, string place,
-            DateTime date, string flightCode, string fireteamCode, string troopId, Warehouse warehouse, Purpose purpose,
+            DateTime date, string squadCode, string flightCode, string fireteamCode, string troopId,
+            Warehouse warehouse, Purpose purpose,
             DocMovement docMovement, string physicalLocation, string others)
         {
             Code = code;
             Validity = validity;
             Place = place;
             Date = date;
+            SquadCode = squadCode;
             FlightCode = flightCode;
             FireteamCode = fireteamCode;
             TroopId = troopId;
@@ -31,6 +33,7 @@ public CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommand(string code,
         public string Place { get; }
         public DateTime Date { get; }
 
+        public string SquadCode { get; }
         public string FlightCode { get; }
         public string FireteamCode { get; }
         public string TroopId { get; }

diff --git a/.../Application/Create/CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommandHandler.cs b/.../Application/Create/CreateWarMaterialAndSpecialEquipmentAssignmentFormatCommandHandler.cs
@@ -28,6 +28,7 @@ public async Task<int> Handle(CreateWarMaterialAndSpecialEquipmentAssignmentForm
                 request.Validity,
                 request.Place,
                 request.Date,
+                request.SquadCode,
                 request.FlightCode,
                 request.FireteamCode,
                 request.TroopId,

diff --git a/...gnmentFormats/Application/Create/WarMaterialAndSpecialEquipmentAssignmentFormatCreator.cs b/...gnmentFormats/Application/Create/WarMaterialAndSpecialEquipmentAssignmentFormatCreator.cs
@@ -28,6 +28,7 @@ public async Task<WarMaterialAndSpecialEquipmentAssignmentFormat> Create(
             DateTime validity,
             string place,
             DateTime date,
+            string squadCode,
             string flightCode,
             string fireteamCode,
             string troopId,
@@ -46,6 +47,7 @@ public async Task<WarMaterialAndSpecialEquipmentAssignmentFormat> Create(
                 validity,
                 place,
                 date,
+                squadCode,
                 flightCode,
                 fireteamCode,
                 troopId,

diff --git a/...pecialEquipmentAssignmentFormats/Domain/WarMaterialAndSpecialEquipmentAssignmentFormat.cs b/...pecialEquipmentAssignmentFormats/Domain/WarMaterialAndSpecialEquipmentAssignmentFormat.cs
@@ -12,20 +12,23 @@
 using Armory.Formats.Shared.Domain;
 using Armory.Shared.Domain.Aggregate;
 using Armory.Shared.Domain.Formats.WarMaterialAndSpecialEquipmentAssignmentFormats.Domain;
+using Armory.Squads.Domain;
 using Armory.Troopers.Domain;
 
 namespace Armory.Formats.WarMaterialAndSpecialEquipmentAssignmentFormats.Domain
 {
     public class WarMaterialAndSpecialEquipmentAssignmentFormat : AggregateRoot
     {
         public WarMaterialAndSpecialEquipmentAssignmentFormat(string code, DateTime validity, string place,
-            DateTime date, string flightCode, string fireteamCode, string troopId, Warehouse warehouse,
+            DateTime date, string squadCode, string flightCode, string fireteamCode, string troopId,
+            Warehouse warehouse,
             Purpose purpose, DocMovement docMovement, string physicalLocation, string others)
         {
             Code = code;
             Validity = validity;
             Place = place;
             Date = date;
+            SquadCode = squadCode;
             FlightCode = flightCode;
             FireteamCode = fireteamCode;
             TroopId = troopId;
@@ -43,6 +46,9 @@ public WarMaterialAndSpecialEquipmentAssignmentFormat(string code, DateTime vali
         [Required] [MaxLength(256)] public string Place { get; set; }
         [DataType(DataType.Date)] public DateTime Date { get; set; }
 
+        [Required] public string SquadCode { get; set; }
+        [ForeignKey("SquadCode")] public Squad Squad { get; set; }
+
         [Required] public string FlightCode { get; set; }
         [ForeignKey("FlightCode")] public Flight Flight { get; set; }
         [Required] public string FireteamCode { get; set; }
@@ -80,14 +86,15 @@ public ICollection<WarMaterialAndSpecialEquipmentAssignmentFormatExplosive>
         [NotMapped] public ICollection<Explosive> Explosives { get; set; } = new HashSet<Explosive>();
 
         public static WarMaterialAndSpecialEquipmentAssignmentFormat Create(string code, DateTime validity,
-            string place, DateTime date, string flightCode, string fireteamCode, string troopId, Warehouse warehouse,
+            string place, DateTime date, string squadCode, string flightCode, string fireteamCode, string troopId,
+            Warehouse warehouse,
             Purpose purpose, DocMovement docMovement, string physicalLocation, string others,
             IEnumerable<string> weaponCodes, IDictionary<string, int> ammunition,
             IDictionary<string, int> equipments,
             IDictionary<string, int> explosives)
         {
-            var format = new WarMaterialAndSpecialEquipmentAssignmentFormat(code, validity, place, date, flightCode,
-                fireteamCode, troopId, warehouse, purpose, docMovement, physicalLocation, others);
+            var format = new WarMaterialAndSpecialEquipmentAssignmentFormat(code, validity, place, date, squadCode,
+                flightCode, fireteamCode, troopId, warehouse, purpose, docMovement, physicalLocation, others);
 
             var weapons = weaponCodes.ToList();
             foreach (var weaponCode in weapons)

diff --git a/...ertificateFormats/Application/Create/CreateWarMaterialDeliveryCertificateFormatCommand.cs b/...ertificateFormats/Application/Create/CreateWarMaterialDeliveryCertificateFormatCommand.cs
@@ -8,12 +8,13 @@ namespace Armory.Formats.WarMaterialDeliveryCertificateFormats.Application.Creat
     public class CreateWarMaterialDeliveryCertificateFormatCommand : Command<int>
     {
         public CreateWarMaterialDeliveryCertificateFormatCommand(string code, DateTime validity, string place,
-            DateTime date, string flightCode, string fireteamCode, string troopId)
+            DateTime date, string squadCode, string flightCode, string fireteamCode, string troopId)
         {
             Code = code;
             Validity = validity;
             Place = place;
             Date = date;
+            SquadCode = squadCode;
             FlightCode = flightCode;
             FireteamCode = fireteamCode;
             TroopId = troopId;
@@ -24,6 +25,7 @@ public CreateWarMaterialDeliveryCertificateFormatCommand(string code, DateTime v
         public string Place { get; }
         public DateTime Date { get; }
 
+        public string SquadCode { get; }
         public string FlightCode { get; }
         public string FireteamCode { get; }
         public string TroopId { get; }

diff --git a/...ateFormats/Application/Create/CreateWarMaterialDeliveryCertificateFormatCommandHandler.cs b/...ateFormats/Application/Create/CreateWarMaterialDeliveryCertificateFormatCommandHandler.cs
@@ -25,6 +25,7 @@ public async Task<int> Handle(CreateWarMaterialDeliveryCertificateFormatCommand
                 request.Validity,
                 request.Place,
                 request.Date,
+                request.SquadCode,
                 request.FlightCode,
                 request.FireteamCode,
                 request.TroopId,

diff --git a/...iveryCertificateFormats/Application/Create/WarMaterialDeliveryCertificateFormatCreator.cs b/...iveryCertificateFormats/Application/Create/WarMaterialDeliveryCertificateFormatCreator.cs
@@ -19,6 +19,7 @@ public async Task<WarMaterialDeliveryCertificateFormat> Create(
             DateTime validity,
             string place,
             DateTime date,
+            string squadCode,
             string flightCode,
             string fireteamCode,
             string troopId,
@@ -32,6 +33,7 @@ public async Task<WarMaterialDeliveryCertificateFormat> Create(
                 validity,
                 place,
                 date,
+                squadCode,
                 flightCode,
                 fireteamCode,
                 troopId,

diff --git a/...mats/WarMaterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormat.cs b/...mats/WarMaterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormat.cs
@@ -10,19 +10,21 @@
 using Armory.Fireteams.Domain;
 using Armory.Flights.Domain;
 using Armory.Shared.Domain.Aggregate;
+using Armory.Squads.Domain;
 using Armory.Troopers.Domain;
 
 namespace Armory.Formats.WarMaterialDeliveryCertificateFormats.Domain
 {
     public class WarMaterialDeliveryCertificateFormat : AggregateRoot
     {
         public WarMaterialDeliveryCertificateFormat(string code, DateTime validity, string place, DateTime date,
-            string flightCode, string fireteamCode, string troopId)
+            string squadCode, string flightCode, string fireteamCode, string troopId)
         {
             Code = code;
             Validity = validity;
             Place = place;
             Date = date;
+            SquadCode = squadCode;
             FlightCode = flightCode;
             FireteamCode = fireteamCode;
             TroopId = troopId;
@@ -35,6 +37,9 @@ public WarMaterialDeliveryCertificateFormat(string code, DateTime validity, stri
         [Required] [MaxLength(256)] public string Place { get; set; }
         [DataType(DataType.Date)] public DateTime Date { get; set; }
 
+        [Required] public string SquadCode { get; set; }
+        [ForeignKey("SquadCode")] public Squad Squad { get; set; }
+
         [Required] public string FlightCode { get; set; }
         [ForeignKey("FlightCode")] public Flight Flight { get; set; }
 
@@ -68,11 +73,13 @@ public ICollection<WarMaterialDeliveryCertificateFormatExplosive>
         [NotMapped] public ICollection<Explosive> Explosives { get; set; } = new HashSet<Explosive>();
 
         public static WarMaterialDeliveryCertificateFormat Create(string code, DateTime validity, string place,
-            DateTime date, string flightCode, string fireteamCode, string troopId, IEnumerable<string> weaponCodes,
+            DateTime date, string squadCode, string flightCode, string fireteamCode, string troopId,
+            IEnumerable<string> weaponCodes,
             IDictionary<string, int> ammunition, IDictionary<string, int> equipments,
             IDictionary<string, int> explosives)
         {
-            var format = new WarMaterialDeliveryCertificateFormat(code, validity, place, date, flightCode, fireteamCode,
+            var format = new WarMaterialDeliveryCertificateFormat(code, validity, place, date, squadCode, flightCode,
+                fireteamCode,
                 troopId);
 
             var weapons = weaponCodes.ToList();