From 3f2e86916d61967097bd32cb89fef26fb8bc8774 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Mon, 2 Jun 2025 19:59:47 +0800
Subject: [PATCH] :wastebasket: Remove duplicate datasource builder

---
 DysonNetwork.Sphere/AppDatabase.cs                  | 13 +++----------
 .../Storage/FileService.ReferenceMigration.cs       |  1 -
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/DysonNetwork.Sphere/AppDatabase.cs b/DysonNetwork.Sphere/AppDatabase.cs
index b2e6c89..e965c01 100644
--- a/DysonNetwork.Sphere/AppDatabase.cs
+++ b/DysonNetwork.Sphere/AppDatabase.cs
@@ -85,17 +85,10 @@ public class AppDatabase(
 
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {
-        var dataSourceBuilder = new NpgsqlDataSourceBuilder(configuration.GetConnectionString("App"));
-        dataSourceBuilder.EnableDynamicJson();
-        dataSourceBuilder.UseNetTopologySuite();
-        dataSourceBuilder.UseNodaTime();
-
-        if (configuration.GetValue<bool>("Debug"))
-            optionsBuilder.EnableSensitiveDataLogging();
-
         optionsBuilder.UseNpgsql(
-            dataSourceBuilder.Build(),
+            configuration.GetConnectionString("App"),
             opt => opt
+                .ConfigureDataSource(optSource => optSource.EnableDynamicJson())
                 .UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery)
                 .UseNetTopologySuite()
                 .UseNodaTime()
@@ -374,7 +367,7 @@ public static class OptionalQueryExtensions
     {
         return condition ? transform(source) : source;
     }
-    
+
     public static IQueryable<T> If<T, TP>(
         this IIncludableQueryable<T, TP> source,
         bool condition,
diff --git a/DysonNetwork.Sphere/Storage/FileService.ReferenceMigration.cs b/DysonNetwork.Sphere/Storage/FileService.ReferenceMigration.cs
index f311ab3..548fa02 100644
--- a/DysonNetwork.Sphere/Storage/FileService.ReferenceMigration.cs
+++ b/DysonNetwork.Sphere/Storage/FileService.ReferenceMigration.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel.DataAnnotations;
 using Microsoft.EntityFrameworkCore;
 
 namespace DysonNetwork.Sphere.Storage;