diff --git a/src/BuildingBlocks/EventBus/EventBus/Abstractions/AbstractIntegrationEventHandler.cs b/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/AbstractIntegrationEventHandler.cs similarity index 97% rename from src/BuildingBlocks/EventBus/EventBus/Abstractions/AbstractIntegrationEventHandler.cs rename to src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/AbstractIntegrationEventHandler.cs index 947b1c406..15b9de442 100644 --- a/src/BuildingBlocks/EventBus/EventBus/Abstractions/AbstractIntegrationEventHandler.cs +++ b/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/EventHandling/AbstractIntegrationEventHandler.cs @@ -6,6 +6,7 @@ using System.IO; using System.Net.Http; using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; using Microsoft.Extensions.Logging; +using Ordering.API.Application.IntegrationEvents.Events; namespace Ordering.API.Application.IntegrationEvents.EventHandling { diff --git a/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/CustomisationEvent.cs b/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/CustomisationEvent.cs new file mode 100644 index 000000000..e49922640 --- /dev/null +++ b/src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/CustomisationEvent.cs @@ -0,0 +1,23 @@ +using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; +using Ordering.API.Application.IntegrationEvents.Events; +using System; +using System.Collections.Generic; +using System.Text; + +namespace Ordering.API.Application.IntegrationEvents.Events +{ + public class CustomisationEvent : IntegrationEvent + { + public CustomisationEvent(int tenantId, IntegrationEvent @event) + { + TenantId = tenantId; + eventType = @event.GetType().Name; + //TODO + userCheckoutAcceptedIntegrationEvent = (UserCheckoutAcceptedIntegrationEvent)@event; + } + + public int TenantId { get; set; } + public String eventType { get; set; } + public UserCheckoutAcceptedIntegrationEvent userCheckoutAcceptedIntegrationEvent { get; set; } + } +} diff --git a/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs b/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs index 57321418b..1b753dc2c 100644 --- a/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs +++ b/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/EventHandling/CustomisationEventHandler.cs @@ -7,7 +7,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using TenantACustomisations.IntegrationEvents.Events; using TenantACustomisations.Services; +using CustomisationEvent = TenantACustomisations.IntegrationEvents.Events.CustomisationEvent; namespace TenantACustomisations.IntegrationEvents.EventHandling { diff --git a/src/BuildingBlocks/EventBus/EventBus/Events/CustomisationEvent.cs b/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/Events/CustomisationEvent.cs similarity index 53% rename from src/BuildingBlocks/EventBus/EventBus/Events/CustomisationEvent.cs rename to src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/Events/CustomisationEvent.cs index 695aef7ea..42c0607eb 100644 --- a/src/BuildingBlocks/EventBus/EventBus/Events/CustomisationEvent.cs +++ b/src/Services/TenantCustomisations/TenantACustomisations/IntegrationEvents/Events/CustomisationEvent.cs @@ -1,8 +1,10 @@ -using System; +using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; +using Ordering.API.Application.IntegrationEvents.Events; +using System; using System.Collections.Generic; using System.Text; -namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events +namespace TenantACustomisations.IntegrationEvents.Events { public class CustomisationEvent : IntegrationEvent { @@ -11,10 +13,13 @@ namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events TenantId = tenantId; this.@event = @event; eventType = @event.GetType().Name; + //TODO + userCheckoutAcceptedIntegrationEvent = (UserCheckoutAcceptedIntegrationEvent)@event; } public int TenantId { get; set; } public IntegrationEvent @event { get; set; } public String eventType { get; set; } + public UserCheckoutAcceptedIntegrationEvent userCheckoutAcceptedIntegrationEvent { get; set; } } } diff --git a/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs b/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs index 8aad4f6ee..dbbed6396 100644 --- a/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs +++ b/src/Services/TenantCustomisations/TenantACustomisations/Startup.cs @@ -35,6 +35,7 @@ using global::TenantACustomisations.Infrastructure.Filters; using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; using global::TenantACustomisations.IntegrationEvents.EventHandling; + using global::TenantACustomisations.IntegrationEvents.Events; public class Startup { diff --git a/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj b/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj index 44c3fe7ff..d21ad07f5 100644 --- a/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj +++ b/src/Services/TenantCustomisations/TenantACustomisations/TenantACustomisations.csproj @@ -42,10 +42,6 @@ - - - -