⏪ Rollback some changes in drive

DysonNetwork.Drive/AppDatabase.cs

@@ -27,7 +27,6 @@ public class AppDatabase(
     public DbSet<SnCloudFileIndex> FileIndexes { get; set; }
 
     public DbSet<PersistentTask> Tasks { get; set; } = null!;
-    public DbSet<PersistentUploadTask> UploadTasks { get; set; } = null!; // Backward compatibility
     
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
@@ -42,18 +41,6 @@ public class AppDatabase(
         base.OnConfiguring(optionsBuilder);
     }
 
-    public static void ConfigureOptions(IServiceProvider serviceProvider, DbContextOptionsBuilder optionsBuilder)
-    {
-        var configuration = serviceProvider.GetRequiredService<IConfiguration>();
-        optionsBuilder.UseNpgsql(
-            configuration.GetConnectionString("App"),
-            opt => opt
-                .ConfigureDataSource(optSource => optSource.EnableDynamicJson())
-                .UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery)
-                .UseNodaTime()
-        ).UseSnakeCaseNamingConvention();
-    }
-
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         base.OnModelCreating(modelBuilder);

DysonNetwork.Drive/Startup/ServiceCollectionExtensions.cs

@@ -9,9 +9,11 @@ namespace DysonNetwork.Drive.Startup;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddAppServices(this IServiceCollection services, IConfiguration configuration)
+    extension(IServiceCollection services)
     {
-        services.AddDbContextPool<AppDatabase>(AppDatabase.ConfigureOptions);
+        public IServiceCollection AddAppServices(IConfiguration configuration)
+        {
+            services.AddDbContext<AppDatabase>();
             services.AddHttpContextAccessor();
 
             services.AddHttpClient();
@@ -37,20 +39,20 @@ public static class ServiceCollectionExtensions
             return services;
         }
 
-    public static IServiceCollection AddAppAuthentication(this IServiceCollection services)
+        public IServiceCollection AddAppAuthentication()
         {
             services.AddAuthorization();
             return services;
         }
 
-    public static IServiceCollection AddAppFlushHandlers(this IServiceCollection services)
+        public IServiceCollection AddAppFlushHandlers()
         {
             services.AddSingleton<FlushBufferService>();
 
             return services;
         }
 
-    public static IServiceCollection AddAppBusinessServices(this IServiceCollection services)
+        public IServiceCollection AddAppBusinessServices()
         {
             services.AddScoped<Storage.FileService>();
             services.AddScoped<Storage.FileReferenceService>();
@@ -63,4 +65,5 @@ public static class ServiceCollectionExtensions
 
             return services;
         }
+    }
 }