From 89278819cc2c4010d6edb37c5db7b4150921785e Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Mon, 6 May 2024 10:49:47 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D0=B3=D0=BE?=
 =?UTF-8?q?=20=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=B0=20=D0=93?=
 =?UTF-8?q?=D0=93=D0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repository/WellOperationRepository.cs     | 23 +++++++++----------
 .../WellOperations/WellOperationExport.cs     |  2 --
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs
index 9bcc718b..522895a7 100644
--- a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs
+++ b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs
@@ -54,15 +54,15 @@ public class WellOperationRepository : CrudRepositoryBase<WellOperationDto, Well
 
     public async Task<PaginationContainer<WellOperationDto>> GetPageAsync(WellOperationRequest request, CancellationToken token)
     {
-        var skip = request.Skip ?? 0;
-        var take = request.Take ?? 32;
+        request.Skip = request.Skip ?? 0;
+        request.Take = request.Take ?? 32;
 
         var (items, count) = await GetWithDaysAndNpvAsync(request, token);
 
         var paginationContainer = new PaginationContainer<WellOperationDto>
         {
-            Skip = skip,
-            Take = take,
+            Skip = request.Skip!.Value,
+            Take = request.Take!.Value,
             Count = count,
             Items = items
         };
@@ -178,9 +178,6 @@ public class WellOperationRepository : CrudRepositoryBase<WellOperationDto, Well
 
     private async Task<(IEnumerable<WellOperationDto> items, int count)> GetWithDaysAndNpvAsync(WellOperationRequest request, CancellationToken token)
     {
-        var skip = request.Skip ?? 0;
-        var take = request.Take ?? 32;
-
         var entities = await GetByIdsWells(request.IdsWell, token);
         var groupedByWellAndType = entities
             .GroupBy(e => new { e.IdWell, e.IdType });
@@ -198,11 +195,14 @@ public class WellOperationRepository : CrudRepositoryBase<WellOperationDto, Well
 
             IEnumerable<WellOperation> filteredWellOperations = FilterByRequest(wellOperationsWithType.AsQueryable(), request);
 
-            var filteredWellOperationsPart = filteredWellOperations
-                .Skip(skip)
-                .Take(take);
+            count += filteredWellOperations.Count();
 
-            var dtos = filteredWellOperationsPart
+            if (request.Skip != null)
+                filteredWellOperations = filteredWellOperations.Skip((int)request.Skip);
+            if (request.Take != null)
+                filteredWellOperations = filteredWellOperations.Take((int)request.Take);
+
+            var dtos = filteredWellOperations
                 .Select(entity =>
                 {
                     var dto = Convert(entity);
@@ -214,7 +214,6 @@ public class WellOperationRepository : CrudRepositoryBase<WellOperationDto, Well
                 });
 
             result.AddRange(dtos);
-            count += filteredWellOperations.Count();
         }
 
         return (result, count);
diff --git a/AsbCloudInfrastructure/Services/WellOperations/WellOperationExport.cs b/AsbCloudInfrastructure/Services/WellOperations/WellOperationExport.cs
index 3e3cd1a6..66e52fd8 100644
--- a/AsbCloudInfrastructure/Services/WellOperations/WellOperationExport.cs
+++ b/AsbCloudInfrastructure/Services/WellOperations/WellOperationExport.cs
@@ -43,8 +43,6 @@ public class WellOperationExport<TTemplate> : ExcelExportService<WellOperationDt
 		var request = new WellOperationRequest(new[] { options.IdWell })
 		{
 			OperationType = options.IdType,
-			Skip = 0,
-			Take = 1000000,
 		};
 		
 		return wellOperationRepository.GetAsync(request, token);