Fix ProcessMapPlanRepository.GetAsync(..)

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;
 
@@ -20,54 +22,69 @@ public class ProcessMapPlanRepository<TDto, TEntity> : CrudWellRelatedRepository
     private readonly IWellService wellService;
 
     public ProcessMapPlanRepository(IAsbCloudDbContext context, IWellService wellService)
-	   : base(context, dbSet =>
+       : base(context, dbSet =>
-		  dbSet
+          dbSet
-			 .Include(p => p.WellSectionType)
+             .Include(p => p.WellSectionType)
-			 .Include(p => p.Well))
+             .Include(p => p.Well))
     {
-	   this.wellService = wellService;
+        this.wellService = wellService;
     }
 
     public async Task<IEnumerable<TDto>> GetAsync(IEnumerable<ProcessMapPlanRequest> requests, CancellationToken cancellationToken)
     {
-	   var query = BuildQuery(requests);
+        var query = BuildQuery(requests);
 
-	   var entities = await query.ToArrayAsync(cancellationToken);
+        var entities = await query.ToArrayAsync(cancellationToken);
 
-	   return entities.Select(Convert);
+        return entities.Select(Convert);
     }
 
     public Task<int> RemoveByWellAsync(int idWell)
     {
-	   var query = GetQuery().Where(x => x.IdWell == idWell);
+        var query = GetQuery().Where(x => x.IdWell == idWell);
 
-	   dbSet.RemoveRange(query);
+        dbSet.RemoveRange(query);
 
-	   return dbContext.SaveChangesAsync(CancellationToken.None);
+        return dbContext.SaveChangesAsync(CancellationToken.None);
     }
 
     private IQueryable<TEntity> BuildQuery(IEnumerable<ProcessMapPlanRequest> requests)
     {
-	   var query = GetQuery();
+        var queries = requests
+            .Select(request => BuildQuery(request))
+            .ToArray();
+     
+        var query = queries.FirstOrDefault()
+            ?? throw new ArgumentInvalidException(nameof(requests), "Пустые запросы недопустимы");
 
-	   foreach (var request in requests)
+        for ( var i = 1; i < queries.Length; i++)
-	   {
+            query = query.Union(queries[i]);
-		  query = query.Where(p => p.IdWell == request.IdWell);
 
-		  if (request.IdWellSectionType is not null)
+        query = query
-			 query = query.Where(p => p.IdWellSectionType == request.IdWellSectionType);
+            .Distinct()
+            .OrderBy(e => e.DepthStart)
+            .ThenBy(e => e.Id)
+            .AsNoTracking();
 
-		  if (request.UpdateFrom is not null)
+        return query;
-		  {
+    }
-			 var timezone = wellService.GetTimezone(request.IdWell);
-			 var updateFromUtc = request.UpdateFrom?.ToUtcDateTimeOffset(timezone.Hours);
 
-			 query = query.Where(p => p.LastUpdate >= updateFromUtc);
+    private IQueryable<TEntity> BuildQuery(ProcessMapPlanRequest request)
-		  }
+    {
-	   }
+        var query = GetQuery();
+         
+        query = query.Where(p => p.IdWell == request.IdWell);
 
-	   return query.OrderBy(e => e.DepthStart)
+        if (request.IdWellSectionType is not null)
-		  .ThenBy(e => e.Id)
+            query = query.Where(p => p.IdWellSectionType == request.IdWellSectionType);
-		  .AsNoTracking();
+
+        if (request.UpdateFrom is not null)
+        {
+            var timezone = wellService.GetTimezone(request.IdWell);
+            var updateFromUtc = request.UpdateFrom?.ToUtcDateTimeOffset(timezone.Hours);
+
+            query = query.Where(p => p.LastUpdate >= updateFromUtc);
+        }
+        return query;
     }
 }