TenantId added to all events in main flow

src/Services/Catalog/Catalog.API/IntegrationEvents/EventHandling/OrderStatusChangedToAwaitingValidationIntegrationEventHandler.cs

@@ -49,6 +49,8 @@
                     ? (IntegrationEvent)new OrderStockRejectedIntegrationEvent(@event.OrderId, confirmedOrderStockItems)
                     : new OrderStockConfirmedIntegrationEvent(@event.OrderId);
 
+                confirmedIntegrationEvent.TenantId = @event.TenantId;
+
                 await _catalogIntegrationEventService.SaveEventAndCatalogContextChangesAsync(confirmedIntegrationEvent);
                 await _catalogIntegrationEventService.PublishThroughEventBusAsync(confirmedIntegrationEvent);
 

src/Services/Ordering/Ordering.API/Application/Commands/SetStockConfirmedOrderStatusCommand.cs

@@ -12,10 +12,13 @@ namespace Ordering.API.Application.Commands
 
         [DataMember]
         public int OrderNumber { get; private set; }
+        [DataMember]
+        public int TenantId { get; private set; }
 
-        public SetStockConfirmedOrderStatusCommand(int orderNumber)
+        public SetStockConfirmedOrderStatusCommand(int orderNumber, int tenantId)
         {
             OrderNumber = orderNumber;
+            TenantId = tenantId;
         }
     }
 }

src/Services/Ordering/Ordering.API/Application/Commands/SetStockConfirmedOrderStatusCommandHandler.cs

@@ -35,7 +35,7 @@ namespace Ordering.API.Application.Commands
                 return false;
             }
 
-            orderToUpdate.SetStockConfirmedStatus();
+            orderToUpdate.SetStockConfirmedStatus(command.TenantId);
             return await _orderRepository.UnitOfWork.SaveEntitiesAsync(cancellationToken);
         }
     }

src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/OrderStockConfirmed/OrderStatusChangedToStockConfirmedDomainEventHandler.cs

@@ -41,6 +41,8 @@
             var buyer = await _buyerRepository.FindByIdAsync(order.GetBuyerId.Value.ToString());
 
             var orderStatusChangedToStockConfirmedIntegrationEvent = new OrderStatusChangedToStockConfirmedIntegrationEvent(order.Id, order.OrderStatus.Name, buyer.Name);
+            orderStatusChangedToStockConfirmedIntegrationEvent.TenantId =
+                orderStatusChangedToStockConfirmedDomainEvent.TenantId;
             await _orderingIntegrationEventService.AddAndSaveEventAsync(orderStatusChangedToStockConfirmedIntegrationEvent);            
         }
     }  

src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/OrderStockConfirmedIntegrationEventHandler.cs

@@ -33,7 +33,7 @@
             {
                 _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 
-                var command = new SetStockConfirmedOrderStatusCommand(@event.OrderId);
+                var command = new SetStockConfirmedOrderStatusCommand(@event.OrderId, @event.TenantId);
 
                 _logger.LogInformation(
                     "----- Sending command: {CommandName} - {IdProperty}: {CommandId} ({@Command})",

src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs

@@ -114,11 +114,11 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
             }
         }
 
-        public void SetStockConfirmedStatus()
+        public void SetStockConfirmedStatus(int tenantId)
         {
             if (_orderStatusId == OrderStatus.AwaitingValidation.Id)
             {
-                AddDomainEvent(new OrderStatusChangedToStockConfirmedDomainEvent(Id));
+                AddDomainEvent(new OrderStatusChangedToStockConfirmedDomainEvent(Id).withTenantId(tenantId));
 
                 _orderStatusId = OrderStatus.StockConfirmed.Id;
                 _description = "All the items were confirmed with available stock.";

src/Services/Ordering/Ordering.Domain/Events/OrderStatusChangedToStockConfirmedDomainEvent.cs

@@ -9,8 +9,15 @@
         : INotification
     {
         public int OrderId { get; }
+        public int TenantId { get; set; }
 
         public OrderStatusChangedToStockConfirmedDomainEvent(int orderId)
             => OrderId = orderId;
+
+        public OrderStatusChangedToStockConfirmedDomainEvent withTenantId(int tenantId)
+        {
+            this.TenantId = tenantId;
+            return this;
+        }
     }
 }

src/Services/Payment/Payment.API/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs

@@ -1,4 +1,6 @@
-namespace Payment.API.IntegrationEvents.EventHandling
+using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Extensions;
+
+namespace Payment.API.IntegrationEvents.EventHandling
 {
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
     using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
@@ -50,6 +52,7 @@
                     orderPaymentIntegrationEvent = new OrderPaymentFailedIntegrationEvent(@event.OrderId);
                 }
 
+                orderPaymentIntegrationEvent.TenantId = @event.TenantId;
                 _logger.LogInformation("----- Publishing integration event: {IntegrationEventId} from {AppName} - ({@IntegrationEvent})", orderPaymentIntegrationEvent.Id, Program.AppName, orderPaymentIntegrationEvent);
 
                 _eventBus.Publish(orderPaymentIntegrationEvent);