feat: Fix rabbitmq registration

alex289 · Nov 21, 2024 · 693ca45 · 693ca45
1 parent 425da0b
commit 693ca45
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 16 deletions.
diff --git a/CleanArchitecture.Api/Extensions/ConfigurationExtensions.cs b/CleanArchitecture.Api/Extensions/ConfigurationExtensions.cs
@@ -0,0 +1,41 @@
+using System;
+using CleanArchitecture.Domain.Rabbitmq;
+using Microsoft.Extensions.Configuration;
+
+namespace CleanArchitecture.Api.Extensions;
+
+public static class ConfigurationExtensions
+{
+    public static RabbitMqConfiguration GetRabbitMqConfiguration(
+        this IConfiguration configuration)
+    {
+        var isAspire = configuration["ASPIRE_ENABLED"] == "true";
+
+        var rabbitEnabled = configuration["RabbitMQ:Enabled"];
+        var rabbitHost = configuration["RabbitMQ:Host"];
+        var rabbitPort = configuration["RabbitMQ:Port"];
+        var rabbitUser = configuration["RabbitMQ:Username"];
+        var rabbitPass = configuration["RabbitMQ:Password"];
+
+        if (isAspire)
+        {
+            rabbitEnabled = "true";
+            var connectionString = configuration["ConnectionStrings:RabbitMq"];
+
+            var rabbitUri = new Uri(connectionString!);
+            rabbitHost = rabbitUri.Host;
+            rabbitPort = rabbitUri.Port.ToString();
+            rabbitUser = rabbitUri.UserInfo.Split(':')[0];
+            rabbitPass = rabbitUri.UserInfo.Split(':')[1];
+        }
+
+        return new RabbitMqConfiguration()
+        {
+            Host = rabbitHost ?? "",
+            Port = int.Parse(rabbitPort ?? "0"),
+            Enabled = bool.Parse(rabbitEnabled ?? "false"),
+            Username = rabbitUser ?? "",
+            Password = rabbitPass ?? "",
+        };
+    }
+}
diff --git a/CleanArchitecture.Api/Program.cs b/CleanArchitecture.Api/Program.cs
@@ -32,16 +32,8 @@
 
 var isAspire = builder.Configuration["ASPIRE_ENABLED"] == "true";
 
-var rabbitHost = builder.Configuration["RabbitMQ:Host"];
-var rabbitPort = builder.Configuration["RabbitMQ:Port"];
-var rabbitUser = builder.Configuration["RabbitMQ:Username"];
-var rabbitPass = builder.Configuration["RabbitMQ:Password"];
-var rabbitConnectionString =
-    isAspire ? builder.Configuration["ConnectionStrings:RabbitMq"] :
-        $"amqp://{rabbitUser}:{rabbitPass}@{rabbitHost}:{rabbitPort}";
-
+var rabbitConfiguration = builder.Configuration.GetRabbitMqConfiguration();
 var redisConnectionString = isAspire ? builder.Configuration["ConnectionStrings:Redis"] : builder.Configuration["RedisHostName"];
-
 var dbConnectionString = isAspire ? builder.Configuration["ConnectionStrings:Database"] : builder.Configuration["ConnectionStrings:DefaultConnection"];
 
 if (builder.Environment.IsProduction())
@@ -51,7 +43,7 @@
         .AddSqlServer(dbConnectionString!)
         .AddRedis(redisConnectionString!, "Redis")
         .AddRabbitMQ(
-            rabbitConnectionString!,
+            rabbitConfiguration.ConnectionString,
             name: "RabbitMQ");
 }
 
@@ -72,7 +64,7 @@
 builder.Services.AddNotificationHandlers();
 builder.Services.AddApiUser();
 
-builder.Services.AddRabbitMqHandler(builder.Configuration, "RabbitMQ");
+builder.Services.AddRabbitMqHandler(rabbitConfiguration);
 
 builder.Services.AddHostedService<SetInactiveUsersService>();
 

diff --git a/CleanArchitecture.Domain/Rabbitmq/Extensions/ServiceCollectionExtensions.cs b/CleanArchitecture.Domain/Rabbitmq/Extensions/ServiceCollectionExtensions.cs
@@ -7,12 +7,9 @@ public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddRabbitMqHandler(
         this IServiceCollection services,
-        IConfiguration configuration,
-        string rabbitMqConfigSection)
+        RabbitMqConfiguration configuration)
     {
-        var rabbitMq = new RabbitMqConfiguration();
-        configuration.Bind(rabbitMqConfigSection, rabbitMq);
-        services.AddSingleton(rabbitMq);
+        services.AddSingleton(configuration);
 
         services.AddSingleton<RabbitMqHandler>();
         services.AddHostedService(serviceProvider => serviceProvider.GetService<RabbitMqHandler>()!);

diff --git a/CleanArchitecture.Domain/Rabbitmq/RabbitMqConfiguration.cs b/CleanArchitecture.Domain/Rabbitmq/RabbitMqConfiguration.cs
@@ -7,4 +7,6 @@ public sealed class RabbitMqConfiguration
     public bool Enabled { get; set; }
     public string Username { get; set; } = string.Empty;
     public string Password { get; set; } = string.Empty;
+
+    public string ConnectionString => $"amqp://{Username}:{Password}@{Host}:{Port}";
 }
diff --git a/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs b/CleanArchitecture.Domain/Rabbitmq/RabbitMqHandler.cs
@@ -38,6 +38,8 @@ public override async Task StartAsync(CancellationToken cancellationToken)
             return;
         }
 
+        _logger.LogInformation("Starting RabbitMQ connection");
+
         var factory = new ConnectionFactory
         {
             AutomaticRecoveryEnabled = true,
@@ -49,6 +51,8 @@ public override async Task StartAsync(CancellationToken cancellationToken)
 
         var connection = await factory.CreateConnectionAsync(cancellationToken);
         _channel = await connection.CreateChannelAsync(null, cancellationToken);
+
+        await base.StartAsync(cancellationToken);
     }