Улучшение миграций SQL Server и подготовка к добавлению поддержки Cli…

…ckHouse

- Приведена в порядок миграция для SQL Server. Убраны лишние версии миграций.
- Небольшой рефакторинг
- Подготовка для добавления поддержки ClickHouse

Libs/YPermitin.FIASToolSet.Storage.ClickHouse/ServiceRegistration.cs

@@ -1,6 +1,30 @@
-namespace YPermitin.FIASToolSet.Storage.ClickHouse
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace YPermitin.FIASToolSet.Storage.ClickHouse
 {
     public static class ServiceRegistration
     {
+        public static void AddFIASStorageOnClickHouse(this IServiceCollection services, IConfiguration configuration)
+        {
+
+
+            /*services.AddScoped<IFIASMaintenanceRepository, FIASMaintenanceRepository>();
+            services.AddScoped<IFIASInstallationManagerRepository, FIASInstallationManagerRepository>();
+            services.AddScoped<IFIASBaseCatalogsRepository, FIASBaseCatalogsRepository>();
+            services.AddScoped<IFIASClassifierDataRepository, FIASClassifierDataRepository>();*/
+        }
+
+        public static void UseFIASStorageOnClickHouse(this IApplicationBuilder app)
+        {
+            /*using (var scope = app.ApplicationServices.CreateScope())
+            {
+                var dbContext = scope.ServiceProvider
+                    .GetRequiredService<FIASToolSetServiceContext>();
+
+                dbContext.Database.Migrate();
+            }*/
+        }
     }
 }

Libs/YPermitin.FIASToolSet.Storage.ClickHouse/YPermitin.FIASToolSet.Storage.ClickHouse.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>disable</Nullable>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="ClickHouse.Client" Version="5.1.0" />
-    <PackageReference Include="Dapper" Version="2.0.123" />
-  </ItemGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\YPermitin.FIASToolSet.Storage.Core\YPermitin.FIASToolSet.Storage.Core.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\YPermitin.FIASToolSet.Storage.Core\YPermitin.FIASToolSet.Storage.Core.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+      <PackageReference Include="ClickHouse.Client" Version="6.8.1" />
+      <PackageReference Include="Dapper" Version="2.1.24" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="DbContexts\" />
-    <Folder Include="Services\" />
-  </ItemGroup>
+    <ItemGroup>
+      <Folder Include="Migrations\" />
+      <Folder Include="Services\" />
+    </ItemGroup>
 
 </Project>

Libs/YPermitin.FIASToolSet.Storage.SQLServer/DbContexts/FIASToolSetServiceContext.cs

@@ -86,8 +86,6 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
-            base.OnModelCreating(modelBuilder);
-
             #region NotificationStatus
 
             modelBuilder.Entity<NotificationStatus>()
@@ -599,6 +597,22 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .ValueGeneratedNever();
 
             #endregion
+
+            #region GlobalSettings
+
+            foreach (var entityType in modelBuilder.Model.GetEntityTypes())
+            {
+                entityType.SetTableName(entityType.DisplayName());
+
+                entityType.GetForeignKeys()
+                    .Where(fk => !fk.IsOwnership && fk.DeleteBehavior == DeleteBehavior.Cascade)
+                    .ToList()
+                    .ForEach(fk => fk.DeleteBehavior = DeleteBehavior.Restrict);
+            }
+
+            #endregion
+
+            base.OnModelCreating(modelBuilder);
         }
     }
 }