Merge branch 'dev' into fix/create-workers

AsbCloudInfrastructure/Repository/ProcessMapPlanRepository.cs

@@ -3,12 +3,14 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using AsbCloudApp.Data.ProcessMaps;
+using AsbCloudApp.Exceptions;
 using AsbCloudApp.Repositories;
 using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
 using AsbCloudDb.Model.ProcessMaps;
 using Microsoft.EntityFrameworkCore;
+using Org.BouncyCastle.Asn1.Ocsp;
 
 namespace AsbCloudInfrastructure.Repository;
 
@@ -47,11 +49,30 @@ public class ProcessMapPlanRepository<TDto, TEntity> : CrudWellRelatedRepository
     }
 
     private IQueryable<TEntity> BuildQuery(IEnumerable<ProcessMapPlanRequest> requests)
+    {
+        var queries = requests
+            .Select(request => BuildQuery(request))
+            .ToArray();
+     
+        var query = queries.FirstOrDefault()
+            ?? throw new ArgumentInvalidException(nameof(requests), "Пустые запросы недопустимы");
+
+        for ( var i = 1; i < queries.Length; i++)
+            query = query.Union(queries[i]);
+
+        query = query
+            .Distinct()
+            .OrderBy(e => e.DepthStart)
+            .ThenBy(e => e.Id)
+            .AsNoTracking();
+
+        return query;
+    }
+
+    private IQueryable<TEntity> BuildQuery(ProcessMapPlanRequest request)
     {
         var query = GetQuery();
          
-	   foreach (var request in requests)
-	   {
         query = query.Where(p => p.IdWell == request.IdWell);
 
         if (request.IdWellSectionType is not null)
@@ -64,10 +85,6 @@ public class ProcessMapPlanRepository<TDto, TEntity> : CrudWellRelatedRepository
 
             query = query.Where(p => p.LastUpdate >= updateFromUtc);
         }
-	   }
-
-	   return query.OrderBy(e => e.DepthStart)
-		  .ThenBy(e => e.Id)
-		  .AsNoTracking();
+        return query;
     }
 }