Merge remote-tracking branch 'origin/dev' into PlannedTrajectory_refact

AsbCloudApp/AsbCloudApp.csproj

@@ -18,7 +18,4 @@
     <EditorConfigFiles Remove="D:\Source\AsbCloudApp\Services\.editorconfig" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\AsbCloudDb\AsbCloudDb.csproj" />
-  </ItemGroup>
 </Project>

AsbCloudApp/Data/RequestLogDto.cs

@@ -2,6 +2,7 @@
 
 namespace AsbCloudApp.Data
 {
+#nullable enable
     /// <summary>
     /// DTO журнала запросов
     /// </summary>
@@ -10,7 +11,7 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// логин пользователя
         /// </summary>
-        public string UserLogin { get; set; }
+        public string UserLogin { get; set; } = string.Empty;
 
         /// <summary>
         /// Id пользователя
@@ -20,22 +21,22 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// IP адрес пользователя
         /// </summary>
-        public string UserIp { get; set; }
+        public string? UserIp { get; set; }
 
         /// <summary>
         /// метод запроса (GET, POST,..)
         /// </summary>
-        public string RequestMethod { get; set; }
+        public string RequestMethod { get; set; } = null!;
 
         /// <summary>
         /// url
         /// </summary>
-        public string RequestPath { get; set; }
+        public string? RequestPath { get; set; }
 
         /// <summary>
         /// Referer
         /// </summary>
-        public string Referer { get; set; }
+        public string Referer { get; set; } = string.Empty;
 
         /// <summary>
         /// продолжительность выполнения
@@ -47,19 +48,20 @@ namespace AsbCloudApp.Data
         /// </summary>
         public int Status { get; set; }
         
-        /// <summary>
-        /// сообщение об ошибке, если она произошла
-        /// </summary>
-        public string ExceptionMessage { get; set; }
-
         /// <summary>
         /// метка времени запроса
         /// </summary>
         public DateTime Date { get; set; }
 
+        /// <summary>
+        /// сообщение об ошибке, если она произошла
+        /// </summary>
+        public string? ExceptionMessage { get; set; } = null!;
+
         /// <summary>
         /// стек вызовов
         /// </summary>
-        public string ExceptionStack { get; set; }
+        public string? ExceptionStack { get; set; } = null!;
     }
+#nullable disable
 }

AsbCloudApp/Data/RequestLogUserDto.cs

@@ -2,6 +2,7 @@
 
 namespace AsbCloudApp.Data
 {
+#nullable enable
     /// <summary>
     /// DTO статистики запросов по пользователю
     /// </summary>
@@ -15,12 +16,12 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// логин
         /// </summary>
-        public string Login { get; set; }
+        public string Login { get; set; } = string.Empty;
 
         /// <summary>
         /// IP адрес пользователя
         /// </summary>
-        public string Ip { get; set; }
+        public string? Ip { get; set; }
 
         /// <summary>
         /// время выполнения запроса
@@ -45,6 +46,7 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// DTO пользователя
         /// </summary>
-        public UserDto User { get; set; }
+        public UserDto User { get; set; } = null!;
     }
+#nullable disable
 }

AsbCloudApp/Data/SAUB/TelemetryUserDto.cs

@@ -1,6 +1,4 @@
-using AsbCloudDb.Model;
-
-namespace AsbCloudApp.Data.SAUB
+namespace AsbCloudApp.Data.SAUB
 {
     /// <summary>
     /// Пользователь панели оператора

AsbCloudApp/Data/Subsystems/SubsystemActiveWellStatDto.cs

@@ -10,7 +10,7 @@ namespace AsbCloudApp.Data.Subsystems
         /// <summary>
         /// Активная скважина
         /// </summary>
-        public WellDto Well { get; set; } = null!; //TODO: заменить на WellInfo
+        public WellInfoDto Well { get; set; } = null!;
         /// <summary>
         /// Наработки подсистемы АКБ
         /// </summary>

AsbCloudApp/Repositories/IDepositRepository.cs

@@ -0,0 +1,44 @@
+using AsbCloudApp.Data;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace AsbCloudApp.Repositories
+{
+#nullable enable
+    /// <summary>
+    /// Сервис информации о кустах
+    /// </summary>
+    public interface IDepositRepository
+    {
+        /// <summary>
+        /// список месторождений, доступных для пользователя
+        /// </summary>
+        /// <param name="idCompany"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<IEnumerable<DepositDto>> GetAsync(int idCompany,
+            CancellationToken token);
+
+        /// <summary>
+        /// Список месторождений/кустов/скважин у которых заполненны параметры бурения
+        /// </summary>
+        /// <param name="idCompany"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<IEnumerable<DepositDto>> GetAllWithDrillParamsAsync(int idCompany,
+            CancellationToken token = default);
+
+        /// <summary>
+        /// Список кустов месторождения доступных компании
+        /// </summary>
+        /// <param name="idCompany"></param>
+        /// <param name="depositId"></param>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        Task<IEnumerable<ClusterDto>> GetClustersAsync(int idCompany,
+            int depositId, CancellationToken token);
+
+    }
+#nullable disable
+}

AsbCloudApp/Requests/RequestBase.cs

@@ -2,6 +2,7 @@
 
 namespace AsbCloudApp.Requests
 {
+#nullable enable
     /// <summary>
     /// Базовые параметры запроса
     /// </summary>
@@ -22,6 +23,7 @@ namespace AsbCloudApp.Requests
         /// Содержат список названий полей сортировки
         /// Указать направление сортировки можно через пробел "asc" или "desc"
         /// </summary>
-        public IEnumerable<string> SortFields { get; set; }
+        public IEnumerable<string>? SortFields { get; set; }
     }
+#nullable disable
 }

AsbCloudApp/Requests/WellOperationRequest.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+
+namespace AsbCloudApp.Requests
+{
+#nullable enable
+    /// <summary>
+    /// параметры для запроса списка операций
+    /// </summary>
+    public class WellOperationRequestBase: RequestBase
+    {
+        /// <summary>
+        /// фильтр по дате начала операции
+        /// </summary>
+        public DateTime? GeDate { get; set; }
+
+        /// <summary>
+        /// фильтр по дате окончания операции
+        /// </summary>
+        public DateTime? LeDate { get; set; }
+
+        /// <summary>
+        /// фильтр по максимальной глубине скважины
+        /// </summary>
+        public double? LeDepth { get; set; }
+
+        /// <summary>
+        /// фильтр по минимальной глубине скважины
+        /// </summary>
+        public double? GeDepth { get; set; }
+
+        /// <summary>
+        /// фильтр по списку id категорий операции
+        /// </summary>
+        public IEnumerable<int>? OperationCategoryIds { get; set; }
+
+        /// <summary>
+        /// фильтр по план = 0, факт = 1
+        /// </summary>
+        public int? OperationType { get; set; }
+
+        /// <summary>
+        /// фильтр по списку id конструкций секции
+        /// </summary>
+        public IEnumerable<int>? SectionTypeIds { get; set; }
+    }
+
+    /// <summary>
+    /// Параметры для запроса списка операций (с id скважины)
+    /// </summary>
+    public class WellOperationRequest: WellOperationRequestBase
+    {
+        /// <summary>
+        /// id скважины
+        /// </summary>
+        public int IdWell { get; set; }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public WellOperationRequest(){}
+
+        /// <summary>
+        /// копирующий конструктор
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="idWell"></param>
+        public WellOperationRequest(WellOperationRequestBase request, int idWell)
+        {
+            this.IdWell = idWell;
+
+            this.GeDepth = request.GeDepth;
+            this.LeDepth = request.LeDepth;
+            this.GeDate = request.GeDate;
+            this.LeDate = request.LeDate;
+            
+            this.OperationCategoryIds = request.OperationCategoryIds;
+            this.OperationType = request.OperationType;
+            this.SectionTypeIds = request.SectionTypeIds;
+
+            this.Skip= request.Skip;
+            this.Take= request.Take;
+            this.SortFields = request.SortFields;
+        }
+    }
+#nullable disable
+}

AsbCloudApp/Services/IClusterService.cs

@@ -1,62 +0,0 @@
-using AsbCloudApp.Data;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AsbCloudApp.Services
-{
-    //TODO: remove unused methods
-
-    /// <summary>
-    /// Сервис информации о кустах
-    /// </summary>
-    public interface IClusterService
-    {
-        /// <summary>
-        /// список месторождений
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<DepositDto>> GetDepositsAsync(int idCompany,
-            CancellationToken token);
-
-        /// <summary>
-        /// Список кустов с заполненными параметрами бурения
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<DepositDto>> GetDepositsDrillParamsAsync(int idCompany,
-            CancellationToken token = default);
-
-        /// <summary>
-        /// Список кустов месторождения доступных компании
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="depositId"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<ClusterDto>> GetClustersAsync(int idCompany,
-            int depositId, CancellationToken token);
-
-        /// <summary>
-        /// Список кустов доступных компании
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<ClusterDto>> GetClustersAsync(int idCompany,
-            CancellationToken token);
-
-        /// <summary>
-        /// Список скважин доступных компании
-        /// </summary>
-        /// <param name="idCompany"></param>
-        /// <param name="clusterId"></param>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        Task<IEnumerable<WellDto>> GetWellsAsync(int idCompany,
-            int clusterId, CancellationToken token);
-    }
-}

AsbCloudApp/Services/IRequestTracker.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 namespace AsbCloudApp.Services
 {
-    // TODO: make this nullable
+#nullable enable
 
     /// <summary>
     /// Отслеживание и сбор статистики по запросам
@@ -29,34 +29,35 @@ namespace AsbCloudApp.Services
         /// </summary>
         /// <param name="take"></param>
         /// <returns></returns>
-        IEnumerable<RequestLogDto> GetAll(int take = -1);
+        IEnumerable<RequestLogDto> GetAll(int? take);
 
         /// <summary>
         /// запросы которые выполнялись быстро
         /// </summary>
         /// <param name="take"></param>
         /// <returns></returns>
-        IEnumerable<RequestLogDto> GetFast(int take = -1);
+        IEnumerable<RequestLogDto> GetFast(int? take);
 
         /// <summary>
         /// запросы, которые выполнялись медленно
         /// </summary>
         /// <param name="take"></param>
         /// <returns></returns>
-        IEnumerable<RequestLogDto> GetSlow(int take = -1);
+        IEnumerable<RequestLogDto> GetSlow(int? take);
 
         /// <summary>
         /// запросы, которые завершились ошибкой
         /// </summary>
         /// <param name="take"></param>
         /// <returns></returns>
-        IEnumerable<RequestLogDto> GetError(int take = -1);
+        IEnumerable<RequestLogDto> GetError(int? take);
 
         /// <summary>
         /// Статистика посещений пользователей
         /// </summary>
         /// <param name="take"></param>
         /// <returns></returns>
-        IEnumerable<RequestLogUserDto> GetUsersStat(int take = -1);
+        IEnumerable<RequestLogUserDto> GetUsersStat(int? take);
     }
+#nullable disable
 }

AsbCloudApp/Services/IWellOperationService.cs

@@ -1,4 +1,5 @@
 using AsbCloudApp.Data;
+using AsbCloudApp.Requests;
 using System;
 using System.Collections.Generic;
 using System.Threading;
@@ -6,6 +7,7 @@ using System.Threading.Tasks;
 
 namespace AsbCloudApp.Services
 {
+#nullable enable
     /// <summary>
     /// сервис операций по скважине
     /// </summary>
@@ -21,54 +23,22 @@ namespace AsbCloudApp.Services
         /// <summary>
         /// Получить список операций
         /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="operationType"></param>
-        /// <param name="sectionTypeIds"></param>
-        /// <param name="operationCategoryIds"></param>
-        /// <param name="begin"></param>
-        /// <param name="end"></param>
-        /// <param name="minDepth"></param>
-        /// <param name="maxDepth"></param>
-        /// <param name="skip"></param>
-        /// <param name="take"></param>
+        /// <param name="request"></param>
         /// <param name="token"></param>
         /// <returns></returns>
         Task<PaginationContainer<WellOperationDto>> GetOperationsAsync(
-                    int idWell,
-                    int? operationType = null,
-                    IEnumerable<int> sectionTypeIds = null,
-                    IEnumerable<int> operationCategoryIds = null,
-                    DateTime begin = default,
-                    DateTime end = default,
-                    double minDepth = double.MinValue,
-                    double maxDepth = double.MaxValue,
-                    int skip = 0,
-                    int take = 32,
-                    CancellationToken token = default);
+                    WellOperationRequest request,
+                    CancellationToken token);
 
         /// <summary>
         /// Получить статистику операции по скважине с группировкой по категориям
         /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="operationType"></param>
-        /// <param name="sectionTypeIds"></param>
-        /// <param name="operationCategoryIds"></param>
-        /// <param name="begin"></param>
-        /// <param name="end"></param>
-        /// <param name="minDepth"></param>
-        /// <param name="maxDepth"></param>        
+        /// <param name="request"></param>
         /// <param name="token"></param>
         /// <returns></returns>
         Task<IEnumerable<WellGroupOpertionDto>> GetGroupOperationsStatAsync(
-                    int idWell,
-                    int? operationType = null,
-                    IEnumerable<int> sectionTypeIds = null,
-                    IEnumerable<int> operationCategoryIds = null,
-                    DateTime begin = default,
-                    DateTime end = default,
-                    double minDepth = double.MinValue,
-                    double maxDepth = double.MaxValue,
-                    CancellationToken token = default);
+                    WellOperationRequest request,
+                    CancellationToken token);
 
         /// <summary>
         /// Получить операцию по id
@@ -76,29 +46,24 @@ namespace AsbCloudApp.Services
         /// <param name="id"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        Task<WellOperationDto> GetOrDefaultAsync(int id, CancellationToken token);
+        Task<WellOperationDto?> GetOrDefaultAsync(int id, CancellationToken token);
 
-        //todo: idWell Не нужен
         /// <summary>
         /// Добавить несколько операций за один раз
         /// </summary>
-        /// <param name="idWell"></param>
         /// <param name="wellOperationDtos"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        Task<int> InsertRangeAsync(int idWell,
+        Task<int> InsertRangeAsync(
             IEnumerable<WellOperationDto> wellOperationDtos, CancellationToken token);
 
-        //todo: id Не нужны
         /// <summary>
         /// Обновить существующую операцию
         /// </summary>
-        /// <param name="idWell"></param>
-        /// <param name="idOperation"></param>
         /// <param name="item"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        Task<int> UpdateAsync(int idWell, int idOperation, WellOperationDto item,
+        Task<int> UpdateAsync(WellOperationDto item,
             CancellationToken token);
 
         /// <summary>
@@ -122,4 +87,5 @@ namespace AsbCloudApp.Services
         /// <returns></returns>
         DateTimeOffset? FirstOperationDate(int idWell);
     }
+#nullable disable
 }

AsbCloudInfrastructure/DependencyInjection.cs

@@ -109,7 +109,7 @@ namespace AsbCloudInfrastructure
             services.AddSingleton<IReduceSamplingService>(provider => ReduceSamplingService.GetInstance(configuration));
 
             services.AddTransient<IAuthService, AuthService>();
-            services.AddTransient<IClusterService, ClusterService>();
+            services.AddTransient<IDepositRepository, DepositRepository>();
             services.AddTransient<IProcessMapRepository, ProcessMapRepository>();
             services.AddTransient<IDrillingProgramService, DrillingProgramService>();
             services.AddTransient<IEventService, EventService>();

AsbCloudInfrastructure/Repository/DepositRepository.cs

@@ -1,4 +1,5 @@
 using AsbCloudApp.Data;
+using AsbCloudApp.Repositories;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
 using Mapster;
@@ -8,20 +9,22 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace AsbCloudInfrastructure.Services
+namespace AsbCloudInfrastructure.Repository
 {
-    public class ClusterService : IClusterService
+#nullable enable
+    public class DepositRepository : IDepositRepository
     {
         private readonly IAsbCloudDbContext db;
         private readonly IWellService wellService;
 
-        public ClusterService(IAsbCloudDbContext db, IWellService wellService)
+        public DepositRepository(IAsbCloudDbContext db, IWellService wellService)
         {
             this.db = db;
             this.wellService = wellService;
         }
 
-        public async Task<IEnumerable<DepositDto>> GetDepositsAsync(int idCompany,
+        /// <inheritdoc/>
+        public async Task<IEnumerable<DepositDto>> GetAsync(int idCompany,
             CancellationToken token = default)
         {
             var wellEntities = await (from well in db.Wells
@@ -40,7 +43,8 @@ namespace AsbCloudInfrastructure.Services
             return dtos;
         }
 
-        public async Task<IEnumerable<DepositDto>> GetDepositsDrillParamsAsync(int idCompany,
+        /// <inheritdoc/>
+        public async Task<IEnumerable<DepositDto>> GetAllWithDrillParamsAsync(int idCompany,
             CancellationToken token = default)
         {
             var wellEntities = await (from well in db.Wells
@@ -59,21 +63,7 @@ namespace AsbCloudInfrastructure.Services
             return dtos;
         }
 
-        public async Task<IEnumerable<ClusterDto>> GetClustersAsync(int idCompany,
-            CancellationToken token = default)
-        {
-            var entities = await GetWellsForCompany(idCompany)
-                        .Select(e => e.Cluster)
-                        .Distinct()
-                        .AsNoTracking()
-                        .ToListAsync(token)
-                        .ConfigureAwait(false);
-
-            var dtos = entities.Adapt<IEnumerable<ClusterDto>>();
-
-            return dtos;
-        }
-
+        /// <inheritdoc/>
         public async Task<IEnumerable<ClusterDto>> GetClustersAsync(int idCompany,
             int depositId, CancellationToken token = default)
         {
@@ -90,48 +80,22 @@ namespace AsbCloudInfrastructure.Services
             return dtos;
         }
 
-        public async Task<IEnumerable<WellDto>> GetWellsAsync(int idCompany,
-            int idCluster, CancellationToken token = default)
-        {
-            var entities = await GetWellsForCompany(idCompany)
-                .Where(e => e.IdCluster == idCluster)
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var dtos = entities.Select(e => new WellDto
-            {
-                Id = e.Id,
-                Caption = e.Caption,
-                Latitude = e.Latitude,
-                Longitude = e.Longitude,
-                Cluster = e.Cluster.Caption,
-                Deposit = e.Cluster.Deposit.Caption,
-            });
-
-            return dtos;
-        }
-
         private static IEnumerable<IGrouping<Deposit, IGrouping<Cluster, Well>>> GroupWells(IEnumerable<Well> wellEntities)
-        {
-            return wellEntities
+        => wellEntities
                 .GroupBy(w => w.Cluster)
                 .GroupBy(c => c.Key.Deposit);
-        }
 
         private IQueryable<Well> GetWellsForCompany(int idCompany)
-        {
-            return db.Wells
-                   .Include(w => w.RelationCompaniesWells)
-                   .ThenInclude(r => r.Company)
-                   .Include(w => w.Cluster)
-                   .ThenInclude(c => c.Deposit)
-                   .Where(w => w.RelationCompaniesWells.Any(c => c.IdCompany == idCompany));
-        }
+        => db.Wells
+                .Include(w => w.RelationCompaniesWells)
+                .ThenInclude(r => r.Company)
+                .Include(w => w.Cluster)
+                .ThenInclude(c => c.Deposit)
+                .Where(w => w.RelationCompaniesWells.Any(c => c.IdCompany == idCompany));
 
         private IEnumerable<DepositDto> CreateDepositDto(IEnumerable<IGrouping<Deposit, IGrouping<Cluster, Well>>> gDepositEntities)
         {
-            return gDepositEntities.Select(gDeposit => new DepositDto
+            var dtos = gDepositEntities.Select(gDeposit => new DepositDto
             {
                 Id = gDeposit.Key.Id,
                 Caption = gDeposit.Key.Caption,
@@ -154,6 +118,8 @@ namespace AsbCloudInfrastructure.Services
                     }),
                 }),
             });
+            return dtos;
         }
     }
+#nullable disable
 }

AsbCloudInfrastructure/Services/RequestTrackerService.cs

@@ -7,6 +7,7 @@ using System.Linq;
 
 namespace AsbCloudInfrastructure.Services
 {
+#nullable enable
     public class RequestTrackerService : IRequerstTrackerService
     {
         const int fastRequestsCount = 1000;
@@ -16,28 +17,28 @@ namespace AsbCloudInfrastructure.Services
 
         const int fastLimitMs = 500;
         static readonly char[] stackTraceSeparators = "\r\n".ToCharArray();
-        private readonly ConcurrentQueue<RequestLogDto> fastRequests = new ConcurrentQueue<RequestLogDto>();
-        private readonly ConcurrentQueue<RequestLogDto> slowRequests = new ConcurrentQueue<RequestLogDto>();
-        private readonly ConcurrentQueue<RequestLogDto> errorRequests = new ConcurrentQueue<RequestLogDto>();
+        private readonly ConcurrentQueue<RequestLogDto> fastRequests = new ();
+        private readonly ConcurrentQueue<RequestLogDto> slowRequests = new ();
+        private readonly ConcurrentQueue<RequestLogDto> errorRequests = new ();
         private readonly ConcurrentDictionary<string, RequestLogUserDto> users = new ConcurrentDictionary<string, RequestLogUserDto>();
 
-        private static IEnumerable<RequestLogDto> Get(IEnumerable<RequestLogDto> list, int take = -1)
+        private static IEnumerable<RequestLogDto> Get(IEnumerable<RequestLogDto> list, int? take)
         {
             IEnumerable<RequestLogDto> orderedlist = list.OrderByDescending(r => r.Date);
             if (take > 0)
-                orderedlist = orderedlist.Take(take);
+                orderedlist = orderedlist.Take(take.Value);
             return orderedlist;
         }
 
-        public IEnumerable<RequestLogUserDto> GetUsersStat(int take = -1)
+        public IEnumerable<RequestLogUserDto> GetUsersStat(int? take)
         {
             IEnumerable<RequestLogUserDto> result = users.Values.OrderByDescending(u => u.LastDate);
             if (take > 0)
-                result = result.Take(take);
+                result = result.Take(take.Value);
             return result;
         }
 
-        public IEnumerable<RequestLogDto> GetAll(int take = -1)
+        public IEnumerable<RequestLogDto> GetAll(int? take)
         {
             var result = fastRequests
                 .Union(slowRequests)
@@ -46,13 +47,13 @@ namespace AsbCloudInfrastructure.Services
             return Get(result, take);
         }
 
-        public IEnumerable<RequestLogDto> GetFast(int take = -1)
+        public IEnumerable<RequestLogDto> GetFast(int? take)
             => Get(fastRequests, take);
 
-        public IEnumerable<RequestLogDto> GetSlow(int take = -1)
+        public IEnumerable<RequestLogDto> GetSlow(int? take)
             => Get(slowRequests, take);
 
-        public IEnumerable<RequestLogDto> GetError(int take = -1)
+        public IEnumerable<RequestLogDto> GetError(int? take)
             => Get(errorRequests, take);
 
         public void RegisterRequest(RequestLogDto requestLog)
@@ -103,14 +104,13 @@ namespace AsbCloudInfrastructure.Services
         {
             if (!string.IsNullOrEmpty(requestLog.UserLogin))
             {
-                var key = $"{requestLog?.UserId}>{requestLog?.UserIp}";
+                var key = $"{requestLog.UserId}>{requestLog.UserIp}";
                 if (!users.ContainsKey(key))
                     users[key] = new RequestLogUserDto
                     {
                         UserId = requestLog.UserId,
                         Ip = requestLog.UserIp,
                         Login = requestLog.UserLogin,
-                        //User = userService.Get(requestLog.UserId),
                     };
                 users[key].ElapsedMs += requestLog.ElapsedMilliseconds;
                 users[key].LastDate = requestLog.Date;
@@ -128,4 +128,5 @@ namespace AsbCloudInfrastructure.Services
             }
         }
     }
+#nullable disable
 }

AsbCloudInfrastructure/Services/WellOperationService/WellOperationRepository.cs

@@ -0,0 +1,242 @@
+using AsbCloudApp.Data;
+using AsbCloudApp.Requests;
+using AsbCloudApp.Services;
+using AsbCloudDb;
+using AsbCloudDb.Model;
+using Mapster;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Threading;
+using System.Collections;
+
+namespace AsbCloudInfrastructure.Services.WellOperationService
+{
+#nullable enable
+
+
+    /*
+                 var opsQuery = db.WellOperations
+                .Where( o => o.IdWell == idWell )
+                .Where( o => o.IdType == idType )
+                .Select( o => new { 
+                    o.Id,
+                    o.IdType,
+                    o.IdWell,
+                    o.IdWellSectionType,
+                    o.IdCategory,
+                    
+                    o.Well,
+                    o.WellSectionType,
+                    o.OperationCategory,
+
+                    o.DateStart,
+                    o.DepthStart, 
+                    o.DepthEnd,
+                    o.DurationHours,
+                    o.CategoryInfo,
+                    o.Comment,
+
+                    nptHours = db.WellOperations
+                        .Where(subOp => subOp.IdWell == idWell)
+                        .Where(subOp => subOp.IdType == idType)
+                        .Where(subOp => nptCats.Contains( subOp.IdCategory ))
+                        .Where(subOp => subOp.DateStart <= o.DateStart)
+                        .Select(subOp => subOp.DurationHours)
+                        .Sum(),
+                    Day = o.DateStart - db.WellOperations
+                        .Where(subOp => subOp.IdWell == idWell)
+                        .Where(subOp => subOp.IdType == idType)
+                        .Where(subOp => subOp.DateStart <= o.DateStart)
+                        .Min(subOp => subOp.DateStart),
+                })
+                .OrderBy(o => o.DateStart);
+     */
+    public class WellOperationRepository
+    {
+        private readonly IAsbCloudDbContext db;
+        private readonly IMemoryCache memoryCache;
+        private readonly IWellService wellService;
+        private static Dictionary<int, DateTimeOffset?>? firstOperationsCache = null;
+
+        public const int idOperationTypePlan = 0;
+        public const int idOperationTypeFact = 1;
+
+        public WellOperationRepository(IAsbCloudDbContext db, IMemoryCache memoryCache, IWellService wellService)
+        {
+            this.db = db;
+            this.memoryCache = memoryCache;
+            this.wellService = wellService;
+        }
+
+        public IDictionary<int, string> GetSectionTypes()
+            => memoryCache
+            .GetOrCreateBasic<WellSectionType>(db)
+            .ToDictionary(s => s.Id, s => s.Caption);
+
+        public IEnumerable<WellOperationCategoryDto> GetCategories()
+        {
+            var allCategories = memoryCache
+                .GetOrCreateBasic<WellOperationCategory>(db);
+
+            var parentIds = allCategories
+                .Select(o => o.IdParent)
+                .Distinct();
+
+            var operationCategories = allCategories
+                .Where(o => !parentIds.Contains(o.Id))
+                .OrderBy(o => o.IdParent)
+                .ThenBy(o => o.Name);
+
+            var result = operationCategories.Adapt<IEnumerable<WellOperationCategoryDto>>();
+            return result;
+        }
+
+        public DateTimeOffset? FirstOperationDate(int idWell)
+        {
+            if (firstOperationsCache is null)
+            {
+                var query = db.WellOperations
+                .GroupBy(o => o.IdWell)
+                .Select(g => new Tuple<int, DateTimeOffset?, DateTimeOffset?>
+                (
+                    g.Key,
+                    g.Where(o => o.IdType == idOperationTypePlan).Min(o => o.DateStart),
+                    g.Where(o => o.IdType == idOperationTypeFact).Min(o => o.DateStart)
+                ));
+
+                firstOperationsCache = query
+                    .ToDictionary(f => f.Item1, f => f.Item3 ?? f.Item2);
+            }
+
+            return firstOperationsCache?.GetValueOrDefault(idWell);
+        }
+
+        public async Task<WellOperationDto?> GetOrDefaultAsync(int id,
+            CancellationToken token)
+        {
+            var entity = await db.WellOperations
+                .Include(s => s.WellSectionType)
+                .Include(s => s.OperationCategory)
+                .FirstOrDefaultAsync(e => e.Id == id, token)
+                .ConfigureAwait(false);
+
+            if (entity is null)
+                return null;
+
+            var timezone = wellService.GetTimezone(entity.IdWell);
+
+            var dto = entity.Adapt<WellOperationDto>();
+            dto.WellSectionTypeName = entity.WellSectionType.Caption;
+            dto.DateStart = entity.DateStart.ToRemoteDateTime(timezone.Hours);
+            dto.CategoryName = entity.OperationCategory.Name;
+            return dto;
+        }
+
+        public Task<IEnumerable<WellOperationDto>> GetAsync(WellOperationRequest request,
+            CancellationToken token)
+        {
+            return Task.FromResult(Enumerable.Empty<WellOperationDto>());
+        }
+
+        public async Task<int> InsertRangeAsync(
+            IEnumerable<WellOperationDto> wellOperationDtos,
+            CancellationToken token)
+        {
+            var firstOperation = wellOperationDtos
+                .FirstOrDefault();
+            if (firstOperation is null)
+                return 0;
+
+            var idWell = firstOperation.IdWell;
+
+            var timezone = wellService.GetTimezone(idWell);
+            foreach (var dto in wellOperationDtos)
+            {
+                var entity = dto.Adapt<WellOperation>();
+                entity.Id = default;
+                entity.DateStart = dto.DateStart.ToUtcDateTimeOffset(timezone.Hours);
+                entity.IdWell = idWell;
+                db.WellOperations.Add(entity);
+            }
+
+            return await db.SaveChangesAsync(token)
+                .ConfigureAwait(false);
+        }
+
+        public async Task<int> UpdateAsync(
+            WellOperationDto dto, CancellationToken token)
+        {
+            var timezone = wellService.GetTimezone(dto.IdWell);
+            var entity = dto.Adapt<WellOperation>();
+            entity.DateStart = dto.DateStart.ToUtcDateTimeOffset(timezone.Hours);
+            db.WellOperations.Update(entity);
+            return await db.SaveChangesAsync(token)
+                .ConfigureAwait(false);
+        }
+
+        public async Task<int> DeleteAsync(IEnumerable<int> ids,
+            CancellationToken token)
+        {
+            var query = db.WellOperations.Where(e => ids.Contains(e.Id));
+            db.WellOperations.RemoveRange(query);
+            return await db.SaveChangesAsync(token)
+                .ConfigureAwait(false);
+        }
+
+        private IQueryable<WellOperation> BuildQuery(WellOperationRequest request)
+        {
+            var timezone = wellService.GetTimezone(request.IdWell);
+
+            var query = db.WellOperations
+                .Include(s => s.WellSectionType)
+                .Include(s => s.OperationCategory)
+                .Where(s => s.IdWell == request.IdWell);
+
+            if (request.OperationType.HasValue)
+                query = query.Where(e => e.IdType == request.OperationType.Value);
+
+            if (request.SectionTypeIds?.Any() == true)
+                query = query.Where(e => request.SectionTypeIds.Contains(e.IdWellSectionType));
+
+            if (request.OperationCategoryIds?.Any() == true)
+                query = query.Where(e => request.OperationCategoryIds.Contains(e.IdCategory));
+
+            if (request.GeDepth.HasValue)
+                query = query.Where(e => e.DepthEnd >= request.GeDepth.Value);
+
+            if (request.LeDepth.HasValue)
+                query = query.Where(e => e.DepthEnd <= request.LeDepth.Value);
+
+            if (request.GeDate.HasValue)
+            {
+                var geDateOffset = request.GeDate.Value.ToUtcDateTimeOffset(timezone.Hours);
+                query = query.Where(e => e.DateStart >= geDateOffset);
+            }
+
+            if (request.LeDate.HasValue)
+            {
+                var leDateOffset = request.LeDate.Value.ToUtcDateTimeOffset(timezone.Hours);
+                query = query.Where(e => e.DateStart <= leDateOffset);
+            }
+
+            if (request.SortFields?.Any() == true)
+            {
+                query = query.SortBy(request.SortFields);
+            }
+            else
+            {
+                query = query
+                    .OrderBy(e => e.DateStart)
+                    .ThenBy(e => e.DepthEnd)
+                    .ThenBy(e => e.Id);
+            }
+
+            return query;
+        }
+    }
+#nullable disable
+}

AsbCloudInfrastructure/Services/WellOperationService/WellOperationService.cs

@@ -1,5 +1,7 @@
 using AsbCloudApp.Data;
+using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
+using AsbCloudDb;
 using AsbCloudDb.Model;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
@@ -75,47 +77,24 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
         }
 
         public async Task<PaginationContainer<WellOperationDto>> GetOperationsAsync(
-            int idWell,
-            int? operationType = default,
-            IEnumerable<int>? sectionTypeIds = null,
-            IEnumerable<int>? operationCategoryIds = null,
-            DateTime begin = default,
-            DateTime end = default,
-            double minDepth = double.MinValue,
-            double maxDepth = double.MaxValue,
-            int skip = 0,
-            int take = 32,
-            CancellationToken token = default)
+            WellOperationRequest request,
+            CancellationToken token)
         {
-            var timezone = wellService.GetTimezone(idWell);
+            var timezone = wellService.GetTimezone(request.IdWell);
 
-            var query = BuildQuery(
-                 idWell,
-                 operationType,
-                 sectionTypeIds,
-                 operationCategoryIds,
-                 begin,
-                 end,
-                 minDepth,
-                 maxDepth,
-                 token);
+            var query = BuildQuery(request);
 
             var result = new PaginationContainer<WellOperationDto>
             {
-                Skip = skip,
-                Take = take,
+                Skip = request.Skip ?? 0,
+                Take = request.Take ?? 32,
                 Count = await query.CountAsync(token).ConfigureAwait(false),
             };
-            
-            query = query
-                .OrderBy(e => e.DateStart)
-                .ThenBy(e => e.DepthEnd)
-                .ThenBy(e => e.Id);
 
-            if (skip > 0)
-                query = query.Skip(skip);
+            if (result.Skip > 0)
+                query = query.Skip(result.Skip!);
 
-            var entities = await query.Take(take).AsNoTracking()
+            var entities = await query.Take(result.Take).AsNoTracking()
                 .ToListAsync(token).ConfigureAwait(false);
 
             if (!entities.Any())
@@ -144,26 +123,10 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
         }
 
         public async Task<IEnumerable<WellGroupOpertionDto>> GetGroupOperationsStatAsync(
-            int idWell,
-            int? operationType = default,
-            IEnumerable<int>? sectionTypeIds = default,
-            IEnumerable<int>? operationCategoryIds = default,
-            DateTime begin = default,
-            DateTime end = default,
-            double minDepth = double.MinValue,
-            double maxDepth = double.MaxValue,
-            CancellationToken token = default)
+            WellOperationRequest request,
+            CancellationToken token)
         {
-            var query = BuildQuery(
-                 idWell,
-                 operationType,
-                 sectionTypeIds,
-                 operationCategoryIds,
-                 begin,
-                 end,
-                 minDepth,
-                 maxDepth,
-                 token);            
+            var query = BuildQuery(request);            
             var entities = await query
                 .Select(o => new {
                     o.IdCategory,
@@ -172,11 +135,12 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
                 })
                 .ToListAsync(token);
             var parentRelationDictionary = GetCategories()
-                .ToDictionary(c => c.Id, cc => new
+                .ToDictionary(c => c.Id, c => new
                 {
-                    Name = cc.Name,
-                    IdParent = cc.IdParent
+                    c.Name,
+                    c.IdParent
                 });
+
             var dtos = entities
                 .GroupBy(o => o.IdCategory)
                 .Select(g => new WellGroupOpertionDto
@@ -206,16 +170,14 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
                     TotalMinutes = g.Sum(o => o.TotalMinutes),
                     Items = g.ToList(),
                     IdParent = g.Key.HasValue ? parentRelationDictionary[g.Key.Value].IdParent : defaultId,
-
                 });
             }
             return dtos;
         }
 
         public async Task<WellOperationDto?> GetOrDefaultAsync(int id,
-            CancellationToken token = default)
+            CancellationToken token)
         {
-
             var entity = await db.WellOperations
                 .Include(s => s.WellSectionType)
                 .Include(s => s.OperationCategory)
@@ -234,10 +196,17 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
             return dto;
         }
 
-        public async Task<int> InsertRangeAsync(int idWell,
+        public async Task<int> InsertRangeAsync(
             IEnumerable<WellOperationDto> wellOperationDtos,
-            CancellationToken token = default)
+            CancellationToken token)
         {
+            var firstOperation = wellOperationDtos
+                .FirstOrDefault();
+            if (firstOperation is null)
+                return 0;
+
+            var idWell = firstOperation.IdWell;
+
             var timezone = wellService.GetTimezone(idWell);
             foreach (var dto in wellOperationDtos)
             {
@@ -252,12 +221,11 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
                 .ConfigureAwait(false);
         }
 
-        public async Task<int> UpdateAsync(int idWell, int idOperation,
-            WellOperationDto dto, CancellationToken token = default)
+        public async Task<int> UpdateAsync(
+            WellOperationDto dto, CancellationToken token)
         {
-            var timezone = wellService.GetTimezone(idWell);
+            var timezone = wellService.GetTimezone(dto.IdWell);
             var entity = dto.Adapt<WellOperation>();
-            entity.Id = idOperation;
             entity.DateStart = dto.DateStart.ToUtcDateTimeOffset(timezone.Hours);
             db.WellOperations.Update(entity);
             return await db.SaveChangesAsync(token)
@@ -265,7 +233,7 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
         }
 
         public async Task<int> DeleteAsync(IEnumerable<int> ids,
-            CancellationToken token = default)
+            CancellationToken token)
         {
             var query = db.WellOperations.Where(e => ids.Contains(e.Id));
             db.WellOperations.RemoveRange(query);
@@ -273,57 +241,55 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
                 .ConfigureAwait(false);
         }
 
-        private IQueryable<WellOperation> BuildQuery(
-            int idWell,
-            int? operationType = default,
-            IEnumerable<int>? sectionTypeIds = null,
-            IEnumerable<int>? operationCategoryIds = null,
-            DateTime begin = default,
-            DateTime end = default,
-            double minDepth = double.MinValue,
-            double maxDepth = double.MaxValue,
-            CancellationToken token = default)
+        private IQueryable<WellOperation> BuildQuery(WellOperationRequest request)
         {
-            var timezone = wellService.GetTimezone(idWell);
+            var timezone = wellService.GetTimezone(request.IdWell);
 
             var query = db.WellOperations
                 .Include(s => s.WellSectionType)
                 .Include(s => s.OperationCategory)
-                .Where(s => s.IdWell == idWell);
+                .Where(s => s.IdWell == request.IdWell);
 
-            if (operationType.HasValue)
-                query = query.Where(e => e.IdType == operationType.Value);
+            if (request.OperationType.HasValue)
+                query = query.Where(e => e.IdType == request.OperationType.Value);
 
-            if (sectionTypeIds != default && sectionTypeIds.Any())
-                query = query.Where(e => sectionTypeIds.Contains(e.IdWellSectionType));
+            if (request.SectionTypeIds?.Any() == true)
+                query = query.Where(e => request.SectionTypeIds.Contains(e.IdWellSectionType));
 
-            if (operationCategoryIds != default && operationCategoryIds.Any())
-                query = query.Where(e => operationCategoryIds.Contains(e.IdCategory));
+            if (request.OperationCategoryIds?.Any() == true)
+                query = query.Where(e => request.OperationCategoryIds.Contains(e.IdCategory));
 
-            if (minDepth != double.MinValue)
-                query = query.Where(e => e.DepthEnd >= minDepth);
+            if (request.GeDepth.HasValue)
+                query = query.Where(e => e.DepthEnd >= request.GeDepth.Value);
 
-            if (maxDepth != double.MaxValue)
-                query = query.Where(e => e.DepthEnd <= maxDepth);
+            if (request.LeDepth.HasValue)
+                query = query.Where(e => e.DepthEnd <= request.LeDepth.Value);
 
-            if (begin != default)
+            if (request.GeDate.HasValue)
             {
-                var beginOffset = begin.ToUtcDateTimeOffset(timezone.Hours);
-                query = query.Where(e => e.DateStart >= beginOffset);
+                var geDateOffset = request.GeDate.Value.ToUtcDateTimeOffset(timezone.Hours);
+                query = query.Where(e => e.DateStart >= geDateOffset);
             }
 
-            if (end != default)
+            if (request.LeDate.HasValue)
             {
-                var endOffset = end.ToUtcDateTimeOffset(timezone.Hours);
-                query = query.Where(e => e.DateStart <= endOffset);
+                var leDateOffset = request.LeDate.Value.ToUtcDateTimeOffset(timezone.Hours);
+                query = query.Where(e => e.DateStart <= leDateOffset);
+            }
+
+            if (request.SortFields?.Any() == true)
+            {
+                query = query.SortBy(request.SortFields);
+            }
+            else
+            {
+                query = query
+                    .OrderBy(e => e.DateStart)
+                    .ThenBy(e => e.DepthEnd)
+                    .ThenBy(e => e.Id);
             }
 
-            query = query
-                .OrderBy(e => e.DateStart)
-                .ThenBy(e => e.DepthEnd)
-                .ThenBy(e => e.Id);
             return query;
-
         }
     }
 #nullable disable

AsbCloudWebApi.Tests/ServicesTests/ClusterServiceTest.cs

@@ -1,170 +0,0 @@
-using AsbCloudApp.Services;
-using AsbCloudDb.Model;
-using AsbCloudInfrastructure.Services;
-using Moq;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace AsbCloudWebApi.Tests.ServicesTests;
-
-public class ClusterServiceTest
-{
-    private readonly AsbCloudDbContext context;
-    private readonly Mock<IWellService> wellService;
-
-    private readonly List<Deposit> deposits = new()
-    {
-        new Deposit { Id = 1, Caption = "Test deposit 1" },
-        new Deposit { Id = 2, Caption = "Test deposit 2" },
-        new Deposit { Id = 3, Caption = "Test deposit 3" },
-        new Deposit { Id = 4, Caption = "Test deposit 4" }
-    };
-
-    private readonly List<Cluster> clusters = new()
-    {
-        new Cluster { Id = 1, Caption = "Test cluster 1", IdDeposit = 1, Timezone = new SimpleTimezone()},
-        new Cluster { Id = 2, Caption = "Test cluster 2", IdDeposit = 1, Timezone = new SimpleTimezone() },
-        new Cluster { Id = 3, Caption = "Test cluster 3", IdDeposit = 2, Timezone = new SimpleTimezone() },
-        new Cluster { Id = 4, Caption = "Test cluster 4", IdDeposit = 2, Timezone = new SimpleTimezone() }
-    };
-
-    private readonly List<Well> wells = new()
-    {
-        new Well { Id = 1, Caption = "Test well 1", IdCluster = 1 },
-        new Well { Id = 2, Caption = "Test well 2", IdCluster = 2 },
-        new Well { Id = 3, Caption = "Test well 3", IdCluster = 1 },
-        new Well { Id = 4, Caption = "Test well 4", IdCluster = 2 }
-    };
-
-    private readonly List<CompanyType> companiesTypes = new()
-    {
-        new CompanyType { Id = 1, Caption = "test company type"}
-    };
-
-    private readonly List<Company> companies = new()
-    {
-        new Company { Id = 1, Caption = "Test company 1", IdCompanyType = 1},
-        new Company { Id = 2, Caption = "Test company 2", IdCompanyType = 1}
-    };
-
-    private readonly List<RelationCompanyWell> relations = new()
-    {
-        new RelationCompanyWell { IdCompany = 1, IdWell = 1 },
-        new RelationCompanyWell { IdCompany = 1, IdWell = 2 },
-        new RelationCompanyWell { IdCompany = 2, IdWell = 2 }
-    };
-
-    private readonly List<WellSectionType> wellSectionTypes = new()
-    {
-        new WellSectionType { Id = 1, Caption = "Test well section type 1" }
-    };
-
-    public ClusterServiceTest()
-    {
-        context = TestHelpter.MakeRealTestContext();
-        wellService = new Mock<IWellService>();
-        context.Deposits.RemoveRange(context.Deposits);
-        context.Clusters.RemoveRange(context.Clusters);
-        context.Wells.RemoveRange(context.Wells);
-        context.CompaniesTypes.RemoveRange(context.CompaniesTypes);
-        context.Companies.RemoveRange(context.Companies);
-        context.RelationCompaniesWells.RemoveRange(context.RelationCompaniesWells);
-        context.WellSectionTypes.RemoveRange(context.WellSectionTypes);
-        if (context.ChangeTracker.HasChanges())
-            context.SaveChanges();
-        context.Deposits.AddRange(deposits);
-        context.Clusters.AddRange(clusters);
-        context.Wells.AddRange(wells);
-        context.CompaniesTypes.AddRange(companiesTypes);
-        context.Companies.AddRange(companies);
-        context.RelationCompaniesWells.AddRange(relations);
-        context.WellSectionTypes.AddRange(wellSectionTypes);
-        context.SaveChanges();
-    }
-
-    ~ClusterServiceTest()
-    {
-        context.Deposits.RemoveRange(context.Deposits);
-        context.Clusters.RemoveRange(context.Clusters);
-        context.Wells.RemoveRange(context.Wells);
-        context.CompaniesTypes.RemoveRange(context.CompaniesTypes);
-        context.Companies.RemoveRange(context.Companies);
-        context.RelationCompaniesWells.RemoveRange(context.RelationCompaniesWells);
-        context.SaveChanges();
-    }
-
-    [Fact]
-    public async Task GetDepositsAsync_returns_one_deposit()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetDepositsAsync(1);
-
-        Assert.Single(dtos);
-    }
-
-    [Fact]
-    public async Task GetDepositsAsync_returns_one_deposit_with_two_clusters()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetDepositsAsync(1);
-
-        Assert.Equal(2, dtos.FirstOrDefault()?.Clusters.Count());
-    }
-    [Fact]
-    public async Task GetDrillParamsAsync_returns_depositDtos()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetDepositsDrillParamsAsync(1);
-
-        Assert.True(dtos.Any());
-    }
-
-    [Fact]
-    public async Task GetDrillParamsAsync_returns_one_deposit()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetDepositsDrillParamsAsync(1);
-
-        Assert.Single(dtos);
-    }
-
-    [Fact]
-    public async Task GetDrillParamsAsync_returns_one_deposit_with_two_clusters()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetDepositsDrillParamsAsync(1);
-
-        Assert.Equal(2, dtos.FirstOrDefault()?.Clusters.Count());
-    }
-
-    [Fact]
-    public async Task GetClustersAsync_returns_two_dtos()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetClustersAsync(1);
-
-        Assert.Equal(2, dtos.Count());
-    }
-
-    [Fact]
-    public async Task GetClustersAsync_with_deposit_returns_two_clusters()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetClustersAsync(1, 1);
-
-        Assert.Equal(2, dtos.Count());
-    }
-
-    [Fact]
-    public async Task GetWellsAsync_returns_one_well_by_cluster_and_company()
-    {
-        var service = new ClusterService(context, wellService.Object);
-        var dtos = await service.GetWellsAsync(1, 1);
-
-        Assert.Single(dtos);
-    }
-
-
-}

AsbCloudWebApi/Controllers/ClusterController.cs

@@ -1,67 +0,0 @@
-using AsbCloudApp.Data;
-using AsbCloudApp.Services;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AsbCloudWebApi.Controllers
-{
-    /// <summary>
-    /// Инфо о кустах
-    /// </summary>
-    [Route("api/cluster")]
-    [ApiController]
-    [Authorize]
-    public class ClusterController : ControllerBase
-    {
-        private readonly IClusterService clusterService;
-
-        public ClusterController(IClusterService clusterService)
-        {
-            this.clusterService = clusterService;
-        }
-
-        /// <summary>
-        /// Получает список доступных пользователю кустов
-        /// </summary>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpGet()]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<ClusterDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetClustersAsync(CancellationToken token = default)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            var result = await clusterService.GetClustersAsync((int)idCompany,
-                token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
-        /// <summary>
-        /// Получение доступных пользователю скважин
-        /// </summary>
-        /// <param name="idCluster"></param>
-        /// <param name="token"> Токен отмены задачи </param>
-        /// <returns></returns>
-        [HttpGet("{idCluster}")]
-        [Permission]
-        [ProducesResponseType(typeof(IEnumerable<WellDto>), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetWellsAsync(int idCluster, CancellationToken token = default)
-        {
-            int? idCompany = User.GetCompanyId();
-
-            if (idCompany is null)
-                return Forbid();
-
-            var result = await clusterService.GetWellsAsync((int)idCompany,
-                idCluster, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-    }
-}

AsbCloudWebApi/Controllers/DepositController.cs

@@ -1,5 +1,5 @@
 using AsbCloudApp.Data;
-using AsbCloudApp.Services;
+using AsbCloudApp.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
@@ -16,11 +16,11 @@ namespace AsbCloudWebApi.Controllers
     [Authorize]
     public class DepositController : ControllerBase
     {
-        private readonly IClusterService clusterService;
+        private readonly IDepositRepository depositService;
 
-        public DepositController(IClusterService clusterService)
+        public DepositController(IDepositRepository depositService)
         {
-            this.clusterService = clusterService;
+            this.depositService = depositService;
         }
 
         /// <summary>
@@ -38,7 +38,7 @@ namespace AsbCloudWebApi.Controllers
             if (idCompany is null)
                 return Forbid();
 
-            var result = await clusterService.GetDepositsAsync((int)idCompany,
+            var result = await depositService.GetAsync((int)idCompany,
                 token).ConfigureAwait(false);
             return Ok(result);
         }
@@ -58,7 +58,7 @@ namespace AsbCloudWebApi.Controllers
             if (idCompany is null)
                 return Forbid();
 
-            var result = await clusterService.GetDepositsDrillParamsAsync((int)idCompany,
+            var result = await depositService.GetAllWithDrillParamsAsync((int)idCompany,
                 token).ConfigureAwait(false);
             return Ok(result);
         }
@@ -80,7 +80,7 @@ namespace AsbCloudWebApi.Controllers
             if (idCompany is null)
                 return Forbid();
 
-            var result = await clusterService.GetClustersAsync((int)idCompany,
+            var result = await depositService.GetClustersAsync((int)idCompany,
                 depositId, token).ConfigureAwait(false);
             return Ok(result);
         }

AsbCloudWebApi/Controllers/RequestTrackerController.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 
 namespace AsbCloudWebApi.Controllers
 {
+#nullable enable
     /// <summary>
     /// Мониторинг запросов, ошибок, пользователей
     /// </summary>
@@ -87,4 +88,5 @@ namespace AsbCloudWebApi.Controllers
             return Ok(result);
         }
     }
+#nullable disable
 }

AsbCloudWebApi/Controllers/WellOperationController.cs

@@ -1,9 +1,9 @@
 using AsbCloudApp.Data;
+using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.Controllers
 {
+#nullable enable
     /// <summary>
     /// Буровые операции (вводимые вручную)
     /// </summary>
@@ -44,7 +45,6 @@ namespace AsbCloudWebApi.Controllers
             return Ok(result);
         }
 
-
         /// <summary>
         /// Возвращает список имен типов операций на скважине
         /// </summary>
@@ -63,15 +63,7 @@ namespace AsbCloudWebApi.Controllers
         /// Отфильтрованный список операций на скважине. Если не применять фильтр, то вернется весь список. Сортированный по глубине затем по дате
         /// </summary>
         /// <param name="idWell">id скважины</param>
-        /// <param name="opertaionType">фильтр по план = 0, факт = 1</param>
-        /// <param name="sectionTypeIds">фильтр по списку id конструкций секции</param>
-        /// <param name="operationCategoryIds">фильтр по списку id категорий операции</param>
-        /// <param name="begin">фильтр по началу операции</param>
-        /// <param name="end">фильтр по окончанию операции</param>
-        /// <param name="minDepth">фильтр по минимальной глубине скважины</param>
-        /// <param name="maxDepth">фильтр по максимальной глубине скважины</param>
-        /// <param name="skip"></param>
-        /// <param name="take"></param>
+        /// <param name="request"></param>
         /// <param name="token"></param>
         /// <returns>Список операций на скважине в контейнере для постраничного просмотра</returns>
         [HttpGet]
@@ -79,31 +71,15 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(PaginationContainer<WellOperationDto>), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> GetOperationsAsync(
             [FromRoute] int idWell,
-            [FromQuery] int? opertaionType = default,
-            [FromQuery] IEnumerable<int> sectionTypeIds = default,
-            [FromQuery] IEnumerable<int> operationCategoryIds = default,
-            [FromQuery] DateTime begin = default,
-            [FromQuery] DateTime end = default,
-            [FromQuery] double minDepth = double.MinValue,
-            [FromQuery] double maxDepth = double.MaxValue,
-            [FromQuery] int skip = 0,
-            [FromQuery] int take = 32,
-            CancellationToken token = default)
+            [FromQuery] WellOperationRequestBase request,
+            CancellationToken token)
         {
             if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
                 return Forbid();
 
+            var requestToService = new WellOperationRequest(request, idWell);
             var result = await operationService.GetOperationsAsync(
-                idWell,
-                opertaionType,
-                sectionTypeIds,
-                operationCategoryIds,
-                begin,
-                end,
-                minDepth,
-                maxDepth,
-                skip,
-                take,
+                requestToService,
                 token)
                 .ConfigureAwait(false);
             return Ok(result);
@@ -113,13 +89,7 @@ namespace AsbCloudWebApi.Controllers
         /// Статистика операций по скважине, группированая по категориям
         /// </summary>
         /// <param name="idWell">id скважины</param>
-        /// <param name="opertaionType"></param>
-        /// <param name="sectionTypeIds"></param>
-        /// <param name="operationCategoryIds"></param>
-        /// <param name="begin"></param>
-        /// <param name="end"></param>
-        /// <param name="minDepth"></param>
-        /// <param name="maxDepth"></param>        
+        /// <param name="request"></param>      
         /// <param name="token"></param>
         /// <returns></returns>
         [HttpGet]
@@ -128,27 +98,15 @@ namespace AsbCloudWebApi.Controllers
         [ProducesResponseType(typeof(IEnumerable<WellGroupOpertionDto>), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> GetGroupOperationsAsync(
             [FromRoute] int idWell,
-            [FromQuery] int? opertaionType = default,
-            [FromQuery] IEnumerable<int> sectionTypeIds = default,
-            [FromQuery] IEnumerable<int> operationCategoryIds = default,
-            [FromQuery] DateTime begin = default,
-            [FromQuery] DateTime end = default,
-            [FromQuery] double minDepth = double.MinValue,
-            [FromQuery] double maxDepth = double.MaxValue,
-            CancellationToken token = default)
+            [FromQuery] WellOperationRequestBase request,
+            CancellationToken token)
         {
             if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
                 return Forbid();
 
+            var requestToService = new WellOperationRequest(request, idWell);
             var result = await operationService.GetGroupOperationsStatAsync(
-                idWell,
-                opertaionType,
-                sectionTypeIds,
-                operationCategoryIds,
-                begin,
-                end,
-                minDepth,
-                maxDepth,
+                requestToService,
                 token)
                 .ConfigureAwait(false);
             return Ok(result);
@@ -165,8 +123,8 @@ namespace AsbCloudWebApi.Controllers
         [Route("{idOperation}")]
         [Permission]
         [ProducesResponseType(typeof(WellOperationDto), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> GetAsync(int idWell, int idOperation,
-            CancellationToken token = default)
+        public async Task<IActionResult> GetOrDefaultAsync(int idWell, int idOperation,
+            CancellationToken token)
         {
             if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
                 return Forbid();
@@ -186,13 +144,17 @@ namespace AsbCloudWebApi.Controllers
         [Permission]
         [ProducesResponseType(typeof(IEnumerable<WellOperationDto>), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> InsertRangeAsync(int idWell, [FromBody] IEnumerable<WellOperationDto> values,
-            CancellationToken token = default)
+            CancellationToken token)
         {
             if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
                 return Forbid();
 
-            var result = await operationService.InsertRangeAsync(idWell, values, token)
+            foreach(var value in values)
+                value.IdWell= idWell;
+
+            var result = await operationService.InsertRangeAsync(values, token)
                 .ConfigureAwait(false);
+
             return Ok(result);
         }
 
@@ -208,12 +170,15 @@ namespace AsbCloudWebApi.Controllers
         [Permission]
         [ProducesResponseType(typeof(WellOperationDto), (int)System.Net.HttpStatusCode.OK)]
         public async Task<IActionResult> UpdateAsync(int idWell, int idOperation,
-            [FromBody] WellOperationDto value, CancellationToken token = default)
+            [FromBody] WellOperationDto value, CancellationToken token)
         {
             if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
                 return Forbid();
 
-            var result = await operationService.UpdateAsync(idWell, idOperation, value, token)
+            value.IdWell= idWell;
+            value.Id = idOperation;
+
+            var result = await operationService.UpdateAsync(value, token)
                 .ConfigureAwait(false);
             return Ok(result);
         }
@@ -228,7 +193,7 @@ namespace AsbCloudWebApi.Controllers
         [HttpDelete("{idOperation}")]
         [Permission]
         [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> DeleteAsync(int idWell, int idOperation, CancellationToken token = default)
+        public async Task<IActionResult> DeleteAsync(int idWell, int idOperation, CancellationToken token)
         {
             if (!await CanUserAccessToWellAsync(idWell,
                 token).ConfigureAwait(false))
@@ -254,8 +219,8 @@ namespace AsbCloudWebApi.Controllers
         [Route("import/{options}")]
         public async Task<IActionResult> ImportAsync(int idWell,
             [FromForm] IFormFileCollection files,
-            int options = 0,
-            CancellationToken token = default)
+            int options,
+            CancellationToken token)
         {
             int? idCompany = User.GetCompanyId();
             int? idUser = User.GetUserId();
@@ -297,7 +262,7 @@ namespace AsbCloudWebApi.Controllers
         [Route("export")]
         [Permission]
         [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token = default)
+        public async Task<IActionResult> ExportAsync([FromRoute] int idWell, CancellationToken token)
         {
             int? idCompany = User.GetCompanyId();
 
@@ -324,7 +289,7 @@ namespace AsbCloudWebApi.Controllers
         [Route("scheduleReport")]
         [Permission]
         [ProducesResponseType(typeof(PhysicalFileResult), (int)System.Net.HttpStatusCode.OK)]
-        public async Task<IActionResult> ScheduleReportAsync([FromRoute] int idWell, [FromServices] IScheduleReportService scheduleReportService, CancellationToken token = default)
+        public async Task<IActionResult> ScheduleReportAsync([FromRoute] int idWell, [FromServices] IScheduleReportService scheduleReportService, CancellationToken token)
         {
             int? idCompany = User.GetCompanyId();
 
@@ -355,11 +320,12 @@ namespace AsbCloudWebApi.Controllers
             return File(stream, "application/octet-stream", fileName);
         }
 
-        private async Task<bool> CanUserAccessToWellAsync(int idWell, CancellationToken token = default)
+        private async Task<bool> CanUserAccessToWellAsync(int idWell, CancellationToken token)
         {
             int? idCompany = User.GetCompanyId();
             return idCompany is not null && await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
                 idWell, token).ConfigureAwait(false);
         }
     }
+#nullable disable
 }

AsbCloudWebApi/Middlewares/RequerstTrackerMiddleware.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.Middlewares
 {
+#nullable enable
     public class RequerstTrackerMiddleware
     {
         private readonly RequestDelegate next;
@@ -18,8 +19,8 @@ namespace AsbCloudWebApi.Middlewares
             var service = context.RequestServices.GetRequiredService<AsbCloudApp.Services.IRequerstTrackerService>();
             var requestLog = new AsbCloudApp.Data.RequestLogDto
             {
-                UserLogin = context.User?.Identity.Name,
-                UserIp = context.Connection.RemoteIpAddress.ToString(),
+                UserLogin = context.User.Identity?.Name ?? string.Empty,
+                UserIp = context.Connection?.RemoteIpAddress?.ToString(),
                 RequestMethod = context.Request.Method,
                 RequestPath = context.Request.Path.Value,
                 Referer = context.Request.Headers["Referer"].ToString(),
@@ -32,7 +33,7 @@ namespace AsbCloudWebApi.Middlewares
             var sw = System.Diagnostics.Stopwatch.StartNew();
             try
             {
-                await next?.Invoke(context);
+                await next.Invoke(context);
                 sw.Stop();
                 requestLog.ElapsedMilliseconds = sw.ElapsedMilliseconds;
                 requestLog.Status = context.Response.StatusCode;
@@ -43,10 +44,10 @@ namespace AsbCloudWebApi.Middlewares
                 sw.Stop();
                 requestLog.ElapsedMilliseconds = sw.ElapsedMilliseconds;
                 requestLog.Status = context.Response.StatusCode;
-                // TODO: Add request params and body size.
                 service.RegisterRequestError(requestLog, ex);
                 throw;
             }
         }
     }
+#nullable disable
 }