Template update

PandaTechAM · Feb 28, 2025 · dad2745 · dad2745
1 parent d85b5b0
commit dad2745
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 26 deletions.
diff --git a/src/Pandatech.VerticalSlices/Pandatech.VerticalSlices.csproj b/src/Pandatech.VerticalSlices/Pandatech.VerticalSlices.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <ItemGroup>
-        <PackageReference Include="Hangfire" Version="1.8.17" />
+        <PackageReference Include="Hangfire" Version="1.8.18" />
         <PackageReference Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1"/>
-        <PackageReference Include="Hangfire.EntityFrameworkCore" Version="0.6.0"/>
+        <PackageReference Include="Hangfire.EntityFrameworkCore" Version="0.7.0" />
         <PackageReference Include="Hangfire.PostgreSql" Version="1.20.10" />
-        <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.4" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-        <PackageReference Include="Pandatech.Communicator" Version="2.1.1" />
-        <PackageReference Include="Pandatech.MassTransit.PostgresOutbox" Version="2.0.2" />
-        <PackageReference Include="Pandatech.SharedKernel" Version="1.1.1" />
-        <PackageReference Include="Pandatech.SharedKernel.Postgres" Version="1.0.15" />
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+        <PackageReference Include="MassTransit.RabbitMQ" Version="8.3.6" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+        <PackageReference Include="Pandatech.Communicator" Version="2.1.2" />
+        <PackageReference Include="Pandatech.MassTransit.PostgresOutbox" Version="2.0.3" />
+        <PackageReference Include="Pandatech.SharedKernel" Version="1.2.10" />
+        <PackageReference Include="Pandatech.SharedKernel.Postgres" Version="1.0.18" />
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Pandatech.VerticalSlices/Program.cs b/src/Pandatech.VerticalSlices/Program.cs
@@ -1,4 +1,5 @@
 using Communicator.Extensions;
+using DistributedCache.Extensions;
 using DistributedCache.Options;
 using FluentMinimalApiMapper;
 using GridifyExtensions.Extensions;
@@ -23,7 +24,7 @@
 
 builder.LogStartAttempt();
 AssemblyRegistry.Add(typeof(Program).Assembly);
-
+var repoName = builder.Environment.GetShortEnvironmentName() + ":" + builder.Configuration.GetRepositoryName();
 builder
    .ConfigureWithPandaVault()
    .AddSerilog()
@@ -35,8 +36,12 @@
    .AddControllers(AssemblyRegistry.ToArray())
    .AddMediatrWithBehaviors(AssemblyRegistry.ToArray())
    .AddResilienceDefaultPipeline()
-   .AddRedis(KeyPrefix.AssemblyNamePrefix)
-   .AddDistributedSignalR("DistributedSignalR")
+   .AddDistributedCache(o =>
+   {
+      o.RedisConnectionString = builder.Configuration.GetRedisUrl();
+      o.ChannelPrefix = repoName;
+   })
+   .AddDistributedSignalR(builder.Configuration.GetRedisUrl(), repoName + ":SignalR")
    .MapDefaultTimeZone()
    .AddCors()
    .AddPostgresContextPool<PostgresContext>(builder.Configuration.GetPostgresUrl())

diff --git a/src/Pandatech.VerticalSlices/SharedKernel/Extensions/ConfigurationExtensions.cs b/src/Pandatech.VerticalSlices/SharedKernel/Extensions/ConfigurationExtensions.cs
@@ -3,23 +3,29 @@ namespace Pandatech.VerticalSlices.SharedKernel.Extensions;
 public static class ConfigurationExtensions
 {
    private const string AesKeyConfigurationPath = "Security:AESKey";
+   private const string RepositoryNameConfigurationPath = "RepositoryName";
+   private const string RedisConfigurationPath = "Redis";
    private const string RabbitMqConfigurationPath = "RabbitMq";
    private const string PostgresConfigurationPath = "Postgres";
    private const string HangfireUserConfigurationPath = "Security:Hangfire:Username";
    private const string HangfirePasswordConfigurationPath = "Security:Hangfire:Password";
    private const string SuperUsernameConfigurationPath = "Security:SuperUser:Username";
    private const string SuperUserPasswordConfigurationPath = "Security:SuperUser:Password";
-   private const string PersistentConfigurationPath = "PersistentStorage";
    private const string CookieDomainConfigurationPath = "Security:CookieDomain";
 
-   public static string GetPersistentPath(this IConfiguration configuration)
+   public static string GetAesKey(this IConfiguration configuration)
    {
-      return configuration.GetConnectionString(PersistentConfigurationPath)!;
+      return configuration[AesKeyConfigurationPath]!;
    }
 
-   public static string GetAesKey(this IConfiguration configuration)
+   public static string GetRepositoryName(this IConfiguration configuration)
    {
-      return configuration[AesKeyConfigurationPath]!;
+      return configuration[RepositoryNameConfigurationPath]!;
+   }
+
+   public static string GetRedisUrl(this IConfiguration configuration)
+   {
+      return configuration.GetConnectionString(RedisConfigurationPath)!;
    }
 
    public static string GetRabbitMqUrl(this IConfiguration configuration)
@@ -31,10 +37,12 @@ public static string GetPostgresUrl(this IConfiguration configuration)
    {
       return configuration.GetConnectionString(PostgresConfigurationPath)!;
    }
+
    public static string GetHangfireUsername(this IConfiguration configuration)
    {
       return configuration[HangfireUserConfigurationPath]!;
    }
+
    public static string GetHangfirePassword(this IConfiguration configuration)
    {
       return configuration[HangfirePasswordConfigurationPath]!;

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

diff --git a/test/Pandatech.VerticalSlices.Tests/Pandatech.VerticalSlices.Tests.csproj b/test/Pandatech.VerticalSlices.Tests/Pandatech.VerticalSlices.Tests.csproj
@@ -6,18 +6,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bogus" Version="35.6.1" />
+        <PackageReference Include="Bogus" Version="35.6.2" />
         <PackageReference Include="FluentAssertions" Version="[7.1.0]" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
         <PackageReference Include="Respawn" Version="6.2.1"/>
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Testcontainers.PostgreSql" Version="4.1.0" />
+        <PackageReference Include="Testcontainers.PostgreSql" Version="4.3.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>