From 95f0c1935bffdfc4d129547d0c785d714be1cd9b Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Wed, 7 Dec 2022 09:02:04 +0500
Subject: [PATCH] nit rename

---
 AsbCloudApp/Services/IWellOperationService.cs        | 12 +++++-------
 .../WellOperationService/WellOperationService.cs     |  2 +-
 .../Controllers/WellOperationController.cs           |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/AsbCloudApp/Services/IWellOperationService.cs b/AsbCloudApp/Services/IWellOperationService.cs
index 5dac4c9b..ea1aa9b0 100644
--- a/AsbCloudApp/Services/IWellOperationService.cs
+++ b/AsbCloudApp/Services/IWellOperationService.cs
@@ -6,7 +6,6 @@ using System.Threading.Tasks;
 
 namespace AsbCloudApp.Services
 {
-#nullable enable
     /// <summary>
     /// сервис операций по скважине
     /// </summary>
@@ -37,8 +36,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,
@@ -63,8 +62,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,
@@ -77,7 +76,7 @@ namespace AsbCloudApp.Services
         /// <param name="id"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        Task<WellOperationDto?> GetAsync(int id, CancellationToken token);
+        Task<WellOperationDto> GetOrDefaultAsync(int id, CancellationToken token);
 
         //todo: idWell Не нужен
         /// <summary>
@@ -123,5 +122,4 @@ 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 24b9eccb..538613b6 100644
--- a/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs
+++ b/AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs
@@ -208,7 +208,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
             return dtos;
         }
 
-        public async Task<WellOperationDto?> GetAsync(int id,
+        public async Task<WellOperationDto?> GetOrDefaultAsync(int id,
             CancellationToken token = default)
         {
 
diff --git a/AsbCloudWebApi/Controllers/WellOperationController.cs b/AsbCloudWebApi/Controllers/WellOperationController.cs
index 9d1450ff..c65ad48a 100644
--- a/AsbCloudWebApi/Controllers/WellOperationController.cs
+++ b/AsbCloudWebApi/Controllers/WellOperationController.cs
@@ -171,7 +171,7 @@ namespace AsbCloudWebApi.Controllers
             if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
                 return Forbid();
 
-            var result = await operationService.GetAsync(idOperation, token).ConfigureAwait(false);
+            var result = await operationService.GetOrDefaultAsync(idOperation, token).ConfigureAwait(false);
             return Ok(result);
         }