Add OrderStockConfirmed and ProductPriceChanged IntegrationEvent

src/Services/Catalog/Catalog.API/IntegrationCommands/CommandHandlers/ConfirmOrderStockCommandMsgHandler.cs

@@ -1,4 +1,4 @@
-namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.EventHandling
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationCommands.CommandHandlers
 {
     using BuildingBlocks.EventBus.Abstractions;
     using System.Threading.Tasks;
@@ -9,21 +9,22 @@
     using global::Catalog.API.Infrastructure.Exceptions;
     using global::Catalog.API.IntegrationEvents;
     using Model;
-    using Events;
+    using Commands;
+    using IntegrationEvents.Events;
 
-    public class ConfirmOrderStockIntegrationEventHandler : IIntegrationEventHandler<ConfirmOrderStockIntegrationEvent>
+    public class ConfirmOrderStockCommandMsgHandler : IIntegrationEventHandler<ConfirmOrderStockCommandMsg>
     {
         private readonly CatalogContext _catalogContext;
         private readonly ICatalogIntegrationEventService _catalogIntegrationEventService;
 
-        public ConfirmOrderStockIntegrationEventHandler(CatalogContext catalogContext,
+        public ConfirmOrderStockCommandMsgHandler(CatalogContext catalogContext,
             ICatalogIntegrationEventService catalogIntegrationEventService)
         {
             _catalogContext = catalogContext;
             _catalogIntegrationEventService = catalogIntegrationEventService;
         }
 
-        public async Task Handle(ConfirmOrderStockIntegrationEvent @event)
+        public async Task Handle(ConfirmOrderStockCommandMsg @event)
         {
             var confirmedOrderStockItems = new List<ConfirmedOrderStockItem>();
 
@@ -38,15 +39,11 @@
                 confirmedOrderStockItems.Add(confirmedOrderStockItem);
             }
 
-            //Create Integration Event to be published through the Event Bus
             var confirmedIntegrationEvent = confirmedOrderStockItems.Any(c => !c.Confirmed)
                 ? (IntegrationEvent) new OrderStockNotConfirmedIntegrationEvent(@event.OrderId, confirmedOrderStockItems)
                 : new OrderStockConfirmedIntegrationEvent(@event.OrderId);
 
-            // Achieving atomicity between original Catalog database operation and the IntegrationEventLog thanks to a local transaction
             await _catalogIntegrationEventService.SaveEventAndCatalogContextChangesAsync(confirmedIntegrationEvent);
-
-            // Publish through the Event Bus and mark the saved event as published
             await _catalogIntegrationEventService.PublishThroughEventBusAsync(confirmedIntegrationEvent);
         }
 

src/Services/Catalog/Catalog.API/IntegrationCommands/CommandHandlers/DecrementOrderStockCommandMsgHandler.cs

@@ -0,0 +1,42 @@
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationCommands.CommandHandlers
+{
+    using BuildingBlocks.EventBus.Abstractions;
+    using System.Threading.Tasks;
+    using Infrastructure;
+    using global::Catalog.API.Infrastructure.Exceptions;
+    using global::Catalog.API.IntegrationEvents;
+    using Model;
+    using Commands;
+
+    public class DecrementOrderStockCommandMsgHandler : IIntegrationEventHandler<DecrementOrderStockCommandMsg>
+    {
+        private readonly CatalogContext _catalogContext;
+
+        public DecrementOrderStockCommandMsgHandler(CatalogContext catalogContext)
+        {
+            _catalogContext = catalogContext;
+        }
+
+        public async Task Handle(DecrementOrderStockCommandMsg @event)
+        {
+            //we're not blocking stock/inventory
+            foreach (var orderStockItem in @event.OrderStockItems)
+            {
+                var catalogItem = _catalogContext.CatalogItems.Find(orderStockItem.ProductId);
+                CheckValidcatalogItemId(catalogItem);
+
+                catalogItem.RemoveStock(orderStockItem.Units);
+            }
+
+            await _catalogContext.SaveChangesAsync();
+        }
+
+        private void CheckValidcatalogItemId(CatalogItem catalogItem)
+        {
+            if (catalogItem is null)
+            {
+                throw new CatalogDomainException("Not able to process catalog event. Reason: no valid catalogItemId");
+            }
+        }
+    }
+}

src/Services/Catalog/Catalog.API/IntegrationCommands/Commands/ConfirmOrderStockCommandMsg.cs

@@ -1,14 +1,14 @@
-namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationCommands.Commands
 {
     using BuildingBlocks.EventBus.Events;
     using System.Collections.Generic;
 
-    public class ConfirmOrderStockIntegrationEvent : IntegrationEvent
+    public class ConfirmOrderStockCommandMsg : IntegrationEvent
     {
         public int OrderId { get; }
         public IEnumerable<OrderStockItem> OrderStockItems { get; }
 
-        public ConfirmOrderStockIntegrationEvent(int orderId,
+        public ConfirmOrderStockCommandMsg(int orderId,
             IEnumerable<OrderStockItem> orderStockItems)
         {
             OrderId = orderId;

src/Services/Catalog/Catalog.API/IntegrationCommands/Commands/DecrementOrderStockCommandMsg.cs

@@ -0,0 +1,18 @@
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationCommands.Commands
+{
+    using System.Collections.Generic;
+    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+
+    public class DecrementOrderStockCommandMsg : IntegrationEvent
+    {
+        public int OrderId { get; }
+        public IEnumerable<OrderStockItem> OrderStockItems { get; }
+
+        public DecrementOrderStockCommandMsg(int orderId,
+            IEnumerable<OrderStockItem> orderStockItems)
+        {
+            OrderId = orderId;
+            OrderStockItems = orderStockItems;
+        }
+    }
+}

src/Services/Catalog/Catalog.API/IntegrationEvents/Events/OrderStockConfirmedIntegrationEvent.cs

@@ -1,6 +1,6 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events
 {
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    using BuildingBlocks.EventBus.Events;
 
     public class OrderStockConfirmedIntegrationEvent : IntegrationEvent
     {

src/Services/Catalog/Catalog.API/IntegrationEvents/Events/ProductPriceChangedIntegrationEvent.cs

@@ -1,10 +1,7 @@
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events
 {
+    using BuildingBlocks.EventBus.Events;
+
     // Integration Events notes: 
     // An Event is “something that has happened in the past”, therefore its name has to be   
     // An Integration Event is an event that can cause side effects to other microsrvices, Bounded-Contexts or external systems.
@@ -23,4 +20,4 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Eve
             OldPrice = oldPrice;
         }
     }
-}
+}

src/Services/Catalog/Catalog.API/Startup.cs

@@ -14,6 +14,9 @@
     using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
     using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services;
     using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
+    using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationCommands.Commands;
+    using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents;
+    using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationCommands.CommandsHandlers;
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.HealthChecks;
@@ -24,7 +27,7 @@
     using System.Data.Common;
     using System.Data.SqlClient;
     using System.Reflection;
-
+    
     public class Startup
     {
         public IConfigurationRoot Configuration { get; }
@@ -120,6 +123,8 @@
 
             services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
             services.AddSingleton<IEventBus, EventBusRabbitMQ>();
+            services.AddTransient<IIntegrationEventHandler<ConfirmOrderStockCommandMsg>, ConfirmOrderStockCommandMsgHandler>();
+            services.AddTransient<IIntegrationEventHandler<DecrementOrderStockCommandMsg>, DecrementOrderStockCommandMsgHandler>();
 
             var container = new ContainerBuilder();
             container.Populate(services);
@@ -149,6 +154,8 @@
             CatalogContextSeed.SeedAsync(app, loggerFactory)
                 .Wait();
 
+            ConfigureEventBus(app);
+
             var integrationEventLogContext = new IntegrationEventLogContext(
                 new DbContextOptionsBuilder<IntegrationEventLogContext>()
                 .UseSqlServer(Configuration["ConnectionString"], b => b.MigrationsAssembly("Catalog.API"))
@@ -180,5 +187,13 @@
                 ctx.Database.CloseConnection();
             }
         }
+
+        private void ConfigureEventBus(IApplicationBuilder app)
+        {
+            var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
+
+            eventBus.Subscribe<ConfirmOrderStockCommandMsg, IIntegrationEventHandler<ConfirmOrderStockCommandMsg>>();
+            eventBus.Subscribe<DecrementOrderStockCommandMsg, IIntegrationEventHandler<DecrementOrderStockCommandMsg>>();
+        }
     }
 }