From 1cf2d745b35beccf944b7f65b09dd604e05e529e Mon Sep 17 00:00:00 2001
From: eugeniy_ivanov <ea.ivanov@digitaldrilling.ru>
Date: Tue, 6 Dec 2022 22:34:10 +0500
Subject: [PATCH] refact warnings to WellOperationService

---
 AsbCloudApp/Services/IWellOperationService.cs    | 12 +++++++-----
 .../WellOperationService/WellOperationService.cs | 16 +++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/AsbCloudApp/Services/IWellOperationService.cs b/AsbCloudApp/Services/IWellOperationService.cs
index a9105939..5dac4c9b 100644
--- a/AsbCloudApp/Services/IWellOperationService.cs
+++ b/AsbCloudApp/Services/IWellOperationService.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 
 namespace AsbCloudApp.Services
 {
+#nullable enable
     /// <summary>
     /// сервис операций по скважине
     /// </summary>
@@ -36,8 +37,8 @@ namespace AsbCloudApp.Services
         Task<PaginationContainer<WellOperationDto>> GetOperationsAsync(
                     int idWell,
                     int? operationType = null,
-                    IEnumerable<int> sectionTypeIds = null,
-                    IEnumerable<int> operationCategoryIds = null,
+                    IEnumerable<int>? sectionTypeIds = null,
+                    IEnumerable<int>? operationCategoryIds = null,
                     DateTime begin = default,
                     DateTime end = default,
                     double minDepth = double.MinValue,
@@ -62,8 +63,8 @@ namespace AsbCloudApp.Services
         Task<IEnumerable<WellGroupOpertionDto>> GetGroupOperationsStatAsync(
                     int idWell,
                     int? operationType = null,
-                    IEnumerable<int> sectionTypeIds = null,
-                    IEnumerable<int> operationCategoryIds = null,
+                    IEnumerable<int>? sectionTypeIds = null,
+                    IEnumerable<int>? operationCategoryIds = null,
                     DateTime begin = default,
                     DateTime end = default,
                     double minDepth = double.MinValue,
@@ -76,7 +77,7 @@ namespace AsbCloudApp.Services
         /// <param name="id"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        Task<WellOperationDto> GetAsync(int id, CancellationToken token);
+        Task<WellOperationDto?> GetAsync(int id, CancellationToken token);
 
         //todo: idWell Не нужен
         /// <summary>
@@ -122,4 +123,5 @@ namespace AsbCloudApp.Services
         /// <returns></returns>
         DateTimeOffset? FirstOperationDate(int idWell);
     }
+#nullable disable
 }
diff --git a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs
index 8cb9b606..24b9eccb 100644
--- a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs
+++ b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs
@@ -77,8 +77,8 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
         public async Task<PaginationContainer<WellOperationDto>> GetOperationsAsync(
             int idWell,
             int? operationType = default,
-            IEnumerable<int> sectionTypeIds = default,
-            IEnumerable<int> operationCategoryIds = default,
+            IEnumerable<int>? sectionTypeIds = null,
+            IEnumerable<int>? operationCategoryIds = null,
             DateTime begin = default,
             DateTime end = default,
             double minDepth = double.MinValue,
@@ -139,7 +139,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
             return result;
         }
 
-        public async Task<IEnumerable<WellGroupOpertionDto>?> GetGroupOperationsStatAsync(
+        public async Task<IEnumerable<WellGroupOpertionDto>> GetGroupOperationsStatAsync(
             int idWell,
             int? operationType = default,
             IEnumerable<int>? sectionTypeIds = default,
@@ -159,9 +159,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
                  end,
                  minDepth,
                  maxDepth,
-                 token);
-            if (query is null)
-                return null;
+                 token);            
             var entities = await query
                 .Select(o => new {
                     o.IdCategory,
@@ -210,7 +208,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
             return dtos;
         }
 
-        public async Task<WellOperationDto> GetAsync(int id,
+        public async Task<WellOperationDto?> GetAsync(int id,
             CancellationToken token = default)
         {
 
@@ -274,8 +272,8 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
         private IQueryable<WellOperation> BuildQuery(
             int idWell,
             int? operationType = default,
-            IEnumerable<int> sectionTypeIds = default,
-            IEnumerable<int> operationCategoryIds = default,
+            IEnumerable<int>? sectionTypeIds = null,
+            IEnumerable<int>? operationCategoryIds = null,
             DateTime begin = default,
             DateTime end = default,
             double minDepth = double.MinValue,