feat(weapons): assign weapon holder on 'WarMaterialDeliveryCertificat…

…eFormat' created
CarlosPavajeau · Sep 30, 2021 · f21ef17 · f21ef17
1 parent e2dc588
commit f21ef17
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 17 deletions.
diff --git a/src/Armory/Armament/Weapons/Application/AssignHolder/AssignWeaponHolderCommandHandler.cs b/src/Armory/Armament/Weapons/Application/AssignHolder/AssignWeaponHolderCommandHandler.cs
@@ -15,7 +15,7 @@ public AssignWeaponHolderCommandHandler(WeaponHolderAssigner assigner)
 
         protected override async Task Handle(AssignWeaponHolderCommand request, CancellationToken cancellationToken)
         {
-            await _assigner.AssignOwner(request.WeaponSerial, request.TroopId);
+            await _assigner.AssignHolder(request.WeaponSerial, request.TroopId);
         }
     }
 }
diff --git a/...plication/AssignHolder/AssignWeaponHolderOnWarMaterialDeliveryCertificateFormatCreated.cs b/...plication/AssignHolder/AssignWeaponHolderOnWarMaterialDeliveryCertificateFormatCreated.cs
@@ -0,0 +1,29 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Armory.Shared.Domain.Bus.Event;
+using Armory.Shared.Domain.Formats.WarMaterialDeliveryCertificateFormats;
+
+namespace Armory.Armament.Weapons.Application.AssignHolder
+{
+    public class
+        AssignWeaponHolderOnWarMaterialDeliveryCertificateFormatCreated : IDomainEventSubscriber<
+            WarMaterialDeliveryCertificateFormatCreatedDomainEvent>
+    {
+        private readonly WeaponHolderAssigner _assigner;
+
+        public AssignWeaponHolderOnWarMaterialDeliveryCertificateFormatCreated(WeaponHolderAssigner assigner)
+        {
+            _assigner = assigner;
+        }
+
+        public async Task Handle(WarMaterialDeliveryCertificateFormatCreatedDomainEvent notification,
+            CancellationToken cancellationToken)
+        {
+            var holder = notification.TroopId;
+            foreach (var weapon in notification.Weapons)
+            {
+                await _assigner.AssignHolder(weapon, holder);
+            }
+        }
+    }
+}
diff --git a/src/Armory/Armament/Weapons/Application/AssignHolder/WeaponHolderAssigner.cs b/src/Armory/Armament/Weapons/Application/AssignHolder/WeaponHolderAssigner.cs
@@ -15,7 +15,7 @@ public WeaponHolderAssigner(IWeaponsRepository repository, IUnitWork unitWork)
             _unitWork = unitWork;
         }
 
-        public async Task AssignOwner(string weaponSerial, string troopId)
+        public async Task AssignHolder(string weaponSerial, string troopId)
         {
             var weapon = await _repository.Find(weaponSerial, false);
             if (weapon == null) throw new WeaponNotFound();

diff --git a/...gnmentFormats/Application/Create/WarMaterialAndSpecialEquipmentAssignmentFormatCreator.cs b/...gnmentFormats/Application/Create/WarMaterialAndSpecialEquipmentAssignmentFormatCreator.cs
@@ -3,24 +3,17 @@
 using System.Threading.Tasks;
 using Armory.Formats.Shared.Domain;
 using Armory.Formats.WarMaterialAndSpecialEquipmentAssignmentFormats.Domain;
-using Armory.Shared.Domain.Bus.Event;
-using Armory.Shared.Domain.Persistence.EntityFramework.Transactions;
 
 namespace Armory.Formats.WarMaterialAndSpecialEquipmentAssignmentFormats.Application.Create
 {
     public class WarMaterialAndSpecialEquipmentAssignmentFormatCreator
     {
-        private readonly IEventBus _eventBus;
-        private readonly ITransactionInitializer _initializer;
         private readonly IWarMaterialAndSpecialEquipmentAssignmentFormatsRepository _repository;
 
         public WarMaterialAndSpecialEquipmentAssignmentFormatCreator(
-            IWarMaterialAndSpecialEquipmentAssignmentFormatsRepository repository, IEventBus eventBus,
-            ITransactionInitializer initializer)
+            IWarMaterialAndSpecialEquipmentAssignmentFormatsRepository repository)
         {
             _repository = repository;
-            _eventBus = eventBus;
-            _initializer = initializer;
         }
 
         public async Task<WarMaterialAndSpecialEquipmentAssignmentFormat> Create(
@@ -57,12 +50,7 @@ public async Task<WarMaterialAndSpecialEquipmentAssignmentFormat> Create(
                 equipments,
                 explosives);
 
-            var transaction = await _initializer.Begin();
-
             await _repository.Save(format);
-            await _eventBus.Publish(format.PullDomainEvents());
-
-            await transaction.CommitAsync();
 
             return format;
         }

diff --git a/...iveryCertificateFormats/Application/Create/WarMaterialDeliveryCertificateFormatCreator.cs b/...iveryCertificateFormats/Application/Create/WarMaterialDeliveryCertificateFormatCreator.cs
@@ -2,16 +2,23 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Armory.Formats.WarMaterialDeliveryCertificateFormats.Domain;
+using Armory.Shared.Domain.Bus.Event;
+using Armory.Shared.Domain.Persistence.EntityFramework.Transactions;
 
 namespace Armory.Formats.WarMaterialDeliveryCertificateFormats.Application.Create
 {
     public class WarMaterialDeliveryCertificateFormatCreator
     {
+        private readonly IEventBus _eventBus;
+        private readonly ITransactionInitializer _initializer;
         private readonly IWarMaterialDeliveryCertificateFormatsRepository _repository;
 
-        public WarMaterialDeliveryCertificateFormatCreator(IWarMaterialDeliveryCertificateFormatsRepository repository)
+        public WarMaterialDeliveryCertificateFormatCreator(IWarMaterialDeliveryCertificateFormatsRepository repository,
+            IEventBus eventBus, ITransactionInitializer initializer)
         {
             _repository = repository;
+            _eventBus = eventBus;
+            _initializer = initializer;
         }
 
         public async Task<WarMaterialDeliveryCertificateFormat> Create(
@@ -42,7 +49,12 @@ public async Task<WarMaterialDeliveryCertificateFormat> Create(
                 equipments,
                 explosives);
 
+            var transaction = await _initializer.Begin();
+
             await _repository.Save(format);
+            await _eventBus.Publish(format.PullDomainEvents());
+
+            await transaction.CommitAsync();
 
             return format;
         }

diff --git a/...mats/WarMaterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormat.cs b/...mats/WarMaterialDeliveryCertificateFormats/Domain/WarMaterialDeliveryCertificateFormat.cs
@@ -10,6 +10,7 @@
 using Armory.Fireteams.Domain;
 using Armory.Flights.Domain;
 using Armory.Shared.Domain.Aggregate;
+using Armory.Shared.Domain.Formats.WarMaterialDeliveryCertificateFormats;
 using Armory.Squads.Domain;
 using Armory.Troopers.Domain;
 
@@ -107,6 +108,15 @@ public static WarMaterialDeliveryCertificateFormat Create(string code, DateTime
                     WarMaterialDeliveryCertificateFormatExplosive.Create(format, explosiveSerial, quantity));
             }
 
+            format.Record(new WarMaterialDeliveryCertificateFormatCreatedDomainEvent
+            {
+                Weapons = weapons,
+                Ammunition = ammunition,
+                Equipments = equipments,
+                Explosives = explosives,
+                TroopId = troopId
+            });
+
             return format;
         }
     }

diff --git a/...erialDeliveryCertificateFormats/WarMaterialDeliveryCertificateFormatCreatedDomainEvent.cs b/...erialDeliveryCertificateFormats/WarMaterialDeliveryCertificateFormatCreatedDomainEvent.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using Armory.Shared.Domain.Bus.Event;
+
+namespace Armory.Shared.Domain.Formats.WarMaterialDeliveryCertificateFormats
+{
+    public class WarMaterialDeliveryCertificateFormatCreatedDomainEvent : DomainEvent
+    {
+        public IEnumerable<string> Weapons { get; init; }
+        public IDictionary<string, int> Ammunition { get; init; }
+        public IDictionary<string, int> Equipments { get; init; }
+        public IDictionary<string, int> Explosives { get; init; }
+        public string TroopId { get; init; }
+
+        public override string EventName()
+        {
+            return "war_material_delivery_certificate_format.created";
+        }
+    }
+}
diff --git a/src/Shared/Domain/Bus/Event/DomainEvent.cs b/src/Shared/Domain/Bus/Event/DomainEvent.cs
@@ -1,3 +1,4 @@
+using System;
 using MediatR;
 
 namespace Armory.Shared.Domain.Bus.Event
@@ -11,7 +12,7 @@ protected DomainEvent(string aggregateId, string eventId, string occurredOn)
             OccurredOn = occurredOn;
         }
 
-        protected DomainEvent()
+        protected DomainEvent() : this(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), DateTime.Now.ToString("d"))
         {
         }