Domain Event Handlers are now grouped by Domain Events, as any Domain Event could have 'n' handlers related.

CESARDELATORRE · CESARDELATORRE · commit 3ed136b00fd8 · 2017-03-18T11:44:18.000-07:00
diff --git a/src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/BuyerAndPaymentMethodVerified/UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler.cs b/src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/BuyerAndPaymentMethodVerified/UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler.cs
@@ -5,13 +5,13 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Ordering.API.Application.DomainEventHandlers
+namespace Ordering.API.Application.DomainEventHandlers.BuyerAndPaymentMethodVerified
 {
-    public class BuyerPaymentMethodVerifiedDomainEventHandler : IAsyncNotificationHandler<BuyerPaymentMethodVerifiedDomainEvent>
+    public class UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler : IAsyncNotificationHandler<BuyerAndPaymentMethodVerifiedDomainEvent>
     {
         private readonly IOrderRepository<Order> _orderRepository;
         private readonly ILoggerFactory _logger;
-        public BuyerPaymentMethodVerifiedDomainEventHandler(IOrderRepository<Order> orderRepository, ILoggerFactory logger)
+        public UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler(IOrderRepository<Order> orderRepository, ILoggerFactory logger)
         {
             _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -20,7 +20,7 @@ public BuyerPaymentMethodVerifiedDomainEventHandler(IOrderRepository<Order> orde
         // Domain Logic comment:
         // When the Buyer and Buyer's payment method have been created or verified that they existed, 
         // then we can update the original Order with the BuyerId and PaymentId (foreign keys)
-        public async Task Handle(BuyerPaymentMethodVerifiedDomainEvent buyerPaymentMethodVerifiedEvent)
+        public async Task Handle(BuyerAndPaymentMethodVerifiedDomainEvent buyerPaymentMethodVerifiedEvent)
         {
             var orderToUpdate = await _orderRepository.GetAsync(buyerPaymentMethodVerifiedEvent.OrderId);
             orderToUpdate.SetBuyerId(buyerPaymentMethodVerifiedEvent.Buyer.Id);
@@ -29,7 +29,7 @@ public async Task Handle(BuyerPaymentMethodVerifiedDomainEvent buyerPaymentMetho
             await _orderRepository.UnitOfWork
                 .SaveEntitiesAsync();
                                        
-            _logger.CreateLogger(nameof(BuyerPaymentMethodVerifiedDomainEventHandler))
+            _logger.CreateLogger(nameof(UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler))
                 .LogTrace($"Order with Id: {buyerPaymentMethodVerifiedEvent.OrderId} has been successfully updated with a payment method id: { buyerPaymentMethodVerifiedEvent.Payment.Id }");
         }
     }
diff --git a/src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStartedEvent/SendEmailToCustomerWhenOrderStartedDomainEventHandler.cs b/src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStartedEvent/SendEmailToCustomerWhenOrderStartedDomainEventHandler.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Application.DomainEventHandlers.OrderStartedEvent
+{
+    public class SendEmailToCustomerWhenOrderStartedDomainEventHandler
+    {
+         //TO DO
+    }
+}
diff --git a/src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStartedEvent/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs b/src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStartedEvent/ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler.cs
@@ -6,15 +6,15 @@
 using System;
 using System.Threading.Tasks;
 
-namespace Ordering.API.Application.DomainEventHandlers
+namespace Ordering.API.Application.DomainEventHandlers.OrderStartedEvent
 {
-    public class OrderStartedDomainEventHandler : IAsyncNotificationHandler<OrderStartedDomainEvent>
+    public class ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler : IAsyncNotificationHandler<OrderStartedDomainEvent>
     {
         private readonly ILoggerFactory _logger;
         private readonly IBuyerRepository<Buyer> _buyerRepository;
         private readonly IIdentityService _identityService;
 
-        public OrderStartedDomainEventHandler(ILoggerFactory logger, IBuyerRepository<Buyer> buyerRepository, IIdentityService identityService)
+        public ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler(ILoggerFactory logger, IBuyerRepository<Buyer> buyerRepository, IIdentityService identityService)
         {
             _buyerRepository = buyerRepository ?? throw new ArgumentNullException(nameof(buyerRepository));
             _identityService = identityService ?? throw new ArgumentNullException(nameof(identityService));
@@ -46,7 +46,7 @@ public async Task Handle(OrderStartedDomainEvent orderNotification)
             await _buyerRepository.UnitOfWork
                 .SaveEntitiesAsync();
 
-            _logger.CreateLogger(nameof(OrderStartedDomainEventHandler)).LogTrace($"A new payment method has been successfully added for orderId: {orderNotification.Order.Id}.");
+            _logger.CreateLogger(nameof(ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler)).LogTrace($"A new payment method has been successfully added for orderId: {orderNotification.Order.Id}.");
 
         }
     }
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs b/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
@@ -3,7 +3,7 @@
 using MediatR;
 using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands;
 using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Decorators;
-using Ordering.API.Application.DomainEventHandlers;
+using Ordering.API.Application.DomainEventHandlers.OrderStartedEvent;
 using Ordering.Domain.Events;
 using System.Collections.Generic;
 using System.Linq;
@@ -24,7 +24,7 @@ protected override void Load(ContainerBuilder builder)
                     .Select(i => new KeyedService("IAsyncRequestHandler", i)));
             
             builder
-                .RegisterAssemblyTypes(typeof(OrderStartedDomainEventHandler).GetTypeInfo().Assembly)
+                .RegisterAssemblyTypes(typeof(ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler).GetTypeInfo().Assembly)
                 .Where(t => t.IsClosedTypeOf(typeof(IAsyncNotificationHandler<>)))
                 .AsImplementedInterfaces();           
 
diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/FailingMiddleware.cs b/src/Services/Ordering/Ordering.API/Infrastructure/Middlewares/FailingMiddleware.cs
@@ -41,7 +41,6 @@ public async Task Invoke(HttpContext context)
 
         private async Task ProcessConfigRequest(HttpContext context)
         {
-            int i = 0;
             var enable = context.Request.Query.Keys.Any(k => k == "enable");
             var disable = context.Request.Query.Keys.Any(k => k == "disable");
 
diff --git a/src/Services/Ordering/Ordering.API/Ordering.API.csproj b/src/Services/Ordering/Ordering.API/Ordering.API.csproj
@@ -58,6 +58,10 @@
     <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="Application\DomainEventHandlers\OrderStartedEvent\SendEmailToCustomerWhenOrderStartedDomainEventHandler.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="Dockerfile">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
diff --git a/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs b/src/Services/Ordering/Ordering.Domain/AggregatesModel/BuyerAggregate/Buyer.cs
@@ -33,15 +33,15 @@ public PaymentMethod VerifyOrAddPaymentMethod(
 
             if (existingPayment != null)
             {
-                AddDomainEvent(new BuyerPaymentMethodVerifiedDomainEvent(this, existingPayment, orderId));
+                AddDomainEvent(new BuyerAndPaymentMethodVerifiedDomainEvent(this, existingPayment, orderId));
                 return existingPayment;
             }
             else
             {
                 var payment = new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration);
 
                 _paymentMethods.Add(payment);
-                AddDomainEvent(new BuyerPaymentMethodVerifiedDomainEvent(this, payment, orderId));
+                AddDomainEvent(new BuyerAndPaymentMethodVerifiedDomainEvent(this, payment, orderId));
                 return payment;
             }
         }       
diff --git a/src/Services/Ordering/Ordering.Domain/Events/BuyerPaymentMethodVerifiedDomainEvent.cs b/src/Services/Ordering/Ordering.Domain/Events/BuyerPaymentMethodVerifiedDomainEvent.cs
@@ -6,14 +6,14 @@
 
 namespace Ordering.Domain.Events
 {
-    public class BuyerPaymentMethodVerifiedDomainEvent
+    public class BuyerAndPaymentMethodVerifiedDomainEvent
         : IAsyncNotification
     {
         public Buyer Buyer { get; private set; }
         public PaymentMethod Payment { get; private set; }
         public int OrderId { get; private set; }
 
-        public BuyerPaymentMethodVerifiedDomainEvent(Buyer buyer, PaymentMethod payment, int orderId)
+        public BuyerAndPaymentMethodVerifiedDomainEvent(Buyer buyer, PaymentMethod payment, int orderId)
         {
             Buyer = buyer;
             Payment = payment;

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`	`using System;`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`
`8`		`-namespace Ordering.API.Application.DomainEventHandlers`
	`8`	`+namespace Ordering.API.Application.DomainEventHandlers.BuyerAndPaymentMethodVerified`
`9`	`9`	`{`
`10`		`- public class BuyerPaymentMethodVerifiedDomainEventHandler : IAsyncNotificationHandler<BuyerPaymentMethodVerifiedDomainEvent>`
	`10`	`+ public class UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler : IAsyncNotificationHandler<BuyerAndPaymentMethodVerifiedDomainEvent>`
`11`	`11`	`{`
`12`	`12`	`private readonly IOrderRepository<Order> _orderRepository;`
`13`	`13`	`private readonly ILoggerFactory _logger;`
`14`		`- public BuyerPaymentMethodVerifiedDomainEventHandler(IOrderRepository<Order> orderRepository, ILoggerFactory logger)`
	`14`	`+ public UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler(IOrderRepository<Order> orderRepository, ILoggerFactory logger)`
`15`	`15`	`{`
`16`	`16`	`_orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));`
`17`	`17`	`_logger = logger ?? throw new ArgumentNullException(nameof(logger));`
`@@ -20,7 +20,7 @@ public BuyerPaymentMethodVerifiedDomainEventHandler(IOrderRepository<Order> orde`
`20`	`20`	`// Domain Logic comment:`
`21`	`21`	`// When the Buyer and Buyer's payment method have been created or verified that they existed,`
`22`	`22`	`// then we can update the original Order with the BuyerId and PaymentId (foreign keys)`
`23`		`- public async Task Handle(BuyerPaymentMethodVerifiedDomainEvent buyerPaymentMethodVerifiedEvent)`
	`23`	`+ public async Task Handle(BuyerAndPaymentMethodVerifiedDomainEvent buyerPaymentMethodVerifiedEvent)`
`24`	`24`	`{`
`25`	`25`	`var orderToUpdate = await _orderRepository.GetAsync(buyerPaymentMethodVerifiedEvent.OrderId);`
`26`	`26`	`orderToUpdate.SetBuyerId(buyerPaymentMethodVerifiedEvent.Buyer.Id);`
`@@ -29,7 +29,7 @@ public async Task Handle(BuyerPaymentMethodVerifiedDomainEvent buyerPaymentMetho`
`29`	`29`	`await _orderRepository.UnitOfWork`
`30`	`30`	`.SaveEntitiesAsync();`
`31`	`31`
`32`		`- _logger.CreateLogger(nameof(BuyerPaymentMethodVerifiedDomainEventHandler))`
	`32`	`+ _logger.CreateLogger(nameof(UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler))`
`33`	`33`	`.LogTrace($"Order with Id: {buyerPaymentMethodVerifiedEvent.OrderId} has been successfully updated with a payment method id: { buyerPaymentMethodVerifiedEvent.Payment.Id }");`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@`
`6`	`6`	`using System;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`
`9`		`-namespace Ordering.API.Application.DomainEventHandlers`
	`9`	`+namespace Ordering.API.Application.DomainEventHandlers.OrderStartedEvent`
`10`	`10`	`{`
`11`		`- public class OrderStartedDomainEventHandler : IAsyncNotificationHandler<OrderStartedDomainEvent>`
	`11`	`+ public class ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler : IAsyncNotificationHandler<OrderStartedDomainEvent>`
`12`	`12`	`{`
`13`	`13`	`private readonly ILoggerFactory _logger;`
`14`	`14`	`private readonly IBuyerRepository<Buyer> _buyerRepository;`
`15`	`15`	`private readonly IIdentityService _identityService;`
`16`	`16`
`17`		`- public OrderStartedDomainEventHandler(ILoggerFactory logger, IBuyerRepository<Buyer> buyerRepository, IIdentityService identityService)`
	`17`	`+ public ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler(ILoggerFactory logger, IBuyerRepository<Buyer> buyerRepository, IIdentityService identityService)`
`18`	`18`	`{`
`19`	`19`	`_buyerRepository = buyerRepository ?? throw new ArgumentNullException(nameof(buyerRepository));`
`20`	`20`	`_identityService = identityService ?? throw new ArgumentNullException(nameof(identityService));`
`@@ -46,7 +46,7 @@ public async Task Handle(OrderStartedDomainEvent orderNotification)`
`46`	`46`	`await _buyerRepository.UnitOfWork`
`47`	`47`	`.SaveEntitiesAsync();`
`48`	`48`
`49`		`- _logger.CreateLogger(nameof(OrderStartedDomainEventHandler)).LogTrace($"A new payment method has been successfully added for orderId: {orderNotification.Order.Id}.");`
	`49`	`+ _logger.CreateLogger(nameof(ValidateOrAddBuyerAggregateWhenOrderStartedDomainEventHandler)).LogTrace($"A new payment method has been successfully added for orderId: {orderNotification.Order.Id}.");`
`50`	`50`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,6 @@ public async Task Invoke(HttpContext context)`
`41`	`41`
`42`	`42`	`private async Task ProcessConfigRequest(HttpContext context)`
`43`	`43`	`{`
`44`		`- int i = 0;`
`45`	`44`	`var enable = context.Request.Query.Keys.Any(k => k == "enable");`
`46`	`45`	`var disable = context.Request.Query.Keys.Any(k => k == "disable");`
`47`	`46`
Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,15 @@ public PaymentMethod VerifyOrAddPaymentMethod(`
`33`	`33`
`34`	`34`	`if (existingPayment != null)`
`35`	`35`	`{`
`36`		`- AddDomainEvent(new BuyerPaymentMethodVerifiedDomainEvent(this, existingPayment, orderId));`
	`36`	`+ AddDomainEvent(new BuyerAndPaymentMethodVerifiedDomainEvent(this, existingPayment, orderId));`
`37`	`37`	`return existingPayment;`
`38`	`38`	`}`
`39`	`39`	`else`
`40`	`40`	`{`
`41`	`41`	`var payment = new PaymentMethod(cardTypeId, alias, cardNumber, securityNumber, cardHolderName, expiration);`
`42`	`42`
`43`	`43`	`_paymentMethods.Add(payment);`
`44`		`- AddDomainEvent(new BuyerPaymentMethodVerifiedDomainEvent(this, payment, orderId));`
	`44`	`+ AddDomainEvent(new BuyerAndPaymentMethodVerifiedDomainEvent(this, payment, orderId));`
`45`	`45`	`return payment;`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,14 @@`
`6`	`6`
`7`	`7`	`namespace Ordering.Domain.Events`
`8`	`8`	`{`
`9`		`- public class BuyerPaymentMethodVerifiedDomainEvent`
	`9`	`+ public class BuyerAndPaymentMethodVerifiedDomainEvent`
`10`	`10`	`: IAsyncNotification`
`11`	`11`	`{`
`12`	`12`	`public Buyer Buyer { get; private set; }`
`13`	`13`	`public PaymentMethod Payment { get; private set; }`
`14`	`14`	`public int OrderId { get; private set; }`
`15`	`15`
`16`		`- public BuyerPaymentMethodVerifiedDomainEvent(Buyer buyer, PaymentMethod payment, int orderId)`
	`16`	`+ public BuyerAndPaymentMethodVerifiedDomainEvent(Buyer buyer, PaymentMethod payment, int orderId)`
`17`	`17`	`{`
`18`	`18`	`Buyer = buyer;`
`19`	`19`	`Payment = payment;`