Merge pull request #23 from YPermitin/develop

Добавлена загрузка всех сущностей ФИАС + оптимизация массовых загрузок данных
YPermitin · Nov 15, 2023 · 27470bb · 27470bb
2 parents 78d5901 + 4dbcb39
commit 27470bb
Show file tree

Hide file tree

Showing 157 changed files with 35,087 additions and 241 deletions.
diff --git a/...in.FIASToolSet.DistributionDownloader/YPermitin.FIASToolSet.DistributionDownloader.csproj b/...in.FIASToolSet.DistributionDownloader/YPermitin.FIASToolSet.DistributionDownloader.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
@@ -13,9 +13,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/...Permitin.FIASToolSet.DistributionBrowser/YPermitin.FIASToolSet.DistributionBrowser.csproj b/...Permitin.FIASToolSet.DistributionBrowser/YPermitin.FIASToolSet.DistributionBrowser.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>disable</Nullable>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <DocumentationFile>YPermitin.FIASToolSet.Loader.xml</DocumentationFile>
@@ -20,8 +20,8 @@
 
   <ItemGroup>
     <PackageReference Include="Downloader" Version="3.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Libs/YPermitin.FIASToolSet.DistributionLoader/Extensions/LinqExtensions.cs b/Libs/YPermitin.FIASToolSet.DistributionLoader/Extensions/LinqExtensions.cs
@@ -0,0 +1,25 @@
+using System.Linq.Expressions;
+
+namespace YPermitin.FIASToolSet.DistributionLoader.Extensions;
+
+public static class LinqExtensions
+{
+    public static IQueryable<TResult> LeftJoin<TOuter, TInner, TKey, TResult> (
+        this IQueryable<TOuter> outer,
+        IQueryable<TInner> inner,
+        Expression<Func<TOuter, TKey>> outerKeySelector,
+        Expression<Func<TInner, TKey>> innerKeySelector,
+        Expression<Func<JoinResult<TOuter, TInner>, TResult>> resultSelector) {
+        var result = outer
+            .GroupJoin(inner, outerKeySelector, innerKeySelector, (outer1, inners) => new { outer1, inners = inners.DefaultIfEmpty() })
+            .SelectMany(row => row.inners, (row, inner1) => new JoinResult<TOuter, TInner> { Outer = row.outer1, Inner = inner1 })
+            .Select(resultSelector);
+
+        return result;
+    }
+
+    public class JoinResult<TOuter, TInner> {
+        public TOuter Outer { get; set; }
+        public TInner Inner { get; set; }
+    }
+}