Fixing database configuration

There is still broken dependencies when the module is in another assembly

Kyoo.Postgresql/Kyoo.Postgresql.csproj

@@ -16,11 +16,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.2" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.5.1" />
 	</ItemGroup>
 
 	<ItemGroup>

Kyoo.Postgresql/PostgresContext.cs

@@ -21,6 +21,11 @@ namespace Kyoo.Postgresql
 		/// Is this instance in debug mode?
 		/// </summary>
 		private readonly bool _debugMode;
+
+		/// <summary>
+		/// Should the configure step be skipped? This is used when the database is created via DbContextOptions.
+		/// </summary>
+		private readonly bool _skipConfigure;
 		
 		/// <summary>
 		/// A basic constructor that set default values (query tracker behaviors, mapping enums...)
@@ -32,6 +37,19 @@ namespace Kyoo.Postgresql
 			NpgsqlConnection.GlobalTypeMapper.MapEnum<StreamType>();
 		}
 
+		/// <summary>
+		/// Create a new <see cref="PostgresContext"/> using specific options
+		/// </summary>
+		/// <param name="options">The options to use.</param>
+		public PostgresContext(DbContextOptions options)
+			: base(options)
+		{
+			NpgsqlConnection.GlobalTypeMapper.MapEnum<Status>();
+			NpgsqlConnection.GlobalTypeMapper.MapEnum<ItemType>();
+			NpgsqlConnection.GlobalTypeMapper.MapEnum<StreamType>();
+			_skipConfigure = true;
+		}
+
 		/// <summary>
 		/// A basic constructor that set default values (query tracker behaviors, mapping enums...)
 		/// </summary>
@@ -49,10 +67,13 @@ namespace Kyoo.Postgresql
 		/// <param name="optionsBuilder">An option builder to fill.</param>
 		protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 		{
-			optionsBuilder.UseNpgsql(_connection);
-			if (_debugMode)
-				optionsBuilder.EnableDetailedErrors()
-					.EnableSensitiveDataLogging();
+			if (!_skipConfigure)
+			{
+				optionsBuilder.UseNpgsql(_connection);
+				if (_debugMode)
+					optionsBuilder.EnableDetailedErrors().EnableSensitiveDataLogging();
+			}
+
 			base.OnConfiguring(optionsBuilder);
 		}
 

Kyoo.Postgresql/PostgresModule.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Kyoo.Controllers;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -59,9 +60,16 @@ namespace Kyoo.Postgresql
 		/// <inheritdoc />
 		public void Configure(IServiceCollection services, ICollection<Type> availableTypes)
 		{
-			services.AddScoped<DatabaseContext>(_ => new PostgresContext(
-				_configuration.GetDatabaseConnection("postgres"), 
-				_environment.IsDevelopment()));
+			services.AddDbContext<DatabaseContext, PostgresContext>(x =>
+			{
+				x.UseNpgsql(_configuration.GetDatabaseConnection("postgres"));
+				if (_environment.IsDevelopment())
+					x.EnableDetailedErrors().EnableSensitiveDataLogging();
+			});
+			// services.AddScoped<DatabaseContext>(_ => new PostgresContext(
+			// 	_configuration.GetDatabaseConnection("postgres"), 
+			// 	_environment.IsDevelopment()));
+			// services.AddScoped<DbContext>(x => x.GetRequiredService<PostgresContext>());
 		}
 	}
 }