Improved Base Context Factory

andrey-serdyuk · andrey-serdyuk · commit cdcbeebce907 · 2025-10-31T10:36:58.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>true</IsPackable>
-		<Version>2.1.9</Version>
+		<Version>2.1.10</Version>
 		<Authors>Andrey Serdyuk</Authors>
 		<Company>TaskHub</Company>
 		<PackageTags>#TaskHub</PackageTags>
diff --git a/TaskHub.Shared.Infrastructure.EfCore/Factories/ContextFactory.cs b/TaskHub.Shared.Infrastructure.EfCore/Factories/ContextFactory.cs
@@ -7,15 +7,18 @@ public abstract class ContextFactoryBase<TFactory, TContext>
     where TFactory : class 
     where TContext : DbContext
 {
-    public DbContextOptions<TContext> BuildOptions(IConfiguration configuration, string connString)
+    public DbContextOptions<TContext> BuildOptions(string connString)
     {
-        var cs = configuration.GetConnectionString(connString) ?? 
+        var config = new ConfigurationBuilder()
+            .AddUserSecrets<TContext>(optional: false)
+            .AddEnvironmentVariables()
+            .Build();
+
+        var cs = config.GetConnectionString(connString) ?? 
             throw new InvalidOperationException($"Connection string {connString} not found in user-secrets.");
 
-        var res = (new DbContextOptionsBuilder<TContext>()
+        return new DbContextOptionsBuilder<TContext>()
             .UseNpgsql(cs, o => o.UseNetTopologySuite())
-            .Options);
-
-        return res;
+            .Options;
     }
 }
diff --git a/TaskHub.Shared.Infrastructure.EfCore/TaskHub.Shared.Infrastructure.EfCore.csproj b/TaskHub.Shared.Infrastructure.EfCore/TaskHub.Shared.Infrastructure.EfCore.csproj
@@ -5,6 +5,9 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.10" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.10" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
 		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.4" />
 	</ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,18 @@ public abstract class ContextFactoryBase<TFactory, TContext>`
`7`	`7`	`where TFactory : class`
`8`	`8`	`where TContext : DbContext`
`9`	`9`	`{`
`10`		`- public DbContextOptions<TContext> BuildOptions(IConfiguration configuration, string connString)`
	`10`	`+ public DbContextOptions<TContext> BuildOptions(string connString)`
`11`	`11`	`{`
`12`		`- var cs = configuration.GetConnectionString(connString) ??`
	`12`	`+ var config = new ConfigurationBuilder()`
	`13`	`+ .AddUserSecrets<TContext>(optional: false)`
	`14`	`+ .AddEnvironmentVariables()`
	`15`	`+ .Build();`
	`16`	`+`
	`17`	`+ var cs = config.GetConnectionString(connString) ??`
`13`	`18`	`throw new InvalidOperationException($"Connection string {connString} not found in user-secrets.");`
`14`	`19`
`15`		`- var res = (new DbContextOptionsBuilder<TContext>()`
	`20`	`+ return new DbContextOptionsBuilder<TContext>()`
`16`	`21`	`.UseNpgsql(cs, o => o.UseNetTopologySuite())`
`17`		`- .Options);`
`18`		`-`
`19`		`- return res;`
	`22`	`+ .Options;`
`20`	`23`	`}`
`21`	`24`	`}`