Skip to content

Commit dad2745

Browse files
HaikAsatryanHaikAsatryan
committed
Template update
1 parent d85b5b0 commit dad2745

File tree

5 files changed

+39
-26
lines changed

5 files changed

+39
-26
lines changed

‎src/Pandatech.VerticalSlices/Pandatech.VerticalSlices.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<ItemGroup>
4-
<PackageReference Include="Hangfire" Version="1.8.17" />
4+
<PackageReference Include="Hangfire" Version="1.8.18" />
55
<PackageReference Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1"/>
6-
<PackageReference Include="Hangfire.EntityFrameworkCore" Version="0.6.0"/>
6+
<PackageReference Include="Hangfire.EntityFrameworkCore" Version="0.7.0" />
77
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.10" />
8-
<PackageReference Include="MassTransit.RabbitMQ" Version="8.3.4" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
11-
<PackageReference Include="Pandatech.Communicator" Version="2.1.1" />
12-
<PackageReference Include="Pandatech.MassTransit.PostgresOutbox" Version="2.0.2" />
13-
<PackageReference Include="Pandatech.SharedKernel" Version="1.1.1" />
14-
<PackageReference Include="Pandatech.SharedKernel.Postgres" Version="1.0.15" />
15-
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
8+
<PackageReference Include="MassTransit.RabbitMQ" Version="8.3.6" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.2" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
11+
<PackageReference Include="Pandatech.Communicator" Version="2.1.2" />
12+
<PackageReference Include="Pandatech.MassTransit.PostgresOutbox" Version="2.0.3" />
13+
<PackageReference Include="Pandatech.SharedKernel" Version="1.2.10" />
14+
<PackageReference Include="Pandatech.SharedKernel.Postgres" Version="1.0.18" />
15+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Pandatech.VerticalSlices/Program.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Communicator.Extensions;
2+
using DistributedCache.Extensions;
23
using DistributedCache.Options;
34
using FluentMinimalApiMapper;
45
using GridifyExtensions.Extensions;
@@ -23,7 +24,7 @@
2324

2425
builder.LogStartAttempt();
2526
AssemblyRegistry.Add(typeof(Program).Assembly);
26-
27+
var repoName = builder.Environment.GetShortEnvironmentName() + ":" + builder.Configuration.GetRepositoryName();
2728
builder
2829
.ConfigureWithPandaVault()
2930
.AddSerilog()
@@ -35,8 +36,12 @@
3536
.AddControllers(AssemblyRegistry.ToArray())
3637
.AddMediatrWithBehaviors(AssemblyRegistry.ToArray())
3738
.AddResilienceDefaultPipeline()
38-
.AddRedis(KeyPrefix.AssemblyNamePrefix)
39-
.AddDistributedSignalR("DistributedSignalR")
39+
.AddDistributedCache(o =>
40+
{
41+
o.RedisConnectionString = builder.Configuration.GetRedisUrl();
42+
o.ChannelPrefix = repoName;
43+
})
44+
.AddDistributedSignalR(builder.Configuration.GetRedisUrl(), repoName + ":SignalR")
4045
.MapDefaultTimeZone()
4146
.AddCors()
4247
.AddPostgresContextPool<PostgresContext>(builder.Configuration.GetPostgresUrl())

‎src/Pandatech.VerticalSlices/SharedKernel/Extensions/ConfigurationExtensions.cs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,29 @@ namespace Pandatech.VerticalSlices.SharedKernel.Extensions;
33
public static class ConfigurationExtensions
44
{
55
private const string AesKeyConfigurationPath = "Security:AESKey";
6+
private const string RepositoryNameConfigurationPath = "RepositoryName";
7+
private const string RedisConfigurationPath = "Redis";
68
private const string RabbitMqConfigurationPath = "RabbitMq";
79
private const string PostgresConfigurationPath = "Postgres";
810
private const string HangfireUserConfigurationPath = "Security:Hangfire:Username";
911
private const string HangfirePasswordConfigurationPath = "Security:Hangfire:Password";
1012
private const string SuperUsernameConfigurationPath = "Security:SuperUser:Username";
1113
private const string SuperUserPasswordConfigurationPath = "Security:SuperUser:Password";
12-
private const string PersistentConfigurationPath = "PersistentStorage";
1314
private const string CookieDomainConfigurationPath = "Security:CookieDomain";
1415

15-
public static string GetPersistentPath(this IConfiguration configuration)
16+
public static string GetAesKey(this IConfiguration configuration)
1617
{
17-
return configuration.GetConnectionString(PersistentConfigurationPath)!;
18+
return configuration[AesKeyConfigurationPath]!;
1819
}
1920

20-
public static string GetAesKey(this IConfiguration configuration)
21+
public static string GetRepositoryName(this IConfiguration configuration)
2122
{
22-
return configuration[AesKeyConfigurationPath]!;
23+
return configuration[RepositoryNameConfigurationPath]!;
24+
}
25+
26+
public static string GetRedisUrl(this IConfiguration configuration)
27+
{
28+
return configuration.GetConnectionString(RedisConfigurationPath)!;
2329
}
2430

2531
public static string GetRabbitMqUrl(this IConfiguration configuration)
@@ -31,10 +37,12 @@ public static string GetPostgresUrl(this IConfiguration configuration)
3137
{
3238
return configuration.GetConnectionString(PostgresConfigurationPath)!;
3339
}
40+
3441
public static string GetHangfireUsername(this IConfiguration configuration)
3542
{
3643
return configuration[HangfireUserConfigurationPath]!;
3744
}
45+
3846
public static string GetHangfirePassword(this IConfiguration configuration)
3947
{
4048
return configuration[HangfirePasswordConfigurationPath]!;

‎src/Pandatech.VerticalSlices/appsettings.Production.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"MinimumLevel": {
44
"Default": "Information",
55
"Override": {
6-
"Microsoft": "Information",
7-
"System": "Information"
6+
"Microsoft": "Warning",
7+
"System": "Warning"
88
}
99
}
1010
},

‎test/Pandatech.VerticalSlices.Tests/Pandatech.VerticalSlices.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Bogus" Version="35.6.1" />
9+
<PackageReference Include="Bogus" Version="35.6.2" />
1010
<PackageReference Include="FluentAssertions" Version="[7.1.0]" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.2" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1313
<PackageReference Include="Respawn" Version="6.2.1"/>
14-
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200">
14+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.6.0.109712">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>
18-
<PackageReference Include="Testcontainers.PostgreSql" Version="4.1.0" />
18+
<PackageReference Include="Testcontainers.PostgreSql" Version="4.3.0" />
1919
<PackageReference Include="xunit" Version="2.9.3" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
20+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

0 commit comments

Comments
 (0)