Refactored namespace statement for payment.api

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

@@ -1,61 +1,52 @@
-namespace Payment.API.IntegrationEvents.EventHandling
+namespace Microsoft.eShopOnContainers.Payment.API.IntegrationEvents.EventHandling;
+    
+public class OrderStatusChangedToStockConfirmedIntegrationEventHandler :
+    IIntegrationEventHandler<OrderStatusChangedToStockConfirmedIntegrationEvent>
 {
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
+    private readonly IEventBus _eventBus;
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    private readonly PaymentSettings _settings;
-    using Microsoft.Extensions.Logging;
+    private readonly ILogger<OrderStatusChangedToStockConfirmedIntegrationEventHandler> _logger;
-    using Microsoft.Extensions.Options;
-    using Payment.API.IntegrationEvents.Events;
-    using Serilog.Context;
-    using System.Threading.Tasks;
 
-    public class OrderStatusChangedToStockConfirmedIntegrationEventHandler :
+    public OrderStatusChangedToStockConfirmedIntegrationEventHandler(
-        IIntegrationEventHandler<OrderStatusChangedToStockConfirmedIntegrationEvent>
+        IEventBus eventBus,
+        IOptionsSnapshot<PaymentSettings> settings,
+        ILogger<OrderStatusChangedToStockConfirmedIntegrationEventHandler> logger)
     {
-        private readonly IEventBus _eventBus;
+        _eventBus = eventBus;
-        private readonly PaymentSettings _settings;
+        _settings = settings.Value;
-        private readonly ILogger<OrderStatusChangedToStockConfirmedIntegrationEventHandler> _logger;
+        _logger = logger ?? throw new System.ArgumentNullException(nameof(logger));
 
-        public OrderStatusChangedToStockConfirmedIntegrationEventHandler(
+        _logger.LogTrace("PaymentSettings: {@PaymentSettings}", _settings);
-            IEventBus eventBus,
+    }
-            IOptionsSnapshot<PaymentSettings> settings,
+
-            ILogger<OrderStatusChangedToStockConfirmedIntegrationEventHandler> logger)
+    public async Task Handle(OrderStatusChangedToStockConfirmedIntegrationEvent @event)
+    {
+        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
         {
-            _eventBus = eventBus;
+            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
-            _settings = settings.Value;
-            _logger = logger ?? throw new System.ArgumentNullException(nameof(logger));
 
-            _logger.LogTrace("PaymentSettings: {@PaymentSettings}", _settings);
+            IntegrationEvent orderPaymentIntegrationEvent;
-        }
 
-        public async Task Handle(OrderStatusChangedToStockConfirmedIntegrationEvent @event)
+            //Business feature comment:
-        {
+            // When OrderStatusChangedToStockConfirmed Integration Event is handled.
-            using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+            // Here we're simulating that we'd be performing the payment against any payment gateway
+            // Instead of a real payment we just take the env. var to simulate the payment 
+            // The payment can be successful or it can fail
+
+            if (_settings.PaymentSucceeded)
             {
-                _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
+                orderPaymentIntegrationEvent = new OrderPaymentSucceededIntegrationEvent(@event.OrderId);
-
-                IntegrationEvent orderPaymentIntegrationEvent;
-
-                //Business feature comment:
-                // When OrderStatusChangedToStockConfirmed Integration Event is handled.
-                // Here we're simulating that we'd be performing the payment against any payment gateway
-                // Instead of a real payment we just take the env. var to simulate the payment 
-                // The payment can be successful or it can fail
-
-                if (_settings.PaymentSucceeded)
-                {
-                    orderPaymentIntegrationEvent = new OrderPaymentSucceededIntegrationEvent(@event.OrderId);
-                }
-                else
-                {
-                    orderPaymentIntegrationEvent = new OrderPaymentFailedIntegrationEvent(@event.OrderId);
-                }
-
-                _logger.LogInformation("----- Publishing integration event: {IntegrationEventId} from {AppName} - ({@IntegrationEvent})", orderPaymentIntegrationEvent.Id, Program.AppName, orderPaymentIntegrationEvent);
-
-                _eventBus.Publish(orderPaymentIntegrationEvent);
-
-                await Task.CompletedTask;
             }
+            else
+            {
+                orderPaymentIntegrationEvent = new OrderPaymentFailedIntegrationEvent(@event.OrderId);
+            }
+
+            _logger.LogInformation("----- Publishing integration event: {IntegrationEventId} from {AppName} - ({@IntegrationEvent})", orderPaymentIntegrationEvent.Id, Program.AppName, orderPaymentIntegrationEvent);
+
+            _eventBus.Publish(orderPaymentIntegrationEvent);
+
+            await Task.CompletedTask;
         }
     }
 }

src/Services/Payment/Payment.API/IntegrationEvents/Events/OrderPaymentFailedIntegrationEvent.cs

@@ -1,11 +1,8 @@
-namespace Payment.API.IntegrationEvents.Events
+namespace Microsoft.eShopOnContainers.Payment.API.IntegrationEvents.Events;
+
+public record OrderPaymentFailedIntegrationEvent : IntegrationEvent
 {
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    public int OrderId { get; }
 
-    public record OrderPaymentFailedIntegrationEvent : IntegrationEvent
+    public OrderPaymentFailedIntegrationEvent(int orderId) => OrderId = orderId;
-    {
-        public int OrderId { get; }
-
-        public OrderPaymentFailedIntegrationEvent(int orderId) => OrderId = orderId;
-    }
 }

src/Services/Payment/Payment.API/IntegrationEvents/Events/OrderPaymentSucceededIntegrationEvent.cs

@@ -1,11 +1,8 @@
-namespace Payment.API.IntegrationEvents.Events
+namespace Microsoft.eShopOnContainers.Payment.API.IntegrationEvents.Events;
+
+public record OrderPaymentSucceededIntegrationEvent : IntegrationEvent
 {
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    public int OrderId { get; }
 
-    public record OrderPaymentSucceededIntegrationEvent : IntegrationEvent
+    public OrderPaymentSucceededIntegrationEvent(int orderId) => OrderId = orderId;
-    {
-        public int OrderId { get; }
-
-        public OrderPaymentSucceededIntegrationEvent(int orderId) => OrderId = orderId;
-    }
 }

src/Services/Payment/Payment.API/IntegrationEvents/Events/OrderStatusChangedToStockConfirmedIntegrationEvent.cs

@@ -1,12 +1,9 @@
-namespace Payment.API.IntegrationEvents.Events
+namespace Microsoft.eShopOnContainers.Payment.API.IntegrationEvents.Events;
+    
+public record OrderStatusChangedToStockConfirmedIntegrationEvent : IntegrationEvent
 {
-    using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
+    public int OrderId { get; }
 
-    public record OrderStatusChangedToStockConfirmedIntegrationEvent : IntegrationEvent
+    public OrderStatusChangedToStockConfirmedIntegrationEvent(int orderId)
-    {
+        => OrderId = orderId;
-        public int OrderId { get; }
-
-        public OrderStatusChangedToStockConfirmedIntegrationEvent(int orderId)
-            => OrderId = orderId;
-    }
 }

src/Services/Payment/Payment.API/PaymentSettings.cs

@@ -1,8 +1,8 @@
-namespace Payment.API
+namespace Microsoft.eShopOnContainers.Payment.API;
+
+public class PaymentSettings
 {
-    public class PaymentSettings
+    public bool PaymentSucceeded { get; set; }
-    {
+    public string EventBusConnection { get; set; }
-        public bool PaymentSucceeded { get; set; }
-        public string EventBusConnection { get; set; }
-    }
 }
+

src/Services/Payment/Payment.API/Program.cs

@@ -1,16 +1,4 @@
-using Microsoft.AspNetCore;
+var configuration = GetConfiguration();
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using Payment.API;
-using Serilog;
-using System;
-using System.IO;
-using Azure.Identity;
-using Azure.Core;
-
-var configuration = GetConfiguration();
 
 Log.Logger = CreateSerilogLogger(configuration);
 

src/Services/Payment/Payment.API/Startup.cs

@@ -1,198 +1,178 @@
-using Autofac;
+namespace Microsoft.eShopOnContainers.Payment.API;
-using Autofac.Extensions.DependencyInjection;
-using HealthChecks.UI.Client;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.Azure.ServiceBus;
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;
-using Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Logging;
-using Payment.API.IntegrationEvents.EventHandling;
-using Payment.API.IntegrationEvents.Events;
-using RabbitMQ.Client;
-using System;
 
-namespace Payment.API
+public class Startup
 {
-    public class Startup
+    public Startup(IConfiguration configuration)
     {
-        public Startup(IConfiguration configuration)
+        Configuration = configuration;
+    }
+
+    public IConfiguration Configuration { get; }
+
+    // This method gets called by the runtime. Use this method to add services to the container.
+    public IServiceProvider ConfigureServices(IServiceCollection services)
+    {
+        services.AddCustomHealthCheck(Configuration);
+        services.Configure<PaymentSettings>(Configuration);
+
+        RegisterAppInsights(services);
+
+        if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
         {
-            Configuration = configuration;
+            services.AddSingleton<IServiceBusPersisterConnection>(sp =>
+            {
+                var serviceBusConnectionString = Configuration["EventBusConnection"];
+                var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString);
+                var subscriptionClientName = Configuration["SubscriptionClientName"];
+
+                return new DefaultServiceBusPersisterConnection(serviceBusConnection, subscriptionClientName);
+            });
         }
-
+        else
-        public IConfiguration Configuration { get; }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public IServiceProvider ConfigureServices(IServiceCollection services)
         {
-            services.AddCustomHealthCheck(Configuration);
+            services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
-            services.Configure<PaymentSettings>(Configuration);
-
-            RegisterAppInsights(services);
-
-            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
             {
-                services.AddSingleton<IServiceBusPersisterConnection>(sp =>
+                var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
+                var factory = new ConnectionFactory()
                 {
-                    var serviceBusConnectionString = Configuration["EventBusConnection"];
+                    HostName = Configuration["EventBusConnection"],
-                    var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString);
+                    DispatchConsumersAsync = true
-                    var subscriptionClientName = Configuration["SubscriptionClientName"];
+                };
 
-                    return new DefaultServiceBusPersisterConnection(serviceBusConnection, subscriptionClientName);
+                if (!string.IsNullOrEmpty(Configuration["EventBusUserName"]))
-                });
-            }
-            else
-            {
-                services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
                 {
-                    var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
+                    factory.UserName = Configuration["EventBusUserName"];
-                    var factory = new ConnectionFactory()
+                }
-                    {
-                        HostName = Configuration["EventBusConnection"],
-                        DispatchConsumersAsync = true
-                    };
 
-                    if (!string.IsNullOrEmpty(Configuration["EventBusUserName"]))
+                if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
-                    {
-                        factory.UserName = Configuration["EventBusUserName"];
-                    }
-
-                    if (!string.IsNullOrEmpty(Configuration["EventBusPassword"]))
-                    {
-                        factory.Password = Configuration["EventBusPassword"];
-                    }
-
-                    var retryCount = 5;
-                    if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"]))
-                    {
-                        retryCount = int.Parse(Configuration["EventBusRetryCount"]);
-                    }
-
-                    return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount);
-                });
-            }
-
-            RegisterEventBus(services);
-
-            var container = new ContainerBuilder();
-            container.Populate(services);
-            return new AutofacServiceProvider(container.Build());
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
-        {
-            //loggerFactory.AddAzureWebAppDiagnostics();
-            //loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
-
-            var pathBase = Configuration["PATH_BASE"];
-            if (!string.IsNullOrEmpty(pathBase))
-            {
-                app.UsePathBase(pathBase);
-            }
-
-            ConfigureEventBus(app);
-
-            app.UseRouting();
-            app.UseEndpoints(endpoints =>
-            {
-                endpoints.MapHealthChecks("/hc", new HealthCheckOptions()
                 {
-                    Predicate = _ => true,
+                    factory.Password = Configuration["EventBusPassword"];
-                    ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
+                }
-                });
+
-                endpoints.MapHealthChecks("/liveness", new HealthCheckOptions
+                var retryCount = 5;
+                if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"]))
                 {
-                    Predicate = r => r.Name.Contains("self")
+                    retryCount = int.Parse(Configuration["EventBusRetryCount"]);
-                });
+                }
+
+                return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount);
             });
         }
 
-        private void RegisterAppInsights(IServiceCollection services)
+        RegisterEventBus(services);
-        {
-            services.AddApplicationInsightsTelemetry(Configuration);
-            services.AddApplicationInsightsKubernetesEnricher();
-        }
 
-        private void RegisterEventBus(IServiceCollection services)
+        var container = new ContainerBuilder();
-        {
+        container.Populate(services);
-            if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
+        return new AutofacServiceProvider(container.Build());
-            {
-                services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
-                {
-                    var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
-                    var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
-                    var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
-                    var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
-
-                    return new EventBusServiceBus(serviceBusPersisterConnection, logger,
-                        eventBusSubcriptionsManager, iLifetimeScope);
-                });
-            }
-            else
-            {
-                services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
-                {
-                    var subscriptionClientName = Configuration["SubscriptionClientName"];
-                    var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
-                    var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
-                    var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
-                    var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
-
-                    var retryCount = 5;
-                    if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"]))
-                    {
-                        retryCount = int.Parse(Configuration["EventBusRetryCount"]);
-                    }
-
-                    return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount);
-                });
-            }
-
-            services.AddTransient<OrderStatusChangedToStockConfirmedIntegrationEventHandler>();
-            services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
-        }
-
-        private void ConfigureEventBus(IApplicationBuilder app)
-        {
-            var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
-            eventBus.Subscribe<OrderStatusChangedToStockConfirmedIntegrationEvent, OrderStatusChangedToStockConfirmedIntegrationEventHandler>();
-        }
     }
 
-    public static class CustomExtensionMethods
+    // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+    public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
     {
-        public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration)
+        //loggerFactory.AddAzureWebAppDiagnostics();
+        //loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
+
+        var pathBase = Configuration["PATH_BASE"];
+        if (!string.IsNullOrEmpty(pathBase))
         {
-            var hcBuilder = services.AddHealthChecks();
+            app.UsePathBase(pathBase);
-
-            hcBuilder.AddCheck("self", () => HealthCheckResult.Healthy());
-
-            if (configuration.GetValue<bool>("AzureServiceBusEnabled"))
-            {
-                hcBuilder
-                    .AddAzureServiceBusTopic(
-                        configuration["EventBusConnection"],
-                        topicName: "eshop_event_bus",
-                        name: "payment-servicebus-check",
-                        tags: new string[] { "servicebus" });
-            }
-            else
-            {
-                hcBuilder
-                    .AddRabbitMQ(
-                        $"amqp://{configuration["EventBusConnection"]}",
-                        name: "payment-rabbitmqbus-check",
-                        tags: new string[] { "rabbitmqbus" });
-            }
-
-            return services;
         }
+
+        ConfigureEventBus(app);
+
+        app.UseRouting();
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapHealthChecks("/hc", new HealthCheckOptions()
+            {
+                Predicate = _ => true,
+                ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
+            });
+            endpoints.MapHealthChecks("/liveness", new HealthCheckOptions
+            {
+                Predicate = r => r.Name.Contains("self")
+            });
+        });
+    }
+
+    private void RegisterAppInsights(IServiceCollection services)
+    {
+        services.AddApplicationInsightsTelemetry(Configuration);
+        services.AddApplicationInsightsKubernetesEnricher();
+    }
+
+    private void RegisterEventBus(IServiceCollection services)
+    {
+        if (Configuration.GetValue<bool>("AzureServiceBusEnabled"))
+        {
+            services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
+            {
+                var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
+                var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
+                var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
+                var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+
+                return new EventBusServiceBus(serviceBusPersisterConnection, logger,
+                    eventBusSubcriptionsManager, iLifetimeScope);
+            });
+        }
+        else
+        {
+            services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
+            {
+                var subscriptionClientName = Configuration["SubscriptionClientName"];
+                var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
+                var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
+                var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
+                var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+
+                var retryCount = 5;
+                if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"]))
+                {
+                    retryCount = int.Parse(Configuration["EventBusRetryCount"]);
+                }
+
+                return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount);
+            });
+        }
+
+        services.AddTransient<OrderStatusChangedToStockConfirmedIntegrationEventHandler>();
+        services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
+    }
+
+    private void ConfigureEventBus(IApplicationBuilder app)
+    {
+        var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
+        eventBus.Subscribe<OrderStatusChangedToStockConfirmedIntegrationEvent, OrderStatusChangedToStockConfirmedIntegrationEventHandler>();
+    }
+}
+
+public static class CustomExtensionMethods
+{
+    public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration)
+    {
+        var hcBuilder = services.AddHealthChecks();
+
+        hcBuilder.AddCheck("self", () => HealthCheckResult.Healthy());
+
+        if (configuration.GetValue<bool>("AzureServiceBusEnabled"))
+        {
+            hcBuilder
+                .AddAzureServiceBusTopic(
+                    configuration["EventBusConnection"],
+                    topicName: "eshop_event_bus",
+                    name: "payment-servicebus-check",
+                    tags: new string[] { "servicebus" });
+        }
+        else
+        {
+            hcBuilder
+                .AddRabbitMQ(
+                    $"amqp://{configuration["EventBusConnection"]}",
+                    name: "payment-rabbitmqbus-check",
+                    tags: new string[] { "rabbitmqbus" });
+        }
+
+        return services;
     }
 }