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
///
/// сервис операций по скважине
///
@@ -37,8 +36,8 @@ namespace AsbCloudApp.Services
Task> GetOperationsAsync(
int idWell,
int? operationType = null,
- IEnumerable? sectionTypeIds = null,
- IEnumerable? operationCategoryIds = null,
+ IEnumerable sectionTypeIds = null,
+ IEnumerable operationCategoryIds = null,
DateTime begin = default,
DateTime end = default,
double minDepth = double.MinValue,
@@ -63,8 +62,8 @@ namespace AsbCloudApp.Services
Task> GetGroupOperationsStatAsync(
int idWell,
int? operationType = null,
- IEnumerable? sectionTypeIds = null,
- IEnumerable? operationCategoryIds = null,
+ IEnumerable sectionTypeIds = null,
+ IEnumerable operationCategoryIds = null,
DateTime begin = default,
DateTime end = default,
double minDepth = double.MinValue,
@@ -77,7 +76,7 @@ namespace AsbCloudApp.Services
///
///
///
- Task GetAsync(int id, CancellationToken token);
+ Task GetOrDefaultAsync(int id, CancellationToken token);
//todo: idWell Не нужен
///
@@ -123,5 +122,4 @@ namespace AsbCloudApp.Services
///
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 GetAsync(int id,
+ public async Task 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);
}