Remove Program from Catalog.API

src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs

@@ -17,7 +17,7 @@ public class ProductPriceChangedIntegrationEventHandler : IIntegrationEventHandl
     {
         using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}"))
         {
-            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, @event);
+            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} - ({@IntegrationEvent})", @event.Id, @event);
 
             var userIds = _repository.GetUsers();
 

src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs

@@ -9,7 +9,7 @@ public class BasketScenarioBase
 
     public TestServer CreateServer()
     {
-        var factory = new BasketApplicaton();
+        var factory = new BasketApplication();
         return factory.Server;
     }
 
@@ -27,7 +27,7 @@ public class BasketScenarioBase
         public static string CheckoutOrder = $"{ApiUrlBase}/checkout";
     }
 
-    private class BasketApplicaton : WebApplicationFactory<Program>
+    private class BasketApplication : WebApplicationFactory<Program>
     {
         protected override IHost CreateHost(IHostBuilder builder)
         {

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -37,6 +37,10 @@
     <None Remove="@(Protobuf)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Catalog.FunctionalTests"/>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" />
     <PackageReference Include="Azure.Identity" />

src/Services/Catalog/Catalog.API/IntegrationEvents/CatalogIntegrationEventService.cs

@@ -26,7 +26,7 @@ public class CatalogIntegrationEventService : ICatalogIntegrationEventService, I
     {
         try
         {
-            _logger.LogInformation("----- Publishing integration event: {IntegrationEventId_published} from {AppName} - ({@IntegrationEvent})", evt.Id, Program.AppName, evt);
+            _logger.LogInformation("----- Publishing integration event: {IntegrationEventId_published} - ({@IntegrationEvent})", evt.Id, evt);
 
             await _eventLogService.MarkEventAsInProgressAsync(evt.Id);
             _eventBus.Publish(evt);
@@ -34,7 +34,7 @@ public class CatalogIntegrationEventService : ICatalogIntegrationEventService, I
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId} from {AppName} - ({@IntegrationEvent})", evt.Id, Program.AppName, evt);
+            _logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId} - ({@IntegrationEvent})", evt.Id, evt);
             await _eventLogService.MarkEventAsFailedAsync(evt.Id);
         }
     }

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

@@ -19,9 +19,9 @@ public class OrderStatusChangedToAwaitingValidationIntegrationEventHandler :
 
     public async Task Handle(OrderStatusChangedToAwaitingValidationIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
-            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
+            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} - ({@IntegrationEvent})", @event.Id, @event);
 
             var confirmedOrderStockItems = new List<ConfirmedOrderStockItem>();
 

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

@@ -16,9 +16,9 @@ public class OrderStatusChangedToPaidIntegrationEventHandler :
 
     public async Task Handle(OrderStatusChangedToPaidIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
-            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
+            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} - ({@IntegrationEvent})", @event.Id, @event);
 
             //we're not blocking stock/inventory
             foreach (var orderStockItem in @event.OrderStockItems)

src/Services/Catalog/Catalog.API/Program.cs

@@ -41,11 +41,8 @@ var eventBus = app.Services.GetRequiredService<IEventBus>();
 eventBus.Subscribe<OrderStatusChangedToAwaitingValidationIntegrationEvent, OrderStatusChangedToAwaitingValidationIntegrationEventHandler>();
 eventBus.Subscribe<OrderStatusChangedToPaidIntegrationEvent, OrderStatusChangedToPaidIntegrationEventHandler>();
 
-try
+using (var scope = app.Services.CreateScope())
 {
-    app.Logger.LogInformation("Configuring web host ({ApplicationContext})...", AppName);
-
-    using var scope = app.Services.CreateScope();
     var context = scope.ServiceProvider.GetRequiredService<CatalogContext>();
     var settings = app.Services.GetService<IOptions<CatalogSettings>>();
     var logger = app.Services.GetService<ILogger<CatalogContextSeed>>();
@@ -54,19 +51,6 @@ try
     await new CatalogContextSeed().SeedAsync(context, app.Environment, settings, logger);
     var integEventContext = scope.ServiceProvider.GetRequiredService<IntegrationEventLogContext>();
     await integEventContext.Database.MigrateAsync();
-    app.Logger.LogInformation("Starting web host ({ApplicationName})...", AppName);
-    await app.RunAsync();
-
-    return 0;
-}
-catch (Exception ex)
-{
-    app.Logger.LogCritical(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
-    return 1;
 }
 
-public partial class Program
-{
-    public static string Namespace = typeof(Program).Assembly.GetName().Name;
-    public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
-}
+await app.RunAsync();

src/Services/Catalog/Catalog.FunctionalTests/CatalogScenarioBase.cs

@@ -2,36 +2,45 @@
 
 namespace Catalog.FunctionalTests;
 
-public class CatalogScenariosBase : WebApplicationFactory<Program>
+public class CatalogScenariosBase 
 {
     public TestServer CreateServer()
     {
-        Services
-            .MigrateDbContext<CatalogContext>((context, services) =>
-            {
-                var env = services.GetService<IWebHostEnvironment>();
-                var settings = services.GetService<IOptions<CatalogSettings>>();
-                var logger = services.GetService<ILogger<CatalogContextSeed>>();
-
-                new CatalogContextSeed()
-                .SeedAsync(context, env, settings, logger)
-                .Wait();
-            })
-            .MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
-
-        return Server;
+        var factory = new CatalogApplication();
+        return factory.CreateServer();
     }
 
-    protected override IHost CreateHost(IHostBuilder builder)
+    private class CatalogApplication : WebApplicationFactory<Program>
     {
-        builder.ConfigureAppConfiguration(c =>
+        public TestServer CreateServer()
+        {
+            Services
+                .MigrateDbContext<CatalogContext>((context, services) =>
+                {
+                    var env = services.GetService<IWebHostEnvironment>();
+                    var settings = services.GetService<IOptions<CatalogSettings>>();
+                    var logger = services.GetService<ILogger<CatalogContextSeed>>();
+
+                    new CatalogContextSeed()
+                    .SeedAsync(context, env, settings, logger)
+                    .Wait();
+                })
+                .MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
+
+            return Server;
+        }
+
+        protected override IHost CreateHost(IHostBuilder builder)
         {
-            var directory = Path.GetDirectoryName(typeof(CatalogScenariosBase).Assembly.Location)!;
+            builder.ConfigureAppConfiguration(c =>
+            {
+                var directory = Path.GetDirectoryName(typeof(CatalogScenariosBase).Assembly.Location)!;
 
-            c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
-        });
+                c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
+            });
 
-        return base.CreateHost(builder);
+            return base.CreateHost(builder);
+        }
     }
 
     public static class Get

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

@@ -23,7 +23,7 @@ public class GracePeriodConfirmedIntegrationEventHandler : IIntegrationEventHand
     /// <returns></returns>
     public async Task Handle(GracePeriodConfirmedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

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

@@ -16,7 +16,7 @@ public class OrderPaymentFailedIntegrationEventHandler :
 
     public async Task Handle(OrderPaymentFailedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

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

@@ -16,7 +16,7 @@ public class OrderPaymentSucceededIntegrationEventHandler :
 
     public async Task Handle(OrderPaymentSucceededIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

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

@@ -16,7 +16,7 @@ public class OrderStockConfirmedIntegrationEventHandler :
 
     public async Task Handle(OrderStockConfirmedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

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

@@ -14,7 +14,7 @@ public class OrderStockRejectedIntegrationEventHandler : IIntegrationEventHandle
 
     public async Task Handle(OrderStockRejectedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

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

@@ -24,7 +24,7 @@ public class UserCheckoutAcceptedIntegrationEventHandler : IIntegrationEventHand
     /// <returns></returns>
     public async Task Handle(UserCheckoutAcceptedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToAwaitingValidationIntegrationEventHandler.cs

@@ -16,7 +16,7 @@ public class OrderStatusChangedToAwaitingValidationIntegrationEventHandler : IIn
 
     public async Task Handle(OrderStatusChangedToAwaitingValidationIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToCancelledIntegrationEventHandler.cs

@@ -16,7 +16,7 @@ public class OrderStatusChangedToCancelledIntegrationEventHandler : IIntegration
 
     public async Task Handle(OrderStatusChangedToCancelledIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToPaidIntegrationEventHandler.cs

@@ -16,7 +16,7 @@ public class OrderStatusChangedToPaidIntegrationEventHandler : IIntegrationEvent
 
     public async Task Handle(OrderStatusChangedToPaidIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToShippedIntegrationEventHandler.cs

@@ -16,7 +16,7 @@ public class OrderStatusChangedToShippedIntegrationEventHandler : IIntegrationEv
 
     public async Task Handle(OrderStatusChangedToShippedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToStockConfirmedIntegrationEventHandler.cs

@@ -17,7 +17,7 @@ public class OrderStatusChangedToStockConfirmedIntegrationEventHandler :
 
     public async Task Handle(OrderStatusChangedToStockConfirmedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

src/Services/Ordering/Ordering.SignalrHub/IntegrationEvents/EventHandling/OrderStatusChangedToSubmittedIntegrationEventHandler.cs

@@ -17,7 +17,7 @@ public class OrderStatusChangedToSubmittedIntegrationEventHandler :
 
     public async Task Handle(OrderStatusChangedToSubmittedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
 

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

@@ -21,7 +21,7 @@ public class OrderStatusChangedToStockConfirmedIntegrationEventHandler :
 
     public async Task Handle(OrderStatusChangedToStockConfirmedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", @event.Id))
         {
             _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);