upgraded

PandaTechAM · Feb 28, 2025 · cf77f7d · cf77f7d
1 parent 275217a
commit cf77f7d
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 19 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,28 +1,28 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="FluentAssertions" Version="[7.1.0]" />
-    <PackageVersion Include="Hangfire" Version="1.8.17" />
+    <PackageVersion Include="Hangfire" Version="1.8.18" />
     <PackageVersion Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1" />
-    <PackageVersion Include="Hangfire.EntityFrameworkCore" Version="0.6.0" />
+    <PackageVersion Include="Hangfire.EntityFrameworkCore" Version="0.7.0" />
     <PackageVersion Include="Hangfire.PostgreSql" Version="1.20.10" />
-    <PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1">
+    <PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1">
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
     <PackageVersion Include="Otp.NET" Version="1.3.0" />
-    <PackageVersion Include="Pandatech.CommissionCalculator" Version="4.0.0" />
-    <PackageVersion Include="Pandatech.Communicator" Version="2.1.1" />
-    <PackageVersion Include="Pandatech.MassTransit.PostgresOutbox" Version="2.0.2" />
-    <PackageVersion Include="Pandatech.SharedKernel" Version="1.1.1" />
-    <PackageVersion Include="Pandatech.SharedKernel.Postgres" Version="1.0.15" />
-    <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.5.0.109200">
+    <PackageVersion Include="Pandatech.CommissionCalculator" Version="4.0.1" />
+    <PackageVersion Include="Pandatech.Communicator" Version="2.1.2" />
+    <PackageVersion Include="Pandatech.MassTransit.PostgresOutbox" Version="2.0.3" />
+    <PackageVersion Include="Pandatech.SharedKernel" Version="1.2.10" />
+    <PackageVersion Include="Pandatech.SharedKernel.Postgres" Version="1.0.18" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
@@ -32,7 +32,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
     <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1">
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>

diff --git a/src/Pandatech.CleanArchitecture.Api/appsettings.Production.json b/src/Pandatech.CleanArchitecture.Api/appsettings.Production.json
@@ -3,8 +3,8 @@
     "MinimumLevel": {
       "Default": "Information",
       "Override": {
-        "Microsoft": "Information",
-        "System": "Information"
+        "Microsoft": "Warning",
+        "System": "Warning"
       }
     }
   },

diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/DependencyInjection.cs b/src/Pandatech.CleanArchitecture.Infrastructure/DependencyInjection.cs
@@ -1,4 +1,5 @@
 using Communicator.Extensions;
+using DistributedCache.Extensions;
 using DistributedCache.Options;
 using GridifyExtensions.Extensions;
 using MassTransit.PostgresOutbox.Extensions;
@@ -19,13 +20,18 @@ public static class DependencyInjection
    public static WebApplicationBuilder AddInfrastructureLayer(this WebApplicationBuilder builder)
    {
       AssemblyRegistry.Add(typeof(AssemblyReference).Assembly);
+      var repoName = builder.Environment.GetShortEnvironmentName() + ":" + builder.Configuration.GetRepositoryName();
 
       builder
          .AddSerilog()
          .AddOpenTelemetry()
          .AddResilienceDefaultPipeline()
-         .AddRedis(KeyPrefix.AssemblyNamePrefix)
-         .AddDistributedSignalR("DistributedSignalR")
+         .AddDistributedCache(o =>
+         {
+            o.RedisConnectionString = builder.Configuration.GetRedisUrl();
+            o.ChannelPrefix = repoName;
+         })
+         .AddDistributedSignalR(builder.Configuration.GetRedisUrl(), repoName + ":SignalR")
          .AddPostgresContextPool<PostgresContext>(builder.Configuration.GetPostgresUrl())
          .AddMassTransit(AssemblyRegistry.ToArray())
          .AddCommunicator()

diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/ConfigurationExtensions.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/ConfigurationExtensions.cs
@@ -6,6 +6,8 @@ public static class ConfigurationExtensions
 {
    private const string AesKeyConfigurationPath = "Security:AESKey";
    private const string RabbitMqConfigurationPath = "RabbitMq";
+   private const string RepositoryNameConfigurationPath = "RepositoryName";
+   private const string RedisConfigurationPath = "Redis";
    private const string PostgresConfigurationPath = "Postgres";
    private const string HangfireUserConfigurationPath = "Security:Hangfire:Username";
    private const string HangfirePasswordConfigurationPath = "Security:Hangfire:Password";
@@ -23,6 +25,15 @@ public static string GetAesKey(this IConfiguration configuration)
    {
       return configuration[AesKeyConfigurationPath]!;
    }
+   public static string GetRepositoryName(this IConfiguration configuration)
+   {
+      return configuration[RepositoryNameConfigurationPath]!;
+   }
+
+   public static string GetRedisUrl(this IConfiguration configuration)
+   {
+      return configuration.GetConnectionString(RedisConfigurationPath)!;
+   }
 
    public static string GetRabbitMqUrl(this IConfiguration configuration)
    {

diff --git a/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/MassTransitExtension.cs b/src/Pandatech.CleanArchitecture.Infrastructure/Extensions/MassTransitExtension.cs
@@ -16,7 +16,6 @@ public static WebApplicationBuilder AddMassTransit(this WebApplicationBuilder bu
       {
          x.AddConsumers(assemblies);
          x.SetKebabCaseEndpointNameFormatter();
-
          x.UsingRabbitMq((context, cfg) =>
          {
             cfg.Host(builder.Configuration.GetRabbitMqUrl());
@@ -46,14 +45,22 @@ public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context
          Uri = new Uri(rmqConnectionString),
          AutomaticRecoveryEnabled = true
       };
+      var connection = default(IConnection);
       try
       {
-         await factory.CreateConnectionAsync(cancellationToken);
+         connection = await factory.CreateConnectionAsync(cancellationToken);
          return HealthCheckResult.Healthy("RabbitMQ is healthy.");
       }
       catch (Exception e)
       {
          return HealthCheckResult.Unhealthy("RabbitMQ is unhealthy.", e);
       }
+      finally
+      {
+         if (connection is not null)
+         {
+            await connection.CloseAsync(cancellationToken);
+         }
+      }
    }
 }