diff --git a/AsbCloudApp/Requests/DetectedOperationRequest.cs b/AsbCloudApp/Requests/DetectedOperationRequest.cs
index 5ce2b499..6d54a801 100644
--- a/AsbCloudApp/Requests/DetectedOperationRequest.cs
+++ b/AsbCloudApp/Requests/DetectedOperationRequest.cs
@@ -1,5 +1,5 @@
using System;
-using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
namespace AsbCloudApp.Requests
{
@@ -9,9 +9,16 @@ namespace AsbCloudApp.Requests
public class DetectedOperationRequest : RequestBase
{
///
- /// категории операций
+ /// категория операций
///
- public IEnumerable CategoryIds { get; set; }
+ [Required]
+ public int IdWell { get; set; }
+
+ ///
+ /// категория операций
+ ///
+ [Required]
+ public int IdCategory { get; set; }
///
/// Больше или равно дате
diff --git a/AsbCloudApp/Services/ICrudService.cs b/AsbCloudApp/Services/ICrudService.cs
index 8114fbaa..d9a2ad37 100644
--- a/AsbCloudApp/Services/ICrudService.cs
+++ b/AsbCloudApp/Services/ICrudService.cs
@@ -31,14 +31,14 @@ namespace AsbCloudApp.Services
///
///
/// null if not found
- Task GetAsync(int id, CancellationToken token);
+ Task GetOrDefaultAsync(int id, CancellationToken token);
///
/// Получить запись по id
///
///
/// null if not found
- TDto? Get(int id);
+ TDto? GetOrDefault(int id);
///
/// Добавление новой записи
diff --git a/AsbCloudApp/Services/IDetectedOperationService.cs b/AsbCloudApp/Services/IDetectedOperationService.cs
index 3b3bccf5..eb932c53 100644
--- a/AsbCloudApp/Services/IDetectedOperationService.cs
+++ b/AsbCloudApp/Services/IDetectedOperationService.cs
@@ -8,8 +8,8 @@ namespace AsbCloudApp.Services
{
public interface IDetectedOperationService
{
- Task> GetCategoriesAsync(CancellationToken token);
- Task GetAsync(int idWell, Requests.DetectedOperationRequest request, CancellationToken token);
- Task DeleteAsync(int idWell, DetectedOperationRequest request, CancellationToken token);
+ Task> GetCategoriesAsync(int? idWell, CancellationToken token);
+ Task GetAsync(DetectedOperationRequest request, CancellationToken token);
+ Task DeleteAsync(DetectedOperationRequest request, CancellationToken token);
}
}
diff --git a/AsbCloudApp/Services/ISetpointsService.cs b/AsbCloudApp/Services/ISetpointsService.cs
index e11b5642..3b608683 100644
--- a/AsbCloudApp/Services/ISetpointsService.cs
+++ b/AsbCloudApp/Services/ISetpointsService.cs
@@ -11,7 +11,7 @@ namespace AsbCloudApp.Services
Task> GetAsync(int idWell, CancellationToken token);
Task> GetForPanelAsync(string uid, CancellationToken token);
Task TryDelete(int id, CancellationToken token);
- Task UpdateStateAsync(int id, SetpointsRequestDto setpointsRequestDto, CancellationToken token);
+ Task UpdateStateAsync(SetpointsRequestDto setpointsRequestDto, CancellationToken token);
IEnumerable GetSetpointsNames();
}
}
diff --git a/AsbCloudApp/Services/IUserSettingsRepository.cs b/AsbCloudApp/Services/IUserSettingsRepository.cs
new file mode 100644
index 00000000..218b23f3
--- /dev/null
+++ b/AsbCloudApp/Services/IUserSettingsRepository.cs
@@ -0,0 +1,15 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AsbCloudApp.Services
+{
+ public interface IUserSettingsRepository
+ {
+ public const int ErrorKeyNotFound = -1;
+ public const int ErrorKeyIsUsed = -2;
+ Task