Merge pull request #31 from Particular/conventional-usage-refactor

Changed structure/usage to adhere to default conventions
Particular · Sep 20, 2024 · a584b3e · a584b3e
2 parents bdaf8f4 + 6f1d71d
commit a584b3e
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 59 deletions.
diff --git a/src/Billing/Program.cs b/src/Billing/Program.cs
@@ -18,6 +18,16 @@ public static IHostBuilder CreateHostBuilder(string[] args)
             {
                 services.AddMassTransit(x =>
                 {
+                    x.AddConsumers(Assembly.GetExecutingAssembly());
+
+                    x.AddConfigureEndpointsCallback((name, cfg) =>
+                    {
+                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
+                        {
+                            rmq.SetQuorumQueue();
+                        }
+                    });
+
                     x.UsingRabbitMq((context, cfg) =>
                     {
                         cfg.Host("localhost", "/", h =>
@@ -28,16 +38,6 @@ public static IHostBuilder CreateHostBuilder(string[] args)
 
                         cfg.ConfigureEndpoints(context);
                     });
-
-                    x.AddConfigureEndpointsCallback((name, cfg) =>
-                    {
-                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
-                        {
-                            rmq.SetQuorumQueue();
-                        }
-                    });
-
-                    x.AddConsumers(Assembly.GetExecutingAssembly());
                 });
 
                 services.AddSingleton<SimulationEffects>();

diff --git a/src/ClientUI/Program.cs b/src/ClientUI/Program.cs
@@ -18,6 +18,16 @@ public static IHostBuilder CreateHostBuilder(string[] args)
             {
                 services.AddMassTransit(x =>
                 {
+                    x.AddConsumers(Assembly.GetExecutingAssembly());
+
+                    x.AddConfigureEndpointsCallback((name, cfg) =>
+                    {
+                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
+                        {
+                            rmq.SetQuorumQueue();
+                        }
+                    });
+
                     x.UsingRabbitMq((context, cfg) =>
                     {
                         cfg.Host("localhost", "/", h =>
@@ -28,20 +38,10 @@ public static IHostBuilder CreateHostBuilder(string[] args)
 
                         cfg.ConfigureEndpoints(context);
                     });
-
-                    x.AddConfigureEndpointsCallback((name, cfg) =>
-                    {
-                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
-                        {
-                            rmq.SetQuorumQueue();
-                        }
-                    });
-
-                    x.AddConsumers(Assembly.GetExecutingAssembly());
                 });
 
                 services.AddSingleton<SimulatedCustomers>();
-                services.AddHostedService(p => p.GetRequiredService<SimulatedCustomers>());
+                services.AddHostedService<SimulatedCustomers>();
                 services.AddHostedService<ConsoleBackgroundService>();
             });
 

diff --git a/src/ClientUI/SimulatedCustomers.cs b/src/ClientUI/SimulatedCustomers.cs
@@ -2,34 +2,40 @@
 
 using MassTransit;
 using Messages;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-class SimulatedCustomers(IBus _bus) : BackgroundService
+class SimulatedCustomers(IServiceScopeFactory factory) : BackgroundService
 {
+    int _rate = 1;
+
     public void WriteState(TextWriter output)
     {
-        output.WriteLine($"Sending {rate} orders / second");
+        output.WriteLine($"Sending {_rate} orders / second");
     }
 
     public void IncreaseTraffic()
     {
-        rate++;
+        _rate++;
     }
 
     public void DecreaseTraffic()
     {
-        if (rate > 0)
+        if (_rate > 0)
         {
-            rate--;
+            _rate--;
         }
     }
 
-    Task PlaceSingleOrder(CancellationToken cancellationToken)
+    async Task PlaceSingleOrder(CancellationToken cancellationToken)
     {
+        await using var scope = factory.CreateAsyncScope();
+
         var placeOrderCommand = new PlaceOrder { OrderId = Guid.NewGuid().ToString() };
 
         Console.Write("!");
-        return _bus.Publish(placeOrderCommand, cancellationToken);
+
+        await scope.ServiceProvider.GetRequiredService<IPublishEndpoint>().Publish(placeOrderCommand, cancellationToken);
     }
 
     protected override async Task ExecuteAsync(CancellationToken cancellationToken = default)
@@ -42,7 +48,6 @@ await Task.WhenAll(
                     SendBatch(cancellationToken),
                     Task.Delay(1000, cancellationToken)
                 );
-
             }
             catch (TaskCanceledException)
             {
@@ -53,8 +58,8 @@ await Task.WhenAll(
 
     async Task SendBatch(CancellationToken cancellationToken)
     {
-        var x = rate;
-        if (rate > 0)
+        int x = _rate;
+        if (_rate > 0)
         {
             var tasks = new List<Task>(x);
 
@@ -66,6 +71,4 @@ async Task SendBatch(CancellationToken cancellationToken)
             await Task.WhenAll(tasks);
         }
     }
-
-    int rate = 1;
 }
diff --git a/src/Messages/OrderBilled.cs b/src/Messages/OrderBilled.cs
@@ -1,6 +1,6 @@
 namespace Messages;
 
-public class OrderBilled
+public record OrderBilled
 {
-    public string OrderId { get; set; }
+    public string OrderId { get; init; }
 }
diff --git a/src/Messages/OrderPlaced.cs b/src/Messages/OrderPlaced.cs
@@ -1,6 +1,6 @@
 namespace Messages;
 
-public class OrderPlaced
+public record OrderPlaced
 {
-    public string OrderId { get; set; }
+    public string OrderId { get; init; }
 }
diff --git a/src/Messages/PlaceOrder.cs b/src/Messages/PlaceOrder.cs
@@ -1,6 +1,6 @@
 namespace Messages;
 
-public class PlaceOrder
+public record PlaceOrder
 {
-    public string OrderId { get; set; }
+    public string OrderId { get; init; }
 }
diff --git a/src/Sales/Program.cs b/src/Sales/Program.cs
@@ -19,6 +19,16 @@ public static IHostBuilder CreateHostBuilder(string[] args)
             {
                 services.AddMassTransit(x =>
                 {
+                    x.AddConsumers(Assembly.GetExecutingAssembly());
+
+                    x.AddConfigureEndpointsCallback((name, cfg) =>
+                    {
+                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
+                        {
+                            rmq.SetQuorumQueue();
+                        }
+                    });
+
                     x.UsingRabbitMq((context, cfg) =>
                     {
                         cfg.Host("localhost", "/", h =>
@@ -29,16 +39,6 @@ public static IHostBuilder CreateHostBuilder(string[] args)
 
                         cfg.ConfigureEndpoints(context);
                     });
-
-                    x.AddConsumers(Assembly.GetExecutingAssembly());
-
-                    x.AddConfigureEndpointsCallback((name, cfg) =>
-                    {
-                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
-                        {
-                            rmq.SetQuorumQueue();
-                        }
-                    });
                 });
 
                 services.AddSingleton<SimulationEffects>();

diff --git a/src/Shipping/Program.cs b/src/Shipping/Program.cs
@@ -19,6 +19,16 @@ public static IHostBuilder CreateHostBuilder(string[] args)
             {
                 services.AddMassTransit(x =>
                 {
+                    x.AddConsumers(Assembly.GetExecutingAssembly());
+
+                    x.AddConfigureEndpointsCallback((name, cfg) =>
+                    {
+                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
+                        {
+                            rmq.SetQuorumQueue();
+                        }
+                    });
+
                     x.UsingRabbitMq((context, cfg) =>
                     {
                         cfg.Host("localhost", "/", h =>
@@ -29,16 +39,6 @@ public static IHostBuilder CreateHostBuilder(string[] args)
 
                         cfg.ConfigureEndpoints(context);
                     });
-
-                    x.AddConsumers(Assembly.GetExecutingAssembly());
-
-                    x.AddConfigureEndpointsCallback((name, cfg) =>
-                    {
-                        if (cfg is IRabbitMqReceiveEndpointConfigurator rmq)
-                        {
-                            rmq.SetQuorumQueue();
-                        }
-                    });
                 });
 
                 services.AddSingleton<SimulationEffects>();